DeltaV-Station · ps3moira · Oct 4, 2023 · Oct 4, 2023 · Oct 5, 2023 · Oct 5, 2023
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -178,6 +178,7 @@
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
       - id: ClothingNeckCloakHos
+      - id: ClothingNeckMantleHOS
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingUniformJumpskirtHoSAlt
       - id: ClothingUniformJumpsuitHoSAlt
@@ -191,7 +192,7 @@
         prob: 0.1
       - id: ClothingOuterHardsuitSecurityRed
       - id: ClothingMaskGasSwat
-      - id: DrinkVacuumFlask
+      - id: DrinkHosFlask
         prob: 0.8
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -13,5 +13,6 @@
     ClothingMaskGasCentcom: 3
     ClothingHeadsetCentCom: 3
     ClothingOuterWinterCentcom: 3
+    ClothingOuterWinterCCWarden: 3
     ClothingNeckScarfStripedCentcom: 3
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -4,7 +4,7 @@
     ClothingBackpack: 5
     ClothingBackpackDuffel: 5
     ClothingBackpackSatchel: 3
-    ClothingBackpackSatchelLeather: 2
+    ClothingBackpackSatchelLeather: 3
     ClothingHeadBandBlack: 2
     ClothingHeadBandBlue: 2
     ClothingHeadBandGreen: 2
@@ -39,6 +39,7 @@
     ClothingUniformJumpsuitJeansRed: 2
     ClothingUniformJumpsuitJeansBrown: 2
     ClothingUniformJumpsuitLostTourist: 2
+    ClothingShoesTourist: 2
     ClothingShoesColorBlack: 8
     ClothingShoesColorBrown: 4
     ClothingShoesColorWhite: 3
@@ -47,6 +48,8 @@
     ClothingShoesColorGreen: 2
     ClothingShoesColorOrange: 2
     ClothingShoesColorRed: 2
+    ClothingShoesBootsLaceup: 4
+    ClothingShoesLeather: 2
     ClothingShoesColorPurple: 2
     ClothingHeadHatGreysoft: 8
     ClothingHeadHatMimesoft: 3
@@ -58,6 +61,23 @@
     ClothingHeadHatPurplesoft: 2
     ClothingHeadHatCorpsoft: 2
     ClothingHeadHatBowlerHat: 2
+    ClothingHeadHatFlatBlack: 2
+    ClothingHeadHatFedoraBlack: 2
+    ClothingHeadHatFlatBrown: 2
+    ClothingHeadHatFedoraChoc: 2
+    ClothingHeadHatFedoraWhite: 2
+    ClothingUniformJumpsuitSuitBlack: 2
+    ClothingUniformJumpsuitSuitBlackAlt: 2
+    ClothingUniformJumpsuitSuitBrown: 2
+    ClothingUniformJumpsuitSuitWhite: 2
+    ClothingNeckTieBlack: 2
+    ClothingNeckTieBrown: 2
+    ClothingNeckTieWhite: 2
+    ClothingNeckTieRed: 2
+    ClothingNeckTieBlue: 2
+    ClothingNeckTieGreen: 2
+    ClothingOuterHoodieBlack: 2
+    ClothingOuterHoodieGrey: 2
     ClothingOuterWinterCoat: 2
     ClothingOuterWinterCoatLong: 2
     ClothingOuterWinterCoatPlaid: 2
@@ -66,8 +86,19 @@
     ClothingOuterCoatLettermanRed: 2
     ClothingOuterDenimJacket: 2
     ClothingOuterCorporateJacket: 2
+    ClothingHeadHatTrucker: 2
     ClothingHeadFishCap: 2
     ClothingShoesBootsFishing: 2
-    ClothingHeadTinfoil: 2
-    ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
+    ClothingEyesEyepatch: 2
+    ClothingEyesGlasses: 2
+    ClothingHandsGlovesFingerless: 3
+  emaggedInventory:
+    ClothingHeadHatFlatSyndie: 1
+    ClothingUniformJumpsuitOperative: 1
+    ClothingUniformJumpskirtOperative: 1
+    ClothingUniformJumpsuitSyndieFormalDress: 1
+    ClothingUniformJumpskirtSyndieFormalDress: 1
+    ClothingUniformJumpskirtTacticalMaid: 1
+    ClothingHandsTacticalMaidGloves: 1
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -1,12 +1,18 @@
 - type: vendingMachineInventory
   id: SalvageEquipmentInventory
   startingInventory:
