Merge branch 'master' into 2020-04-28-tool-component

# Conflicts: # Content.Server/GameObjects/Components/AnchorableComponent.cs # Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs # Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs # Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs # Content.Server/GameObjects/Components/WiresComponent.cs # Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs # Resources/Prototypes/Entities/Items/tools.yml
2020-05-23 12:02:34 +02:00
parent 6daa1bcf27 6a4d78cfac
commit 3029e31e4a
305 changed files with 33490 additions and 982 deletions
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: LockerBooze
+  parent: LockerSecureBase
+  name: "booze storage"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: cabinet
+
+  - type: Icon
+    state: cabinet_door
+
+
+# LockerBooze Filled
+- type: entity
+  id: LockerBoozeFilled
+  suffix: Filled
+  parent: LockerBooze
+
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
@@ -0,0 +1,19 @@
+# QM
+- type: entity
+  id: LockerQuarterMaster
+  parent: LockerSecureBase
+  name: "quatermaster's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: qm
+
+  - type: Icon
+    state: qm_door
+
+# LockerQuarterMaster Filled
+- type: entity
+  id: LockerQuarterMasterFilled
+  suffix: Filled
+  parent: LockerQuarterMaster
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
@@ -0,0 +1,40 @@
+# Captain
+- type: entity
+  id: LockerCaptain
+  parent: LockerSecureBase
+  name: "captain's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: cap
+
+  - type: Icon
+    state: cap_door
+
+# HoP
+- type: entity
+  id: LockerHeadOfPersonnel
+  parent: LockerSecureBase
+  name: "head of personnel's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: hop
+
+  - type: Icon
+    state: hop_door
+
+
+# LockerCaptain Filled
+- type: entity
+  id: LockerCaptainFilled
+  suffix: Filled
+  parent: LockerCaptain
+
+# LockerHeadOfPersonnel Filled
+- type: entity
+  id: LockerHeadOfPersonnelFilled
+  suffix: Filled
+  parent: LockerHeadOfPersonnel
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
@@ -0,0 +1,102 @@
+# CE
+- type: entity
+  id: LockerChiefEngineer
+  parent: LockerSecureBase
+  name: "chief engineer's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: ce
+
+  - type: Icon
+    state: ce_door
+
+# Electrical supplies
+- type: entity
+  id: LockerElectricalSupplies
+  parent: LockerSecureBase
+  name: "electrical supplies locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: eng
+      state_closed: eng_elec_door
+
+  - type: Icon
+    state: eng_elec_door
+
+# Welding supplies
+- type: entity
+  id: LockerWeldingSupplies
+  parent: LockerSecureBase
+  name: "welding supplies locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: eng
+      state_closed: eng_weld_door
+
+  - type: Icon
+    state: eng_weld_door
+
+# Atmos tech
+- type: entity
+  id: LockerAtmospherics
+  parent: LockerSecureBase
+  name: "atmospheric technician's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: atmos
+
+  - type: Icon
+    state: atmos_door
+
+# Engineer
+- type: entity
+  id: LockerEngineer
+  parent: LockerSecureBase
+  name: "engineer's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: eng_secure
+
+  - type: Icon
+    state: eng_secure_door
+
+
+# LockerChiefEngineer Filled
+- type: entity
+  id: LockerChiefEngineerFilled
+  suffix: Filled
+  parent: LockerChiefEngineer
+
+# LockerElectricalSupplies Filled
+- type: entity
+  id: LockerElectricalSuppliesFilled
+  suffix: Filled
+  parent: LockerElectricalSupplies
+
+# LockerWeldingSupplies Filled
+- type: entity
+  id: LockerWeldingSuppliesFilled
+  suffix: Filled
+  parent: LockerWeldingSupplies
+
+# LockerAtmospherics Filled
+- type: entity
+  id: LockerAtmosphericsFilled
+  suffix: Filled
+  parent: LockerAtmospherics
+
+# LockerEngineer Filled
+- type: entity
+  id: LockerEngineerFilled
+  suffix: Filled
+  parent: LockerEngineer
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/freezer.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/freezer.yml
@@ -0,0 +1,12 @@
+- type: entity
+  id: LockerFreezer
+  parent: LockerSecureBase
+  name: "freezer"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: freezer
+
+  - type: Icon
+    state: freezer_door
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: LockerBotanist
+  parent: LockerSecureBase
+  name: "botanist's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: hydro
+
+  - type: Icon
+    state: hydro_door
+
+
+# LockerBotanist Filled
+- type: entity
+  id: LockerBotanistFilled
+  suffix: Filled
+  parent: LockerBotanist
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
@@ -0,0 +1,82 @@
+# Medicine
+- type: entity
+  id: LockerMedicine
+  parent: LockerSecureBase
+  name: "medicine locker"
+  description: "Filled to the brim with medical junk."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: med
+
+  - type: Icon
+    state: med_door
+
+# Medical doctor
+- type: entity
+  id: LockerMedical
+  parent: LockerSecureBase
+  name: "medical doctor's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: med_secure
+
+  - type: Icon
+    state: med_secure_door
+
+# Chemical
+- type: entity
+  id: LockerChemistry
+  parent: LockerSecureBase
+  name: "chemical closet"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: med
+      state_closed: chemical_door
+
+  - type: Icon
+    state: chemical_door
+
+# CMO
+- type: entity
+  id: LockerChiefMedicalOfficer
+  parent: LockerSecureBase
+  name: "chief medical officer's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: cmo
+
+  - type: Icon
+    state: cmo_door
+
+
+# LockerMedicine Filled
+- type: entity
+  id: LockerMedicineFilled
+  suffix: Filled
+  parent: LockerMedicine
+
+# LockerMedical Filled
+- type: entity
+  id: LockerMedicalFilled
+  suffix: Filled
+  parent: LockerMedical
+
+# LockerChemistry Filled
+- type: entity
+  id: LockerChemistryFilled
+  suffix: Filled
+  parent: LockerChemistry
+
+# LockerChiefMedicalOfficer Filled
+- type: entity
+  id: LockerChiefMedicalOfficerFilled
+  suffix: Filled
+  parent: LockerChiefMedicalOfficer
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: LockerResearchDirector
+  parent: LockerSecureBase
+  name: "research director's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: rd
+
+  - type: Icon
+    state: rd_door
+
+
+# LockerResearchDirector Filled
+- type: entity
+  id: LockerResearchDirectorFilled
+  suffix: Filled
+  parent: LockerResearchDirector
+
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
@@ -0,0 +1,59 @@
+# HoS
+- type: entity
+  id: LockerHeadOfSecurity
+  parent: LockerSecureBase
+  name: "head of security's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: hos
+
+  - type: Icon
+    state: hos_door
+
+# Warden
+- type: entity
+  id: LockerWarden
+  parent: LockerSecureBase
+  name: "warden's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: warden
+
+  - type: Icon
+    state: warden_door
+
+# Security Officer
+- type: entity
+  id: LockerSecurity
+  parent: LockerSecureBase
+  name: "security officer's locker"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: sec
+
+  - type: Icon
+    state: sec_door
+
+# LockerHeadOfSecurity Filled
+- type: entity
+  id: LockerHeadOfSecurityFilled
+  suffix: Filled
+  parent: LockerHeadOfSecurity
+
+# LockerWarden Filled
+- type: entity
+  id: LockerWardenFilled
+  suffix: Filled
+  parent: LockerWarden
+
+# LockerSecurity Filled
+- type: entity
+  id: LockerSecurityFilled
+  suffix: Filled
+  parent: LockerSecurity
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml
@@ -0,0 +1,5 @@
+- type: entity
+  id: LockerSecureBase
+  parent: LockerGeneric
+  abstract: true
+  # TODO: Access components and such.
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
@@ -0,0 +1,215 @@
+# Formal
+- type: entity
+  id: LockerFormal
+  parent: WardrobeBlack
+  name: "formal closet"
+  description: "It's a storage unit for formal clothing."
+
+# Chef
+- type: entity
+  id: LockerChef
+  parent: WardrobeBlack
+  name: "chef's closet"
+  description: "It's a storage unit for foodservice garments and mouse traps."
+
+# Janitor
+- type: entity
+  id: LockerJanitor
+  parent: WardrobeMixed
+  name: "custodial closet"
+  description: "It's a storage unit for janitorial clothes and gear."
+
+# Legal
+- type: entity
+  id: LockerLegal
+  parent: WardrobeBlue
+  name: "legal closet"
+  description: "It's a storage unit for courtroom apparel and items."
+
+# Chapel
+- type: entity
+  id: WardrobeChapel
+  parent: WardrobeBlack
+  name: "chaplain's wardrobe"
+  description: "It's a storage unit for Nanotrasen-approved religious attire."
+
+# Security wardrobe
+- type: entity
+  id: WardrobeSecurity
+  parent: WardrobeBase
+  name: "security wardrobe"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: red_door
+
+  - type: Icon
+    state: red_door
+
+# Cargo wardrobe
+- type: entity
+  id: WardrobeCargo
+  parent: WardrobePrison
+  name: "cargo wardrobe"
+
+# Atmospherics wardrobe
+- type: entity
+  id: WardrobeAtmospherics
+  parent: WardrobeBase
+  name: "atmospherics wardrobe"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: atmos_wardrobe_door
+
+  - type: Icon
+    state: atmos_door
+
+# Engineering wardrobe
+- type: entity
+  id: WardrobeEngineering
+  parent: WardrobeYellow
+  name: "engineering wardrobe"
+
+# Medical doctor wardrobe
+- type: entity
+  id: WardrobeMedicalDoctor
+  parent: WardrobeWhite
+  name: "medical doctor's wardrobe"
+
+# Robotics wardrobe
+- type: entity
+  id: WardrobeRobotics
+  parent: WardrobeBlack
+  name: "robotics wardrobe"
+
+# Chemistry wardrobe
+- type: entity
+  id: WardrobeChemistry
+  parent: WardrobeWhite
+  name: "chemistry wardrobe"
+
+# Genetics wardrobe
+- type: entity
+  id: WardrobeGenetics
+  parent: WardrobeWhite
+  name: "genetics wardrobe"
+
+# Virology wardrobe
+- type: entity
+  id: WardrobeVirology
+  parent: WardrobeWhite
+  name: "virology wardrobe"
+
+# Science wardrobe
+- type: entity
+  id: WardrobeScience
+  parent: WardrobeWhite
+  name: "science wardrobe"
+
+# Botanist wardrobe
+- type: entity
+  id: WardrobeBotanist
+  parent: WardrobeGreen
+  name: "botanist wardrobe"
+
+
+# LockerFormal Filled
+- type: entity
+  id: LockerFormalFilled
+  suffix: Filled
+  parent: LockerFormal
+
+# LockerChef Filled
+- type: entity
+  id: LockerChefFilled
+  suffix: Filled
+  parent: LockerChef
+
+# LockerJanitor Filled
+- type: entity
+  id: LockerJanitorFilled
+  suffix: Filled
+  parent: LockerJanitor
+
+# LockerLegal Filled
+- type: entity
+  id: LockerLegalFilled
+  suffix: Filled
+  parent: LockerLegal
+
+# WardrobeChapel Filled
+- type: entity
+  id: WardrobeChapelFilled
+  suffix: Filled
+  parent: WardrobeChapel
+
+# WardrobeSecurity Filled
+- type: entity
+  id: WardrobeSecurityFilled
+  suffix: Filled
+  parent: WardrobeSecurity
+
+# WardrobeCargo Filled
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+
+# WardrobeAtmospherics Filled
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+
+# WardrobeEngineering Filled
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
+
+# WardrobeMedicalDoctor Filled
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+
+# WardrobeRobotics Filled
+- type: entity
+  id: WardrobeRoboticsFilled
+  suffix: Filled
+  parent: WardrobeRobotics
+
+# WardrobeChemistry Filled
+- type: entity
+  id: WardrobeChemistryFilled
+  suffix: Filled
+  parent: WardrobeChemistry
+
+# WardrobeGenetics Filled
+- type: entity
+  id: WardrobeGeneticsFilled
+  suffix: Filled
+  parent: WardrobeGenetics
+
+# WardrobeVirology Filled
+- type: entity
+  id: WardrobeVirologyFilled
+  suffix: Filled
+  parent: WardrobeVirology
+
+# WardrobeScience Filled
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+
+# WardrobeBotanist Filled
+- type: entity
+  id: WardrobeBotanistFilled
+  suffix: Filled
+  parent: WardrobeBotanist
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
@@ -0,0 +1,84 @@
+# Base level 3 bio hazard closet
+- type: entity
+  id: LockerL3
+  parent: LockerGeneric
+  name: "level 3 biohazard gear closet"
+  description: "It's a storage unit for level 3 biohazard gear."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: bio
+
+  - type: Icon
+    state: bio_door
+
+# Virology variant
+- type: entity
+  id: LockerL3Virology
+  parent: LockerL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: bio_viro
+
+  - type: Icon
+    state: bio_viro_door
+
+# Security variant
+- type: entity
+  id: LockerL3Security
+  parent: LockerL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: bio_sec
+
+  - type: Icon
+    state: bio_sec_door
+
+# Janitor variant
+- type: entity
+  id: LockerL3Janitor
+  parent: LockerL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: bio_jan
+
+  - type: Icon
+    state: bio_jan_door
+
+
+# LockerL3 Filled
+- type: entity
+  id: LockerL3Filled
+  suffix: Filled, Generic
+  parent: LockerL3
+
+# LockerL3Virology Filled
+- type: entity
+  id: LockerL3VirologyFilled
+  suffix: Filled, Virology
+  parent: LockerL3Virology
+
+# LockerL3Security Filled
+- type: entity
+  id: LockerL3SecurityFilled
+  suffix: Filled, Security
+  parent: LockerL3Security
+
+# LockerL3Janitor Filled
+- type: entity
+  id: LockerL3JanitorFilled
+  suffix: Filled, Janitor
+  parent: LockerL3Janitor
+
+# LockerL3Science Filled
+- type: entity
+  id: LockerL3ScienceFilled
+  suffix: Filled, Science
+  parent: LockerL3Virology
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
@@ -0,0 +1,27 @@
+# Base syndicate closet
+- type: entity
+  id: LockerSyndicateBase
+  name: armory closet
+  parent: LockerGeneric
+  abstract: true
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: syndicate
+
+  - type: Icon
+    state: syndicate_door
+
+# Personal syndicate closet
+- type: entity
+  id: LockerSyndicatePersonal
+  parent: LockerSyndicateBase
+  description: "It's a personal storage unit for operative gear."
+
+
+# LockerSyndicatePersonal Filled
+- type: entity
+  id: LockerSyndicatePersonalFilled
+  suffix: Filled
+  parent: LockerSyndicatePersonal
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/utility_closets.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/utility_closets.yml
@@ -0,0 +1,109 @@
+# Tool closet
+- type: entity
+  id: LockerTool
+  name: tool closet
+  parent: LockerGeneric
+  description: "It's a storage unit for tools."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: eng
+      state_closed: eng_tool_door
+  - type: Icon
+    state: eng_tool_door
+
+# Filled tool closet
+- type: entity
+  id: LockerToolFilled
+  suffix: Filled
+  parent: LockerTool
+  components:
+  - type: ToolLockerFill
+
+# Radiation suit closet
+- type: entity
+  id: LockerRadiationSuit
+  name: radiation suit closet
+  parent: LockerGeneric
+  description: "It's a storage unit for rad-protective suits."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: eng
+      state_closed: eng_rad_door
+
+  - type: Icon
+    state: eng_rad_door
+
+# Filled
+- type: entity
+  id: LockerRadiationSuitFilled
+  parent: LockerRadiationSuit
+  suffix: Filled
+
+# Emergency closet
+- type: entity
+  id: LockerEmergency
+  name: emergency closet
+  parent: LockerGeneric
+  description: "It's a storage unit for emergency breath masks and O2 tanks."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: emergency
+
+  - type: Icon
+    state: emergency_door
+
+# Filled random
+- type: entity
+  id: LockerEmergencyFilledRandom
+  parent: LockerEmergency
+  suffix: Filled, Random
+  components:
+  - type: EmergencyClosetFill
+
+# Fire safety closet
+- type: entity
+  id: LockerFire
+  name: fire-safety closet
+  parent: LockerGeneric
+  description: "It's a storage unit for fire-fighting supplies."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: fire
+
+  - type: Icon
+    state: fire_door
+
+# Filled
+- type: entity
+  id: LockerFireFilled
+  parent: LockerFire
+  suffix: Filled
+
+# EOD closet
+- type: entity
+  id: LockerBomb
+  name: EOD closet
+  parent: LockerGeneric
+  description: "It's a storage unit for explosion-protective suits."
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: bomb
+
+  - type: Icon
+    state: bomb_door
+
+# Filled
+- type: entity
+  id: LockerBombFilled
+  parent: LockerBomb
+  suffix: Filled
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
@@ -0,0 +1,216 @@
+- type: entity
+  id: WardrobeBase
+  parent: LockerGeneric
+  abstract: true
+  description: "It's a storage unit for standard-issue Nanotrasen attire."
+
+# Blue wardrobe
+- type: entity
+  id: WardrobeBlue
+  parent: WardrobeBase
+  name: blue wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: blue_door
+
+  - type: Icon
+    state: blue_door
+
+
+# Pink wardrobe
+- type: entity
+  id: WardrobePink
+  parent: WardrobeBase
+  name: pink wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: pink_door
+
+  - type: Icon
+    state: pink_door
+
+
+# Black wardrobe
+- type: entity
+  id: WardrobeBlack
+  parent: WardrobeBase
+  name: black wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: black_door
+
+  - type: Icon
+    state: black_door
+
+
+# Green wardrobe
+- type: entity
+  id: WardrobeGreen
+  parent: WardrobeBase
+  name: green wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: green_door
+
+  - type: Icon
+    state: green_door
+
+
+# Prison wardrobe
+- type: entity
+  id: WardrobePrison
+  parent: WardrobeBase
+  name: prison wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: orange_door
+
+  - type: Icon
+    state: orange_door
+
+
+# Yellow wardrobe
+- type: entity
+  id: WardrobeYellow
+  parent: WardrobeBase
+  name: yellow wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: yellow_door
+
+  - type: Icon
+    state: yellow_door
+
+
+# White wardrobe
+- type: entity
+  id: WardrobeWhite
+  parent: WardrobeBase
+  name: white wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: white_door
+
+  - type: Icon
+    state: white_door
+
+
+# Pajama wardrobe
+- type: entity
+  id: WardrobePajama
+  parent: WardrobeWhite
+  name: pajama wardrobe
+
+
+# Grey wardrobe
+- type: entity
+  id: WardrobeGrey
+  parent: WardrobeBase
+  name: grey wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: grey_door
+
+  - type: Icon
+    state: grey_door
+
+
+# Mixed wardrobe
+- type: entity
+  id: WardrobeMixed
+  parent: WardrobeBase
+  name: mixed wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: mixed_door
+
+  - type: Icon
+    state: mixed_door
+
+
+# WardrobeBlue Filled
+- type: entity
+  id: WardrobeBlueFilled
+  suffix: Filled
+  parent: WardrobeBlue
+
+# WardrobePink Filled
+- type: entity
+  id: WardrobePinkFilled
+  suffix: Filled
+  parent: WardrobePink
+
+# WardrobeBlack Filled
+- type: entity
+  id: WardrobeBlackFilled
+  suffix: Filled
+  parent: WardrobeBlack
+
+# WardrobeGreen Filled
+- type: entity
+  id: WardrobeGreenFilled
+  suffix: Filled
+  parent: WardrobeGreen
+
+# WardrobePrison Filled
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+
+# WardrobeYellow Filled
+- type: entity
+  id: WardrobeYellowFilled
+  suffix: Filled
+  parent: WardrobeYellow
+
+# WardrobeWhite Filled
+- type: entity
+  id: WardrobeWhiteFilled
+  suffix: Filled
+  parent: WardrobeWhite
+
+# WardrobePajama Filled
+- type: entity
+  id: WardrobePajamaFilled
+  suffix: Filled
+  parent: WardrobePajama
+
+# WardrobeGrey Filled
+- type: entity
+  id: WardrobeGreyFilled
+  suffix: Filled
+  parent: WardrobeGrey
+
+# WardrobeMixed Filled
+- type: entity
+  id: WardrobeMixedFilled
+  suffix: Filled
+  parent: WardrobeMixed
--- a/Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: LockerGeneric
-  name: Locker
+  name: closet
  description: A standard-issue Nanotrasen storage unit.
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml
@@ -1,150 +0,0 @@
- type: entity
-  id: LockerTool
-  name: Tool Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: eng
-    - state: eng_tool_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: eng_open
-      state_closed: eng_tool_door
-  - type: Icon
-    state: eng_tool_door
-
- type: entity
-  id: LockerToolFilled
-  name: Tool Locker
-  suffix: Filled
-  parent: LockerTool
-  components:
-  - type: ToolLockerFill
-
- type: entity
-  id: LockerElectricalSupplies
-  name: Electrical Supplies Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: eng
-    - state: eng_elec_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: eng_open
-      state_closed: eng_elec_door
-  - type: Icon
-    state: eng_elec_door
-
- type: entity
-  id: LockerWeldingSupplies
-  name: Welding Supplies Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: eng
-    - state: eng_weld_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: eng_open
-      state_closed: eng_weld_door
-
-  - type: Icon
-    state: eng_weld_door
-
- type: entity
-  id: LockerRadiationSuit
-  name: Radiation Suit Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: eng
-    - state: eng_rad_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: eng_open
-      state_closed: eng_rad_door
-
-  - type: Icon
-    state: eng_rad_door
-
- type: entity
-  id: LockerMedical
-  name: Medical Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: med
-    - state: med_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: med_open
-      state_closed: med_door
-
-  - type: Icon
-    state: med_door
-
- type: entity
-  id: LockerChemistry
-  name: Chemistry Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: med
-    - state: chemical_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: med_open
-      state_closed: chemical_door
-
-  - type: Icon
-    state: chemical_door
-
- type: entity
-  id: LockerScience
-  name: Science Locker
-  parent: LockerGeneric
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: science
-    - state: science_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: science_open
-      state_closed: science_door
-
-  - type: Icon
-    state: science_door
--- a/Resources/Prototypes/Entities/Buildings/emergency_light.yml
+++ b/Resources/Prototypes/Entities/Buildings/emergency_light.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: EmergencyLight
+  name: "Emergency Light"
+  parent: WallLight
+  components:
+  - type: PointLight
+    radius: 10
+    energy: 5
+    offset: "0.5, 0"
+    color: "#FF4020"
+    mask: /Textures/emergency_mask.png
+
+  #- type: EmergencyLight
+
+  placement:
+    snap:
+    - Wallmount
--- a/Resources/Prototypes/Entities/Items/Consumables/food.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml
@@ -295,7 +295,7 @@

 - type: entity
  parent: FoodBase
