Merge remote-tracking branch 'space-station-14/master'

2024-04-13 18:59:09 +03:00
parent f6a28d4afc 154b8606f9
commit a841fc9fcd
74 changed files with 1038 additions and 503 deletions
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -88,27 +88,6 @@
      - state: box
      - state: nitrile

- type: entity
-  name: sterile swab box
-  parent: BoxCardboard
-  id: BoxMouthSwab
-  components:
-  - type: Storage
-    grid:
-    - 0,0,4,3
-  - type: StorageFill
-    contents:
-      - id: DiseaseSwab
-        amount: 10
-  - type: Sprite
-    layers:
-      - state: box
-      - state: swab
-  - type: GuideHelp
-    guides:
-  # - Virology (when it's back)
-    - Botany
-
 - type: entity
  name: body bag box
  parent: BoxCardboard
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -61,6 +61,21 @@
      - id: BoxMRE
        prob: 0.1

+- type: entity
+  id: ClosetEmergencyN2FilledRandom
+  parent: ClosetEmergencyN2
+  suffix: Filled, Random
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyTankOrRegularTank
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyTankOrRegularTank
+
 - type: entity
  id: ClosetFireFilled
  parent: ClosetFire
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -104,6 +104,7 @@
      - id: ClothingBeltPlant
      - id: PlantBag ##Some maps don't have nutrivend
      - id: BoxMouthSwab
+      - id: Dropper
      - id: HandLabeler
      - id: ClothingUniformOveralls
      - id: ClothingHeadHatTrucker
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -6,6 +6,7 @@
    HydroponicsToolClippers: 4
    HydroponicsToolScythe: 4
    HydroponicsToolHatchet: 4
+    Dropper: 4
    PlantBag: 3
    PlantBGoneSpray: 20
    WeedSpray: 20
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -100,7 +100,7 @@
      blacklist:
        tags:
          - NukeOpsUplink
-  
+
 - type: listing
  id: UplinkEshield
  name: uplink-eshield-name
@@ -314,7 +314,7 @@
    Telecrystal: 11
  categories:
    - UplinkExplosives
-  restockTime: 30
+  restockTime: 1800
  conditions:
  - !type:StoreWhitelistCondition
    blacklist:
@@ -478,7 +478,7 @@
    Telecrystal: 6
  categories:
  - UplinkChemicals
-  
+
 - type: listing
  id: UplinkHypoDart
  name: uplink-hypodart-name
@@ -500,7 +500,7 @@
    Telecrystal: 4
  categories:
  - UplinkChemicals
-  
+
 - type: listing
  id: UplinkZombieBundle
  name: uplink-zombie-bundle-name
@@ -570,7 +570,7 @@
    Telecrystal: 12
  categories:
  - UplinkChemicals
-  
+
 - type: listing
  id: UplinkCigarettes
  name: uplink-cigarettes-name
@@ -601,7 +601,7 @@
          - SurplusBundle

 # Deception
-  
+
 - type: listing
  id: UplinkAgentIDCard
  name: uplink-agent-id-card-name
@@ -611,7 +611,7 @@
    Telecrystal: 3
  categories:
  - UplinkDeception
-  
+
 - type: listing
  id: UplinkStealthBox
  name: uplink-stealth-box-name
@@ -639,11 +639,11 @@
  description: uplink-binary-translator-key-desc
  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
  productEntity: EncryptionKeyBinary
-  cost: 
+  cost:
    Telecrystal: 1
  categories:
  - UplinkDeception
-  
+
 - type: listing
  id: UplinkCyberpen
  name: uplink-cyberpen-name
@@ -663,7 +663,7 @@
    Telecrystal: 1
  categories:
  - UplinkDeception
-  
+
 - type: listing
  id: UplinkUltrabrightLantern
  name: uplink-ultrabright-lantern-name
@@ -726,7 +726,7 @@
    Telecrystal: 8
  categories:
  - UplinkDisruption
-  
+
 - type: listing
  id: UplinkRadioJammer
  name: uplink-radio-jammer-name
