From ae9af7326399107f532f8515812175e40247d6e9 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:10:07 -0500 Subject: [PATCH] Adds the Improvised Shotgun (#18025) * improvised shotguns * spaghetti * progress so far (TODO: rename modular_reciever.yml) * i forgotted * everything so far * fuck fuck fuck (boner boner) * ganon: You must die * bobie * boob boob booby balls --- .../Locale/en-US/tools/tool-qualities.ftl | 3 ++ .../Prototypes/Catalog/Fills/Lockers/misc.yml | 8 ++++ .../Objects/Materials/crafting_parts.yml | 0 .../Objects/Misc/improvised_gun_parts.yml | 38 ++++++++++++++++++ .../Guns/Ammunition/Cartridges/shotgun.yml | 19 +++++++++ .../Guns/Ammunition/Projectiles/shotgun.yml | 15 +++++++ .../Weapons/Guns/Shotguns/shotguns.yml | 32 +++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Graphs/improvised/improvised_shotgun.yml | 28 +++++++++++++ .../Graphs/improvised/rifle_stock.yml | 14 +++++++ .../Recipes/Crafting/improvised.yml | 26 ++++++++++++ Resources/Prototypes/Recipes/Lathes/misc.yml | 8 ++++ Resources/Prototypes/tags.yml | 6 +++ Resources/Prototypes/tool_qualities.yml | 2 +- .../Misc/modular_receiver.rsi/icon.png | Bin 0 -> 353 bytes .../Misc/modular_receiver.rsi/inhand-left.png | Bin 0 -> 240 bytes .../modular_receiver.rsi/inhand-right.png | Bin 0 -> 260 bytes .../Misc/modular_receiver.rsi/meta.json | 22 ++++++++++ .../Objects/Misc/rifle_stock.rsi/icon.png | Bin 0 -> 296 bytes .../Misc/rifle_stock.rsi/inhand-left.png | Bin 0 -> 289 bytes .../Misc/rifle_stock.rsi/inhand-right.png | Bin 0 -> 297 bytes .../Objects/Misc/rifle_stock.rsi/meta.json | 22 ++++++++++ .../shotgun_shell.rsi/improvised-spent.png | Bin 0 -> 284 bytes .../Casings/shotgun_shell.rsi/improvised.png | Bin 0 -> 282 bytes .../Casings/shotgun_shell.rsi/meta.json | 8 +++- .../equipped-BACKPACK.png | Bin 0 -> 541 bytes .../Shotguns/improvised_shotgun.rsi/icon.png | Bin 0 -> 379 bytes .../improvised_shotgun.rsi/inhand-left.png | Bin 0 -> 500 bytes .../improvised_shotgun.rsi/inhand-right.png | Bin 0 -> 512 bytes .../improvised_shotgun.rsi/ishotgunstep1.png | Bin 0 -> 301 bytes .../improvised_shotgun.rsi/ishotgunstep2.png | Bin 0 -> 403 bytes .../Shotguns/improvised_shotgun.rsi/meta.json | 32 +++++++++++++++ 32 files changed, 282 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Materials/crafting_parts.yml create mode 100644 Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml create mode 100644 Resources/Textures/Objects/Misc/modular_receiver.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/modular_receiver.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/modular_receiver.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/modular_receiver.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/rifle_stock.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/rifle_stock.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/rifle_stock.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/rifle_stock.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl index 3036de0219..d12eb1104e 100644 --- a/Resources/Locale/en-US/tools/tool-qualities.ftl +++ b/Resources/Locale/en-US/tools/tool-qualities.ftl @@ -24,3 +24,6 @@ tool-quality-sawing-tool-name = Saw tool-quality-honking-name = Honking tool-quality-honking-tool-name = Bike Horn + +tool-quality-woodcutting-name = Woodcutting +tool-quality-woodcutting-tool-name = Hatchet \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 59fedf3654..1da5a38912 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -127,6 +127,8 @@ prob: 0.25 - id: StrangePill prob: 0.20 + - id: ModularReceiver + prob: 0.1 - id: DrinkSpaceGlue prob: 0.20 - id: DrinkSpaceLube @@ -208,6 +210,12 @@ prob: 0.1 - id: ClothingHandsGlovesColorYellowBudget prob: 0.25 + - id: StrangePill + prob: 0.20 + - id: DrinkSpaceGlue + prob: 0.20 + - id: ModularReceiver + prob: 0.1 # Syndicate loot - id: null prob: 0.95 diff --git a/Resources/Prototypes/Entities/Objects/Materials/crafting_parts.yml b/Resources/Prototypes/Entities/Objects/Materials/crafting_parts.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml new file mode 100644 index 0000000000..05bf36d83f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml @@ -0,0 +1,38 @@ +#The entire game mysteriously shits itself and dies if you uncomment the item size. I have no idea why. +#TODO: Assimilate these into the same RSI. +- type: entity + parent: BaseItem + id: ModularReceiver + name: modular receiver + description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that. + components: +# - type: Item +# size: 15 + - type: Sprite + sprite: Objects/Misc/modular_receiver.rsi + - type: Item + sprite: Objects/Misc/modular_receiver.rsi + - type: Tag + tags: + - ModularReceiver + - Metal + +- type: entity + parent: BaseItem + id: RifleStock + name: rifle stock + description: A robust wooden stock, used in the creation of firearms. #Same as above + components: +# - type: Item +# size: 25 + - type: Sprite + sprite: Objects/Misc/rifle_stock.rsi + - type: Item + sprite: Objects/Misc/rifle_stock.rsi + - type: Construction + graph: RifleStockGraph + node: riflestock + - type: Tag + tags: + - RifleStock + - Wooden diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 297d9e9df7..21780fefb6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -130,3 +130,22 @@ maxTransferAmount: 7 - type: SpentAmmoVisuals state: "practice" + +#Not yet craftable due to balance concerns. Should take a good bit of setup to create like the /tg/station recipe. +#Either the improvised shotgun or its recipe (as of July 2023) will also probably have to be nerfed if you decide to make this craftable. +- type: entity + id: ShellShotgunImprovised + name: improvised shotgun shell + description: A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. + parent: BaseShellShotgun + components: + - type: Sprite + layers: + - state: improvised + map: [ "enum.AmmoVisualLayers.Base" ] + - type: CartridgeAmmo + count: 10 + spread: 45 #deadly if you can get up close... otherwise, good luck doing any kind of real damage + proto: PelletShotgunImprovised + - type: SpentAmmoVisuals + state: "improvised" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 6254136f3e..ec23d3063a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -70,6 +70,21 @@ types: Blunt: 1 +- type: entity + id: PelletShotgunImprovised + name: improvised pellet + noSpawn: true + parent: BaseBullet + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot + - type: Projectile + damage: + types: + Piercing: 3 + Slash: 3 #remember, it's metal shrapnel! + - type: entity id: PelletShotgunTranquilizer name: pellet (.50 tranquilizer) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 128898675c..ab122ef0de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -220,3 +220,35 @@ fireRate: 2 - type: BallisticAmmoProvider capacity: 1 + +- type: entity + name: improvised shotgun + parent: BaseWeaponShotgun + id: WeaponShotgunImprovised + description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + - type: Item + size: 75 + - type: Gun + fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. + - type: BallisticAmmoProvider + capacity: 1 + proto: null + - type: Construction + graph: ImprovisedShotgunGraph + node: shotgun + - type: StaticPrice + price: 400 + +- type: entity + name: improvised shotgun + parent: WeaponShotgunImprovised + suffix: Loaded + id: WeaponShotgunImprovisedLoaded + components: + - type: BallisticAmmoProvider + proto: ShellShotgunImprovised \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 602d593e7b..da5781057c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -98,6 +98,7 @@ - GasAnalyzer - UtilityBelt - Pickaxe + - ModularReceiver - AppraisalTool - SheetRGlass - Beaker diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml new file mode 100644 index 0000000000..f8e7b64b90 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: ImprovisedShotgunGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: Pipe + icon: + sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeStraight + name: pipe + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: modular receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: rifle stock + - material: Cloth + amount: 3 + doAfter: 10 + - node: shotgun + entity: WeaponShotgunImprovised diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml new file mode 100644 index 0000000000..acb743b442 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml @@ -0,0 +1,14 @@ +#In its own file and not improvised-shotgun.yml in case anyone ever wants to add more guns that use it. +- type: constructionGraph + id: RifleStockGraph + start: start + graph: + - node: start + edges: + - to: riflestock + steps: + - material: WoodPlank + amount: 5 + doAfter: 4 + - node: riflestock + entity: RifleStock \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 33a963d3a9..3043c0f7a1 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -112,3 +112,29 @@ icon: sprite: Objects/Specific/Janitorial/rag.rsi state: rag + +- type: construction + name: improvised shotgun + id: improvisedshotgun + graph: ImprovisedShotgunGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: A shitty, single-shot shotgun made from salvaged and hand-crafted gun parts. Ammo not included. + icon: + sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + state: icon + +- type: construction + name: rifle stock + id: riflestock + graph: RifleStockGraph + startNode: start + targetNode: riflestock + category: construction-category-weapons + objectType: Item + description: A stock carved out of wood, vital for improvised firearms. + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 5e53366660..5aff63ed92 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -84,3 +84,11 @@ materials: Steel: 1000 Plastic: 500 + +- type: latheRecipe + id: ModularReceiver + result: ModularReceiver + completetime: 12 + materials: + Steel: 750 + Plastic: 100 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 4103b904cb..5a5d407dde 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -875,3 +875,9 @@ - type: Tag id: Write + +- type: Tag + id: RifleStock + +- type: Tag + id: ModularReceiver diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml index 08e00f17ce..6525454287 100644 --- a/Resources/Prototypes/tool_qualities.yml +++ b/Resources/Prototypes/tool_qualities.yml @@ -59,4 +59,4 @@ name: tool-quality-honking-name toolName: tool-quality-honking-tool-name spawn: BikeHorn - icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon } + icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon } \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/modular_receiver.rsi/icon.png b/Resources/Textures/Objects/Misc/modular_receiver.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..37408defadab2df72158a8866919a55ab15eb4af GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xj z)5S5QV$R!3=eyhjB-lQ%2Y+#mym4y>TXt&tTd|nwz1$nhq_>Hk+TY6R86l81$H>>$ z*ZoTP<;w8mmY@E_z5jV&b~mF$0|@<7Kk#|a-c?#Ifk$k)0zymw|GZNwtK!+Dz#(yb z;v368=35_DH_Uxrd16z~zW1IhQX^+9>y)`x+FLpAU8YoId!mQ!Z|{cvul5LM&WhvP x&uhSwykEFZxG+x3>)WoD_K&0!p5$$TZEZF8Dt& zviaaq&(Dm`pY8=kcxfv00u?hbgddfVPqsYUHRo>akxai`HRgL6HJ66#EcMa;HTSc| z)@!NjL9PLU59QkXH`%|nd9A&7!Clu_+x%BG4%u&~70d0m{q@En|InGrmd9V%X1Fsj b)CnIFzA#xbxBbcYogkf_u6{1-oD!Mejv*CsZ*T49Z8i{K2$(!gaK-^!UEAu4 z*lUHpE-AMXRJfZy#Xa^)lI+OK%nc1~f+&65V3MKU{ zy?(;x{OhtGg);J=xzAbrVLWWmGN*XEj(7Mnuto-kf2Xf%exC1j@xI`hZRxLTS97bB xRqu89?9{?_*`zk;YidRRl%UVy3=BKsIP$}rgnp|vd$@?2>?z%U!MQ~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/modular_receiver.rsi/meta.json b/Resources/Textures/Objects/Misc/modular_receiver.rsi/meta.json new file mode 100644 index 0000000000..a8748c9eba --- /dev/null +++ b/Resources/Textures/Objects/Misc/modular_receiver.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Inhands sprited by Flareguy for Space Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/rifle_stock.rsi/icon.png b/Resources/Textures/Objects/Misc/rifle_stock.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..305627ce6a513222166ea74ae6f904da3dcf42cb GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0s`$ z#WAE}&f6>AT!#z<7%rGZ31k&MX8*|Y=#=ma(LF5{D)|pZ_c%_MTj+832eV_6%2bCW zFDuTrT{9YU)Kost;LM!d#>~j!z`!K%;eW$drH3Y$if{k5RkG*Ob`X(Y7IJ!Sp8lpt zHJKtymRB}Sb8{Ocxz~MyJy@$t*FMkW|&_48&*Q2MUBd??VW%q}F>>(ak_c^e#Iw-t) q(Zm?j#mf4FjY*(^fyIQcg1N*xaEHsRs4GBUGI+ZBxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwW;k%y`0xfAasUMud1(iL)RhGJ1^@s5pTR+E_2TJPy*XJ{IKX)|uJ`l#@ aBJ-3k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwW;k%y`0xfAasUMud1(iL)RhGJ1^@s5pTR+E(+Pm&m|paz%Sdg&!NciH|ImOBejes4Us$UE|2}j z&!u4i(W%T~wpr6Qjy2T%<&Rz_-Fivh#vGQD%3+P}mWk`EH$Hkcxlr$eXr$35ZPU_| eY}dJ;)i7vW(C@i6F*z3KLIzJ)KbLh*2~7a_l4F$s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/rifle_stock.rsi/meta.json b/Resources/Textures/Objects/Misc/rifle_stock.rsi/meta.json new file mode 100644 index 0000000000..a8748c9eba --- /dev/null +++ b/Resources/Textures/Objects/Misc/rifle_stock.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Inhands sprited by Flareguy for Space Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png new file mode 100644 index 0000000000000000000000000000000000000000..cca772d66f5a60e45cfa5e2b889fa886ca18e7b5 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STZ{EDQe*O9e0fsLO^8f$;pE6~Ns;X*eXsErtJy6N%%t;r36jw=* zUocP>0vI-((K!zk zxK{51HQ%Z-f2QOkA@)TM=lKmv!x%E!=dm&bzBtREv7CF&1)l~(WhN^@MsdXsZwaj`>`E3O+AXtSbP0l+XkKEB0j& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png new file mode 100644 index 0000000000000000000000000000000000000000..6d600ab9ce277040ebead4519c4e9faa5d8206fd GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STZ{EDQe*O9e0fsLO^8f$;pE6~Ns;X*eXsErtJy6N%%t;r36jw=* zUocP>0vI-((K!zkZ!|`)O@ST{2%qXO|E;=Fi~FN%^HRaV#?eMO54R51N>NXUT`)TDl_>VVqWL;K>ne_ z>)9G+y=NMhh6(=fl)Ur2HMik44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y*7)!S8giW4I(=fKz}=JUNN z*474OFMrWI4@mKs1o;L3M*$31?#x&Sl;SM#h%9Dc;5!V$jK}j=qyQZe=jq}Y65;-K z+Uvd+1s*rX?(DrE{`K!(suV5AlK$89p^9+e&puaU%~O9T>vc5o+Ze6fTA35zmTh;* zpPy|W_W_=J2bfN6e#<$Fr~N=fSo6cvXMdzOoo~6cl}+MXqUh^848I?D?kF=h+sBsu zwqJ_3C3t356zkKgCVuY!R64}-9aIjRv>HDO*}n2xgYm7CU4J42);50H*Hmy!CI8(% zmM3WMj!sjuT%55X~A5*7fk-*d$cWf#megbyWu48JC*kqUyGn33s+Q? zG-HvqQhQJh`w8BO5=v%U!)Lh|E2ld;SAR9;YMQAZ&Ql|uE@$k?+S~L==nq%^!`rL} zAI)}L+E9B)>(;s1O>b}Yajl7#5V)`UVEPT0m)acfZHvBtSoXkp*8^^rbAOo<|J@LK Te?__v82k*Lu6{1-oD!Mj-Lq%Uu3fwKt*BE|Q%g!pii?YjjEoEk37HrvP~*cJXvhIH@>V*#ACQtN3Gxg6 zj|(t}C^6gus^Tp0h%9Dc;5!V$jK}j=qyPmcc)B=-Sopu4aGLM10uM{&%p>o*uc;jP z|3Aam>59yXMR8T9WG1|k)#V7~vuK_ApR2Zf|J5kz*9W3M81O9KdT!@OWri%}HpK~Z z^h);Lm3L86VB#P(8_;bGp00i_>zopr04Ext^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9e52a5bbdd3c0d25e6556b3c36da8e87b4c9aba6 GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z?%1)Tt*tFCE>2NV(a+CMP*Bj=*jPzPNkl}X#)o%eq=2z7LxuzQ z-IME1ZJi!y$N|*%&~xuAASGB5Eaj?;r@2&>1l@)1YANd2?fag|G%|uqw(RzQa*RiKFoWQ9Bj@xd)E>DnN6A=UsyA( zD_qKJciwyS)~c?}<<#+s3pdw1cW0~I{+ykyaB1D=lM5alD&`f_3DkUKxp2yq>GvG& zey&luWMj&~utJimB9pn=cr`P<`66_4#4^hG$t`5K#)eGZDKEK5*0G5ylPc@Ng# zvHE&V@JZ!O1@2ROG6YylPk;W?EoYk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z?%1&-E-tREtxZu;(a+CMP*Bj=*jPzPX=0>6jSsJgh{)ZO>oOd; zjfELbZJi!y$N|(>aa8R;kP<8j@(cct1{hS=&P)PIau#?*7BevL9R^{>$dNQ znVrqQ%&ki}P*>b|o9%Lb{DWl&zwK6k!=5-zDlY0q-7kIzjytO!wd%4-$sM~Tsm8Fo ziqU7CM(Q+%{9ucN(hldgX{G+GiFFiy@jiXws*cjgm7kd2nsZGEI@|Rsw&D6B)Aktg zkPG~30h79PvSPQ@*&W1>K|hfJ%1vhsoKO*SYp^ oPJ?Z$fA=?8n;ewq*z%9@Oyf_3dqwsC|boFyt=akR{02Xu85C8xG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep1.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep1.png new file mode 100644 index 0000000000000000000000000000000000000000..0603dfcb513a6a4ef869ec39387515990e2b66cc GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tt~ z#WAE}&f7@`Ia>?_T-DW{JqTQL#7XCH+?s>YUMFrU?YYs)5f>tG(umQS<*3e@*Qs_V z&eSCR>vlVET8V*40gQe~I|PcjWuI+gShdRN_O_js@0U(FU}^v3vyHsXn~UpTOD)SR z`WN{_l|k!#ar9!1P5j9`#|m3iJP$}Dr(cP?=sYzw^R-;x>)Htl4eMSn$c?_e{`D)f zLw0@1+t1B!6}Vt>R#C?{IAYq-Z;{hx?t6c@t}*DoL3=v4+!S3j3^P6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep2.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/ishotgunstep2.png new file mode 100644 index 0000000000000000000000000000000000000000..2908400dd3152c0c1e7ec66b59f47396a847be60 GIT binary patch literal 403 zcmV;E0c`$>P)f`Q6Q&Rd4IPh3_BVi3BLi5{jbW6T>jb4`FWGwp=tG zTb2cRo-4cdJP-Q5-xPQ{g5}l6R^ik6rhCilV}=kMAWhRr?fNR;_t|({*R?W_9q>;K z#d~?B5`u38zM-nBw!jfe_^W2dRt<%Va~t;Qpnt)*IO^fK7dbmym^;@T6ku0J1jy~> xOdc0@MZo>qMKtP$qW^mnY5)zO0W`o=eF8>WfW7(jf6f2^002ovPDHLkV1ifytgHY4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json new file mode 100644 index 0000000000..3a12cd6330 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, inhand and back sprites modified by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "ishotgunstep1" + }, + { + "name": "ishotgunstep2" + } + ] +} \ No newline at end of file