diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index f80fe66a7c0..cd73d4f3f83 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -62,15 +62,15 @@ loadout-group-station-engineer-neck = Station Engineer neck loadout-group-atmospheric-technician-neck = Atmospheric Technician neck # Security -loadout-group-head-of-security-shoes = Head of Security shoes - -loadout-group-security-cadet-head = Security Cadet head +loadout-group-security-eyes = Security eyes loadout-group-security-neck = Security neck -loadout-group-brig-medic-head = Brigmedic head -loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit -loadout-group-brig-medic-back = Brigmedic backpack +loadout-group-brig-medic-head = Corpsman head +loadout-group-brig-medic-eyes = Corpsman eyes loadout-group-brig-medic-neck = Corpsman neck +loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit +loadout-group-brig-medic-back = Corpsman backpack +loadout-group-brig-medic-outerclothing = Corpsman outer clothing loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6fc0a72571e..f819aa8feb0 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -332,7 +332,7 @@ - type: StorageFill contents: - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench + - id: ClothingOuterStasecCoatHoS # DeltaV - ClothingOuterCoatHoSTrench replaced in favour of uniform equipment - id: ClothingMaskNeckGaiter - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. - id: ClothingMaskGasSwat @@ -352,7 +352,6 @@ - id: BoxPDASecurity # Delta-V - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun - id: HoSIDCard # Delta-V - - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 @@ -364,7 +363,7 @@ - type: StorageFill contents: - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench + - id: ClothingOuterStasecCoatHoS # DeltaV - ClothingOuterCoatHoSTrench replaced in favour of uniform equipment - id: ClothingMaskNeckGaiter - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity @@ -381,7 +380,6 @@ - id: BoxPDASecurity # Delta-V - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun - id: HoSIDCard # Delta-V - - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 582b039c3bf..1f1c32b4b72 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -14,14 +14,14 @@ - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +## - id: ClothingOuterCoatWarden # DeltaV - remove this coat from standard gameplay. +## - id: ClothingOuterWinterCoatWarden # DeltaV - remove this coat from standard gameplay. + - id: ClothingOuterStasecCoatWarden # DeltaV - replace erroneous coats with appropriate uniform. - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. - id: HoloprojectorSecurity - id: BoxPDAPrisoner # Delta-V - - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots - id: BoxEncryptionKeyPrisoner #Delta-V - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -42,13 +42,13 @@ - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +## - id: ClothingOuterCoatWarden # DeltaV - remove this coat from standard gameplay. +## - id: ClothingOuterWinterCoatWarden # DeltaV - remove this coat from standard gameplay. + - id: ClothingOuterStasecCoatWarden # DeltaV - replace erroneous coats with appropriate uniform. - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: BoxPDAPrisoner # Delta-V - - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots - id: BoxEncryptionKeyPrisoner #Delta-V - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -78,11 +78,13 @@ - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear prob: 0.4 - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - - id: ClothingOuterArmorDuraVest + - id: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 prob: 0.75 - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit - prob: 0.25 + prob: 0.15 + - id: ClothingUniformJumpskirtSecFormal # DeltaV - emergency parade time, Central's coming to visit + prob: 0.15 - id: ClothingBeltSecurityFilled - id: Flash prob: 0.5 @@ -109,9 +111,10 @@ - id: TrackingImplanter amount: 2 ## - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. - - id: BoxSterileMask +## - id: BoxSterileMask # DeltaV - Sterile masks have next to no use and bloat this locker. - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret. -## - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. +## - id: ClothingOuterCoatAMG # DeltaV - Remove from standard gameplay. + - id: ClothingOuterCoatLabCorpsman # DeltaV - replace AMG coat with more uniform option. - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic ## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah @@ -144,10 +147,12 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 + - id: ClothingHeadHatBeretCorpsman + - id: ClothingOuterCoatLabCorpsman - id: ClothingOuterHardsuitCombatCorpsman - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic @@ -179,10 +184,12 @@ contents: - id: ClothingEyesGlassesSecurity prob: 0.3 - - id: ClothingHeadHatFedoraBrown - - id: ClothingNeckTieDet - - id: ClothingOuterVestDetective - - id: ClothingOuterCoatDetective +## - id: ClothingHeadHatFedoraBrown # DeltaV - Replace in favour of proper uniform. + - id: ClothingHeadHatBeretForensicSpecialist # DeltaV - Add forensic beret. +## - id: ClothingNeckTieDet # DeltaV - remove the outdated look. stop breaking uniform. +## - id: ClothingOuterVestDetective # DeltaV - see above +## - id: ClothingOuterCoatDetective # DeltaV - Replace in favour of proper uniform. + - id: ClothingOuterStasecCoatDet # DeltaV - Add forensic coat. - id: FlashlightSeclite - id: ForensicScanner - id: LogProbeCartridge diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index ac5cb47cc97..fdf061094ec 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -139,6 +139,7 @@ - type: StorageFill contents: - id: OxygenTankFilled + - id: JetpackSecurityFilled # DeltaV - add jetpacks to security suit storage - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit. - id: ClothingMaskBreath - type: AccessReader @@ -212,6 +213,7 @@ - type: StorageFill contents: - id: OxygenTankFilled + - id: JetpackSecurityFilled # DeltaV - add jetpacks to security suit storage - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. - id: ClothingMaskBreath - type: AccessReader @@ -271,8 +273,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled +# - id: NitrogenTankFilled # removed for consistency. - id: OxygenTankFilled + - id: JetpackSecurityFilled - id: ClothingOuterHardsuitCombatCorpsman - id: ClothingMaskBreath - type: AccessReader diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index f45dd229a2a..113f8952667 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -1,16 +1,22 @@ - type: vendingMachineInventory id: DetDrobeInventory startingInventory: - ClothingUniformJumpsuitDetective: 2 - ClothingUniformJumpskirtDetective: 2 - ClothingShoesColorBrown: 2 - ClothingOuterCoatDetective: 2 - ClothingHeadHatFedoraBrown: 2 - ClothingUniformJumpsuitDetectiveGrey: 2 - ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingOuterVestDetective: 2 - ClothingNeckTieDet: 2 - ClothingHeadHatFedoraGrey: 2 +## ClothingUniformJumpsuitDetective: 2 # DeltaV - set detective uniform +## ClothingUniformJumpskirtDetective: 2 # DeltaV - set detective uniform + ClothingUniformJumpsuitForensicSpecialist: 2 + ClothingUniformJumpskirtForensicSpecialist: 2 +## ClothingShoesColorBrown: 2 # DeltaV -set detective uniform +## ClothingOuterCoatDetective: 2 # DeltaV - set detective uniform + ClothingOuterStasecCoatDet: 2 +## ClothingHeadHatFedoraBrown: 2 # DeltaV - set detective uniform +## ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - set detective uniform +## ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - set detective uniform +## ClothingOuterVestDetective: 2 # DeltaV - set detective uniform + ClothingNeckTieDet: 2 # DeltaV - Fuck it, they can keep the tie if they want. +## ClothingHeadHatFedoraGrey: 2 # DeltaV - set detective uniform ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetSecurity: 2 + BoxForensicPad: 1 # DeltaV - add some forensic equipment to the DetDrobe. + ForensicScanner: 1 # DeltaV - add some forensic equipment to the DetDrobe. + BoxEvidenceMarkers: 1 # DeltaV - add some forensic equipment to the DetDrobe. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 65dacf75d19..d812c16e1b7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -10,7 +10,7 @@ Flash: 5 Tourniquet: 5 FlashlightSeclite: 5 - ClothingEyesGlassesSunglasses: 2 + ClothingEyesGlassesSunglasses: 5 # DeltaV - give em a few extra. They're not as good as sec glasses anyways. ClothingEyesHudSecurity: 2 ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 14bc1764981..3a59f4f5dd1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,13 +4,12 @@ ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 - ClothingUniformJumpsuitSec: 3 - ClothingShoesBootsJack: 3 - ClothingHeadHatBeretSecurity: 3 + ClothingHeadHatBeretSecurity: 6 # DeltaV - they always run out... :( ## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction ClothingHeadBandRed: 3 ClothingHandsGlovesColorBlack: 3 ClothingHandsGlovesFingerless: 3 + ClothingUniformJumpsuitSec: 3 # DeltaV - moved it down with the other jumpsuits/skirts ClothingUniformJumpskirtSec: 3 ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 @@ -18,13 +17,15 @@ ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe ClothingHeadsetSecurity: 3 ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe - ClothingOuterWinterSec: 2 - ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. +## ClothingOuterWinterSec: 2 # DeltaV - replaced with uniform coats. + ClothingOuterStasecCoat: 3 # DeltaV - these are more fitting. ## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech -## ClothingOuterArmorBasicSlim: 2 +## ClothingOuterArmorBasicSlim: 2 # DeltaV - see above. ClothingNeckScarfStripedRed: 3 ClothingEyesBlindfold: 1 + ClothingMaskNeckGaiter: 3 # DeltaV - what could go wrong? + ClothingShoesBootsJack: 3 # DeltaV - moved it down with the combat boots ClothingShoesBootsCombat: 1 - ClothingShoesBootsWinterSec: 2 - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 +## ClothingShoesBootsWinterSec: 2 # DeltaV - removed until they fit the uniform +## ClothingShoesBootsCowboyBlack: 1 # DeltaV - hearing these things give me a headache. +## ClothingHeadHatCowboyBlack: 1 # DeltaV - seeing these things don't give me a headache, but please wear actual uniform. diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Shoes/shoes.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml rename to Resources/Prototypes/DeltaV/Catalog/Fills/Items/Shoes/shoes.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml index bdef8822cc5..f69158b0717 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml @@ -6,6 +6,7 @@ name: combat hardsuit helmet description: An armoured helmet with a yellow visor and dual head-mounted lights. components: + - type: BreathMask - type: Sprite sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi - type: Clothing @@ -41,6 +42,7 @@ name: medical combat hardsuit helmet description: A lightweight armoured helmet with full-face blue visor and head-mounted light. components: + - type: BreathMask - type: Sprite sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi - type: Clothing @@ -76,6 +78,7 @@ name: riot combat hardsuit helmet description: A heavy armoured helmet with a sealed visor with yellow slits and dual head-mounted lights. components: + - type: BreathMask - type: Sprite sprite: DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi - type: Clothing @@ -111,6 +114,7 @@ name: advanced combat hardsuit helmet description: A light but durable helmet with full-face protection and four head-mounted lights. components: + - type: BreathMask - type: Sprite sprite: DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi - type: Clothing diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index bdb5ad85d9a..7c69e81d8bc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -193,6 +193,17 @@ - type: Clothing sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretForensicSpecialist + name: forensic specialist beret + description: For investigative souls. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCJToque @@ -203,4 +214,3 @@ sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi - type: Clothing sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi - diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index 954255a3dc4..bf10a5227fd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -127,6 +127,26 @@ - type: TemperatureProtection coefficient: 0.1 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatLabCorpsman + name: corpsman's lab coat + description: A labcoat that protects against minor chemical spills and rowdy patients. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 + - type: AllowSuitStorage + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterChiefJustice @@ -139,4 +159,3 @@ sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi - type: TemperatureProtection coefficient: 0.1 - diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml index 0d9bb7e1190..30ddaddde10 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml @@ -57,3 +57,47 @@ Piercing: 0.85 Heat: 0.75 - type: AllowSuitStorage + +- type: entity + parent: ClothingOuterStasecSweater + id: ClothingOuterStasecCoat + name: station security winter coat + description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest security officer's cold heart. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi + +- type: entity + parent: ClothingOuterStasecSweater + id: ClothingOuterStasecCoatWarden + name: warden's winter coat + description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest warden's cold heart. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi + +- type: entity + parent: ClothingOuterStasecSweater + id: ClothingOuterStasecCoatHoS + name: head of security's winter coat + description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest head of security's cold heart. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi + +- type: entity + parent: ClothingOuterStasecSweater + id: ClothingOuterStasecCoatDet + name: detective's windbreaker + description: A light but warm jacket, worn tight and close to avoid contaminating evidence in cooler temperatures. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4853aa235b0..c1b0edf0c31 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -33,6 +33,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtSecFormal + name: security formal dress + description: A ceremonial piece of Station Security kit, for special occasions of any kind. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi + # Warden alt uniforms - type: entity @@ -57,6 +68,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtForensicSpecialist + name: forensic specialist's jumpskirt + description: A crisp white shirt on a stark charcoal skirt for the deductive mind. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi + # HoS alt uniforms - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index b831c379478..118754cbd86 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -220,6 +220,39 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitForensicSpecialist + name: forensic specialist's jumpsuit + description: A crisp white shirt on stark charcoal pants for the deductive mind. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCadet + name: security cadet's jumpsuit + description: A surplus grey jumpsuit with station security markings. Smells like fresh meat. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSecurityTactical + name: security tactical jumpsuit + description: A sharp charcoal jumpsuit with flashy blue markings. Smells like old boot. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi + # Central Command Uniform - ported from Velta - type: entity @@ -309,4 +342,3 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi - diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml index a86ce988a79..e247626b261 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml @@ -8,6 +8,26 @@ equipment: head: ClothingHeadHatBeretCorpsman +# Eyes + +- type: loadout # DeltaV + id: HudMed + equipment: HudMed + +- type: startingGear # DeltaV + id: HudMed + equipment: + eyes: ClothingEyesHudMedical + +- type: loadout # DeltaV + id: HudMedPatch + equipment: HudMedPatch + +- type: startingGear # DeltaV + id: HudMedPatch + equipment: + eyes: ClothingEyesEyepatchHudMedical + # Jumpsuit - type: loadout id: BrigMedicJumpsuit diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 6abbc33429a..0def0a44ff7 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -57,6 +57,18 @@ loadouts: - CorpsmanBeret +- type: loadoutGroup + id: BrigMedicEyes + name: loadout-group-brig-medic-eyes + minLimit: 0 + loadouts: + - Sunglasses + - SunglassesSec + - HudSec + - HudSecPatch + - HudMed + - HudMedPatch + - type: loadoutGroup id: BrigMedicNeck name: loadout-group-brig-medic-neck diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 8b6299e564d..b4d85e655ba 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -16,11 +16,11 @@ id: JobBrigmedic groups: - BrigMedicHead + - BrigMedicEyes - BrigMedicNeck - BrigMedicJumpsuit - BrigMedicBack - SecurityShoes - - SecurityOuterClothing - MedicalGloves - Trinkets diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml index 7f7648d9d8c..3ad030ea733 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml @@ -28,6 +28,34 @@ materials: Cloth: 300 +- type: latheRecipe + id: ClothingUniformJumpsuitForensicSpecialist + result: ClothingUniformJumpsuitForensicSpecialist + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecFormal + result: ClothingUniformJumpsuitSecFormal + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitCadet + result: ClothingUniformJumpsuitCadet + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecurityTactical + result: ClothingUniformJumpsuitSecurityTactical + completetime: 4 + materials: + Cloth: 300 + # Jumpskirts - Security - type: latheRecipe @@ -72,7 +100,21 @@ materials: Cloth: 300 -# Security Sweater +- type: latheRecipe + id: ClothingUniformJumpskirtForensicSpecialist + result: ClothingUniformJumpskirtForensicSpecialist + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtSecFormal + result: ClothingUniformJumpskirtSecFormal + completetime: 4 + materials: + Cloth: 300 + +# Security Outerwear - type: latheRecipe id: ClothingOuterStasecSweater @@ -80,6 +122,63 @@ completetime: 4 materials: Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterStasecCoat + result: ClothingOuterStasecCoat + completetime: 4 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterCoatLabCorpsman + result: ClothingOuterCoatLabCorpsman + completetime: 4 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterStasecCoatDet + result: ClothingOuterStasecCoatDet + completetime: 4 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterStasecCoatWarden + result: ClothingOuterStasecCoatWarden + completetime: 4 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterStasecCoatHoS + result: ClothingOuterStasecCoatHoS + completetime: 4 + materials: + Cloth: 500 + Durathread: 300 + +# Security Headwear + +- type: latheRecipe + id: ClothingHeadHatBeretForensicSpecialist + result: ClothingHeadHatBeretForensicSpecialist + completetime: 4 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatBeretCorpsman + result: ClothingHeadHatBeretCorpsman + completetime: 4 + materials: + Cloth: 100 # Chief Justice Wardrobe diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index 77fb313efcf..246fe7ae13d 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -19,8 +19,10 @@ - Security #- Brig #Delta V: Removed brig access - Maintenance + - Service # The rest of security has this access. - External - Corpsman + - Cryogenics # The rest of security also gets this access. extendedAccess: - Chemistry special: @@ -30,7 +32,8 @@ - type: startingGear id: CorpsmanGear # see Prototypes/Roles/Jobs/Fun/misc_startinggear.yml for "BrigmedicGear" equipment: - eyes: ClothingEyesHudMedical +# eyes: ClothingEyesHudMedical + outerClothing: ClothingOuterCoatLabCorpsman id: CorpsmanPDA ears: ClothingHeadsetBrigmedic belt: ClothingBeltCorpsmanWebbingFilled diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b7b7758517a..33a464ec801 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1039,9 +1039,11 @@ - ClothingUniformJumpskirtHoSGrey # DeltaV - alternate sec uniforms - ClothingUniformJumpsuitHosFormal - ClothingUniformJumpskirtHosFormal + - ClothingUniformJumpsuitSecFormal # DeltaV - formal security uniforms + - ClothingUniformJumpskirtSecFormal # DeltaV - formal security uniforms - ClothingUniformJumpsuitHoSAlt - ClothingUniformJumpskirtHoSAlt - - ClothingUniformJumpsuitHoSBlue +# - ClothingUniformJumpsuitHoSBlue # DeltaV - Remove erroneous second entry. - ClothingUniformJumpsuitHoSGrey - ClothingUniformJumpsuitHoSParadeMale - ClothingUniformJumpskirtHoSParadeMale @@ -1066,8 +1068,8 @@ - ClothingUniformJumpsuitMusician - ClothingUniformJumpsuitParamedic - ClothingUniformJumpskirtParamedic - - ClothingUniformJumpsuitSeniorOfficer - - ClothingUniformJumpskirtSeniorOfficer +# - ClothingUniformJumpsuitSeniorOfficer # DeltaV - replaced with tactical jumpsuit +# - ClothingUniformJumpskirtSeniorOfficer # DeltaV - replaced with tactical jumpsuit - ClothingUniformJumpsuitPrisoner - ClothingUniformJumpskirtPrisoner - ClothingHeadHatQMsoft @@ -1096,7 +1098,12 @@ - ClothingUniformJumpskirtSecBlue # DeltaV - alternate sec uniforms - ClothingUniformJumpsuitSecGrey # DeltaV - alternate sec uniforms - ClothingUniformJumpskirtSecGrey # DeltaV - alternate sec uniforms - - ClothingHeadHatBeretBrigmedic + - ClothingUniformJumpsuitForensicSpecialist # DeltaV - det uniforms + - ClothingUniformJumpskirtForensicSpecialist # DeltaV - det uniforms + - ClothingHeadHatBeretForensicSpecialist # DeltaV - det uniforms + - ClothingUniformJumpsuitCadet # DeltaV - cadet uniform + - ClothingUniformJumpsuitSecurityTactical # DeltaV - senior uniform + - ClothingHeadHatBeretCorpsman # DeltaV - replaced ClothingHeadHatBeretBrigmedic with corpsman beret - ClothingUniformJumpsuitBrigmedic - ClothingUniformJumpskirtBrigmedic - ClothingHeadHatBeretWarden @@ -1113,8 +1120,8 @@ - ClothingOuterWinterCE - ClothingOuterWinterCMO - ClothingOuterWinterHoP - - ClothingOuterWinterHoSUnarmored - - ClothingOuterWinterWardenUnarmored +# - ClothingOuterWinterHoSUnarmored # DeltaV - replaced in favour of stasec coats +# - ClothingOuterWinterWardenUnarmored # DeltaV - replaced in favour of stasec coats - ClothingOuterWinterQM - ClothingOuterWinterRD - ClothingOuterChiefJustice # DeltaV - Chief Justice @@ -1146,7 +1153,12 @@ - ClothingOuterWinterViro - ClothingOuterWinterSci - ClothingOuterWinterRobo - - ClothingOuterWinterSec +# - ClothingOuterWinterSec # DeltaV - replaced in favour of stasec coats + - ClothingOuterStasecCoat # DeltaV - security winter gear + - ClothingOuterCoatLabCorpsman # DeltaV - security winter gear + - ClothingOuterStasecCoatDet # DeltaV - security winter gear + - ClothingOuterStasecCoatWarden # DeltaV - security winter gear + - ClothingOuterStasecCoatHoS # DeltaV - security winter gear # Ties - ClothingNeckTieRed - ClothingNeckTieDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index 5fabfdca91d..ca5fa7b2f5e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -1,21 +1,30 @@ # Head -- type: loadout - id: DetectiveFedora - equipment: DetectiveFedora - -- type: startingGear - id: DetectiveFedora +#- type: loadout # DeltaV +# id: DetectiveFedora +# equipment: DetectiveFedora + +#- type: startingGear # DeltaV +# id: DetectiveFedora +# equipment: +# head: ClothingHeadHatFedoraBrown + +#- type: loadout # DeltaV +# id: DetectiveFedoraGrey +# equipment: DetectiveFedoraGrey + +#- type: startingGear # DeltaV +# id: DetectiveFedoraGrey +# equipment: +# head: ClothingHeadHatFedoraGrey + +- type: loadout # DeltaV + id: DetectiveBeret + equipment: DetectiveBeret + +- type: startingGear # DeltaV + id: DetectiveBeret equipment: - head: ClothingHeadHatFedoraBrown - -- type: loadout - id: DetectiveFedoraGrey - equipment: DetectiveFedoraGrey - -- type: startingGear - id: DetectiveFedoraGrey - equipment: - head: ClothingHeadHatFedoraGrey + head: ClothingHeadHatBeretForensicSpecialist # Neck - type: loadout @@ -35,7 +44,7 @@ - type: startingGear id: DetectiveJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitDetective + jumpsuit: ClothingUniformJumpsuitForensicSpecialist # DeltaV - replace ClothingUniformJumpsuitDetective with an actual uniform - type: loadout id: DetectiveJumpskirt @@ -44,25 +53,25 @@ - type: startingGear id: DetectiveJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtDetective + jumpsuit: ClothingUniformJumpskirtForensicSpecialist # DeltaV - replace ClothingUniformJumpskirtDetective with an actual uniform -- type: loadout - id: NoirJumpsuit - equipment: NoirJumpsuit +#- type: loadout # DeltaV +# id: NoirJumpsuit +# equipment: NoirJumpsuit -- type: startingGear - id: NoirJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitDetectiveGrey +#- type: startingGear # DeltaV +# id: NoirJumpsuit +# equipment: +# jumpsuit: ClothingUniformJumpsuitDetectiveGrey -- type: loadout - id: NoirJumpskirt - equipment: NoirJumpskirt +#- type: loadout # DeltaV +# id: NoirJumpskirt +# equipment: NoirJumpskirt -- type: startingGear - id: NoirJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtDetectiveGrey +#- type: startingGear # DeltaV +# id: NoirJumpskirt +# equipment: +# jumpsuit: ClothingUniformJumpskirtDetectiveGrey # Back - type: loadout @@ -93,20 +102,29 @@ back: ClothingBackpackDuffelSecurityFilledDetective # OuterClothing -- type: loadout - id: DetectiveArmorVest - equipment: DetectiveArmorVest - -- type: startingGear - id: DetectiveArmorVest - equipment: - outerClothing: ClothingOuterVestDetective - -- type: loadout - id: DetectiveCoat - equipment: DetectiveCoat - -- type: startingGear - id: DetectiveCoat +#- type: loadout # DeltaV +# id: DetectiveArmorVest +# equipment: DetectiveArmorVest + +#- type: startingGear # DeltaV +# id: DetectiveArmorVest +# equipment: +# outerClothing: ClothingOuterVestDetective + +#- type: loadout # DeltaV +# id: DetectiveCoat +# equipment: DetectiveCoat + +#- type: startingGear # DeltaV +# id: DetectiveCoat +# equipment: +# outerClothing: ClothingOuterCoatDetective + +- type: loadout # DeltaV + id: DetectiveStasecCoat + equipment: DetectiveStasecCoat + +- type: startingGear # DeltaV + id: DetectiveStasecCoat equipment: - outerClothing: ClothingOuterCoatDetective + outerClothing: ClothingOuterStasecCoatDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 78e29fd8bd5..ffbafc0d50c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -17,6 +17,42 @@ equipment: jumpsuit: ClothingUniformJumpskirtHoS +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitGrey + equipment: HeadofSecurityJumpsuitGrey + +- type: startingGear # DeltaV + id: HeadofSecurityJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtGrey + equipment: HeadofSecurityJumpskirtGrey + +- type: startingGear # DeltaV + id: HeadofSecurityJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitBlue + equipment: HeadofSecurityJumpsuitBlue + +- type: startingGear # DeltaV + id: HeadofSecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitHoSBlue + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtBlue + equipment: HeadofSecurityJumpskirtBlue + +- type: startingGear # DeltaV + id: HeadofSecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtHoSBlue + - type: loadout id: HeadofSecurityTurtleneck equipment: HeadofSecurityTurtleneck @@ -92,30 +128,29 @@ neck: ClothingNeckMantleHOS # OuterClothing -- type: loadout - id: HeadofSecurityCoat - equipment: HeadofSecurityCoat +#- type: loadout # DeltaV +# id: HeadofSecurityCoat +# equipment: HeadofSecurityCoat -- type: startingGear - id: HeadofSecurityCoat - equipment: - outerClothing: ClothingOuterCoatHoSTrench +#- type: startingGear # DeltaV +# id: HeadofSecurityCoat +# equipment: +# outerClothing: ClothingOuterCoatHoSTrench -- type: loadout - id: HeadofSecurityWinterCoat - equipment: HeadofSecurityWinterCoat +#- type: loadout # DeltaV +# id: HeadofSecurityWinterCoat +# equipment: HeadofSecurityWinterCoat -- type: startingGear - id: HeadofSecurityWinterCoat - equipment: - outerClothing: ClothingOuterWinterHoS +#- type: startingGear # DeltaV +# id: HeadofSecurityWinterCoat +# equipment: +# outerClothing: ClothingOuterWinterHoS -# Shoes - DeltaV - type: loadout # DeltaV - id: HeadOfSecurityWinterBoots - equipment: HeadOfSecurityWinterBoots + id: HoSStasecCoat + equipment: HoSStasecCoat - type: startingGear # DeltaV - id: HeadOfSecurityWinterBoots + id: HoSStasecCoat equipment: - shoes: ClothingShoesBootsWinterHeadOfSecurity + outerClothing: ClothingOuterStasecCoatHoS diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml index bc19900e5bd..e79558d8606 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml @@ -1,18 +1,18 @@ -# Jumpsuit -- type: loadout - id: RedJumpsuit - equipment: RedJumpsuit +# Jumpsuit - DeltaV deprecated +#- type: loadout +# id: RedJumpsuit +# equipment: RedJumpsuit -- type: startingGear - id: RedJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitColorRed +#- type: startingGear +# id: RedJumpsuit +# equipment: +# jumpsuit: ClothingUniformJumpsuitColorRed -- type: loadout - id: RedJumpskirt - equipment: RedJumpskirt +#- type: loadout +# id: RedJumpskirt +# equipment: RedJumpskirt -- type: startingGear - id: RedJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtColorRed +#- type: startingGear +# id: RedJumpskirt +# equipment: +# jumpsuit: ClothingUniformJumpskirtColorRed diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 20ba1c2e693..ed83113dab7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -24,14 +24,14 @@ equipment: head: ClothingHeadHelmetBasic -- type: loadout - id: SecurityHat - equipment: SecurityHat +#- type: loadout # DeltaV +# id: SecurityHat +# equipment: SecurityHat -- type: startingGear - id: SecurityHat - equipment: - head: ClothingHeadHatSecsoft +#- type: startingGear # DeltaV +# id: SecurityHat +# equipment: +# head: ClothingHeadHatSecsoft - type: loadout id: SecurityBeret @@ -42,6 +42,43 @@ equipment: head: ClothingHeadHatBeretSecurity +# Eyes - DeltaV +- type: loadout # DeltaV + id: Sunglasses + equipment: Sunglasses + +- type: startingGear # DeltaV + id: Sunglasses + equipment: + eyes: ClothingEyesGlassesSunglasses + +- type: loadout # DeltaV + id: SunglassesSec + equipment: SunglassesSec + +- type: startingGear # DeltaV + id: SunglassesSec + equipment: + eyes: ClothingEyesGlassesSecurity + +- type: loadout # DeltaV + id: HudSec + equipment: HudSec + +- type: startingGear # DeltaV + id: HudSec + equipment: + eyes: ClothingEyesHudSecurity + +- type: loadout # DeltaV + id: HudSecPatch + equipment: HudSecPatch + +- type: startingGear # DeltaV + id: HudSecPatch + equipment: + eyes: ClothingEyesEyepatchHudSecurity + # Jumpsuit - type: loadout id: SecurityJumpsuit @@ -107,19 +144,19 @@ - type: startingGear id: SeniorOfficerJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitSeniorOfficer + jumpsuit: ClothingUniformJumpsuitSecurityTactical # DeltaV - replace ClothingUniformJumpsuitSeniorOfficer -- type: loadout - id: SeniorOfficerJumpskirt - equipment: SeniorOfficerJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer +#- type: loadout # DeltaV +# id: SeniorOfficerJumpskirt +# equipment: SeniorOfficerJumpskirt +# effects: +# - !type:GroupLoadoutEffect +# proto: SeniorOfficer -- type: startingGear - id: SeniorOfficerJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtSeniorOfficer +#- type: startingGear # DeltaV +# id: SeniorOfficerJumpskirt +# equipment: +# jumpsuit: ClothingUniformJumpskirtSeniorOfficer # Back - type: loadout @@ -169,14 +206,32 @@ belt: ClothingBeltSecurityWebbingFilled # Outerclothing -- type: loadout - id: ArmorVest - equipment: ArmorVest +#- type: loadout # DeltaV - deprecated +# id: ArmorVest +# equipment: ArmorVest -- type: startingGear - id: ArmorVest - equipment: - outerClothing: ClothingOuterArmorBasic +#- type: startingGear # DeltaV +# id: ArmorVest +# equipment: +# outerClothing: ClothingOuterArmorBasic + +#- type: loadout # DeltaV - deprecated +# id: ArmorVestSlim +# equipment: ArmorVestSlim + +#- type: startingGear # DeltaV +# id: ArmorVestSlim +# equipment: +# outerClothing: ClothingOuterArmorBasicSlim + +#- type: loadout # DeltaV - deprecated +# id: SecurityOfficerWintercoat +# equipment: SecurityOfficerWintercoat + +#- type: startingGear # DeltaV +# id: SecurityOfficerWintercoat +# equipment: +# outerClothing: ClothingOuterWinterSec - type: loadout # DeltaV id: PlateCarrier @@ -196,23 +251,23 @@ equipment: outerClothing: ClothingOuterArmorDuraVest -- type: loadout - id: ArmorVestSlim - equipment: ArmorVestSlim +- type: loadout # DeltaV + id: SecurityOfficerStasecCoat + equipment: SecurityOfficerStasecCoat -- type: startingGear - id: ArmorVestSlim +- type: startingGear # DeltaV + id: SecurityOfficerStasecCoat equipment: - outerClothing: ClothingOuterArmorBasicSlim + outerClothing: ClothingOuterStasecCoat -- type: loadout - id: SecurityOfficerWintercoat - equipment: SecurityOfficerWintercoat +- type: loadout # DeltaV + id: SecurityOfficerStasecSweater + equipment: SecurityOfficerStasecSweater -- type: startingGear - id: SecurityOfficerWintercoat +- type: startingGear # DeltaV + id: SecurityOfficerStasecSweater equipment: - outerClothing: ClothingOuterWinterSec + outerClothing: ClothingOuterStasecSweater # Shoes - type: loadout @@ -222,7 +277,7 @@ - type: startingGear id: CombatBoots equipment: - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsCombat - type: loadout # DeltaV id: JackBoots @@ -233,14 +288,14 @@ equipment: shoes: ClothingShoesBootsJackFilled -- type: loadout - id: SecurityWinterBoots - equipment: SecurityWinterBoots +#- type: loadout # DeltaV +# id: SecurityWinterBoots +# equipment: SecurityWinterBoots -- type: startingGear - id: SecurityWinterBoots - equipment: - shoes: ClothingShoesBootsWinterSec +#- type: startingGear # DeltaV +# id: SecurityWinterBoots +# equipment: +# shoes: ClothingShoesBootsWinterSec # PDA - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index e3a39d709e4..8f573a82157 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -36,21 +36,66 @@ equipment: jumpsuit: ClothingUniformJumpskirtWarden -# OuterClothing -- type: loadout - id: WardenCoat - equipment: WardenCoat +- type: loadout # DeltaV + id: WardenJumpsuitGrey + equipment: WardenJumpsuitGrey -- type: startingGear - id: WardenCoat +- type: startingGear # DeltaV + id: WardenJumpsuitGrey equipment: - outerClothing: ClothingOuterCoatWarden + jumpsuit: ClothingUniformJumpsuitWardenGrey -- type: loadout - id: WardenArmoredWinterCoat - equipment: WardenArmoredWinterCoat +- type: loadout # DeltaV + id: WardenJumpskirtGrey + equipment: WardenJumpskirtGrey -- type: startingGear - id: WardenArmoredWinterCoat +- type: startingGear # DeltaV + id: WardenJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtWardenGrey + +- type: loadout # DeltaV + id: WardenJumpsuitBlue + equipment: WardenJumpsuitBlue + +- type: startingGear # DeltaV + id: WardenJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitWardenBlue + +- type: loadout # DeltaV + id: WardenJumpskirtBlue + equipment: WardenJumpskirtBlue + +- type: startingGear # DeltaV + id: WardenJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtWardenBlue + +# OuterClothing +#- type: loadout # DeltaV +# id: WardenCoat +# equipment: WardenCoat + +#- type: startingGear # DeltaV +# id: WardenCoat +# equipment: +# outerClothing: ClothingOuterCoatWarden + +#- type: loadout # DeltaV +# id: WardenArmoredWinterCoat +# equipment: WardenArmoredWinterCoat + +#- type: startingGear # DeltaV +# id: WardenArmoredWinterCoat +# equipment: +# outerClothing: ClothingOuterWinterWarden + +- type: loadout # DeltaV + id: WardenStasecCoat + equipment: WardenStasecCoat + +- type: startingGear # DeltaV + id: WardenStasecCoat equipment: - outerClothing: ClothingOuterWinterWarden + outerClothing: ClothingOuterStasecCoatWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 5ec4b0d72a9..5287605843f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -998,6 +998,10 @@ loadouts: - HeadofSecurityJumpsuit - HeadofSecurityJumpskirt + - HeadofSecurityJumpsuitGrey # DeltaV + - HeadofSecurityJumpskirtGrey # DeltaV + - HeadofSecurityJumpsuitBlue # DeltaV + - HeadofSecurityJumpskirtBlue # DeltaV - HeadofSecurityTurtleneck - HeadofSecurityTurtleneckSkirt - HeadofSecurityFormalSuit @@ -1016,17 +1020,11 @@ id: HeadofSecurityOuterClothing name: loadout-group-head-of-security-outerclothing loadouts: - - HeadofSecurityCoat - - HeadofSecurityWinterCoat - -- type: loadoutGroup # DeltaV - id: HeadOfSecurityShoes - name: loadout-group-head-of-security-shoes - loadouts: - - CombatBoots - - JackBoots # DeltaV - - SecurityWinterBoots - - HeadOfSecurityWinterBoots # DeltaV +# - HeadofSecurityCoat # DeltaV +# - HeadofSecurityWinterCoat # DeltaV + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - HoSStasecCoat # DeltaV - type: loadoutGroup id: WardenHead @@ -1042,13 +1040,20 @@ loadouts: - WardenJumpsuit - WardenJumpskirt + - WardenJumpsuitGrey # DeltaV + - WardenJumpskirtGrey # DeltaV + - WardenJumpsuitBlue # DeltaV + - WardenJumpskirtBlue # DeltaV - type: loadoutGroup id: WardenOuterClothing name: loadout-group-warden-outerclothing loadouts: - - WardenCoat - - WardenArmoredWinterCoat +# - WardenCoat # DeltaV +# - WardenArmoredWinterCoat # DeltaV + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - WardenStasecCoat # DeltaV - type: loadoutGroup id: SecurityHead @@ -1057,8 +1062,21 @@ loadouts: - SecurityHelmet - SecurityBeret - - SecurityHat - - MimeHead # DeltaV - Red Beret +# - SecurityHat # DeltaV + +# DeltaV - add more options to security officer eyewear. + +- type: loadoutGroup + id: SecurityEyes + name: loadout-group-security-eyes + minLimit: 0 + loadouts: + - Sunglasses + - SunglassesSec + - HudSec + - HudSecPatch + +# End DeltaV addition. - type: loadoutGroup id: SecurityJumpsuit @@ -1071,7 +1089,7 @@ - SecurityJumpsuitBlue # DeltaV - SecurityJumpskirtBlue # DeltaV - SeniorOfficerJumpsuit - - SeniorOfficerJumpskirt +# - SeniorOfficerJumpskirt # DeltaV - type: loadoutGroup id: SecurityBackpack @@ -1092,11 +1110,13 @@ id: SecurityOuterClothing name: loadout-group-security-outerclothing loadouts: - - ArmorVest +# - ArmorVest # DeltaV +# - ArmorVestSlim # DeltaV +# - SecurityOfficerWintercoat # DeltaV - PlateCarrier # DeltaV - DuraVest # DeltaV - - ArmorVestSlim - - SecurityOfficerWintercoat + - SecurityOfficerStasecCoat # DeltaV + - SecurityOfficerStasecSweater # DeltaV - type: loadoutGroup id: SecurityShoes @@ -1104,7 +1124,7 @@ loadouts: - CombatBoots - JackBoots # DeltaV - - SecurityWinterBoots + - LaceupShoes # DeltaV - type: loadoutGroup id: SecurityPDA @@ -1125,8 +1145,9 @@ name: loadout-group-detective-head minLimit: 0 loadouts: - - DetectiveFedora - - DetectiveFedoraGrey +# - DetectiveFedora # DeltaV +# - DetectiveFedoraGrey # DeltaV + - DetectiveBeret # DeltaV - type: loadoutGroup id: DetectiveNeck @@ -1142,8 +1163,8 @@ loadouts: - DetectiveJumpsuit - DetectiveJumpskirt - - NoirJumpsuit - - NoirJumpskirt +# - NoirJumpsuit # DeltaV +# - NoirJumpskirt # DeltaV - type: loadoutGroup id: DetectiveBackpack @@ -1158,22 +1179,18 @@ name: loadout-group-detective-outerclothing minLimit: 0 loadouts: - - DetectiveArmorVest - - DetectiveCoat - -- type: loadoutGroup - id: SecurityCadetJumpsuit - name: loadout-group-security-cadet-jumpsuit - loadouts: - - RedJumpsuit - - RedJumpskirt +# - DetectiveArmorVest # DeltaV +# - DetectiveCoat # DeltaV + - DetectiveStasecCoat # DeltaV + - PlateCarrier # DeltaV + - DuraVest # DeltaV -- type: loadoutGroup # DeltaV - id: SecurityCadetHead - name: loadout-group-security-cadet-head - minLimit: 0 - loadouts: - - MimeHead # DeltaV - Red Beret +#- type: loadoutGroup # DeltaV +# id: SecurityCadetJumpsuit +# name: loadout-group-security-cadet-jumpsuit +# loadouts: +# - RedJumpsuit +# - RedJumpskirt # Medical - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index b3ec4edaada..697cc5e12b0 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -275,19 +275,20 @@ id: JobHeadOfSecurity groups: - HeadofSecurityHead + - SecurityEyes # DeltaV - HeadofSecurityNeck - HeadofSecurityJumpsuit - SecurityBackpack - SecurityBelt - HeadofSecurityOuterClothing - #- SecurityShoes - - HeadOfSecurityShoes # DeltaV + - SecurityShoes - Trinkets - type: roleLoadout id: JobWarden groups: - WardenHead + - SecurityEyes # DeltaV - SecurityNeck # DeltaV - WardenJumpsuit - SecurityBackpack @@ -300,6 +301,7 @@ id: JobSecurityOfficer groups: - SecurityHead + - SecurityEyes # DeltaV - SecurityNeck # DeltaV - SecurityJumpsuit - SecurityBackpack @@ -313,6 +315,7 @@ id: JobDetective groups: - DetectiveHead + - SecurityEyes # DeltaV - DetectiveNeck - DetectiveJumpsuit - DetectiveBackpack @@ -323,10 +326,13 @@ - type: roleLoadout id: JobSecurityCadet groups: - - SecurityCadetHead # DeltaV + - SecurityHead # DeltaV + - SecurityEyes # DeltaV +# - SecurityCadetJumpsuit # DeltaV - SecurityNeck # DeltaV - - SecurityCadetJumpsuit - SecurityBackpack + - SecurityOuterClothing # DeltaV + - SecurityShoes # DeltaV - Trinkets # Medical diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index d3ae13d79f9..ecd9e5c01b8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -25,7 +25,7 @@ - type: startingGear id: DetectiveGear equipment: - eyes: ClothingEyesGlassesSecurity +# eyes: ClothingEyesGlassesSecurity # DeltaV id: DetectivePDA ears: ClothingHeadsetSecurity belt: ClothingBeltHolsterFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 09186b660b1..8f9d7023fb0 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -48,7 +48,7 @@ - type: startingGear id: HoSGear equipment: - eyes: ClothingEyesGlassesSecurity +# eyes: ClothingEyesGlassesSecurity # DeltaV id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 2eac551ac3d..08bc1144da3 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -19,7 +19,7 @@ #- Brig # Delta V: Removed - Maintenance #- Service # Delta V: Access adjustments - - External + #- External # Delta V: Don't let cadets space themselves alone. #- Cryogenics # Delta V: Access adjustments special: - !type:AddImplantSpecial @@ -28,8 +28,9 @@ - type: startingGear id: SecurityCadetGear equipment: - shoes: ClothingShoesBootsCombatFilled - outerClothing: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasic replaced in favour of stab vest. Sucks to suck, cadets + jumpsuit: ClothingUniformJumpsuitCadet # DeltaV - precious uniform budget has been allocated to real security uniforms for cadets. not good ones though. +# shoes: ClothingShoesBootsCombatFilled # DeltaV +# outerClothing: ClothingOuterArmorDuraVest # DeltaV id: SecurityCadetPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 166d2a0b8ba..a655e74f0ee 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -25,6 +25,6 @@ - type: startingGear id: SecurityOfficerGear equipment: - eyes: ClothingEyesGlassesSecurity +# eyes: ClothingEyesGlassesSecurity # DeltaV ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58Nonlethal diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index cb610743cf0..1640f915771 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -23,6 +23,7 @@ #- Service # Delta V: Access adjustments - External - Detective + - Corpsman # DeltaV - corpsman access. - Cryogenics special: - !type:AddImplantSpecial @@ -31,7 +32,7 @@ - type: startingGear id: WardenGear equipment: - eyes: ClothingEyesGlassesSecurity +# eyes: ClothingEyesGlassesSecurity # DeltaV id: WardenPDA ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58Nonlethal diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..99d37f118d1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json index 98e76beb9eb..171f3f76e22 100644 --- a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/joy.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. Reptilian edit by Nairod(Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | equipped-MASK-vulpkanin sprited by TJohnson.", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..ce3522a41af Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json index 4da74959ddc..00c9d5f3d68 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github)", + "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github) | equipped-MASK-vulpkanin sprited by TJohnson.", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "equipped-MASK-reptilian", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..ee231f9e6c7 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png new file mode 100644 index 00000000000..51fb8824f5f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png new file mode 100644 index 00000000000..ffd0d1a2f9c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png new file mode 100644 index 00000000000..d368e74291f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json new file mode 100644 index 00000000000..0b2e116c645 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.", + "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/OuterClothing/Coats/labcoat_corpsman.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..380ad4f4b2b Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/icon.png new file mode 100644 index 00000000000..3eed85b6a0e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-left.png new file mode 100644 index 00000000000..fe1ae1cc303 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-right.png new file mode 100644 index 00000000000..12bf2b9ada6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/meta.json new file mode 100644 index 00000000000..ae64177b466 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..fec13f68bf7 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/icon.png new file mode 100644 index 00000000000..8f0b8a10f23 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-left.png new file mode 100644 index 00000000000..f5f1b0d333d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-right.png new file mode 100644 index 00000000000..5a2e24dd5ef Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/meta.json new file mode 100644 index 00000000000..146bd662b49 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f901627c4be Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png new file mode 100644 index 00000000000..f280cbb3bfc Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png new file mode 100644 index 00000000000..646e218bfde Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png new file mode 100644 index 00000000000..b20332ebeae Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json new file mode 100644 index 00000000000..0ecf19768ed --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9932b889343 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png new file mode 100644 index 00000000000..f504fd0c7c9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png new file mode 100644 index 00000000000..40b2530a17f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png new file mode 100644 index 00000000000..1c7979dd1a1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json new file mode 100644 index 00000000000..146bd662b49 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..020cba2a873 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png new file mode 100644 index 00000000000..55731fcae25 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png new file mode 100644 index 00000000000..40b2530a17f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png new file mode 100644 index 00000000000..1c7979dd1a1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json new file mode 100644 index 00000000000..0ecf19768ed --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index 6ad490793d0..ca975a84274 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png index b2c11fdd168..c82151630a8 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..8026f0b28cc Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png new file mode 100644 index 00000000000..3d000f6ba3f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png new file mode 100644 index 00000000000..83c210f8035 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png new file mode 100644 index 00000000000..5f0efab0e09 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png index c59e4ce0bd9..33b135660b3 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index dfa53d57a3d..30162239441 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png index 9fa77c22018..d020d95db4a 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png index cded3b544f9..263993b51b5 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..27c75954c37 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/icon.png new file mode 100644 index 00000000000..3021f49d2b3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-left.png new file mode 100644 index 00000000000..7e4921e1eea Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-right.png new file mode 100644 index 00000000000..1cc36d84a4e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index 8d5f5d2d9e6..8594fefbbc1 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png index e225a5df862..a5bec5a06dc 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png index 365a41e35aa..5fe0e0286fe 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index 546f95d7e37..25a093ea738 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png index b8dbbcbba6a..40999700c22 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png index 0e0e7571fca..02003868f4e 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index f3ef4e24408..365f8c9a7df 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index 999b61e9ce5..fc1dfb685bf 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index e92fcfa75b0..55d64155cbf 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9b9b7cf1fc2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png new file mode 100644 index 00000000000..6d467fbe661 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png new file mode 100644 index 00000000000..db3449cfed8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png new file mode 100644 index 00000000000..5f9260e2ec5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png index 077f909e403..487a1ccb804 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a9a6f585a60 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/icon.png new file mode 100644 index 00000000000..fefd52fcac4 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-left.png new file mode 100644 index 00000000000..42166c83de2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-right.png new file mode 100644 index 00000000000..0002c8c94cf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7c669fcac47 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/icon.png new file mode 100644 index 00000000000..60a702969aa Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-left.png new file mode 100644 index 00000000000..2cf2c126379 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-right.png new file mode 100644 index 00000000000..199fa527ae4 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}