From 637fda8e584eaa987b36c94e8248cfff41704311 Mon Sep 17 00:00:00 2001 From: vanx Date: Mon, 23 Dec 2024 19:11:13 +0300 Subject: [PATCH 1/4] sechuds in sechud box --- Resources/Prototypes/Catalog/Fills/Boxes/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index 82da52de3f..ab7c536d7a 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -40,7 +40,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity + - id: ClothingEyesGlassesSecurity amount: 4 - type: Sprite layers: From 289d5d86e55fe68c8f41100291728e236d134417 Mon Sep 17 00:00:00 2001 From: vanx Date: Mon, 23 Dec 2024 19:11:37 +0300 Subject: [PATCH 2/4] secdrobe-sectech-sec locker trifecta reshuffle --- .../Catalog/Fills/Lockers/security.yml | 31 +++-------------- .../VendingMachines/Inventories/sec.yml | 7 ++-- .../VendingMachines/Inventories/secdrobe.yml | 34 +++++++++++-------- 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 53a0e22ea7..804651b170 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -65,40 +65,17 @@ - type: StorageFill contents: - id: FlashlightSeclite - prob: 0.8 - - id: ClothingUniformJumpsuitSecGrey - prob: 0.3 - - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms - prob: 0.3 + - id: ClothingUniformJumpsuitSec - id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear - prob: 0.4 - - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - - id: ClothingOuterArmorDuraVest - - 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 + - id: ClothingOuterArmorBasic # WWDP - plate carrier and stabproof vest replaced back to regular bodyarmor - id: ClothingBeltSecurityFilled - - id: Flash - prob: 0.5 - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack - - id: ClothingShoesBootsJack + - id: WeaponDisabler - id: WeaponMeleeNeedle prob: 0.1 - - id: ClothingEyesHudSecurity - - id: HoloprojectorSecurity - prob: 0.6 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 69bf3228c1..aea960d490 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -11,7 +11,9 @@ Flash: 5 Tourniquet: 5 FlashlightSeclite: 5 + HoloprojectorSecurity: 5 ClothingEyesGlassesSunglasses: 2 + ClothingEyesGlassesSecurity: 2 ClothingEyesHudSecurity: 2 ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 @@ -22,11 +24,6 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 - ClothingHeadHelmetInsulated: 2 - ClothingHeadCage: 2 - ClothingOuterArmorPlateCarrier: 2 - ClothingOuterArmorDuraVest: 2 - ClothingHeadHelmetBasic: 2 BreachingCharge: 8 # security officers need to follow a diet regimen! contrabandInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index cb0c10c129..0cd55ecff7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,26 +4,32 @@ ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 - ClothingUniformJumpsuitSec: 3 - ClothingShoesBootsJack: 3 - ClothingHeadHatBeretSecurity: 3 ## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction + ClothingHeadsetSecurity: 3 + ClothingHeadHelmetBasic: 2 + ClothingHeadHelmetInsulated: 2 + ClothingHeadCage: 2 + ClothingHeadHatBeretSecurity: 3 ClothingHeadBandRed: 3 + ClothingHeadHatCowboyBlack: 1 + ClothingNeckScarfStripedRed: 3 + ClothingEyesBlindfold: 1 + ClothingOuterWinterSec: 2 + ClothingOuterStasecSweater: 2 # WWDP - moved sweaters from security lockers to SecDrobe + ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. + ClothingOuterArmorBasic: 2 # WWDP - moved body armour back to SecDrobe from SecTech + ClothingOuterArmorBasicSlim: 2 + ClothingOuterArmorPlateCarrier: 2 + ClothingOuterArmorDuraVest: 2 + ClothingShoesBootsJack: 3 + ClothingShoesBootsCombat: 1 + ClothingShoesBootsWinterSec: 2 + ClothingShoesBootsCowboyBlack: 1 ClothingHandsGlovesColorBlack: 3 ClothingHandsGlovesFingerless: 3 + ClothingUniformJumpsuitSec: 3 ClothingUniformJumpskirtSec: 3 ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe - ClothingHeadsetSecurity: 3 - ClothingOuterWinterSec: 2 - ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. -## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech -## ClothingOuterArmorBasicSlim: 2 - ClothingNeckScarfStripedRed: 3 - ClothingEyesBlindfold: 1 - ClothingShoesBootsCombat: 1 - ClothingShoesBootsWinterSec: 2 - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 \ No newline at end of file From a6c6e39d941eef80a371b632ab9ebd1b6eb9ab02 Mon Sep 17 00:00:00 2001 From: vanx Date: Mon, 23 Dec 2024 19:19:40 +0300 Subject: [PATCH 3/4] shoes --- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 804651b170..4b349b5914 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -73,6 +73,7 @@ - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack + - id: ClothingShoesBootsJack - id: WeaponDisabler - id: WeaponMeleeNeedle prob: 0.1 From f45802c313273e885fe51302a83ffc8635c3cdc8 Mon Sep 17 00:00:00 2001 From: vanx Date: Wed, 25 Dec 2024 15:05:31 +0300 Subject: [PATCH 4/4] all i want for christmas is merge --- Resources/Prototypes/Catalog/Fills/Boxes/security.yml | 2 +- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 8 ++++---- .../Catalog/VendingMachines/Inventories/sec.yml | 5 +++-- .../Catalog/VendingMachines/Inventories/secdrobe.yml | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index ab7c536d7a..b3cc6f537a 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -40,7 +40,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesSecurity + - id: ClothingEyesGlassesSecurity # WD SecHuds amount: 4 - type: Sprite layers: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 4b349b5914..5d8a4e5cfd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -65,16 +65,16 @@ - type: StorageFill contents: - id: FlashlightSeclite - - id: ClothingUniformJumpsuitSec + - id: ClothingUniformJumpsuitSec # WD - Less random bloat - id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear - - id: ClothingOuterArmorBasic # WWDP - plate carrier and stabproof vest replaced back to regular bodyarmor + - id: ClothingOuterArmorBasic # WD - plate carrier and stabproof vest replaced back to regular bodyarmor - id: ClothingBeltSecurityFilled - - id: ClothingEyesGlassesSecurity + - id: ClothingEyesGlassesSecurity # WD - SecHuds - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack - id: ClothingShoesBootsJack - - id: WeaponDisabler + - id: WeaponDisabler # WD - id: WeaponMeleeNeedle prob: 0.1 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index aea960d490..975796c962 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -11,9 +11,9 @@ Flash: 5 Tourniquet: 5 FlashlightSeclite: 5 - HoloprojectorSecurity: 5 + HoloprojectorSecurity: 5 # WD - moved from Sec lockers ClothingEyesGlassesSunglasses: 2 - ClothingEyesGlassesSecurity: 2 + ClothingEyesGlassesSecurity: 2 # WD - SecHuds ClothingEyesHudSecurity: 2 ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 @@ -24,6 +24,7 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 + # WD - armor moved to SecDrobe BreachingCharge: 8 # security officers need to follow a diet regimen! contrabandInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 0cd55ecff7..61b0c20c06 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -5,6 +5,7 @@ ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 ## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction +# WD edit start - moved clothes from SecTech & sorted by type ClothingHeadsetSecurity: 3 ClothingHeadHelmetBasic: 2 ClothingHeadHelmetInsulated: 2 @@ -33,3 +34,4 @@ ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe +# WD edit end