@@ -766,7 +766,7 @@
    Telecrystal: 3
  categories:
  - UplinkDisruption
-  
+
 - type: listing
  id: UplinkToolbox
  name: uplink-toolbox-name
@@ -1120,7 +1120,7 @@
      whitelist:
        tags:
          - NukeOpsUplink
- 
+
 - type: listing
  id: UplinkUplinkImplanter # uplink uplink real
  name: uplink-uplink-implanter-name
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -229,6 +229,7 @@
  description: It consists of a liquid, and it wants to dissolve you in itself.
  components:
  - type: GhostRole
+    prob: 0
    description: ghost-role-information-angry-slimes-description
  - type: NpcFactionMember
    factions:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -2,6 +2,7 @@
  parent: DrinkBase
  id: DrinkCartonBaseFull
  abstract: true
+  suffix: Full
  components:
  - type: Openable
    sound:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -3,6 +3,7 @@
  parent: DrinkBase
  id: DrinkBottlePlasticBaseFull
  abstract: true
+  suffix: Full
  components:
  - type: Tag
    tags:
@@ -744,7 +745,7 @@
  parent: DrinkBottlePlasticBaseFull
  id: DrinkSugarJug
  name: sugar jug
-  suffix: for drinks
+  suffix: For Drinks, Full
  description: some people put this in their coffee...
  components:
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -5,6 +5,7 @@
  parent: BaseItem
  abstract: true
  description: An empty bottle.
+  suffix: Empty
  components:
  - type: Sprite
    state: icon
@@ -93,6 +94,7 @@
  parent: BaseItem
  abstract: true
  description: An empty carton.
+  suffix: Empty
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -522,7 +522,7 @@
 # Shakers

 - type: entity
-  parent: BaseFoodCondimentBottle
+  parent: BaseFoodCondiment
  id: BaseFoodShaker
  abstract: true
  name: empty shaker
@@ -560,6 +560,8 @@
        acts: [ "Destruction" ]
  - type: Sprite
    state: shaker-empty
+  - type: RefillableSolution
+    solution: food

 - type: entity
  parent: BaseFoodShaker
--- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -17,6 +17,8 @@
    whitelist:
      tags:
      - Burnt
+      - Cigarette
+      - Cigar
    maxItemSize: Tiny
    grid:
    - 0,0,9,0
@@ -27,4 +29,4 @@
    fillBaseName: icon
    maxFillLevels: 10
  - type: Appearance
-  - type: Dumpable
+  - type: Dumpable
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -18,7 +18,7 @@
      key: enum.DoorElectronicsConfigurationUiKey.Key
      allowedItems:
        tags:
-        - Multitool
+        - DoorElectronicsConfigurator
    - type: UserInterface
      interfaces:
      - key: enum.DoorElectronicsConfigurationUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -55,6 +55,14 @@
  - type: AccessReader
    access: [["Hydroponics"]]

+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsLawyer
+  suffix: Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Lawyer"]]
+
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsCaptain
@@ -151,6 +159,14 @@
  - type: AccessReader
    access: [["Command"]]

+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCentralCommand
+  suffix: CentralCommand, Locked
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsChiefMedicalOfficer
@@ -207,6 +223,14 @@
  - type: AccessReader
    access: [["Security"]]

+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSecurityLawyer
+  suffix: Security/Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Security", "Lawyer"]]
+
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsDetective
@@ -255,6 +279,14 @@
  - type: AccessReader
    access: [["SyndicateAgent"]]

+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsNukeop
+  suffix: Nukeop, Locked
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+
 - type: entity
  parent: DoorElectronics
  id: DoorElectronicsRnDMed
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
@@ -11,8 +11,6 @@
    state: icon
    noRot: false
  - type: ImmovableRod
-  - type: TimedDespawn
-    lifetime: 30.0
  - type: Physics
    bodyType: Dynamic
    linearDamping: 0
@@ -36,8 +34,15 @@
    location: immovable rod

 - type: entity
+  id: ImmovableRodDespawn
  parent: ImmovableRod
+  components:
+  - type: TimedDespawn
+    lifetime: 30.0
+
+- type: entity
  id: ImmovableRodSlow
