Quickfix

Resources/Audio/DeltaV/license.txt

@@ -1 +1,4 @@
 typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sound/ which is licensed under the CC BY 4.0 License. This modified file follows the same license.
+axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
+jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license.
+universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.

Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl

@@ -1,2 +1,20 @@
 reagent-name-kvass = kvass
 reagent-desc-kvass = A cool refreshing drink with a taste of socialism.
+
+reagent-name-gunmetal = gunmetal
+reagent-desc-gunmetal = A controversial drink first mixed by Solus Cream, renowned as the first bartender to serve welding fuel in a cocktail - without losing their liquor license.
+
+reagent-name-lemondrop = lemon drop
+reagent-desc-lemondrop = A simple, tangy, and tasty drink consisting of lemon, vodka, and simple syrup. Refreshing!
+
+reagent-name-greengrass = green grass
+reagent-desc-greengrass = Green grass, or grüne wiese, is a peculiar green cocktail hailing from the now dissolved GDR. Popular amongst the disillusioned and disingenuous alike.
+
+reagent-name-daiquiri = modern daiquiri
+reagent-desc-daiquiri = A sweet mix of deadrum and lime, a favourite of writers and politicians.
+
+reagent-name-arsonistsbrew = arsonist's brew
+reagent-desc-arsonistsbrew = Take a sip and laugh, while you watch your world burn.
+
+reagent-name-dulleavene = dulleavene
+reagent-desc-dulleavene = Allegedly it's a cocktail. The warning cone motif seems apt.

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -4,7 +4,7 @@
     sprite: Clothing/OuterClothing/Armor/security.rsi
     state: icon
   product: CrateSecurityArmor
-  cost: 700
+  cost: 1000 # DeltaV - raise price for buffed armour
   category: Security
   group: market
 

Resources/Prototypes/Catalog/Fills/Crates/security.yml

@@ -4,7 +4,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorBulletproof
+      - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBulletproof replaced in favour of plate carrier
         amount: 3
 
 - type: entity

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -109,6 +109,8 @@
       - id: IDComputerCircuitboard
       - id: WeaponDisabler
       - id: ClothingOuterWinterHoP
+      - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite
+      - id: ClothingOuterCoatHoPFormal # DeltaV - formal jacket
       - id: CigarGoldCase
         prob: 0.25
         # Fuck the HoP they don't deserve fucking cigars.

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -62,11 +62,25 @@
         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: 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

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml

@@ -4,7 +4,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
     state: base
   product: CrateArmoryGrand
-  cost: 4000
+  cost: 5500
   category: Armory
   group: market
 
@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 3500
+  cost: 6500
   category: Armory
   group: market
 
@@ -24,6 +24,6 @@
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi
     state: icon
   product: CrateArmoryAdjutant
-  cost: 9000
+  cost: 10000
   category: Armory
   group: market

Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -13,9 +13,9 @@
         amount: 1
       - id: WeaponPistolViperWood
         amount: 1
-#      - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails)
+#      - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails) || it does WHAT now???
 #        amount: 1
-#      - id: BaseBallBat # THIS BAT IS TOO DAMN BIG!
+#      - id: BaseBallBat # THIS BAT IS TOO DAMN BIG! || well shucks, guess I'll cry
 #        amount: 1
 
 - type: entity

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml

@@ -17,7 +17,7 @@
     contents:
       - id: WeaponPistolUniversal
         amount: 2
-      - id: MagazineUniversalCaselessRifle
+      - id: MagazineUniversalMagnum
         amount: 4
 
 - type: entity

Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belt.yml

@@ -0,0 +1,9 @@
+- type: entity
+  id: ClothingBeltKatanaSheathFilled
+  parent: ClothingBeltKatanaSheath
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: Wakizashi
+      - id: Katana

Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml

@@ -1,26 +1,26 @@
-#- type: entity
-#  parent: GunSafe
-#  id: GunSafePistolUniversal
-#  name: mk32 safe
-#  components:
-#  - type: StorageFill
-#    contents:
-#    - id: WeaponPistolUniversal
-#      amount: 2
-#    - id: MagazineUniversalCaselessRifle
-#      amount: 4
+- type: entity
+  parent: GunSafe
+  id: GunSafePistolUniversal
+  name: mk32 safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolUniversal
+      amount: 2
+    - id: MagazineUniversalMagnum
+      amount: 4
 
-#- type: entity
-#  parent: GunSafe
-#  id: GunSafeSniperGrand
-#  name: mark 1 rifle safe
-#  components:
-#  - type: StorageFill
-#    contents:
-#    - id: WeaponSniperGrand
-#      amount: 2
-#    - id: SpeedLoaderLightRifle
-#      amount: 4
+- type: entity
+  parent: GunSafe
+  id: GunSafeSniperGrand
+  name: mark 1 rifle safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSniperGrand
+      amount: 2
+    - id: SpeedLoaderLightRifle
+      amount: 4
 
 - type: entity
   parent: GunSafe

Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml

@@ -135,3 +135,14 @@
     sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatDirCap
+  name: director's cap
+  description: A green cap with a director's rank emblem, belonging to a high-ranking member of Central Command. Whoever it is, they mean business.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/dircap.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/dircap.rsi

Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml

@@ -7,4 +7,15 @@
   - type: Sprite
     sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi    
+    sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakBoat
+  name: NanoTrasen boat cloak
+  description: A regal blue durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi    

Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml

@@ -110,3 +110,16 @@
         Slash: 0.95
         Piercing: 0.95
         Heat: 0.75
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatHoPFormal
+  name: head of personnel's formal jacket
+  description: A showy and over-the-top jacket with gold buttons and red trim. More tacky than classy.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1

Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml

@@ -37,3 +37,21 @@
     sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterStasecSweater
+  name: station security sweater
+  description: A thick synthetic sweater with reinforced shoulders and elbows, enough to warm even the harshest security officer's cold heart.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi
+  - type: Armor # Keep this the same as the sec winter coat
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.75

Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtHoPMess
   name: head of personnel's mess kit
   description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this.
@@ -8,3 +8,64 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi
+
+# Security alt uniforms
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtSecBlue
+  name: blue security jumpskirt
+  description: A cool blue shirt over charcoal skirt, for the calm and collected security officer.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi
+
+# Warden alt uniforms
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtWardenBlue
+  name: blue warden's jumpskirt
+  description: A cool blue shirt with ice-white markings and warden's epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtWardenGrey
+  name: grey warden's jumpskirt
+  description: Charcoal skirt, a grey shirt, and white warden's markings and epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi
+
+# HoS alt uniforms
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoSBlue
+  name: head of security's blue jumpskirt
+  description: A blue Station Security shirt with charcoal skirt. Features gold emblems and commander's epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoSGrey
+  name: head of security's grey jumpskirt
+  description: A grey Station Security shirt with charcoal skirt. Stands out with red highlights, gold emblems, and commander's epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi

Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -123,7 +123,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSecFormal
   name: security formal suit
-  description: A suit for special occasions.
+  description: A ceremonial piece of Station Security kit, for special occasions of any kind.
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi
@@ -184,3 +184,27 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi
+
+# Warden alt uniforms
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWardenBlue
+  name: blue warden's jumpsuit
+  description: A cool blue shirt with ice-white markings and warden's epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWardenGrey
+  name: grey warden's jumpsuit
+  description: Charcoal pants, a grey shirt, and white warden's markings and epaulettes.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi