Merge branch 'master' into Avalon-Branche

DeltaV-Station · Sep 21, 2024 · 35b82c6 · 35b82c6
2 parents ccb8e23 + 3fd5287
commit 35b82c6
Show file tree

Hide file tree

Showing 66 changed files with 697 additions and 267 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,24 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: Moth coloration has been changed, existing characters might look slightly
-      weird
-    type: Tweak
-  id: 66
-  time: '2023-10-17T20:09:27.0000000+00:00'
-- author: Tex
-  changes:
-  - message: Added scrambled eggs.
-    type: Add
-  id: 67
-  time: '2023-10-18T21:07:50.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Certain roles require whitelist now. These being the captain, head of
-      security and nukie commander.
-    type: Add
-  id: 68
-  time: '2023-10-18T22:23:18.0000000+00:00'
 - author: FluffiestFloof
   changes:
   - message: Removed mediborgs as round start job.
@@ -3607,3 +3587,36 @@
   id: 565
   time: '2024-09-20T14:02:21.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1867
+- author: TadJohnson00
+  changes:
+  - message: Removed tech anoms until we pull upstream fixes for superfast flicker.
+    type: Remove
+  id: 566
+  time: '2024-09-21T04:07:17.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1880
+- author: TadJohnson00
+  changes:
+  - message: Adjusts security loadouts and lockers. Notable changes include moving
+      detective clothing to the Rep and Autodrobes.
+    type: Tweak
+  - message: Advanced plate carriers have been added for the warden and head of security
+      and are located in their lockers.
+    type: Add
+  - message: Several security clothing items have been resprited, including winter
+      boots and winter clothes.
+    type: Tweak
+  id: 567
+  time: '2024-09-21T06:21:39.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1854
+- author: TadJohnson00
+  changes:
+  - message: Security and medical webbing now feature slots for sidearms and medkits
+      respectively.
+    type: Add
+  - message: Medkits now have a whitelist for stored items.
+    type: Tweak
+  - message: Security belts will now display stored items properly.
+    type: Fix
+  id: 568
+  time: '2024-09-21T06:28:38.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1870
diff --git a/Resources/Locale/en-US/deltav/clothing/belts.ftl b/Resources/Locale/en-US/deltav/clothing/belts.ftl
@@ -0,0 +1,7 @@
+# Add sidearm and medkit slots to security belts + webbing, medical webbing respectively
+clothing-belt-sidearm = Sidearm
+clothing-belt-medkit = Medkit
+
+# Add slots to the daishou
+clothing-belt-katana = Katana
+clothing-belt-wakizashi = Wakizashi
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1900 # DeltaV
+  cost: 2000 # DeltaV
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -70,11 +70,14 @@
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
       - id: ClothingNeckCloakHos
-      - id: ClothingUniformJumpskirtHoSAlt
-      - id: ClothingUniformJumpsuitHoSAlt
+#      - id: ClothingUniformJumpskirtHoSAlt # DeltaV - removed for incongruence
+#      - id: ClothingUniformJumpsuitHoSAlt # DeltaV - removed for incongruence
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
-      - id: ClothingOuterWinterHoS
+#      - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence
+      - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat
+      - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat
+      - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots
 
 - type: entity
   id: DresserQuarterMasterFilled
@@ -116,3 +119,6 @@
     contents:
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
+      - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat
+      - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat
+      - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -333,7 +333,7 @@
     - id: ClothingEyesGlassesSecurity
     - id: ClothingHeadsetAltSecurity
     - id: ClothingMaskNeckGaiter
-    - id: ClothingOuterCoatHoSTrench
+#    - id: ClothingOuterCoatHoSTrench # DeltaV - removed for incongruence
     - id: ClothingShoesBootsJack
     - id: DoorRemoteSecurity
     - id: HoloprojectorSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -7,26 +7,26 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
+#        prob: 0.3 # DeltaV - just give them the damn disabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
+#      - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
+#      - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
       # Begin DeltaV additions
       - id: BoxPDAPrisoner