+  parent: ImmovableRodDespawn
  suffix: Slow
  components:
  - type: ImmovableRod
@@ -45,7 +50,7 @@
    maxSpeed: 5

 - type: entity
-  parent: ImmovableRod
+  parent: ImmovableRodDespawn
  id: ImmovableRodKeepTiles
  suffix: Keep Tiles
  components:
@@ -53,6 +58,33 @@
    destroyTiles: false
    hitSoundProbability: 1.0

+# For Wizard Polymorph
+- type: entity
+  parent: ImmovableRod
+  id: ImmovableRodWizard
+  suffix: Wizard
+  components:
+  - type: ImmovableRod
+    minSpeed: 35
+    destroyTiles: false
+    randomizeVelocity: false
+    shouldGib: false
+    damage:
+      types:
+        Blunt: 200
+  - type: MovementIgnoreGravity
+    gravityState: true
+  - type: InputMover
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 5
+    weightlessModifier: 2
+    weightlessFriction: 0
+    friction: 0
+    frictionNoInput: 0
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: NoSlip
+
 - type: entity
  parent: ImmovableRodKeepTiles
  id: ImmovableRodKeepTilesStill
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -19,6 +19,27 @@
  # - Virology (when it's back)
    - Botany

+- type: entity
+  parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust
+  id: BoxMouthSwab
+  name: sterile swab dispenser
+  description: Dispenses 30 sterile swabs, extremely useful for botany.
+  components:
+  - type: Sprite
+    layers:
+    - state: boxwide
+    - state: swab
+  - type: BallisticAmmoProvider
+    whitelist:
+      components:
+      - BotanySwab
+    proto: DiseaseSwab
+    capacity: 30
+  - type: GuideHelp
+    guides:
+  # - Virology (when it's back)
+    - Botany
+
 - type: entity
  parent: BaseItem
  id: Vaccine
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -222,7 +222,6 @@
  - type: ItemBorgModule
    items:
    - WeaponGrapplingGun
-    - WeaponCrusherDagger
    - HandheldGPSBasic

 # engineering modules
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -225,6 +225,7 @@
  - type: Tag
    tags:
      - Multitool
+      - DoorElectronicsConfigurator
  - type: PhysicalComposition
    materialComposition:
      Steel: 100
@@ -266,6 +267,9 @@
    - type: ActivatableUI
      key: enum.NetworkConfiguratorUiKey.List
      inHandsOnly: true
+    - type: Tag
+      tags:
+        - DoorElectronicsConfigurator
    - type: UserInterface
      interfaces:
        - key: enum.NetworkConfiguratorUiKey.List
@@ -343,13 +347,13 @@
  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
  components:
  - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
    - WallSolid
    - FloorSteel
    - Plating
    - Catwalk
    - Grille
-    - Window    
+    - Window
    - WindowDirectional
    - WindowReinforcedDirectional
    - ReinforcedWindow
@@ -398,7 +402,7 @@
  - type: LimitedCharges
    charges: 0
  - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
    - WallSolid
    - FloorSteel
    - Plating
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -7,19 +7,20 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsService ]
-
- type: entity
-  parent: Airlock
-  id: AirlockLawyerLocked
-  suffix: Lawyer, Locked
-  components:
-  - type: AccessReader
-    access: [["Lawyer"]]
  - type: Wires
    layoutId: AirlockService

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
+  id: AirlockLawyerLocked
+  suffix: Lawyer, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]
+
+- type: entity
+  parent: AirlockServiceLocked
  id: AirlockTheatreLocked
  suffix: Theatre, Locked
  components:
@@ -28,7 +29,7 @@
      board: [ DoorElectronicsTheatre ]

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
  id: AirlockChapelLocked
  suffix: Chapel, Locked
  components:
@@ -37,7 +38,7 @@
      board: [ DoorElectronicsChapel ]

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
  id: AirlockJanitorLocked
  suffix: Janitor, Locked
  components:
@@ -46,7 +47,7 @@
      board: [ DoorElectronicsJanitor ]

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
  id: AirlockKitchenLocked
  suffix: Kitchen, Locked
  components:
@@ -55,7 +56,7 @@
      board: [ DoorElectronicsKitchen ]

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
  id: AirlockBarLocked
  suffix: Bar, Locked
  components:
@@ -64,7 +65,7 @@
      board: [ DoorElectronicsBar ]

 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
  id: AirlockHydroponicsLocked
  suffix: Hydroponics, Locked
  components:
@@ -73,7 +74,7 @@
      board: [ DoorElectronicsHydroponics ]

 - type: entity
-  parent: Airlock
+  parent: AirlockCommandLocked
  id: AirlockServiceCaptainLocked
  suffix: Captain, Locked
  components:
@@ -122,16 +123,18 @@
  id: AirlockExternalSyndicateLocked
  suffix: External, Syndicate, Locked
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockExternal
  id: AirlockExternalNukeopLocked
  suffix: External, Nukeop, Locked
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 - type: entity
  parent: AirlockFreezer
@@ -156,10 +159,9 @@
  id: AirlockFreezerHydroponicsLocked
  suffix: Hydroponics, Locked
  components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]

 - type: entity
  parent: AirlockEngineering
@@ -202,10 +204,9 @@
  id: AirlockMiningLocked
  suffix: Mining(Salvage), Locked
  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]

 - type: entity
  parent: AirlockMedical
@@ -257,10 +258,9 @@
  id: AirlockCentralCommandLocked
  suffix: Central Command, Locked
  components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]

 - type: entity
  parent: AirlockCommand
@@ -270,8 +270,6 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsCommand ]
-  - type: Wires
-    layoutId: AirlockCommand

 - type: entity
  parent: AirlockCommand
@@ -344,8 +342,6 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsSecurity ]
-  - type: Wires
-    layoutId: AirlockSecurity

 - type: entity
  parent: AirlockSecurity
@@ -355,8 +351,6 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsDetective ]
-  - type: Wires
-    layoutId: AirlockSecurity

 - type: entity
  parent: AirlockSecurity
@@ -366,18 +360,15 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsBrig ]
-  - type: Wires
-    layoutId: AirlockSecurity

 - type: entity
  parent: AirlockSecurity
  id: AirlockSecurityLawyerLocked
  suffix: Security/Lawyer, Locked
  components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurityLawyer ]

 - type: entity
  parent: AirlockSecurity
@@ -417,26 +408,26 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsService ]
+  - type: Wires
+    layoutId: AirlockService

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockLawyerGlassLocked
  suffix: Lawyer, Locked
  components:
-  - type: AccessReader
-    access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockTheatreGlassLocked
  suffix: Theatre, Locked
  components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]

 - type: entity
  parent: AirlockGlass
@@ -470,16 +461,18 @@
  id: AirlockExternalGlassSyndicateLocked
  suffix: External, Glass, Syndicate, Locked
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockExternalGlass
  id: AirlockExternalGlassNukeopLocked
  suffix: External, Glass, Nukeop, Locked
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 - type: entity
  parent: AirlockExternalGlass
@@ -500,7 +493,7 @@
      board: [ DoorElectronicsAtmospherics ]

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockKitchenGlassLocked
  suffix: Kitchen, Locked
  components:
@@ -509,17 +502,16 @@
      board: [ DoorElectronicsKitchen ]

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockJanitorGlassLocked
  suffix: Janitor, Locked
  components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockHydroGlassLocked
  suffix: Hydroponics, Locked
  components:
@@ -528,7 +520,7 @@
      board: [ DoorElectronicsHydroponics ]

 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
  id: AirlockChapelGlassLocked
  suffix: Chapel, Locked
  components:
@@ -577,20 +569,18 @@
  id: AirlockMiningGlassLocked
  suffix: Mining(Salvage), Locked
  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]

 - type: entity
  parent: AirlockChemistryGlass
  id: AirlockChemistryGlassLocked
  suffix: Chemistry, Locked
  components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]

 - type: entity
  parent: AirlockMedicalGlass
