diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index 187dbc68fe5..5d9e4456afa 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -98,6 +98,7 @@ character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms # Dignitary - Nanotrasen Representative character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms +character-tiem-group-LoadoutNanotrasenRepresentativeWeapon = Nanotrasen Representative Weapons # Engineering character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml index 6864346e3fb..abdb0d64cba 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml @@ -12,4 +12,11 @@ - type: loadout id: LoadoutClothingUniformJumpskirtNanotrasenRepresentative - type: loadout - id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative \ No newline at end of file + id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative + +- type: characterItemGroup + id: LoadoutNanotrasenRepresentativeWeapon + maxItems: 1 + items: + - type: loadout + id: LoadoutNanotrasenRepresentativeDisabler diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index df4641827b1..6785abf2099 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -566,6 +566,35 @@ bluntStaminaDamageFactor: 2.5 wideAnimationRotation: 135 +- type: entity + name: CentCom disabler + parent: WeaponDisabler + id: WeaponCCDisabler + description: An improved self-defense weapon that exhausts organic targets, weakening them until they collapse. Only for the finest officers that we don't trust with lethals. + components: + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 20 + - type: StealTarget + stealGroup: WeaponCCDisabler + - type: Gun + fireRate: 3 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/ccdisabler.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Tag + tags: + - HighRiskItem + - Taser + - Sidearm + - type: entity name: disabler SMG parent: BaseWeaponBattery diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml index 858c7a65e8a..f17b3013b08 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml @@ -19,7 +19,19 @@ # Ears # Equipment - +- type: loadout + id: LoadoutNanotrasenRepresentativeDisabler + category: JobsCommandNanorep + cost: 0 + canBeHeirloom: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNanotrasenRepresentativeWeapon + - !type:CharacterJobRequirement + jobs: + - NanotrasenRepresentative + items: + - WeaponCCDisabler # Eyes # Gloves @@ -63,4 +75,4 @@ jobs: - NanotrasenRepresentative items: - - ClothingUniformJumpsuitNanotrasenRepresentative \ No newline at end of file + - ClothingUniformJumpsuitNanotrasenRepresentative diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png new file mode 100644 index 00000000000..e780187b0bb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ce393454ded Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ce393454ded Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png new file mode 100644 index 00000000000..c1ceb2a91dd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png new file mode 100644 index 00000000000..ccd1e39299b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png new file mode 100644 index 00000000000..6f5bb847fff Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png new file mode 100644 index 00000000000..9fce41b8707 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png new file mode 100644 index 00000000000..cad42dcfd79 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png new file mode 100644 index 00000000000..9abb79eee04 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png new file mode 100644 index 00000000000..6feb5766f67 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png new file mode 100644 index 00000000000..ebc20e06ab9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png new file mode 100644 index 00000000000..eb5a3cb4619 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png new file mode 100644 index 00000000000..3a79d38e486 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png new file mode 100644 index 00000000000..4efbefc03b0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png new file mode 100644 index 00000000000..c42804f9ff4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..2729cc16ae9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..5b1ee7abca4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..9fd9947bd51 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..b2ac90405bb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..2077862fdb4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json new file mode 100644 index 00000000000..5ff0eda7009 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json @@ -0,0 +1,81 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, painted green by Timfa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-0" + }, + { + "name": "inhand-left-1" + }, + { + "name": "inhand-left-2" + }, + { + "name": "inhand-left-3" + }, + { + "name": "inhand-left-4" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-0" + }, + { + "name": "inhand-right-1" + }, + { + "name": "inhand-right-2" + }, + { + "name": "inhand-right-3" + }, + { + "name": "inhand-right-4" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}