+    ClothingUniformJumpsuitSalvageSpecialist: 4
+    ClothingBackpackSalvage: 4
+    ClothingBackpackDuffelSalvage: 4
+    ClothingBackpackSatchelSalvage: 4
+    ClothingBeltSalvageWebbing: 4
     Crowbar: 2
     Pickaxe: 4
     OreBag: 4
-    Flare: 4
+    Flare: 6
     FlashlightLantern: 2
     Floodlight: 2
-    HandheldGPSBasic: 2
-    RadioHandheld: 2
+    HandheldGPSBasic: 4
+    RadioHandheld: 4
     WeaponCrusherDagger: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -16,7 +16,10 @@
     ClothingUniformJumpsuitSecSummer: 3
     ClothingHeadsetSecurity: 3
     ClothingOuterWinterSec: 2
+    ClothingOuterCoatGreatcoat: 2
     ClothingOuterArmorBasic: 2
     ClothingOuterArmorBasicSlim: 2 
     ClothingEyesBlindfold: 1
+    ClothingHeadHatTacticalMaidHeadband: 1
+    ClothingMaskNeckGaiter: 2
     ClothingShoesBootsCombat: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -11,6 +11,7 @@
     ClothingOuterWinterMusician: 1
     ClothingUniformDressRed: 1
     ClothingMaskJoy: 2
+    ClothingHeadHatFez: 2
     ClothingHeadHatCardborg: 2
     ClothingOuterCardborg: 2
     ClothingHeadHatSombrero: 2
@@ -34,6 +35,7 @@
     ClothingHeadPaperSackSmile: 2
     ClothingHeadRastaHat: 2
     ClothingEyesBlindfold: 1
+    ClothingEyesGlassesOutlawGlasses: 2
     ClothingUniformSchoolGakuranBlack: 2
     UniformSchoolgirlBlack: 1
     UniformSchoolgirlBlue: 1
@@ -59,11 +61,38 @@
     ClothingUniformJumpsuitDameDane: 1
     ClothingShoesDameDane: 1
     ClothingOuterDameDane: 1
+    ClothingShoeSlippersDuck: 1
+    ClothingHeadHatPirateTricord: 1
+    ClothingHeadHatPirate: 1
+    ClothingUniformJumpsuitPirate: 2
+    ClothingOuterCoatPirate: 2
     ClothingUniformJumpsuitSober: 1
     ClothingOuterClownPriest: 1
     ClothingUniformSkirtTurtle: 2
+    ClothingUniformRat: 1
+    UniformJabroni: 1
     ClothingUniformSwimsuitBlue: 2
+    ClothingUniformJumpskirtPerformer: 1
+    ClothingShoesBootsPerformer: 1
     ClothingCostumeBunnySuit: 2
     ClothingHeadHatBunny: 2
+    ClothingHeadHatCatEars: 2
+    ClothingHeadHatWitch1: 1
+    ClothingOuterVestAmongGrande: 1
+    ClothingHeadHatSkeletonmask: 1
+    ClothingOuterSkeletonCostume: 1
+    ClothingHeadHatRichard: 1
+    ClothingMaskBat: 2
+    ClothingMaskJackal: 2
+    ClothingMaskRaven: 2
+    ClothingMaskBear: 2
+    ClothingHeadHatSquid: 2
+    ClothingMaskBee: 2
+    ClothingMaskFox: 2
+    ClothingMaskRat: 2
   emaggedInventory:
+    ClothingOuterArmorTouseiGusoku: 1
+    ClothingHeadHelmetKabuto: 1
     ClothingShoesBling: 1
+    ClothingUniformJumpsuitGalaxyRed: 1
+    ClothingUniformJumpsuitGalaxyBlue: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -10,7 +10,13 @@
     ClothingNeckScarfStripedOrange: 3
     ClothingNeckScarfStripedPurple: 3
     ClothingOuterWinterCoat: 6
