diff --git a/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl index 8196f47ac86..f03f2579e06 100644 --- a/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl @@ -5,3 +5,5 @@ uplink-hardsuit-cybersunsciencesuit-desc = A scientific reseach hardsuit meant t uplink-dislippler-name = Dislippler uplink-dislippler-desc = Standard-issue security disabler on Honk! Co. stations. Ultimate proof that God has abandoned us. +uplink-folding-shotgun-name = Folding Shotgun +uplink-folding-shotgun-desc = A 4 round capacity shotgun that can be folded up to conceal with ease. Stolen from the Quartermaster of a far away station. Chambered in 12 gauge shotgun shells. diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 484df454c14..86dae9372ce 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -179,6 +179,9 @@ - id: WeaponSniperMosin prob: 0.01 orGroup: Weapons + - id: WeaponShotgunFoldingBeanbag + prob: 0.05 + orGroup: Weapons - id: WeaponMakeshiftLaser prob: 0.001 orGroup: Weapons diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 3bcd4d54775..fe5310b1fb0 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -159,6 +159,9 @@ - id: CargoSaleComputerCircuitboard - id: CargoShuttleConsoleCircuitboard - id: SalvageMagnetMachineCircuitboard + # Commented incase I wanna bring it back + #- id: WeaponShotgunFoldingBeanbag # Omu + #- id: BoxBeanbag # Omu - id: CigPackGreen prob: 0.75 - id: ClothingHeadsetAltCargo diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index bd89edfc18a..691cbf09f12 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -261,6 +261,8 @@ - id: ClothingShoesBootsCombatFilled - id: ToolboxSyndicateFilled - id: BalloonSyn + - id: WeaponShotgunFoldingBeanbag + weight: 2 - id: WeaponSniperMosin weight: 2 - id: ClothingHandsKnuckleDustersSyndicate diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3ac2922bfad..2b07f1f2afa 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -356,6 +356,15 @@ categories: - UplinkWeaponry + - type: listing + id: UplinkFoldingShotgun + name: uplink-folding-shotgun-name + description: uplink-folding-shotgun-desc + productEntity: WeaponShotgunFolding + cost: + Telecrystal: 25 + categories: + - UplinkWeaponry - type: listing id: UplinkGrenadeLauncherBundle diff --git a/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml index fa63c1e5041..7d534238ce1 100644 --- a/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml @@ -24,3 +24,12 @@ whitelist: - Clown +- type: listing + id: UplinkFoldingShotgun + name: uplink-folding-shotgun-name + description: uplink-folding-shotgun-desc + productEntity: WeaponShotgunFolding + cost: + Telecrystal: 20 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml index 3dfb528b907..da9cd102e73 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml @@ -7,3 +7,85 @@ - type: Contraband allowedDepartments: [ CentralCommand ] severity: Restricted + +- type: entity + name: folding shotgun + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMajorContraband] + id: WeaponShotgunFolding + description: An abysmally outdated, but otherwise decently effective and compact shotgun. Chambered in 12 gauge shotgun shells. + components: + - type: Item + size: Normal + storedRotation: -45 + - type: Sprite + sprite: _Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi + layers: + - state: bow-folded + map: [ "base" ] + - state: unwielded-arrow + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "bowstring" ] + - type: ToggleableVisuals + spriteLayer: bowstring + inhandVisuals: + left: + - state: inhand-left-bowstring + shader: unshaded + map: [ "left" ] + - state: wielded-inhand-left-bowstring + shader: unshaded + visible: false + map: [ "wielded-left" ] + right: + - state: inhand-right-bowstring + shader: unshaded + map: [ "right" ] + - state: wielded-inhand-right-bowstring + shader: unshaded + visible: false + map: [ "wielded-right" ] + clothingVisuals: + back: + - state: bowstring-equipped-BACKPACK + shader: unshaded + suitstorage: + - state: bowstring-equipped-BACKPACK + shader: unshaded + - type: GenericVisualizer + visuals: + enum.ToggleableVisuals.Enabled: + base: + True: { state: bow } + False: { state: bow-folded } + - type: Clothing + sprite: _Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi + - type: ToggleableLightWieldable + - type: GunRequiresWield + - type: Appearance + - type: Gun + fireRate: 0.8 + - type: BallisticAmmoProvider + capacity: 4 + - type: GunSpreadModifier + spread: 1.25 + - type: ItemToggle + wieldToggle: false + soundActivate: + path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + soundDeactivate: + path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg + - type: ItemToggleSize + activatedSize: Large + activatedShape: + - 0,0,0,4 + - type: FoldingWeapon + +- type: entity + parent: WeaponShotgunFolding + id: WeaponShotgunFoldingBeanbag + suffix: Non-Lethal + components: + - type: BallisticAmmoProvider + proto: ShellShotgunBeanbag diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow - Copy.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow - Copy.png new file mode 100644 index 00000000000..fcdf39f529e Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow - Copy.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow-folded.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow-folded.png new file mode 100644 index 00000000000..8fa202de74d Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow-folded.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow.png new file mode 100644 index 00000000000..fcdf39f529e Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bowstring-equipped-BACKPACK.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bowstring-equipped-BACKPACK.png new file mode 100644 index 00000000000..de6aadd7827 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bowstring-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-BACKPACK.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-BACKPACK.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-SUITSTORAGE.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-left.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-left.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-right.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-right.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/icon.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/icon.png new file mode 100644 index 00000000000..11c296c2de9 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/icon.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-left-bowstring.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-left-bowstring.png new file mode 100644 index 00000000000..de6aadd7827 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-left-bowstring.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-right-bowstring.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-right-bowstring.png new file mode 100644 index 00000000000..de6aadd7827 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/inhand-right-bowstring.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/meta.json b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/meta.json new file mode 100644 index 00000000000..1e34a0c82f0 --- /dev/null +++ b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/meta.json @@ -0,0 +1,86 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from YogStation at https://github.com/yogstation13/Yogstation at b38f136e1e3b587de23956df450e6d320046bc2b; wielded and worn sprites made by Aviu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bow" + }, + { + "name": "bow-folded" + }, + { + "name": "unfolded-inhand-left", + "directions": 4 + }, + { + "name": "unfolded-inhand-right", + "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-bowstring", + "directions": 4 + }, + { + "name": "inhand-right-bowstring", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left-bowstring", + "directions": 4 + }, + { + "name": "wielded-inhand-right-bowstring", + "directions": 4 + }, + { + "name": "unfolded-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "folded-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "unfolded-equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "folded-equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "bowstring-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-arrow" + }, + { + "name": "unwielded-arrow" + } + ] +} diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-BACKPACK.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-BACKPACK.png new file mode 100644 index 00000000000..243b442073c Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-SUITSTORAGE.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..243b442073c Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-left.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-left.png new file mode 100644 index 00000000000..3163d3f8dae Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-right.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-right.png new file mode 100644 index 00000000000..eafeaabe3fc Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unfolded-inhand-right.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unwielded-arrow.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unwielded-arrow.png new file mode 100644 index 00000000000..15e78643473 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-arrow.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-arrow.png new file mode 100644 index 00000000000..15e78643473 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left-bowstring.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left-bowstring.png new file mode 100644 index 00000000000..de6aadd7827 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left-bowstring.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..e0e4c3379a8 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right-bowstring.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right-bowstring.png new file mode 100644 index 00000000000..de6aadd7827 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right-bowstring.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..b8954e18aae Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/wielded-inhand-right.png differ