Equipment & inhands. (#110)

* Equipment WiP

* Equipment's starting to work.

* Equipment works properly 100% now.

* Inhands work.

Also more clothes.

Resources/Prototypes/Entities/Clothing.yml

@@ -2,170 +2,13 @@
   name: "Clothing"
   id: Clothing
   parent: BaseItem
+  abstract: true
   components:
   - type: Clothing
     Size: 5
 
-- type: entity
-  parent: Clothing
-  id: ShoesItem
-  name: Shoes
-  description: Don't take them off at your office Christmas party
-  components:
-  - type: Sprite
-    texture: Objects/shoes.png
 
-  - type: Icon
-    texture: Objects/shoes.png
 
-  - type: Clothing
-    Slots:
-    - shoes
 
-- type: entity
-  parent: Clothing
-  id: JanitorUniform
-  name: Janitor Jumpsuit
-  description: The jumpsuit for the poor sop with a mop
-  components:
-  - type: Sprite
-    texture: Objects/janitorsuit.png
 
-  - type: Icon
-    texture: Objects/janitorsuit.png
 
-  - type: Clothing
-    Slots:
-    - innerclothing
-
-- type: entity
-  parent: Clothing
-  id: SecurityVestClothing
-  name: Security Vest
-  description: Bulletproof vest, more or less
-  components:
-  - type: Sprite
-    texture: Clothing/armorvest.png
-  - type: Icon
-    texture: Clothing/armorvest.png
-  - type: Clothing
-    Slots:
-    - outerclothing
-
-- type: entity
-  parent: Clothing
-  id: UtilityBeltClothing
-  name: Utility Belt
-  description: Belt for holding all your usual tools
-  components:
-  - type: Sprite
-    texture: Clothing/belt_utility.png
-  - type: Icon
-    texture: Clothing/belt_utility.png
-    Size: 30
-  - type: Clothing
-    Slots:
-    - belt
-  - type: Storage
-    Capacity: 30
-
-- type: entity
-  parent: Clothing
-  id: BackpackClothing
-  name: Backpack
-  description: A convenient storage pack
-  components:
-  - type: Sprite
-    texture: Clothing/backpack.png
-  - type: Icon
-    texture: Clothing/backpack.png
-    Size: 9999
-  - type: Clothing
-    Slots:
-    - back
-  - type: Storage
-    Capacity: 100
-
-- type: entity
-  parent: Clothing
-  id: MesonGlasses
-  name: Optical Meson Scanners
-  description: The pinnacle of modern science, wallhacks in real life
-  components:
-  - type: Sprite
-    texture: Clothing/glasses_meson.png
-  - type: Icon
-    texture: Clothing/glasses_meson.png
-  - type: Clothing
-    Slots:
-    - eyes
-
-- type: entity
-  parent: Clothing
-  id: YellowGloves
-  name: Insulated Gloves
-  description: Electrical gloves that keep you from frying
-  components:
-  - type: Sprite
-    texture: Clothing/gloves_yellow.png
-  - type: Icon
-    texture: Clothing/gloves_yellow.png
-  - type: Clothing
-    Slots:
-    - gloves
-
-- type: entity
-  parent: Clothing
-  id: HelmetSecurity
-  name: Security Helmet
-  description: "A slick logo covers the ear: \"Concussions are better than holes!\""
-  components:
-  - type: Sprite
-    texture: Clothing/helmet_sec.png
-  - type: Icon
-    texture: Clothing/helmet_sec.png
-  - type: Clothing
-    Slots:
-    - head
-
-- type: entity
-  parent: Clothing
-  id: GasMaskClothing
-  name: Gas Mask
-  description: Regulations require these to be stocked after the fourth coolant leak
-  components:
-  - type: Sprite
-    texture: Clothing/gasmask.png
-  - type: Icon
-    texture: Clothing/gasmask.png
-  - type: Clothing
-    Slots:
-    - mask
-
-- type: entity
-  parent: Clothing
-  id: IDCardStandard
-  name: Identification Card
-  description: A card necessary to access various areas aboard the station
-  components:
-  - type: Sprite
-    texture: Clothing/idcard_standard.png
-  - type: Icon
-    texture: Clothing/idcard_standard.png
-  - type: Clothing
-    Slots:
-    - idcard
-
-- type: entity
-  parent: Clothing
-  id: RadioHeadsetEars
-  name: Headset Radio
-  description: The radio to keep up to date in real time with fun onboard station activities
-  components:
-  - type: Sprite
-    texture: Clothing/ears_headset.png
-  - type: Icon
-    texture: Clothing/ears_headset.png
-  - type: Clothing
-    Slots:
-    - ears

Resources/Prototypes/Entities/Clothing/IDs.yml

@@ -0,0 +1,13 @@
+- type: entity
+  parent: Clothing
+  id: IDCardStandard
+  name: Identification Card
+  description: A card necessary to access various areas aboard the station
+  components:
+  - type: Sprite
+    texture: Clothing/idcard_standard.png
+  - type: Icon
+    texture: Clothing/idcard_standard.png
+  - type: Clothing
+    Slots:
+    - idcard

Resources/Prototypes/Entities/Clothing/backpacks.yml

@@ -0,0 +1,19 @@
+- type: entity
+  parent: Clothing
+  id: BackpackClothing
+  name: Backpack
+  description: A convenient storage pack
+  components:
+  - type: Sprite
+    sprite: Clothing/backpack.rsi
+    state: backpack
+  - type: Icon
+    sprite: Clothing/backpack.rsi
+    state: backpack
+  - type: Clothing
+    Size: 9999
+    Slots:
+    - back
+    sprite: Clothing/backpack.rsi
+  - type: Storage
+    Capacity: 100

Resources/Prototypes/Entities/Clothing/belts.yml

@@ -0,0 +1,26 @@
+- type: entity
+  parent: Clothing
+  id: BeltBase
+  abstract: true
+  components:
+  - 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_utility.rsi
+    state: utilitybelt
+  - type: Icon
+    sprite: Clothing/belt_utility.rsi
+    state: utilitybelt
+  - type: Clothing
+    Size: 30
+    sprite: Clothing/belt_utility.rsi
+  - type: Storage
+    Capacity: 30

Resources/Prototypes/Entities/Clothing/ears.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: Clothing
+  id: RadioHeadsetEars
+  name: Headset Radio
+  description: The radio to keep up to date in real time with fun onboard station activities
+  components:
+  - type: Sprite
+    sprite: Clothing/headset.rsi
+    state: headset
+  - type: Icon
+    sprite: Clothing/headset.rsi
+    state: headset
+  - type: Clothing
+    Slots:
+    - ears
+    sprite: Clothing/headset.rsi

Resources/Prototypes/Entities/Clothing/eyes.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: Clothing
+  id: GlassesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [eyes]
+
+
+- type: entity
+  parent: GlassesBase
+  id: MesonGlasses
+  name: Optical Meson Scanners
+  description: The pinnacle of modern science, wallhacks in real life
+  components:
+  - type: Sprite
+    sprite: Clothing/meson_scanners.rsi
+    state: meson
+  - type: Icon
+    sprite: Clothing/meson_scanners.rsi
+    state: meson
+  - type: Clothing
+    sprite: Clothing/meson_scanners.rsi
+
+
+- type: entity
+  parent: GlassesBase
+  id: SunGlasses
+  name: Sun Glasses
+  description: Useful both for security and cargonia
+  components:
+  - type: Sprite
+    sprite: Clothing/sunglasses.rsi
+    state: sunglasses
+  - type: Icon
+    sprite: Clothing/sunglasses.rsi
+    state: sunglasses
+  - type: Clothing
+    sprite: Clothing/sunglasses.rsi

Resources/Prototypes/Entities/Clothing/gloves.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: Clothing
+  id: GlovesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [gloves]
+
+
+- type: entity
+  parent: GlovesBase
+  id: YellowGloves
+  name: Insulated Gloves
+  description: Electrical gloves that keep you from frying
+  components:
+  - type: Sprite
+    sprite: Clothing/gloves_yellow.rsi
+    state: yellow
+  - type: Icon
+    sprite: Clothing/gloves_yellow.rsi
+    state: yellow
+  - type: Clothing
+    sprite: Clothing/gloves_yellow.rsi
+
+
+- type: entity
+  parent: GlovesBase
+  id: BlackGloves
+  name: Insulated Gloves
+  description: Regular gloves that do not keep you from frying
+  components:
+  - type: Sprite
+    sprite: Clothing/gloves_black.rsi
+    state: black
+  - type: Icon
+    sprite: Clothing/gloves_black.rsi
+    state: black
+  - type: Clothing
+    sprite: Clothing/gloves_black.rsi

Resources/Prototypes/Entities/Clothing/helmets.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: Clothing
+  id: HelmetSecurity
+  name: Security Helmet
+  description: "A slick logo covers the ear: \"Concussions are better than holes!\""
+  components:
+  - type: Sprite
+    sprite: Clothing/helmet_sec.rsi
+    state: helmet
+  - type: Icon
+    sprite: Clothing/helmet_sec.rsi
+    state: helmet
+  - type: Clothing
+    Slots:
+    - head
+    sprite: Clothing/helmet_sec.rsi

Resources/Prototypes/Entities/Clothing/masks.yml

@@ -0,0 +1,35 @@
+- type: entity
+  parent: Clothing
+  id: MasksBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [mask]
+
+
+- type: entity
+  parent: MasksBase
+  id: GasMaskClothing
+  name: Gas Mask
+  description: Regulations require these to be stocked after the fourth coolant leak
+  components:
+  - type: Sprite
+    texture: Clothing/gasmask.png
+  - type: Icon
+    texture: Clothing/gasmask.png
+
+
+- type: entity
+  parent: MasksBase
+  id: BreathMaskClothing
+  name: Breath Mask
+  description: Might as well keep this on 24/7
+  components:
+  - type: Sprite
+    sprite: Clothing/mask_breath.rsi
+    state: breath
+  - type: Icon
+    sprite: Clothing/mask_breath.rsi
+    state: breath
+  - type: Clothing
+    sprite: Clothing/mask_breath.rsi

Resources/Prototypes/Entities/Clothing/shoes.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: Clothing
+  id: ShoesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [shoes]
+
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesItem
+  name: Black Shoes
+  description: Don't take them off at your office Christmas party
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_black.rsi
+    state: black
+
+  - type: Icon
+    sprite: Clothing/shoes_black.rsi
+    state: black
+
+  - type: Clothing
+    sprite: Clothing/shoes_black.rsi
+
+
+- type: entity
+  parent: ShoesBase
+  id: WhiteShoes
+  name: White Shoes
+  description: Don't take them off at your office Christmas party
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_white.rsi
+    state: white
+
+  - type: Icon
+    sprite: Clothing/shoes_white.rsi
+    state: white
+
+  - type: Clothing
+    sprite: Clothing/shoes_white.rsi

Resources/Prototypes/Entities/Clothing/suits.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: Clothing
+  id: SuitBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [outerclothing]
+
+
+- type: entity
+  parent: SuitBase
+  id: SecurityVestClothing
+  name: Security Vest
+  description: Bulletproof vest, more or less
+  components:
+  - type: Sprite
+    sprite: Clothing/armor.rsi
+    state: armor
+
+  - type: Icon
+    sprite: Clothing/armor.rsi
+    state: armor
+
+  - type: Clothing
+    sprite: Clothing/armor.rsi
+
+
+- type: entity
+  parent: SuitBase
+  id: HazardVestClothing
+  name: Hazard Vest
+  description: Prevents accidents
+  components:
+  - type: Sprite
+    sprite: Clothing/vest_hazard.rsi
+    state: hazard
+
+  - type: Icon
+    sprite: Clothing/vest_hazard.rsi
+    state: hazard
+
+  - type: Clothing
+    sprite: Clothing/vest_hazard.rsi

Resources/Prototypes/Entities/Clothing/uniforms.yml

@@ -0,0 +1,76 @@
+- type: entity
+  parent: Clothing
+  id: UniformBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [innerclothing]
+
+
+- type: entity
+  parent: UniformBase
+  id: JanitorUniform
+  name: Janitor Jumpsuit
+  description: The jumpsuit for the poor sop with a mop
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_janitor.rsi
+    state: janitor
+
+  - type: Icon
+    sprite: Clothing/uniform_janitor.rsi
+    state: janitor
+
+  - type: Clothing
+    sprite: Clothing/uniform_janitor.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformGrey
+  name: Grey Jumpsuit
+  description: Greytide. Worldwide.
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_grey.rsi
+    state: grey
+
+  - type: Icon
+    sprite: Clothing/uniform_grey.rsi
+    state: grey
+
+  - type: Clothing
+    sprite: Clothing/uniform_grey.rsi
+
+
+- type: entity
+  parent: UniformBase
+  id: UniformEngineering
+  name: Engineering Jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_engineering.rsi
+    state: engine
+
+  - type: Icon
+    sprite: Clothing/uniform_engineering.rsi
+    state: engine
+
+  - type: Clothing
+    sprite: Clothing/uniform_engineering.rsi
+
+
+- type: entity
+  parent: UniformBase
+  id: UniformAssistant
+  name: Assistant Jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_assistant.rsi
+    state: assistant
+
+  - type: Icon
+    sprite: Clothing/uniform_assistant.rsi
+    state: assistant
+
+  - type: Clothing
+    sprite: Clothing/uniform_assistant.rsi

Resources/Prototypes/Entities/Mobs.yml

@@ -12,13 +12,29 @@
   - type: Constructor
   - type: Clickable
   - type: Sprite
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
+    netsync: false
     drawdepth: Mobs
 
+    layers:
+    - sprite: Mob/human.rsi
+      state: male
+    - map: ["enum.Slots.INNERCLOTHING"]
+    - map: ["enum.Slots.IDCARD"]
+    - map: ["enum.Slots.SHOES"]
+    - map: ["enum.Slots.GLOVES"]
+    - map: ["enum.Slots.BELT"]
+    - map: ["enum.Slots.OUTERCLOTHING"]
+    - map: ["enum.Slots.EYES"]
+    - map: ["enum.Slots.BACKPACK"]
+    - map: ["enum.Slots.EARS"]
+    - map: ["enum.Slots.MASK"]
+    - map: ["enum.Slots.HEAD"]
+    - map: ["hand-left"]
+    - map: ["hand-right"]
+
   - type: Icon
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
+    sprite: Mob/human.rsi
+    state: male
 
   - type: BoundingBox
     aabb: "-0.5,-0.25,-0.05,0.25"