-  id: FoodSpagettiBoiled
+  id: FoodSpaghettiBoiled
  name: Boiled spaghetti
  description: A plain dish of noodles, this sucks.
  components:
--- a/Resources/Prototypes/Entities/Items/powercells.yml
+++ b/Resources/Prototypes/Entities/Items/powercells.yml
@@ -7,7 +7,7 @@
    shapes:
    - !type:PhysShapeAabb
      bounds: "-0.15,-0.3,0.2,0.3"
-      mask: 26
+      mask: 0
      layer: 32
  - type: PowerCell
  - type: Appearance
--- a/Resources/Prototypes/Entities/Items/toolbox.yml
+++ b/Resources/Prototypes/Entities/Items/toolbox.yml
@@ -14,7 +14,7 @@
 - type: entity
  name: Emergency Toolbox
  parent: ToolboxBase
-  id: RedToolboxItem
+  id: ToolboxEmergency
  description: A bright red toolbox, stocked with emergency tools
  components:
  - type: Sprite
@@ -23,6 +23,11 @@
  - type: Icon
    texture: Objects/Tools/toolbox_r.png

+- type: entity
+  id: ToolboxEmergencyFilled
+  parent: ToolboxEmergency
+  suffix: Filled
+
 - type: entity
  name: Mechanical Toolbox
  parent: ToolboxBase