@@ -633,10 +623,9 @@
  id: AirlockCentralCommandGlassLocked
  suffix: Central Command, Locked
  components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]

 - type: entity
  parent: AirlockCommandGlass
@@ -742,10 +731,9 @@
  id: AirlockSecurityLawyerGlassLocked
  suffix: Security/Lawyer, Locked
  components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurityLawyer ]

 - type: entity
  parent: AirlockSecurityGlass
@@ -770,16 +758,18 @@
  id: AirlockSyndicateGlassLocked
  suffix: Syndicate, Locked
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockSyndicateGlass
  id: AirlockSyndicateNukeopGlassLocked
  suffix: Nukeop, Locked
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 # Maintenance Hatches
 - type: entity
@@ -855,7 +845,7 @@
      board: [ DoorElectronicsAtmospherics ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintBarLocked
  suffix: Bar, Locked
  components:
@@ -864,7 +854,7 @@
      board: [ DoorElectronicsBar ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintChapelLocked
  suffix: Chapel, Locked
  components:
@@ -873,7 +863,7 @@
      board: [ DoorElectronicsChapel ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintHydroLocked
  suffix: Hydroponics, Locked
  components:
@@ -882,7 +872,7 @@
      board: [ DoorElectronicsHydroponics ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintJanitorLocked
  suffix: Janitor, Locked
  components:
@@ -891,27 +881,27 @@
      board: [ DoorElectronicsJanitor ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintLawyerLocked
  suffix: Lawyer, Locked
  components:
-  - type: AccessReader
-    access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]

 - type: entity
  parent: AirlockMaint
  id: AirlockMaintServiceLocked
  suffix: Service, Locked
  components:
-  - type: AccessReader
-    access: [["Service"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
  - type: Wires
    layoutId: AirlockService

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintTheatreLocked
  suffix: Theatre, Locked
  components:
@@ -920,7 +910,7 @@
      board: [ DoorElectronicsTheatre ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
  id: AirlockMaintKitchenLocked
  suffix: Kitchen, Locked
  components:
@@ -945,9 +935,11 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsMedical ]
+  - type: Wires
+    layoutId: AirlockMedical

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintMedLocked
  id: AirlockMaintChemLocked
  suffix: Chemistry, Locked
  components:
@@ -963,9 +955,11 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsResearch ]
+  - type: Wires
+    layoutId: AirlockScience

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintRnDLocked
  id: AirlockMaintRnDMedLocked
  suffix: Medical/Science, Locked
  components:
@@ -981,9 +975,11 @@
  - type: ContainerFill
    containers:
      board: [ DoorElectronicsSecurity ]
+  - type: Wires
+    layoutId: AirlockSecurity

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintSecLocked
  id: AirlockMaintDetectiveLocked
  suffix: Detective, Locked
  components:
@@ -992,7 +988,7 @@
      board: [ DoorElectronicsDetective ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintHOPLocked
  suffix: HeadOfPersonnel, Locked
  components:
@@ -1001,7 +997,7 @@
      board: [ DoorElectronicsHeadOfPersonnel ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintCaptainLocked
  suffix: Captain, Locked
  components:
@@ -1010,70 +1006,69 @@
      board: [ DoorElectronicsCaptain ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintChiefEngineerLocked
  suffix: ChiefEngineer, Locked
  components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintChiefMedicalOfficerLocked
  suffix: ChiefMedicalOfficer, Locked
  components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintHeadOfSecurityLocked
  suffix: HeadOfSecurity, Locked
  components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
  id: AirlockMaintResearchDirectorLocked
  suffix: ResearchDirector, Locked
  components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]

 - type: entity
  parent: AirlockMaint
  id: AirlockMaintArmoryLocked
  suffix: Armory, Locked
  components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
  - type: Wires
-    layoutId: AirlockSecurity
+    layoutId: AirlockArmory

 - type: entity
  parent: AirlockSyndicate
  id: AirlockSyndicateLocked
  suffix: Syndicate, Locked
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockSyndicate
  id: AirlockSyndicateNukeopLocked
  suffix: Nukeop, Locked
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 # Shuttle airlocks
 - type: entity
@@ -1090,16 +1085,18 @@
  id: AirlockExternalShuttleSyndicateLocked
  suffix: External, Docking, Syndicate, Locked
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockShuttleSyndicate
  id: AirlockExternalShuttleNukeopLocked
  suffix: External, Docking, Nukeop, Locked
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 - type: entity
  parent: AirlockGlassShuttle
@@ -1115,42 +1112,44 @@
  id: AirlockExternalGlassShuttleSyndicateLocked
  suffix: Syndicate, Locked, Glass
  components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]

 - type: entity
  parent: AirlockGlassShuttleSyndicate
  id: AirlockExternalGlassShuttleNukeopLocked
  suffix: Nukeop, Locked, Glass
  components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]

 - type: entity
  parent: AirlockGlassShuttle
  id: AirlockExternalGlassShuttleEmergencyLocked
  suffix: External, Emergency, Glass, Docking, Locked
  components:
-    - type: PriorityDock
-      tag: DockEmergency
-    - type: ContainerFill
-      containers:
-        board: [ DoorElectronicsExternal ]
+  - type: PriorityDock
+    tag: DockEmergency
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]

 - type: entity
  parent: AirlockGlassShuttle
  id: AirlockExternalGlassShuttleArrivals
  suffix: External, Arrivals, Glass, Docking
  components:
-    - type: PriorityDock
-      tag: DockArrivals
+  - type: PriorityDock
+    tag: DockArrivals

 - type: entity
  parent: AirlockGlassShuttle
  id: AirlockExternalGlassShuttleEscape
  suffix: External, Escape 3x4, Glass, Docking
  components:
-    - type: GridFill
+  - type: GridFill

 #HighSecDoors
 - type: entity
@@ -1158,8 +1157,9 @@
  id: HighSecCentralCommandLocked
  suffix: Central Command, Locked
  components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]

 - type: entity
  parent: HighSecDoor
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -5,6 +5,8 @@
  components:
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
+  - type: Wires
+    layoutId: AirlockService

 - type: entity
  parent: Airlock
@@ -15,6 +17,8 @@
    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
  - type: PaintableAirlock
    department: Engineering
+  - type: Wires
+    layoutId: AirlockEngineering

 - type: entity
  parent: AirlockEngineering
@@ -33,6 +37,8 @@
    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
  - type: PaintableAirlock
    department: Cargo
+  - type: Wires
+    layoutId: AirlockCargo

 - type: entity
  parent: Airlock
@@ -43,6 +49,8 @@
    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
  - type: PaintableAirlock
    department: Medical
+  - type: Wires
+    layoutId: AirlockMedical

 - type: entity
  parent: AirlockMedical
@@ -66,6 +74,8 @@
    sprite: Structures/Doors/Airlocks/Standard/science.rsi
  - type: PaintableAirlock
    department: Science
+  - type: Wires
+    layoutId: AirlockScience

 - type: entity
  parent: Airlock
@@ -78,6 +88,8 @@
    securityLevel: medSecurity
  - type: PaintableAirlock
    department: Command
+  - type: Wires
+    layoutId: AirlockCommand

 - type: entity
  parent: Airlock
@@ -88,6 +100,8 @@
    sprite: Structures/Doors/Airlocks/Standard/security.rsi
  - type: PaintableAirlock
    department: Security
+  - type: Wires
+    layoutId: AirlockSecurity

 - type: entity
  parent: Airlock
@@ -112,6 +126,8 @@
  components:
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+  - type: Wires
+    layoutId: AirlockCargo

 - type: entity
  parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -147,6 +163,8 @@
    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
  - type: PaintableAirlock
    department: Engineering
+  - type: Wires
+    layoutId: AirlockEngineering

 - type: entity
  parent: AirlockGlass
@@ -173,6 +191,8 @@
    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
  - type: PaintableAirlock
    department: Cargo
+  - type: Wires
+    layoutId: AirlockCargo

 - type: entity
  parent: AirlockGlass
@@ -183,6 +203,8 @@
    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
  - type: PaintableAirlock
    department: Medical
+  - type: Wires
+    layoutId: AirlockMedical

 - type: entity
  parent: AirlockMedicalGlass
@@ -206,6 +228,8 @@
    sprite: Structures/Doors/Airlocks/Glass/science.rsi
  - type: PaintableAirlock
    department: Science
+  - type: Wires
+    layoutId: AirlockScience

 - type: entity
  parent: AirlockGlass
@@ -218,6 +242,8 @@
    department: Command
  - type: WiresPanelSecurity
    securityLevel: medSecurity
+  - type: Wires
+    layoutId: AirlockCommand

 - type: entity
  parent: AirlockGlass
@@ -228,6 +254,8 @@
    sprite: Structures/Doors/Airlocks/Glass/security.rsi
  - type: PaintableAirlock
    department: Security
+  - type: Wires
+    layoutId: AirlockSecurity

 - type: entity
  parent: AirlockSecurityGlass # see standard
@@ -252,5 +280,3 @@
  components:
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
-  - type: WiresPanelSecurity
-    securityLevel: medSecurity
--- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -0,0 +1,148 @@
+- type: entity
+  id: AlwaysPoweredStrobeLight
+  name: strobe
+  description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!"
+  suffix: Always powered
+  components:
+  - type: AmbientSound
+    volume: -15
+    range: 2
+    sound:
+      path: /Audio/Ambience/Objects/light_hum.ogg
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Construction
+    graph: LightFixture
+    node: bulbLight
+  - type: Sprite
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    drawdepth: WallMountedItems
+    layers:
+    - map: ["enum.PoweredLightLayers.Base"]
+      state: base
+    - map: ["enum.PoweredLightLayers.Glow"]
+      state: glow
+      shader: unshaded
+    state: base
+  - type: PointLight
+    mask: /Textures/Effects/LightMasks/double_cone.png
+    color: "#FFE4CE"
+    energy: 5
+    radius: 10
+    softness: 1
+    offset: "0, 0.35"
+  - type: RotatingLight
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+
+- type: entity
+  name: strobe
+  description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!"
+  id: PoweredStrobeLightEmpty
+  suffix: Empty
+  parent: AlwaysPoweredStrobeLight
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    state: empty
+  - type: AmbientSound
+    enabled: false
+  - type: PointLight
+    enabled: false
+    offset: "0, 0.35"
+  - type: ContainerContainer
+    containers:
+      light_bulb: !type:ContainerSlot
+  - type: PoweredLight
+    bulb: Bulb
+    on: false
+    damage:
+      types:
+        Heat: 5
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SmartLight
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: Appearance
+  - type: PoweredLightVisuals
+    spriteStateMap:
+      empty: empty
+      broken: broken
+      burned: broken
+      off: base
+      on: base
+  - type: DeviceLinkSink
+    ports:
+      - On
+      - Off
+      - Toggle
+  - type: Construction
+    graph: LightFixture
+    node: strobeLight
+
+- type: entity
+  id: PoweredStrobeLightPolice
+  suffix: "Empty, police"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Effects/Lightning/strobe.ogg"
+
+- type: entity
+  id: PoweredStrobeLightSiren
+  suffix: "Empty, siren"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Misc/siren.ogg"
+
+- type: entity
+  id: PoweredStrobeLightEpsilon
+  suffix: "Empty, epsilon"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -19,8 +19,8 @@
      damageModifierSet: Metallic
    - type: RCDDeconstructable
      cost: 2
-      delay: 2
-      fx: EffectRCDDeconstruct2  
+      delay: 0
+      fx: EffectRCDConstruct0  
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -45,8 +45,8 @@
    node: power
  - type: RCDDeconstructable
    cost: 2
-    delay: 2
-    fx: EffectRCDDeconstruct2  
+    delay: 0
+    fx: EffectRCDConstruct0  

 - type: entity
  parent: CableBase
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -37,6 +37,19 @@
    stateDoorOpen: emergency_open
    stateDoorClosed: emergency_door

+# Emergency N2 closet
+- type: entity
+  id: ClosetEmergencyN2
+  name: emergency nitrogen closet
+  parent: ClosetSteelBase
+  description: It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen.
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: fire
+    stateDoorOpen: fire_open
+    stateDoorClosed: n2_door
+
 # Fire safety closet
 - type: entity
  id: ClosetFire
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -2,6 +2,8 @@
  id: NoticeBoard
  name: notice board
  description: Is there a job for a witcher?
+  placement:
+    mode: SnapgridCenter
  components:
  - type: WallMount
  - type: Sprite
@@ -53,3 +55,9 @@
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Wooden
+  - type: Construction
+    graph: NoticeBoard
+    node: noticeBoard
--- a/Resources/Prototypes/RCD/rcd.yml
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -17,9 +17,9 @@
  name: rcd-component-deconstruct
  mode: Deconstruct
  cost: 2
-  delay: 1
+  delay: 0
  rotation: Camera
-  fx: EffectRCDDeconstruct2
+  fx: EffectRCDConstruct0
    
 - type: rcd
  id: DeconstructTile      # Hidden prototype - do not add to RCDs
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -479,7 +479,9 @@
      - !type:PopupMessage
        conditions:
          - !type:OrganType
-            type: Human
+            type: Animal
+            shouldHave: false
+        reagent: Protein
        type: Local
        visualType: MediumCaution
        messages: [ "generic-reagent-effect-sick" ]
@@ -488,19 +490,21 @@
        probability: 0.1
        conditions:
          - !type:OrganType
-            type: Human
+            type: Animal
+            shouldHave: false
      - !type:HealthChange
        conditions:
        - !type:OrganType
-          type: Human
+          type: Animal
+          shouldHave: false
        damage:
          types:
            Poison: 1
      - !type:AdjustReagent
        conditions:
        - !type:OrganType
-          type: Human
-          shouldHave: false
+          type: Animal
+          shouldHave: true
        reagent: Protein
        amount: 0.5

--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml
@@ -0,0 +1,26 @@
+- type: constructionGraph
+  id: NoticeBoard
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: noticeBoard
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+    - node: noticeBoard
+      entity: NoticeBoard
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank
+              amount: 3
+          steps:
+            - tool: Prying
+              doAfter: 3
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -19,6 +19,11 @@
            - material: Steel
              amount: 5
              doAfter: 2.0
+        - to: strobeLight
+          steps:
+            - material: Steel
+              amount: 1
+              doAfter: 2.0
    - node: tubeLight
      entity: PoweredlightEmpty
      edges:
@@ -63,4 +68,19 @@
            - !type:SpawnPrototype
              prototype: SheetSteel1
              amount: 5
+            - !type:DeleteEntity {}
+    - node: strobeLight
+      entity: PoweredStrobeLightEmpty
+      edges:
+        - to: start
+          conditions:
+            - !type:ContainerEmpty
+              container: "light_bulb"
+          steps:
+            - tool: Screwing
+              doAfter: 2.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 1
            - !type:DeleteEntity {}
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -884,3 +884,21 @@
  canBuildInImpassable: false
  conditions:
    - !type:TileNotBlocked
+
+- type: construction
+  id: NoticeBoard
+  name: notice board
+  description: Wooden notice board, can store paper inside itself.
+  graph: NoticeBoard
+  startNode: start
+  targetNode: noticeBoard
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Wallmounts/noticeboard.rsi
+    state: noticeboard
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1472,6 +1472,24 @@
  conditions:
    - !type:TileNotBlocked

+- type: construction
+  name: strobe light
+  id: LightStrobeFixture
+  graph: LightFixture
+  startNode: start
+  targetNode: strobeLight
+  category: construction-category-structures
+  description: A wall light fixture. Use light bulbs.
+  icon:
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 #conveyor
 - type: construction
  name: conveyor belt
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -523,6 +523,9 @@
 - type: Tag
  id: DoorElectronics

+- type: Tag
+  id: DoorElectronicsConfigurator
+
 - type: Tag
  id: DrinkBottle

@@ -1177,7 +1180,7 @@

 - type: Tag
  id: SuitEVA
-  
+
 - type: Tag
  id: Sunglasses