-      - id: ClothingShoesBootsWinterWarden
       - id: BoxEncryptionKeyPrisoner
       - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      - id: ClothingOuterVestPlateCarrierAdv
       # End DeltaV additions
       - id: ClothingNeckShockCollar
         amount: 2
@@ -42,25 +42,25 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
+#        prob: 0.3 # DeltaV - just give them the damn disabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
+#      - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
+#      - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
       # Begin DeltaV additions
       - id: BoxPDAPrisoner
-      - id: ClothingShoesBootsWinterWarden
       - id: BoxEncryptionKeyPrisoner
       - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      - id: ClothingOuterVestPlateCarrierAdv
       # End DeltaV additions
       - id: ClothingNeckShockCollar
         amount: 2
@@ -76,30 +76,16 @@
     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: ClothingUniformJumpsuitSecGrey # DeltaV - remove uniforms from sec lockers
+#        prob: 0.3
       - 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: ClothingBeltSecurityFilled
       - id: Flash
-        prob: 0.5
+#        prob: 0.5 # DeltaV - standardise spare flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
@@ -120,18 +106,20 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses
+#      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked.
       - id: WeaponDisabler
       - 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: 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: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret.
-##      - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
+      - id: ClothingHeadsetBrigmedic # DeltaV - add spare headset.
+#      - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
-##      - id: ClothingUniformJumpskirtOfLife # DeltaV - nah
-##        prob: 0.1
+#      - id: ClothingUniformJumpskirtOfLife # DeltaV - removed for incongruence
+#        prob: 0.1
+      - id: ClothingBeltCorpsmanWebbing # DeltaV - added spare webbing
       - id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up.
       - id: MedkitFilled
       - id: MedkitCombatFilled
@@ -146,8 +134,8 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
-##      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
-##        prob: 0.15
+#      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - removed for incongruence
+#        prob: 0.15
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
@@ -160,13 +148,17 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses
+#      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked.
       - id: WeaponDisabler
       - id: TrackingImplanter
         amount: 2
       - id: ClothingOuterHardsuitCombatCorpsman
+      - id: BoxSterileMask
+      - id: ClothingHeadHatBeretCorpsman # Add corpsman beret.
+      - id: ClothingHeadsetBrigmedic # Add spare headset.
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
+      - id: ClothingBeltCorpsmanWebbing # Added spare webbing
       - id: HandheldGPSBasic # Added GPS because I just think it should be there tbh.
       - id: MedkitFilled
       - id: MedkitCombatFilled
@@ -194,11 +186,13 @@
   - type: StorageFill
     contents:
       - id: ClothingEyesGlassesSecurity
-        prob: 0.3
-      - id: ClothingHeadHatFedoraBrown
-      - id: ClothingNeckTieDet
-      - id: ClothingOuterVestDetective
-      - id: ClothingOuterCoatDetective
+#        prob: 0.3 # DeltaV - standardise until HUD balance worked out
+#      - id: ClothingHeadHatFedoraBrown # DeltaV - removed for incongruence
+#      - id: ClothingNeckTieDet # DeltaV - removed for incongruence
+#      - id: ClothingOuterVestDetective # DeltaV - removed for incongruence
+#      - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence
+      - id: ClothingHeadsetSecurity # DeltaV - add spare headset.
+      - id: FlippoEngravedLighter # DeltaV - add due to removal of trench coat
       - id: FlashlightSeclite
       - id: ForensicScanner
       - id: LogProbeCartridge

diff --git 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
-    ClothingOuterCoatDetectiveLoadout: 2
-    ClothingHeadHatFedoraBrown: 2
-    ClothingUniformJumpsuitDetectiveGrey: 2
-    ClothingUniformJumpskirtDetectiveGrey: 2
-    ClothingOuterVestDetective: 2
-    ClothingNeckTieDet: 2
-    ClothingHeadHatFedoraGrey: 2
+#    ClothingUniformJumpsuitDetective: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpskirtDetective: 2 # DeltaV - removed for incongruence
+#    ClothingShoesColorBrown: 2 # DeltaV - removed for incongruence
+#    ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - removed for incongruence
+#    ClothingHeadHatFedoraBrown: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - removed for incongruence
+#    ClothingOuterVestDetective: 2 # DeltaV - removed for incongruence
+#    ClothingNeckTieDet: 2 # DeltaV - removed for incongruence
+#    ClothingHeadHatFedoraGrey: 2 # DeltaV - removed for incongruence
+    ClothingUniformJumpsuitForensicSpec: 2 # DeltaV
+    ClothingUniformJumpskirtForensicSpec: 2 # DeltaV
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetSecurity: 2
+    ForensicPad: 10 # DeltaV
+    BoxFolderBlack: 2 # DeltaV
+    BoxEvidenceMarkers: 1 # DeltaV
+    HandLabeler: 1 # DeltaV
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -28,6 +28,6 @@
     BreachingCharge: 8 # DeltaV - added breaching charges
   # security officers need to follow a diet regimen!
   contrabandInventory:
-    FoodDonutHomer: 12
-    FoodBoxDonut: 2
+#    FoodDonutHomer: 12 # DeltaV - removed for incongruence at maintainer request
+#    FoodBoxDonut: 2 # DeltaV - removed for incongruence at maintainer request
     #box evidence
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -4,33 +4,35 @@
     ClothingBackpackSecurity: 3
     ClothingBackpackSatchelSecurity: 3
     ClothingBackpackDuffelSecurity: 3
-    ClothingUniformJumpsuitSec: 3
+#    ClothingUniformJumpsuitSec: 3 # DeltaV - moved*
     ClothingShoesBootsJack: 3
     ClothingHeadHatBeretSecurity: 3
-##    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
-    ClothingHeadBandRed: 3
+    ClothingMaskNeckGaiter: 3 # DeltaV - add neck gaiters to secdrobe
+    ClothingMaskGasSecurity: 3 # DeltaV - add security gas masks to secdrobe
+#    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
+#    ClothingHeadBandRed: 3 # DeltaV - removed for incongruency
 #   ClothingMaskNeckGaiterRed: 3 # DeltaV - removed
     ClothingHandsGlovesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
+    ClothingUniformJumpsuitSec: 3 # DeltaV - *moved
     ClothingUniformJumpskirtSec: 3
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
     ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe
+    ClothingUniformJumpsuitSecFormal: 1 # DeltaV - add formal uniform to secdrobe
+    ClothingUniformJumpskirtSecFormal: 1 # DeltaV - add formal uniform to secdrobe
     ClothingHeadsetSecurity: 3
     ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe
+    ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe
     ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec
     ClothingOuterGreatcoatStasec: 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
+#    ClothingShoesBootsWinterSec: 2 # DeltaV - removed for incongruency
 #   ClothingHeadHelmetJustice: 1 # DeltaV - lrp
-    # Begin DeltaV additions
-    ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
-    # End DeltaV additions
   contrabandInventory:
-    ClothingMaskClownSecurity: 1
+#    ClothingMaskClownSecurity: 1 # DeltaV - removed for incongruency
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -82,6 +82,14 @@
     ClothingOuterSuitCarp: 2 # DeltaV - Move carp suit out of syndicate uplink into the AutoDrobe
     ClothingShoesBootsWinterClown: 2  #Delta V: Add departmental winter boots
     ClothingShoesBootsWinterMime: 2  #Delta V: Add departmental winter boots
+    ClothingUniformJumpsuitDetective: 1 # DeltaV - moved from detdrobe
+    ClothingUniformJumpskirtDetective: 1 # DeltaV - moved from detdrobe
+    ClothingUniformJumpsuitDetectiveGrey: 1 # DeltaV - moved from detdrobe
+    ClothingUniformJumpskirtDetectiveGrey: 1 # DeltaV - moved from detdrobe
+    ClothingOuterCoatDetectiveLoadout: 1 # DeltaV - moved from detdrobe
+    ClothingNeckTieDet: 1 # DeltaV - moved from detdrobe
+    ClothingHeadHatFedoraBrown: 1 # DeltaV - moved from detdrobe
+    ClothingHeadHatFedoraGrey: 1 # DeltaV - moved from detdrobe
     ClothingHeadHatCowboyBrown: 1
     ClothingHeadHatCowboyBlack: 1
     ClothingHeadHatCowboyWhite: 1