Medical scrubs expansion

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

@@ -58,13 +58,23 @@
   - type: StorageFill
     contents:
       - id: UniformScrubsColorGreen
-      - id: UniformScrubsColorPurple
       - id: UniformScrubsColorBlue
-      - id: ClothingHeadBandBlue
-      - id: ClothingHeadBandRed
-      - id: ClothingHeadBandGreen
+      - id: UniformScrubsColorCyan
+      - id: UniformScrubsColorPurple
+      - id: UniformScrubsColorBlack
+      - id: UniformScrubsColorPink
+      - id: UniformScrubsColorRainbow
+      - id: UniformScrubsColorWhite
+      - id: ClothingHeadHatSurgcapGreen
+      - id: ClothingHeadHatSurgcapBlue
+      - id: ClothingHeadHatSurgcapCyan
+      - id: ClothingHeadHatSurgcapPurple
+      - id: ClothingHeadHatSurgcapBlack
+      - id: ClothingHeadHatSurgcapPink
+      - id: ClothingHeadHatSurgcapRainbow
+      - id: ClothingHeadHatSurgcapWhite
       - id: ClothingMaskSterile
-        amount: 3
+        amount: 1
 
 - type: entity
   id: CrateEmergencyBurnKit

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

@@ -52,19 +52,55 @@
         prob: 0.1
         orGroup: Surgcaps
       - id: ClothingHeadHatSurgcapPurple
-        prob: 0.05
+        prob: 0.11
         orGroup: Surgcaps
       - id: ClothingHeadHatSurgcapBlue
-        prob: 0.90
+        prob: 0.12
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapCyan
+        prob: 0.13
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapBlack
+        prob: 0.15
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapPink
+        prob: 0.16
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapRainbow
+        prob: 0.18
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapWhite
+        prob: 0.19
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapCybersun
+        prob: 0.02
         orGroup: Surgcaps
       - id: UniformScrubsColorBlue
-        prob: 0.5
+        prob: 0.1
         orGroup: Surgshrubs
       - id: UniformScrubsColorGreen
-        prob: 0.1
+        prob: 0.11
         orGroup: Surgshrubs
       - id: UniformScrubsColorPurple
-        prob: 0.05
+        prob: 0.12
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorCyan
+        prob: 0.13
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorBlack
+        prob: 0.15
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorPink
+        prob: 0.16
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorRainbow
+        prob: 0.18
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorWhite
+        prob: 0.19
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorCybersun
+        prob: 0.02
         orGroup: Surgshrubs
       - id: NitrousOxideTankFilled
         prob: 0.3
@@ -103,4 +139,4 @@
       - id: ClothingUniformJumpsuitParamedic
       - id: ClothingUniformJumpskirtParamedic
       - id: ClothingEyesHudMedical
-
+

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

@@ -18,6 +18,6 @@
     ClothingHeadHatParamedicsoft: 2
     ClothingHeadHelmetVoidParamed: 1
     ClothingOuterHardsuitVoidParamed: 1
-    UniformScrubsColorGreen: 2
-    UniformScrubsColorBlue: 2
-    UniformScrubsColorPurple: 2
+  emaggedInventory:
+    UniformScrubsColorCybersun: 1
+    ClothingHeadHatSurgcapCybersun: 1

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

@@ -68,4 +68,70 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 8
+        Slash: 8
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapBlack
+  name: surgical cap
+  description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_black.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_black.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapCyan
+  name: surgical cap
+  description: A cyan cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapCybersun
+  name: surgical cap
+  description: A surgical cap worn by members of Cybersun's Biotechnology division.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapPink
+  name: surgical cap
+  description: A pink cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_pink.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_pink.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapRainbow
+  name: surgical cap
+  description: A rainbow cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSurgcapWhite
+  name: surgical cap
+  description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi

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

@@ -0,0 +1,65 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorBlack
+  name: black scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/black.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/black.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorCyan
+  name: cyan scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorPink
+  name: pink scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/pink.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/pink.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorRainbow
+  name: rainbow scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorWhite
+  name: white scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/white.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/white.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorCybersun
+  name: cybersun scrubs
+  description: The official uniform of Cybersun's biotechnology division
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi

Resources/Prototypes/DeltaV/Entities/Markers/Spawners/scrubs.yml

@@ -0,0 +1,23 @@
+- type: entity
+  name: Medical Scrubs Spawner
+  id: MedicalScrubsSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+        - UniformScrubsColorGreen
+        - UniformScrubsColorBlue
+        - UniformScrubsColorCyan
+        - UniformScrubsColorPurple
+        - UniformScrubsColorBlack
+        - UniformScrubsColorPink
+        - UniformScrubsColorRainbow
+        - UniformScrubsColorWhite
+      rarePrototypes:
+        - UniformScrubsColorCybersun
+      rareChance: 0.01

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/meta.json

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

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json

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

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json

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

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/meta.json

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