diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 862d3369ae6..04794709892 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -10,6 +10,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - type: Item size: Large + sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi # it just looks good - type: GunRequiresWield - type: Gun fireRate: 1.5 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json index 013ebbce3f2..b57507c99c6 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -1,35 +1,43 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson.", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson. Wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..42926b00f47 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..fd58fca837b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json index 3df5f2ca034..424cc69c69a 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111, wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", "size": { "x": 32, "y": 32 @@ -28,6 +28,14 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..42926b00f47 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..fd58fca837b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png differ