+    ClothingOuterCoatOvercoat: 3
+    ClothingOuterHoodieBlack: 2
+    ClothingOuterHoodieGrey: 2
     ClothingOuterCoatBomber: 3
+    ClothingOuterCoatJensen: 3
+    ClothingOuterCoatLeatherJacket: 2
+    ClothingHeadHatUshanka: 4
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
 

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -68,4 +68,22 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 8
+        Slash: 8
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSkeletonmask
+  name: skeleton mask
+  description: it's a beautiful day outside.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/skeletonmask.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/skeletonmask.rsi
+  - type: TypingIndicatorClothing
+    proto: robot
+  - type: IdentityBlocker
+  - type: IngestionBlocker
+  - type: Tag
+    tags:
+    - HidesHair
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHatAmongGrande
+  noSpawn: true
+  name: among grande hood
+  description: sospechoso...
+  components:
+  - type: Sprite
+    sprite:  DeltaV/Clothing/Head/Hoods/amonggrande.rsi
+  - type: Clothing
+    sprite:  DeltaV/Clothing/Head/Hoods/amonggrande.rsi  
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
@@ -90,3 +90,15 @@
       coefficients:
         Slash: 0.9
         Heat: 0.75
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterSkeletonCostume
+  name: skeleton costume
+  description: Once we're dead, the only thing that's left is bones, hee hee hee!.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Coats/skeletoncostume.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Coats/skeletoncostume.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml
@@ -37,3 +37,20 @@
         Heat: 0.9
   - type: ExplosionResistance
     damageCoefficient: 0.9
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestAmongGrande
+  name: among grande
+  description: Sospechoso...
+  components:
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatAmongGrande
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Vests/amonggrande.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Vests/amonggrande.rsi
+  - type: TemperatureProtection
+    coefficient: 0.5    
+  - type: TypingIndicatorClothing
+    proto: lawyer
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -80,8 +80,8 @@
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesOutlawGlasses
-  name: outlaw glasses
-  description: A must for every self-respecting undercover agent.
+  name: silly glasses
+  description: Suddenly you look unrecognizable wearing these.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Glasses/outlawglasses.rsi

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
@@ -2,7 +2,7 @@
   parent: ClothingEyesBase
   id: ClothingEyesEyepatch
   name: eyepatch
-  description: Yarr.
+  description: A small patch worn to cover a scar.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Misc/eyepatch.rsi

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -650,7 +650,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatTacticalMaidHeadband
-  name: tactical maid headband
+  name: red headband
-  name: red headband
+  name: tactical maid headband
-  name: red headband
+  name: tactical maid headband
   description: "A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns."
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -251,7 +251,7 @@
     sprite: Clothing/OuterClothing/Coats/clownpriest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/clownpriest.rsi
-
+    
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterDogi

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -86,7 +86,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSalvageSpecialist
   name: salvage technician's jumpsuit
-  description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
+  description: Standard uniform for exploring the unknowns of space and its many deadly inhabitants. It's very dirty and smells of welding fumes..
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/ourjobs.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/ourjobs.yml
@@ -8,6 +8,7 @@
     contents:
       - id: ClothingHeadsetAltMystagogue
       - id: ClothingOuterHardsuitMystagogue
+      - id: ClothingNeckCloakMystagogue
       - id: PlushieSlime
         prob: 0.1
       - id: DoorRemoteResearch

diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Made by @ps3moira#9488",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Head/Hats/legionnaireheadpiece.rsi - Copy/icon.png b/Resources/Textures/Clothing/Head/Hats/legionnaireheadpiece.rsi - Copy/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/suspiciouscostume.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/suspiciouscostume.rsi/icon.png
diff --git a/...rces/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png b/...rces/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.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/0a1ae39f0fb7353b0704f27d1599a567891f727c. In hand sprite scaled down by potato1234_x",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a3849062b8756e3c2176fa0b9bd80aef9facc3ef. In hand sprite scaled down by @ps3moir#9488",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/inhand-right.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/skeletonmask.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by @ps3moira#9488",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi/inhand-right.png