@@ -37,7 +42,7 @@
 - type: entity
  name: Electrical Toolbox
  parent: ToolboxBase
-  id: YellowToolboxItem
+  id: ToolboxElectrical
  description: A toolbox typically stocked with electrical gear
  components:
  - type: Sprite
@@ -46,9 +51,9 @@
    texture: Objects/Tools/Toolbox_y.png

 - type: entity
-  id: YellowToolboxItemFilled
+  id: ToolboxElectricalFilled
  name: Electrical Toolbox
  suffix: Filled
-  parent: YellowToolboxItem
+  parent: ToolboxElectrical
  components:
  - type: ToolboxElectricalFill
--- a/Resources/Prototypes/Entities/Items/tools.yml
+++ b/Resources/Prototypes/Entities/Items/tools.yml
@@ -5,15 +5,29 @@
  description: This kills the wire.
  components:
  - type: Sprite
-    texture: Objects/Tools/wirecutter.png
+    sprite: Objects/Tools/wirecutters.rsi
+    layers:
+    - state: cutters-map
+    - state: cutters-cutty-thingy
  - type: Icon
-    texture: Objects/Tools/wirecutter.png
+    sprite: Objects/Tools/wirecutters.rsi
+    state: cutters-map
  - type: ItemCooldown
  - type: MeleeWeapon
  - type: Tool
    qualities:
      - Cutting
    useSound: /Audio/items/wirecutter.ogg
