hos loadout and gun sprites

impstation · Nov 6, 2024 · a014edb · a014edb
1 parent 4aae477
commit a014edb
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 6 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -368,10 +368,10 @@
     sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase]
   id: ClothingUniformJumpsuitHoSGrey
   name: head of security's grey jumpsuit
-  description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger.
+  description: A grey jumpsuit for the Head of Security, unfortunately resembling a passenger's uniform.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
@@ -1334,7 +1334,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitLoungewearWeb

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -29,6 +29,11 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoS
 
+- type: loadout
+  id: HeadofSecurityJumpsuitGrey
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoSGrey
+
 - type: loadout
   id: HeadofSecurityTurtleneck
   equipment:

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1412,6 +1412,7 @@
   loadouts:
   - HeadofSecurityJumpsuit
   - HeadofSecurityJumpskirt
+  - HeadofSecurityJumpsuitGrey
   - HeadofSecurityTurtleneck
   - HeadofSecurityTurtleneckSkirt
   - HeadofSecurityFormalSuit
@@ -1435,6 +1436,8 @@
   - HeadofSecurityCoat
   - HeadofSecurityWinterCoat
   - HeadofSecurityWinterCoatUnarmored
+  - ArmorVest
+  - ArmorVestSlim
   - HeadofSecurityEliteArmor
 
 - type: loadoutGroup

diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
diff --git a/...ures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/...ures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
diff --git a/...ces/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/...ces/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/...tures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/folded-equipped-INNERCLOTHING.png b/...tures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/folded-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Sha-Seng (Github). In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    },
     {
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png
diff --git a/.../Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png b/.../Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png
diff --git a/...xtures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png b/...xtures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png
diff --git a/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png b/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png
diff --git a/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png b/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png
diff --git a/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png b/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png
diff --git a/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png b/...ces/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.",
+    "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference, then modified by Sha-Seng (github).",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111, then modified by Sha-Seng (Github)",
   "size": {
     "x": 32,
     "y": 32