Merge pull request #2789 from Smugman/ClothingOps2

Adding JustAnOrange's Cybersun Clothing options (Plus Loadout Changes for Recruiter and Synthesis)

Resources/Prototypes/Catalog/Fills/Items/briefcases.yml

@@ -30,7 +30,7 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  parent: BriefcaseSyndie
+  parent: CybersunBriefcase # DeltaV
   suffix: Syndicate, Spesos
   components:
   - type: StorageFill
@@ -41,8 +41,12 @@
       - id: EncryptionKeySyndie
       - id: RubberStampTrader
       - id: PhoneInstrumentSyndicate
-      - id: ClothingUniformJumpsuitTacticool
-      - id: ClothingOuterCoatJensen
+      # begin DeltaV
+      # - id: ClothingUniformJumpsuitTacticool
+      # - id: ClothingOuterCoatJensen
+      - id: ClothingOuterCybersunOvercoat
+      - id: ClothingUniformCybersunAttorney
+      # end DeltaV
       - id: ClothingHandsGlovesCombat
       - id: ClothingMaskNeckGaiter
       - id: SyndieHandyFlag

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

@@ -16,3 +16,5 @@
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
+  contrabandInventory:
+    ClothingUniformCybersunHazard: 1 # DeltaV

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

@@ -30,5 +30,10 @@
     ClothingHeadHatPwig: 1
     # "Legally" obtained currency
     SpaceCash100: 2
+    # Begin DeltaV additions
+    ClothingUniformCybersunAttorney: 1
+    CybersunBriefcase: 1
+    ClothingOuterCybersunOvercoat: 1
+    # End DeltaV additions
   emaggedInventory:
     CyberPen: 1

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

@@ -16,3 +16,5 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2
+  contrabandInventory:
+    ClothingUniformCybersunRND: 1 # DeltaV

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -1326,10 +1326,11 @@
       - ClothingOuterCoatCybersunWindbreaker
       - ClothingMaskInterdyneChemistry
       - ClothingHeadHatSurgcapCybersun
-      #- ClothingUniformCybersunHazard
-      #- ClothingUniformCybersunCasual
-      #- ClothingUniformCybersunRND
-      #- ClothingOuterCybersunOvercoat
+      - ClothingUniformCybersunHazard
+      - ClothingUniformCybersunCasual
+      - ClothingUniformCybersunRND
+      - ClothingOuterCybersunOvercoat
+      - ClothingBeltSyndicateUtility
       # End DeltaV Additions
   - type: MaterialStorage
     whitelist:

Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml

@@ -106,3 +106,14 @@
       components:
       - FitsInDispenser
       - Stamp
+
+- type: entity
+  parent: ClothingBeltUtility
+  id: ClothingBeltSyndicateUtility
+  name: syndicate utility belt
+  description: Can hold various nefarious things.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi

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

@@ -119,3 +119,15 @@
   - type: TemperatureProtection
     coolingCoefficient: 0.1
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCybersunOvercoat
+  name: cybersun overcoat
+  description: Heavy black robes with magenta and gold trim. It smells old.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
+  - type: TemperatureProtection
+    coolingCoefficient: 0.1

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

@@ -451,3 +451,37 @@
     sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformCybersunHazard
+  name: cybersun hazard suit
+  description: This high-visibility jumpsuit prevents you from getting run over, yet keeps you dark enough to stay unnoticed!
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformCybersunCasual
+  name: cybersun casual jumpsuit
+  description: With all the non-descript gizmos they shoved in this thing, are you sure it's even safe to put on?
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformCybersunRND
+  name: cybersun research turtleneck
+  description: It's another Turtleneck. What'd you expect?
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
+

Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml

@@ -0,0 +1,11 @@
+- type: entity
+  parent: BriefcaseBrown
+  id: CybersunBriefcase
+  name: cybersun briefcase
+  description: It's like a brown briefcase, but black.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
+    state: icon
+  - type: Item
+    sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi

Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml

@@ -131,24 +131,24 @@
   id: ClothingUniformInterdyneChemist
   result: ClothingUniformInterdyneChemist
 
-#- type: latheRecipe
-#  parent: BaseJumpsuitRecipe
-#  id: ClothingUniformCybersunHazard
-#  result: ClothingUniformCybersunHazard
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformCybersunHazard
+  result: ClothingUniformCybersunHazard
 
-#- type: latheRecipe
-#  parent: BaseJumpsuitRecipe
-#  id: ClothingUniformCybersunCasual
-#  result: ClothingUniformCybersunCasual
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformCybersunCasual
+  result: ClothingUniformCybersunCasual
 
-#- type: latheRecipe
-#  parent: BaseJumpsuitRecipe
-#  id: ClothingUniformCybersunRND
-#  result: ClothingUniformCybersunRND
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformCybersunRND
+  result: ClothingUniformCybersunRND
 
 - type: latheRecipe
   parent: BaseCoatRecipe
-  id: ClothingOuterCoatCybersunWindbreaker #unsure because its armored, but with an EMAG you can get far better things than it from machines that you DONT have to steal/make.
+  id: ClothingOuterCoatCybersunWindbreaker
   result: ClothingOuterCoatCybersunWindbreaker
   materials:
     Cloth: 100
@@ -162,17 +162,17 @@
     Cloth: 100
     Durathread: 200 #increased durathread cost since it has "armor" (Caustic is such a real damage type)
 
-#- type: latheRecipe #Commented out for now until added
-#  parent: BaseCoatRecipe
-#  id: ClothingOuterCybersunOvercoat
-#  result: ClothingOuterCybersunOvercoat
+- type: latheRecipe
+  parent: BaseCoatRecipe
+  id: ClothingOuterCybersunOvercoat
+  result: ClothingOuterCybersunOvercoat
 
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatSurgcapCybersun
   result: ClothingHeadHatSurgcapCybersun
 
-- type: latheRecipe #unsure about letting people craft a gasmask at the uniform printer, but also dont want to split up the uniform into different machines or leave it half-finished, added higher cloth cost because this is the only way to lathe gasmasks at all, apparently.
+- type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingMaskInterdyneChemistry
   result: ClothingMaskInterdyneChemistry
@@ -202,3 +202,9 @@
   materials:
     Cloth: 200
     Durathread: 100
+
+- type: latheRecipe
+  id: ClothingBeltSyndicateUtility
+  result: ClothingBeltSyndicateUtility
+  materials:
+    Cloth: 200

Resources/Prototypes/_DV/Roles/Antags/recruiter.yml

@@ -18,9 +18,12 @@
     head: ClothingHeadHatFedoraBrown
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesColorWhite
-    outerClothing: ClothingOuterCoatTrench
+    outerClothing: ClothingOuterCybersunOvercoat
     shoes: ClothingShoesLeather
     id: PassengerPDA
     ears: ClothingHeadsetGrey
     pocket1: PenRecruiter
     pocket2: RubberStampSyndicate
+    belt: ClothingBeltSyndicateUtility
+  inhand:
+    - CybersunBriefcase

Resources/Prototypes/_DV/Roles/Antags/synthesis_specialist.yml

@@ -13,17 +13,18 @@
 - type: startingGear
   id: SyndicateSynthesisGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitSyndieFormal
-    jumpskirt: ClothingUniformJumpskirtSyndieFormalDress
+    jumpsuit: ClothingUniformInterdyneChemist
     back: ClothingBackpackChemistry
     belt: ChemBag
-    eyes: ClothingEyesGlassesChemical
+    eyes: ClothingEyesGlassesChemicalInterdyne
     gloves: ClothingHandsGlovesChemist
-    outerClothing: ClothingOuterCoatLabChem
+    outerClothing: ClothingOuterInterdyneChemistrySuit
     shoes: ClothingShoesEnclosedChem
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
     pocket1: HandLabeler
     pocket2: RubberStampSyndicate
-    mask: ClothingMaskNeckGaiter
+    mask: ClothingMaskInterdyneChemistry
     head: ClothingHeadHatSyndie
+  inhand:
+    - DefibrillatorSyndicate

Resources/Textures/_DV/Clothing/Belt/syndbelt_overlay.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "sprites by JustAnOrange (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by JustanOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by JustanOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by JustanOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}