+  - type: RandomToolColor
+    state: cutters
+    colors:
+      blue: "#1861d5"
+      red: "#951710"
+      pink: "#d5188d"
+      brown: "#a05212"
+      green: "#0e7f1b"
+      cyan: "#18a2d5"
+      yellow: "#d58c18"

 - type: entity
  name: Screwdriver
@@ -27,6 +41,14 @@
  - type: Icon
    sprite: Objects/Tools/screwdriver.rsi
    state: screwdriver
+    layers:
+    - state: screwdriver-map
+    - state: screwdriver-screwybits
+
+  - type: Icon
+    sprite: Objects/Tools/screwdriver.rsi
+    state: screwdriver-map
+
  - type: Item
    sprite: Objects/Tools/screwdriver.rsi
  - type: ItemCooldown
@@ -35,6 +57,16 @@
    qualities:
      - Screwing
    useSoundCollection: Screwdriver
+  - type: RandomToolColor
+    state: screwdriver
+    colors:
+      blue: "#1861d5"
+      red: "#ff0000"
+      pink: "#d5188d"
+      brown: "#a05212"
+      green: "#0e7f1b"
+      cyan: "#18a2d5"
+      yellow: "#ffa500"

 - type: entity
  name: Welding Tool
--- a/Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml
--- a/Resources/Prototypes/Entities/janitor.yml
+++ b/Resources/Prototypes/Entities/janitor.yml
@@ -78,8 +78,6 @@
  - type: Physics
    mass: 5
    Anchored: false
-  - type: Sound
-

 - type: entity
  name: wet floor sign
--- a/Resources/Prototypes/Entities/kitchen.yml
+++ b/Resources/Prototypes/Entities/kitchen.yml
@@ -2,7 +2,11 @@
  id: KitchenMicrowave
  name: Microwave
  description: It's magic.
+  placement:
+    mode: SnapgridCenter
  components:
+  - type: SnapGrid
+    offset: Center
  - type: Microwave
  - type: Clickable
  - type: InteractionOutline
@@ -17,8 +21,6 @@
    interfaces:
    - key: enum.MicrowaveUiKey.Key
      type: MicrowaveBoundUserInterface
-
-
  - type: Collidable
    shapes:
    - !type:PhysShapeAabb