Merge branch 'master' of https://github.com/nkokic/Sector-Umbra into …

…bloodstream

README.md

@@ -6,7 +6,7 @@ This is the primary repository for Sector Umbra, other related repositories are
 
 ## Links
 
-[Website](https://sector-umbra.net/) | [Wiki](https://wiki.sector-umbra.net/)
+[Website](https://sector-umbra.net/) | [Wiki](https://wiki.sector-umbra.net/) | [Latest Builds](https://sector-umbra.net/cdn/fork/sectorumbra/)
 
 ## Contributing
 

Resources/Locale/en-US/_CD/foldable/components/foldable-component.ftl

@@ -0,0 +1,4 @@
+# Foldable
+
+fold-verb-clothing-layer = Take off layer
+unfold-verb-clothing-layer = Put on layer

Resources/Locale/en-US/_CD/preferences/loadout-groups.ftl

@@ -9,6 +9,9 @@ loadout-group-private-investigator-glasses = Private Investigator glasses
 
 loadout-group-passenger-id = Passenger ID
 
+# Cargo
+loadout-group-salvage-specialist-jumpsuit = Salvage Specialist jumpsuit
+
 # Engineering
 loadout-group-senior-engineer-jumpsuit = Senior Engineer jumpsuit
 

Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl

@@ -3,7 +3,8 @@ advertisement-bruiseomat-2 = Who has TC?
 advertisement-bruiseomat-3 = Did anyone buy an EMAG?
 advertisement-bruiseomat-4 = I wanna go back to my home station...
 advertisement-bruiseomat-5 = Beware of the Mime and Clown. BEWARE!
-advertisement-bruiseomat-6 = A nuke a day keeps the deathsquad at bay!
+advertisement-bruiseomat-6 = A nuke a day keeps the NTIA at bay!
+# Umbra change ^^^
 advertisement-bruiseomat-7 = You'll never be able to match MY mixing, Agent!
 advertisement-bruiseomat-8 = Thirsting for blood? I got you covered!
 advertisement-bruiseomat-9 = If they didn't want us to blow up the station, then why would they leave the disk so unsecured?

Resources/Locale/en-US/foldable/components/foldable-component.ftl

@@ -7,4 +7,4 @@ unfold-verb = Unfold
 fold-flip-verb = Flip
 
 fold-zip-verb = Zip up
-fold-unzip-verb = Unzip
+fold-unzip-verb = Unzip

Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

@@ -194,8 +194,10 @@ ghost-role-information-behonker-description = You are an antagonist, bring death
 ghost-role-information-hellspawn-name = Hellspawn
 ghost-role-information-hellspawn-description = Bring death to those who do not follow the great god Nar'Sie.
 
-ghost-role-information-Death-Squad-name = Death Squad Operative
-ghost-role-information-Death-Squad-description = One of Nanotrasen's top internal affairs agents. Await orders from CentComm or an official.
+ghost-role-information-Death-Squad-name = Internal Affairs Agent
+# Umbra change ^^^
+ghost-role-information-Death-Squad-description = One of Nanotrasen's top operatives for internal matters. Await orders from CentComm or an official.
+# Umbra change ^^^
 ghost-role-information-Death-Squad-rules = You are required to obey orders given by your superior, you are effectively their [color=#6495ed][bold]Familiar[/bold][/color].
 
 ghost-role-information-SyndiCat-name = SyndiCat
@@ -252,7 +254,7 @@ ghost-role-information-medical-description = You are a medical professional, but
 ghost-role-information-cargo-name = Cargo
 ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
 
-ghost-role-information-engineering-name = Engineering 
+ghost-role-information-engineering-name = Engineering
 ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
 
 ghost-role-information-science-name = Science

Resources/Locale/en-US/job/job-names.ftl

@@ -22,7 +22,8 @@ job-name-captain = Captain
 job-name-serviceworker = Service Worker
 job-name-centcomoff = CentComm Official
 job-name-cburn = Centcomm Quarantine Officer
-job-name-deathsquad = Centcomm Agent
+job-name-deathsquad = Centcomm NTIA Agent
+# Umbra change ^^^
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian

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

@@ -36,6 +36,7 @@
       - id: ClothingOuterCoatLabCmo
       - id: ClothingUniformJumpsuitCMOTurtle
       - id: ClothingUniformJumpskirtCMOTurtle
+      - id: ClothingUniformCMOFormal # CD
       - id: ClothingHeadHatBeretCmo
       - id: ClothingHeadMirror
       - id: ClothingEyesGlasses

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

@@ -172,10 +172,10 @@
    - type: StorageFill
      contents:
        - id: ClothingHeadHatCargosoft
-       - id: ClothingUniformJumpsuitCargo
+       - id: ClothingUniformJumpsuitCargoLight # CD
        - id: ClothingBackpack
        - id: ClothingShoesColorBlack
-       - id: ClothingUniformJumpskirtCargo
+       - id: ClothingUniformJumpskirtCargoLight # CD
        - id: ClothingHandsGlovesFingerless
        - id: AppraisalTool
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml

@@ -4,16 +4,22 @@
     ClothingBackpackCargo: 3
     ClothingBackpackSatchelCargo: 3
     ClothingBackpackDuffelCargo: 3
-    ClothingUniformJumpsuitCargo: 3
-    ClothingUniformJumpskirtCargo: 3
+    ClothingUniformJumpsuitCargoLight: 3 # CD
+    ClothingUniformJumpsuitCargoDark: 3 # CD
+    ClothingUniformJumpskirtCargoLight: 3 # CD
+    ClothingUniformJumpskirtCargoDark: 3 # CD
     ClothingUniformJumpsuitCargoPants: 3 # CD
+    ClothingUniformJumpsuitCargoOveralls: 3 # CD
     ClothingShoesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
+    ClothingHandsGlovesMechanic: 3 # CD
     ClothingHeadHatCargosoft: 3
     ClothingHeadBandBrown: 3
+    ClothingMaskBandCargo : 3 # CD
     ClothingHeadsetCargo: 3
     ClothingOuterWinterCargo: 2
     ClothingOuterWinterMiner: 2
     ClothingOuterCoatCargoBomber: 2 # CD
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
+    ClothingShoesBootsSteel: 2 # CD

Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml

@@ -3,7 +3,9 @@
   startingInventory:
     ClothingUniformJumpsuitChemistry: 2
     ClothingUniformJumpskirtChemistry: 2
+    ClothingUniformChemistCasual: 2 # CD
     ClothingOuterCoatLabChem: 2
+    ClothingOuterCoatStylishLabChem: 2 # CD
     ClothingShoesColorWhite: 2
     ClothingBackpackChemistry: 2
     ClothingBackpackSatchelChemistry: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml

@@ -10,6 +10,9 @@
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2
     ClothingOuterVestDetective: 2
+    ClothingUniformDetectiveCasual: 2
+    ClothingUniformJumpskirtDetectiveCasual: 2
+    ClothingOuterCoatDetectiveForensic: 2
     ClothingNeckTieDet: 2
     ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -6,11 +6,13 @@
     ClothingBackpackSatchelMedical: 4
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
-    ClothingBeltMedical: 4
     ClothingUniformDoctorCasual: 4 # CD
+    ClothingUniformMedicalTechnician: 4 # CD
+    ClothingBeltMedical: 4
     ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
     ClothingOuterCoatLab: 4
+    ClothingOuterCoatStylishLab: 4
     ClothingShoesColorWhite: 4
     ClothingHandsGlovesLatex: 4
     ClothingHandsGlovesNitrile: 2
@@ -26,3 +28,4 @@
     ClothingShoesBootsWinterMed: 2
   contrabandInventory:
     ClothingUniformJumpskirtOfLife: 1
+    ClothingUniformJumpsuitMaintSurgeon: 1 # CD

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -9,6 +9,7 @@
     ClothingHeadHatBeretSecurity: 3
     ClothingHeadHatSecsoft: 3
     ClothingHeadBandRed: 3
+    ClothingMaskBandSec : 3 # CD
     ClothingMaskNeckGaiterRed: 3
     ClothingHandsGlovesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
@@ -23,6 +24,7 @@
     ClothingOuterArmorBasic: 2
     ClothingNeckScarfStripedRed: 3
     ClothingOuterArmorBasicSlim: 2
+    ClothingOuterCoatSecGreatcoat : 2 # CD
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml

@@ -5,6 +5,7 @@
     ClothingUniformJumpskirtVirology: 2
     ClothingShoesColorWhite: 2
     ClothingOuterCoatLabViro: 2
+    ClothingOuterCoatLabStylishViro: 2
     ClothingOuterWinterViro: 2
     ClothingMaskSterile: 2
     ClothingBackpackVirology: 2

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -170,7 +170,7 @@
   description: A robust backpack for stealing cargo's loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Backpacks/cargo.rsi
+      sprite: _CD/Clothing/Back/Backpacks/cargo.rsi # CD drip 2
 
 - type: entity
   parent: ClothingBackpack
@@ -260,7 +260,7 @@
 - type: entity
   parent: ClothingBackpackERTSecurity
   id: ClothingBackpackDeathSquad
-  name: death squad backpack
+  name: internal affairs backpack # Umbra change
   description: Holds the kit of CentComm's most feared agents.
   components:
     - type: Storage

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -146,7 +146,7 @@
   description: A large duffel bag for stealing cargo's precious loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Duffels/cargo.rsi
+      sprite: _CD/Clothing/Back/Duffels/cargo.rsi # CD drip 2
 
 - type: entity
   parent: ClothingBackpackDuffel

Resources/Prototypes/Entities/Clothing/Back/satchel.yml

@@ -148,7 +148,7 @@
   description: A robust satchel for stealing cargo's loot.
   components:
     - type: Sprite
-      sprite: Clothing/Back/Satchels/cargo.rsi
+      sprite: _CD/Clothing/Back/Satchels/cargo.rsi # CD drip 2
 
 - type: entity
   parent: ClothingBackpackSatchel

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -686,7 +686,7 @@
 - type: entity
   parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase ]
   id: ClothingHeadHelmetHardsuitDeathsquad
-  name: deathsquad hardsuit helmet
+  name: internal affairs hardsuit helmet # Umbra change
   description: A robust helmet for special operations.
   components:
   - type: BreathMask

Resources/Prototypes/Entities/Clothing/Head/soft.yml

@@ -63,9 +63,9 @@
   description: "It's a baseball hat painted in Cargo colours."
   components:
   - type: Sprite
-    sprite: Clothing/Head/Soft/cargosoft.rsi
+    sprite: _CD/Clothing/Head/Soft/cargosoft.rsi # CD drip 2
   - type: Clothing
-    sprite: Clothing/Head/Soft/cargosoft.rsi
+    sprite: _CD/Clothing/Head/Soft/cargosoft.rsi # CD drip 2
   - type: Tag
     tags:
     - ClothMade

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -433,8 +433,8 @@
 - type: entity
   parent: ClothingMaskGasERT
   id: ClothingMaskGasDeathSquad
-  name: death squad gas mask
-  description: A unique gas mask for the NT's most elite squad.
+  name: internal affairs gas mask # Umbra change
+  description: A unique gas mask for the NT's most elite agents. # Umbra change
   components:
   - type: Sprite
     sprite: Clothing/Mask/squadron.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

@@ -8,6 +8,7 @@
     - outerClothing
   - type: Sprite
     state: icon
+  - type: AllowSuitStorage #Umbra Change
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -853,8 +853,8 @@
 - type: entity
   parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
   id: ClothingOuterHardsuitDeathsquad
-  name: death squad hardsuit
-  description: An advanced hardsuit favored by commandos for use in special operations.
+  name: internal affairs hardsuit # Umbra change
+  description: An advanced hardsuit favored by agents for use in special operations. # Umbra change
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi

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

@@ -125,7 +125,7 @@
   name: cargo winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    sprite: _CD/Clothing/OuterClothing/WinterCoats/coat.rsi # CD drip 2
     layers:
     - state: CARGO-icon
   - type: Item
@@ -135,7 +135,7 @@
       right:
       - state: CARGO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    sprite: _CD/Clothing/OuterClothing/WinterCoats/coat.rsi # CD drip 2
     clothingVisuals:
       outerClothing:
       - state: CARGO-equipped-OUTERCLOTHING

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -110,9 +110,9 @@
   name: cargo winter boots
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Boots/winterbootscargo.rsi
+    sprite: _CD/Clothing/Shoes/Boots/winterbootscargo.rsi # CD drip 2
   - type: Clothing
-    sprite: Clothing/Shoes/Boots/winterbootscargo.rsi
+    sprite: _CD/Clothing/Shoes/Boots/winterbootscargo.rsi # CD drip 2
 
 - type: entity
   parent: ClothingShoesBaseWinterBoots

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

@@ -126,9 +126,9 @@
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpskirt/cmoturtleskirt.rsi # CD
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpskirt/cmoturtleskirt.rsi # CD
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -344,9 +344,9 @@
   description: A sharp turtleneck made for the hardy work environment of supply.
   components:
     - type: Sprite
-      sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi
+      sprite: _CD/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi # CD drip 2
     - type: Clothing
-      sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi
+      sprite: _CD/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi # CD drip 2
 
 - type: entity
   parent: [ClothingUniformSkirtBase, BaseCommandContraband]

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

@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitDeathSquad
-  name: death squad uniform
+  name: internal affairs uniform # Umbra change
   description: Advanced armored jumpsuit used by special forces in special operations.
   components:
   - type: Sprite
@@ -86,9 +86,9 @@
   description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/salvage.rsi # CD drip 2
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/salvage.rsi # CD drip 2
 
 - type: entity
   parent: [ClothingUniformBase, BaseCommandContraband]
@@ -270,9 +270,9 @@
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmoturtle.rsi # CD
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmoturtle.rsi # CD
 
 - type: entity
   parent: ClothingUniformBase
@@ -530,9 +530,9 @@
   description: A sharp turtleneck made for the hardy work environment of supply.
   components:
     - type: Sprite
-      sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
+      sprite: _CD/Clothing/Uniforms/Jumpsuit/qmturtle.rsi # CD drip 2
     - type: Clothing
-      sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
+      sprite: _CD/Clothing/Uniforms/Jumpsuit/qmturtle.rsi # CD drip 2
 
 - type: entity
   parent: [ClothingUniformBase, BaseCommandContraband]
@@ -1346,7 +1346,7 @@
       - state: equipped-INNERCLOTHING-jumpsuit
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
-  
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCasualGreen

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -18,8 +18,8 @@
 
 - type: entity
   id: RandomHumanoidSpawnerDeathSquad
-  name: Death Squad Agent
-  suffix: ERTRole, Death Squad
+  name: Internal Affairs Agent # Umbra change
+  suffix: ERTRole, Internal Affairs # Umbra change
   components:
     - type: Sprite
       sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -777,7 +777,7 @@
 - type: entity
   parent: CentcomPDA
   id: DeathsquadPDA
-  suffix: Death Squad
+  suffix: Internal Affairs # Umbra change
   components:
   - type: Pda
     id: CentcomIDCardDeathsquad