More belts and welders (#2453)

* Adds sprites

* Added prototypes

* Adds experimental and mini welder

* Adds welder to CE's belt

* Lazily filled out the belts

* Added to spawn jobs

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/2453

* Update Resources/Prototypes/Entities/Objects/Tools/welders.yml

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

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

@@ -1,30 +1,162 @@
+# BASE
 - type: entity
   parent: Clothing
-  id: BeltBase
+  id: ClothingBeltBase
   abstract: true
   components:
+  - type: Sprite
+    state: icon
   - type: Clothing
     Slots: [belt]
-
-- type: entity
-  parent: BeltBase
-  id: UtilityBeltClothing
-  name: utility belt
-  description: Belt for holding all your usual tools
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/belt_utility.rsi
-    state: utilitybelt
-  - type: Clothing
     size: 50
     QuickEquip: false
-    sprite: Clothing/Belt/belt_utility.rsi
+
+# CONTENT
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltAssault
+  name: assault belt
+  description: "A tactical assault belt."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/assault.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/assault.rsi
   - type: Storage
-    capacity: 40 # Full tool loadout is 35, plus an extra
+    capacity: 40
 
 - type: entity
-  parent: BeltBase
-  id: SuspendersClothing
+  parent: ClothingBeltBase
+  id: ClothingBeltBandolier
+  name: assault belt
+  description: "A bandolier for holding shotgun ammunition."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChiefEngineer
+  name:  the Chief Engineer's toolbelt
+  description: "Holds tools, looks snazzy."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/ce.rsi
+  - type: Storage
+    capacity: 60
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChampion
+  name:  championship belt
+  description: "Proves to the world that you are the strongest!"
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/champion.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/champion.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltHolster
+  name:  shoulder holster
+  description: "A holster to carry a handgun and ammo. WARNING: Badasses only."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/holster.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/holster.rsi
+  - type: Storage
+    capacity: 20
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltJanitor
+  name:  janibelt
+  description: "A belt used to hold most janitorial supplies."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltMedical
+  name:  medical belt
+  description: "Can hold various medical equipment."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/medical.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSecurity
+  name:  security belt
+  description: "Can hold security gear like handcuffs and flashes."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/security.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/security.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSecurityWebbing
+  name:  security webbing
+  description: "Unique and versatile chest rig, can hold security gear."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltMilitaryWebbing
+  name:  chest rig
+  description: "A set of tactical webbing worn by Syndicate boarding parties."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSheath
+  name:  sabre sheath
+  description: "An ornate sheath designed to hold an officer's blade."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/sheath.rsi
+    state: sheath
+  - type: Clothing
+    sprite: Clothing/Belt/sheath.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSuspenders
   name: suspenders
   description: For holding your pants up.
   components:
@@ -32,6 +164,17 @@
     sprite: Clothing/Belt/suspenders.rsi
     state: icon
   - type: Clothing
-    size: 50
-    QuickEquip: false
     sprite: Clothing/Belt/suspenders.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: UtilityBeltClothing #Change to ClothingBeltUtility
+  name: utility belt
+  description: "Can hold various things."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/utility.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/utility.rsi
+  - type: Storage
+    capacity: 40 # Full tool loadout is 35, plus an extra

Resources/Prototypes/Entities/Clothing/Belt/filled_belts.yml

@@ -0,0 +1,65 @@
+- type: entity
+  id: UtilityBeltClothingFilled #Change to ClothingBeltUtilityFilled
+  parent: UtilityBeltClothing #Change to ClothingBeltUtility
+  description: "Holds tools."
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Crowbar
+      - name: Wrench
+      - name: Screwdriver
+      - name: Wirecutter
+      - name: Welder
+      - name: Multitool
+
+- type: entity
+  id: UtilityBeltClothingFilledEvent
+  parent: UtilityBeltClothing
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Crowbar
+      - name: Screwdriver
+      - name: Multitool
+
+- type: entity
+  id: ClothingBeltChiefEngineerFilled
+  parent: ClothingBeltChiefEngineer
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: PowerDrill
+      - name: JawsOfLife
+      - name: WelderExperimental
+      - name: Multitool
+      - name: ApcExtensionCableStack
+
+- type: entity
+  id: ClothingBeltSecurityFilled
+  parent: ClothingBeltSecurity
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: SecGlasses
+      - name: GrenadeFlashBang
+      - name: GrenadeFlashBang
+      - name: Stunbaton
+      - name: Handcuffs
+      - name: Handcuffs
+
+- type: entity
+  id: ClothingBeltJanitorFilled
+  parent: ClothingBeltJanitor
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Soap #Make a soap group and pick between when i'm not lazy
+      - name: SprayBottleSpaceCleaner
+      - name: # GrenadeChem
+      - name: # GrenadeChem
+      - name: FlashlightLantern

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -61,40 +61,6 @@
       cyan: "#18a2d5"
       yellow: "#ffa500"
 
-- type: entity
-  name: welding tool
-  parent: BaseItem
-  id: Welder
-  description: 'Melts anything as long as it''s fueled, don''t forget your eye protection!'
-  components:
-  - type: Sprite
-    sprite: Objects/Tools/welder.rsi
-    layers:
-    - state: welder
-    - state: welder_flame
-      shader: unshaded
-      visible: false
-  - type: Item
-    size: 10
-    sprite: Objects/Tools/welder.rsi
-    HeldPrefix: off
-  - type: ItemCooldown
-  - type: MeleeWeapon
-  - type: ItemStatus
-  - type: SolutionContainer
-    maxVol: 100
-    caps: AddTo, NoExamine
-    contents:
-      reagents:
-        - ReagentId: chem.WeldingFuel
-          Quantity: 100
-  - type: Welder
-    weldSoundCollection: Welder
-  - type: PointLight
-    enabled: false
-    radius: 1.5
-    color: orange
-
 - type: entity
   name: wrench
   parent: BaseItem

Resources/Prototypes/Entities/Objects/Tools/welders.yml

@@ -0,0 +1,77 @@
+- type: entity
+  name: welding tool
+  parent: BaseItem
+  id: Welder
+  description: "Melts anything as long as it's fueled, don't forget your eye protection!"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder.rsi
+    layers:
+    - state: icon
+    - state: welder_flame
+      shader: unshaded
+      visible: false
+  - type: Item
+    size: 10
+    sprite: Objects/Tools/welder.rsi
+    HeldPrefix: off
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  - type: ItemStatus
+  - type: SolutionContainer
+    maxVol: 100
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 100
+  - type: Welder
+    weldSoundCollection: Welder
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    color: orange
+
+- type: entity
+  name: experimental welding tool
+  parent: Welder
+  id: WelderExperimental
+  description: "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_experimental.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_experimental.rsi
+  - type: SolutionContainer
+    maxVol: 1000
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 1000
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    color: lightblue
+
+- type: entity
+  name: emergency welding tool
+  parent: Welder
+  id: WelderMini
+  description: "A miniature welder used during emergencies."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_mini.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_mini.rsi
+  - type: SolutionContainer
+    maxVol: 25
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 25
+  - type: PointLight
+    enabled: false
+    radius: 1.0
+    color: orange