diff --git a/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 00000000000..fcb4766049d --- /dev/null +++ b/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,15 @@ +- type: entity + name: CentComm disabler # Frontier: extra M + parent: [BaseC2ContrabandUnredeemable, WeaponDisabler] # Frontier: add BaseC2ContrabandUnredeemable + 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: Gun + fireRate: 3 + - type: Sprite + sprite: _EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi + - type: Clothing + sprite: _EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml index 4be2be90090..7390c499e1a 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml @@ -33,7 +33,7 @@ - type: startingGear id: SrGear equipment: - pocket1: WeaponDisabler + pocket1: WeaponCCDisabler storage: back: - Flash diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png new file mode 100644 index 00000000000..e780187b0bb Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ce393454ded Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ce393454ded Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png new file mode 100644 index 00000000000..9abb79eee04 Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png new file mode 100644 index 00000000000..c42804f9ff4 Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png b/Resources/Textures/_EE/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/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json b/Resources/Textures/_EE/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json new file mode 100644 index 00000000000..5ff0eda7009 --- /dev/null +++ b/Resources/Textures/_EE/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 + } + ] +}