From d5af6638bf2bedec07a77f39ebedc3b9d5008c59 Mon Sep 17 00:00:00 2001 From: Nox38 Date: Thu, 16 Jan 2025 11:20:00 -0800 Subject: [PATCH 1/4] Changed security things --- .../Catalog/Fills/Lockers/dressers.yml | 4 +++ .../Catalog/Fills/Lockers/heads.yml | 4 +-- .../Catalog/Fills/Lockers/security.yml | 35 +++++++------------ .../VendingMachines/Inventories/detdrobe.yml | 3 -- .../VendingMachines/Inventories/sec.yml | 9 ++--- .../VendingMachines/Inventories/secdrobe.yml | 1 - 6 files changed, 22 insertions(+), 34 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index febfe23ad16984..513e208b86d6a3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -69,6 +69,7 @@ - id: ClothingUniformJumpsuitHosFormal - id: ClothingOuterWinterHoS - id: ClothingNeckCloakHos + - id: ClothingMaskNeckGaiter - type: entity id: DresserQuarterMasterFilled @@ -106,5 +107,8 @@ components: - type: StorageFill contents: + - id: ClothingUniformJumpsuitWarden + - id: ClothingUniformJumpskirtWarden - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden + - id: ClothingOuterWinterWarden \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1cc97c2401fc01..96621d4d8b115e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -320,11 +320,10 @@ - id: ClothingBeltSecurityFilled - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - - id: ClothingMaskNeckGaiter + - id: FlashlightSeclite - id: ClothingOuterCoatHoSTrench - id: ClothingShoesBootsJack - id: DoorRemoteSecurity - - id: HoloprojectorSecurity - id: RubberStampHos - id: SecurityTechFabCircuitboard - id: WeaponDisabler @@ -376,6 +375,7 @@ - type: StorageFill contents: - id: WeaponRevolverDeckard + - id: SpeedLoaderMagnum - id: ClothingOuterHardsuitBasic - id: JetpackBlue - id: SpaceCash1000 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 01038f4196076c..c76c52a232f992 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -8,17 +8,16 @@ - id: FlashlightSeclite - id: WeaponDisabler - id: ClothingBeltSecurityFilled - - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitWarden - - id: HoloprojectorSecurity - id: BookSpaceLaw + - id: HandLabeler + - id: Multitool - id: ClothingBackpackElectropack amount: 2 - id: RemoteSignaller @@ -34,16 +33,15 @@ - id: FlashlightSeclite - id: WeaponDisabler - id: ClothingBeltSecurityFilled - - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory - - id: HoloprojectorSecurity - id: BookSpaceLaw + - id: HandLabeler + - id: Multitool - id: ClothingBackpackElectropack amount: 2 - id: RemoteSignaller @@ -57,23 +55,18 @@ - type: StorageFill contents: - id: FlashlightSeclite - prob: 0.8 - id: WeaponDisabler - - id: ClothingUniformJumpsuitSecGrey - prob: 0.3 - id: ClothingHeadHelmetBasic - id: ClothingOuterArmorBasic - id: ClothingBeltSecurityFilled - id: Flash - prob: 0.5 + - id: Tourniquet - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 - - id: HoloprojectorSecurity - prob: 0.6 - id: BookSpaceLaw prob: 0.5 @@ -119,20 +112,16 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesSecurity - prob: 0.3 - - id: ClothingHeadHatFedoraBrown - - id: ClothingNeckTieDet - id: ClothingOuterVestDetective - - id: ClothingOuterCoatDetective + - id: ClothingEyesGlassesSecurity - id: FlashlightSeclite + - id: ClothingHeadsetSecurity - id: ForensicScanner - id: LogProbeCartridge - id: BoxForensicPad - id: DrinkDetFlask - id: ClothingHandsGlovesForensic - id: RubberStampDetective - - id: HoloprojectorSecurity - id: BoxEvidenceMarkers - id: HandLabeler @@ -148,7 +137,9 @@ - id: Wirecutter - id: Screwdriver - id: Multitool - prob: 0.5 + - id: d10Dice + prob: 0.2 + - type: entity parent: [GunSafeBaseSecure, BaseRestrictedContraband] @@ -158,7 +149,7 @@ - type: StorageFill contents: - id: WeaponDisabler - amount: 5 + amount: 6 - type: entity parent: [GunSafeBaseSecure, BaseRestrictedContraband] @@ -216,9 +207,9 @@ - type: StorageFill contents: - id: WeaponShotgunKammerer - amount: 2 + amount: 3 - id: BoxLethalshot - amount: 2 + amount: 3 - type: entity id: GunSafeSubMachineGunWt550 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index a67ed9397b3d95..b0eea18236bb72 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -12,6 +12,3 @@ ClothingOuterVestDetective: 2 ClothingNeckTieDet: 2 ClothingHeadHatFedoraGrey: 2 - ClothingHandsGlovesColorBlack: 2 - ClothingHandsGlovesLatex: 2 - ClothingHeadsetSecurity: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index afbeff6b080629..3f19550e261be2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -8,17 +8,14 @@ ClusterBangFull: 2 GrenadeStinger: 4 Flash: 5 - Tourniquet: 5 + Tourniquet: 8 FlashlightSeclite: 5 - ClothingEyesGlassesSunglasses: 2 + ClothingEyesGlassesSunglasses: 4 ClothingEyesHudSecurity: 2 ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 - CombatKnife: 3 + CombatKnife: 6 Zipties: 12 - RiotShield: 2 - RiotLaserShield: 2 - RiotBulletShield: 2 RadioHandheldSecurity: 5 # 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 f81f5854cb4c35..8465c1c2e8e698 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -22,7 +22,6 @@ ClothingNeckScarfStripedRed: 3 ClothingOuterArmorBasicSlim: 2 ClothingEyesBlindfold: 1 - ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 ClothingHeadHelmetJustice: 1 contrabandInventory: From 4d5ef03638b7db5ce1bb8b0dcb3abb8c3e510f5d Mon Sep 17 00:00:00 2001 From: Nox38 Date: Thu, 16 Jan 2025 11:30:51 -0800 Subject: [PATCH 2/4] removed air masks from suit lockers --- .../Catalog/Fills/Lockers/suit_storage.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 41a11561e80b42..17a02ce5e0dca6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -10,7 +10,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVA - - id: ClothingMaskBreath #Basic EVA (Big Ass Helmet) - type: entity @@ -23,7 +22,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVALarge - - id: ClothingMaskBreath #Emergency EVA - type: entity @@ -35,7 +33,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - - id: ClothingMaskBreath #Prisoner EVA - type: entity @@ -48,7 +45,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge - - id: ClothingMaskBreath #Syndicate EVA - type: entity @@ -61,7 +57,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate - - id: ClothingMaskGasSyndicate #Pirate EVA - type: entity @@ -73,7 +68,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - - id: ClothingMaskGas #NTSRA Voidsuit - type: entity @@ -86,7 +80,6 @@ - id: JetpackVoidFilled - id: ClothingOuterHardsuitAncientEVA - id: ClothingHeadHelmetAncient - - id: ClothingMaskBreath #HARDSUITS #Basic hardsuit @@ -99,7 +92,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitBasic - - id: ClothingMaskBreath #Engineering hardsuit - type: entity @@ -112,7 +104,6 @@ - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering - - id: ClothingMaskBreath - type: AccessReader access: [["Engineering"]] @@ -126,7 +117,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitAtmos - - id: ClothingMaskBreath - type: AccessReader access: [["Atmospherics"]] @@ -140,7 +130,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitSecurity - - id: ClothingMaskBreath - type: AccessReader access: [["Security"]] @@ -206,7 +195,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitWarden - - id: ClothingMaskBreath - type: AccessReader access: [["Armory"]] @@ -247,7 +235,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndie - id: ClothingShoesBootsMagSyndie - - id: ClothingMaskGasSyndicate #Pirate Captain's hardsuit - type: entity @@ -259,7 +246,6 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateCap - - id: ClothingMaskGas #Wizard - type: entity @@ -271,4 +257,3 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - - id: ClothingMaskBreath From 890a71ebc880ffc6a70652883f71e84e99c0b5a8 Mon Sep 17 00:00:00 2001 From: Nox38 Date: Thu, 16 Jan 2025 12:51:49 -0800 Subject: [PATCH 3/4] Reverted a few changes --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 1 - Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 2 +- .../Prototypes/Catalog/VendingMachines/Inventories/sec.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 96621d4d8b115e..2ebff46e721943 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -375,7 +375,6 @@ - type: StorageFill contents: - id: WeaponRevolverDeckard - - id: SpeedLoaderMagnum - id: ClothingOuterHardsuitBasic - id: JetpackBlue - id: SpaceCash1000 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index c76c52a232f992..a995d990425509 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -149,7 +149,7 @@ - type: StorageFill contents: - id: WeaponDisabler - amount: 6 + amount: 5 - type: entity parent: [GunSafeBaseSecure, BaseRestrictedContraband] diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 3f19550e261be2..727f35ddc004fa 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -8,7 +8,7 @@ ClusterBangFull: 2 GrenadeStinger: 4 Flash: 5 - Tourniquet: 8 + Tourniquet: 6 FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 4 ClothingEyesHudSecurity: 2 From a74ce477f0b8a395c26513f288187eecd4866513 Mon Sep 17 00:00:00 2001 From: Nox38 Date: Fri, 17 Jan 2025 13:47:02 -0800 Subject: [PATCH 4/4] Added kosticia's changes --- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 2 +- Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml | 1 + .../Catalog/VendingMachines/Inventories/detdrobe.yml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index a995d990425509..29a8f2bdff7b89 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -118,9 +118,9 @@ - id: ClothingHeadsetSecurity - id: ForensicScanner - id: LogProbeCartridge + - id: HoloprojectorSecurity - id: BoxForensicPad - id: DrinkDetFlask - - id: ClothingHandsGlovesForensic - id: RubberStampDetective - id: BoxEvidenceMarkers - id: HandLabeler diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 17a02ce5e0dca6..118bbfb2cc9ee8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -57,6 +57,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate + - id: ClothingMaskGasSyndicate #Pirate EVA - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index b0eea18236bb72..771b9afb4468c3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -12,3 +12,6 @@ ClothingOuterVestDetective: 2 ClothingNeckTieDet: 2 ClothingHeadHatFedoraGrey: 2 + ClothingHandsGlovesForensic: 2 + ClothingHandsGlovesColorBlack: 2 + ClothingHandsGlovesLatex: 2