Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream

# Conflicts: # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/lobbyscreens.yml
2024-05-08 12:26:05 +03:00
parent 9fe1528490 31491775e5
commit b92032fdd7
585 changed files with 5719 additions and 3832 deletions
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -31,6 +31,7 @@
        - AppraisalTool
        - JawsOfLife
        - GPS
+        - WeldingMask
      components:
        - SprayPainter
        - NetworkConfigurator
@@ -482,6 +483,10 @@
        - Handcuff
        - BallisticAmmoProvider
        - CartridgeAmmo
+        - DoorRemote
+        - Whistle
+        - HolosignProjector
+        - BalloonPopper
  - type: ItemMapper
    mapLayers:
      flashbang:
@@ -612,7 +617,7 @@
    sprite: Clothing/Belt/securitywebbing.rsi
  - type: Clothing
    sprite: Clothing/Belt/securitywebbing.rsi
-  
+
 - type: entity
  parent: ClothingBeltStorageBase
  id: ClothingBeltMercWebbing
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -242,6 +242,12 @@
  name: combat gloves
  description: These tactical gloves are fireproof and shock resistant.
  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/combat.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/combat.rsi
+  - type: GloveHeatResistance
+    heatResistance: 1400
  - type: Insulated
  - type: Fiber
    fiberMaterial: fibers-insulative
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -19,6 +19,7 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+    - WeldingMask
  - type: HideLayerClothing
    slots:
    - Snout
@@ -37,6 +38,7 @@
    tags:
    - HamsterWearable
    - WhitelistChameleon
+    - WeldingMask

 - type: entity
  parent: WeldingMaskBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -96,6 +96,7 @@
        Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature
  - type: Reflect
    reflectProb: 1
+    innate: true # armor grants a passive shield that does not require concentration to maintain
    reflects:
      - Energy

--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -8,6 +8,8 @@
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
    rules: ghost-role-information-rat-king-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobRatKing
  - type: Sprite
@@ -27,6 +29,8 @@
    name: ghost-role-information-remilia-name
    description: ghost-role-information-remilia-description
    rules: ghost-role-information-remilia-rules
+    raffle:
+      settings: short
  - type: GhostRoleMobSpawner
    prototype: MobBatRemilia
  - type: Sprite
@@ -46,6 +50,8 @@
    name: ghost-role-information-cerberus-name
    description: ghost-role-information-cerberus-description
    rules: ghost-role-information-cerberus-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobCorgiCerberus
  - type: Sprite
@@ -64,6 +70,8 @@
  components:
  - type: GhostRole
    rules: ghost-role-information-nukeop-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobHumanNukeOp
  - type: Sprite
@@ -103,6 +111,8 @@
    name: ghost-role-information-space-dragon-name
    description: ghost-role-information-space-dragon-description
    rules: ghost-role-component-default-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobDragon
  - type: Sprite
@@ -121,6 +131,8 @@
    name: ghost-role-information-space-ninja-name
    description: ghost-role-information-space-ninja-description
    rules: ghost-role-information-space-ninja-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobHumanSpaceNinja
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml
+++ b/Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml
@@ -0,0 +1,53 @@
+- type: entity
+  parent: MobHuman
+  id: MobDebugCounter
+  name: debug counter
+  description: He can count
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugCounterCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          0.5
+        MaximumIdleTime: !type:Single
+          0.5
+        Count: !type:Single
+          0
+
+- type: entity
+  parent: MobHuman
+  id: MobDebugRandomCounter
+  name: debug random counter
+  description: He can randomize
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugRandomCounterCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          1
+        MaximumIdleTime: !type:Single
+          1
+        Count: !type:Single
+          0
+
+- type: entity
+  parent: MobHuman
+  id: MobDebugRandomLess
+  name: debug random less
+  description: He can lessing
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugRandomLessCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          1
+        MaximumIdleTime: !type:Single
+          1
+        Count: !type:Single
+          0
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1308,6 +1308,8 @@
    makeSentient: true
    name: ghost-role-information-monkey-name
    description: ghost-role-information-monkey-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Loadout
    prototypes: [SyndicateOperativeGearMonkey]
@@ -2292,6 +2294,8 @@
      makeSentient: true
      name: ghost-role-information-giant-spider-name
      description: ghost-role-information-giant-spider-description
+      raffle:
+        settings: short
    - type: GhostTakeoverAvailable

 - type: entity
@@ -2816,6 +2820,8 @@
    allowMovement: true
    description: ghost-role-information-SyndiCat-description
    rules: ghost-role-information-SyndiCat-rules
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: AutoImplant
    implants:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -10,6 +10,8 @@
      makeSentient: true
      name: ghost-role-information-behonker-name
      description: ghost-role-information-behonker-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: HTN
      rootTask:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -163,6 +163,8 @@
      makeSentient: true
      name: ghost-role-information-sentient-carp-name
      description: ghost-role-information-sentient-carp-description
+      raffle:
+        settings: short
    - type: GhostTakeoverAvailable
    - type: HTN
      rootTask:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -232,6 +232,8 @@
  - type: GhostRole
    prob: 0
    description: ghost-role-information-angry-slimes-description
+    raffle:
+      settings: short
  - type: NpcFactionMember
    factions:
    - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -12,6 +12,8 @@
    makeSentient: true
    name: ghost-role-information-hellspawn-name
    description: ghost-role-information-hellspawn-description
+    raffle:
+      settings: default
  - type: RotationVisuals
    defaultRotation: 90
    horizontalRotation: 90
@@ -53,6 +55,7 @@
  - type: Perishable
  - type: Reflect
    reflectProb: 0.7
+    innate: true
    reflects:
      - Energy
  - type: Fixtures
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -90,6 +90,8 @@
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
    rules: ghost-role-information-rat-king-rules
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -56,6 +56,8 @@
    name: ghost-role-information-revenant-name
    description: ghost-role-information-revenant-description
    rules: ghost-role-information-revenant-rules
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Revenant
    malfunctionWhitelist:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -154,6 +154,8 @@
    makeSentient: true
    name: ghost-role-information-honkbot-name
    description: ghost-role-information-honkbot-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: InteractionPopup
    interactSuccessString: petting-success-honkbot
@@ -179,6 +181,8 @@
    makeSentient: true
    name: ghost-role-information-jonkbot-name
    description: ghost-role-information-jonkbot-description
+    raffle:
+      settings: default
  - type: InteractionPopup
    interactSuccessSound:
      path: /Audio/Items/brokenbikehorn.ogg
@@ -315,9 +319,65 @@
    makeSentient: true
    name: ghost-role-information-mimebot-name
    description: ghost-role-information-mimebot-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: InteractionPopup
    interactSuccessString: petting-success-mimebot
    interactFailureString: petting-failure-mimebot
  - type: Inventory
    templateId: head
+
+- type: entity
+  parent: MobSiliconBase
+  id: MobSupplyBot
+  name: supplybot
+  description: Delivers cargo!
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/supplybot.rsi
+    layers:
+    - state: supplybot
+  - type: GhostRole
+    name: ghost-role-information-supplybot-name
+    description: ghost-role-information-supplybot-description
+  - type: Construction
+    graph: SupplyBot
+    node: bot
+  - type: Access
+    tags:
+    - Cargo
+    - Maintenance
+    - Salvage
+  - type: Dumpable
+  - type: Storage
+    maxItemSize: Huge
+    grid:
+    - 0,0,9,3
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UnpoweredFlashlight
+  - type: PointLight
+    enabled: false
+    radius: 3.5
+    softness: 2
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBorg
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+    - Supply
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -126,6 +126,8 @@
    makeSentient: true
    name: ghost-role-information-slimes-name
    description: ghost-role-information-slimes-description
+    raffle:
+      settings: short
  - type: Speech
    speechVerb: Slime
    speechSounds: Slime
@@ -197,6 +199,8 @@
        - SimpleHostile
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short

 - type: entity
  name: green slime
@@ -232,6 +236,8 @@
        - SimpleHostile
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short

 - type: entity
  name: yellow slime
@@ -267,3 +273,5 @@
        - SimpleHostile
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -104,6 +104,8 @@
    name: ghost-role-information-xeno-name
    description: ghost-role-information-xeno-description
    rules: ghost-role-information-xeno-rules
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: TypingIndicator
    proto: alien
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -14,6 +14,8 @@
    makeSentient: true
    name: ghost-role-information-space-dragon-name
    description: ghost-role-information-space-dragon-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: HTN
    rootTask:
@@ -89,6 +91,12 @@
    speedModifierThresholds:
      250: 0.7
      400: 0.5
+  # disable taking damage from fire, since its a fire breathing dragon
+  - type: Flammable
+    damage:
+      types: {}
+  - type: Temperature
+    heatDamageThreshold: 800
  - type: Metabolizer
    solutionOnBody: false
    updateInterval: 0.25
@@ -139,10 +147,33 @@
    spawnRiftAction: ActionSpawnRift
  - type: GenericAntag
    rule: Dragon
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
  - type: GuideHelp
    guides:
    - MinorAntagonists

+- type: entity
+  noSpawn: true
+  id: DragonsBreathGun
+  name: dragon's lung
+  description: For dragon's breathing
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 5
+    rechargeSound:
+      path: /Audio/Animals/space_dragon_roar.ogg
+  - type: BasicEntityAmmoProvider
+    proto: ProjectileDragonsBreath
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Animals/space_dragon_roar.ogg
+    soundEmpty: null
+    projectileSpeed: 5
+
 - type: entity
  parent: BaseMobDragon
  id: MobDragonDungeon
@@ -150,6 +181,8 @@
  components:
  - type: GhostRole
    description: ghost-role-information-space-dragon-dungeon-description
+    raffle:
+      settings: default
  - type: SlowOnDamage
    speedModifierThresholds:
      100: 0.7
@@ -179,6 +212,7 @@
      state: icon
    event: !type:DragonSpawnRiftActionEvent
    useDelay: 1
+    priority: 3

 - type: entity
  id: ActionDevour
@@ -190,3 +224,18 @@
    icon: { sprite : Interface/Actions/devour.rsi, state: icon }
    iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
    event: !type:DevourActionEvent
+    priority: 1
+
+- type: entity
+  noSpawn: true
+  id: ActionDragonsBreath
+  name: "[color=orange]Dragon's Breath[/color]"
+  description: Spew out flames at anyone foolish enough to attack you!
+  components:
+  - type: WorldTargetAction
+    # TODO: actual sprite
+    icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -44,6 +44,8 @@
    name: ghost-role-information-cerberus-name
    description: ghost-role-information-cerberus-description
    rules: ghost-role-information-cerberus-rules
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: MeleeWeapon
    altDisarm: false
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -13,6 +13,8 @@
      makeSentient: true
      name: ghost-role-information-guardian-name
      description: ghost-role-information-guardian-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Input
      context: "human"
@@ -120,6 +122,8 @@
      makeSentient: true
      name: ghost-role-information-holoparasite-name
      description: ghost-role-information-holoparasite-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: NameIdentifier
      group: Holoparasite
@@ -150,6 +154,8 @@
      makeSentient: true
      name: ghost-role-information-ifrit-name
      description: ghost-role-information-ifrit-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomSprite
      available:
@@ -176,6 +182,8 @@
      makeSentient: true
      name: ghost-role-information-holoclown-name
      description: ghost-role-information-holoclown-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: NameIdentifier
      group: Holoparasite
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -26,6 +26,8 @@
    - type: GhostRole
      name: ghost-role-information-Death-Squad-name
      description: ghost-role-information-Death-Squad-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ DeathSquadGear ]
@@ -62,6 +64,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGear ]
@@ -92,6 +96,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGearEVA ]
@@ -114,6 +120,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGearEVALecter ]
@@ -145,6 +153,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-chaplain-name
      description: ghost-role-information-ert-chaplain-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -174,6 +184,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-chaplain-name
      description: ghost-role-information-ert-chaplain-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTChaplainGearEVA ]
@@ -205,6 +217,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -234,6 +248,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTJanitorGearEVA ]
@@ -265,6 +281,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -294,6 +312,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTEngineerGearEVA ]
@@ -325,6 +345,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -354,6 +376,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTSecurityGearEVA ]
@@ -375,6 +399,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTSecurityGearEVALecter ]
@@ -406,6 +432,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -435,6 +463,8 @@
    - type: GhostRole
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTMedicalGearEVA ]
@@ -463,6 +493,8 @@
    - type: GhostRole
      name: ghost-role-information-cburn-agent-name
      description: ghost-role-information-cburn-agent-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -489,6 +521,8 @@
    - type: GhostRole
      name: ghost-role-information-centcom-official-name
      description: ghost-role-information-centcom-official-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ CentcomGear ]
@@ -551,5 +585,7 @@
    - type: GhostRole
      name: ghost-role-information-cluwne-name
      description: ghost-role-information-cluwne-description
+      raffle:
+        settings: default
    - type: GhostTakeoverAvailable
    - type: Cluwne
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -17,6 +17,8 @@
  - type: GhostRole
    name: ghost-role-information-skeleton-pirate-name
    description: ghost-role-information-skeleton-pirate-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Loadout
    prototypes: [PirateGear]
@@ -31,6 +33,8 @@
  - type: GhostRole
    name: ghost-role-information-skeleton-biker-name
    description: ghost-role-information-skeleton-biker-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Loadout
    prototypes: [SkeletonBiker]
@@ -44,6 +48,8 @@
  - type: GhostRole
    name: ghost-role-information-closet-skeleton-name
    description: ghost-role-information-closet-skeleton-description
+    raffle:
+      settings: default
  - type: GhostTakeoverAvailable
  - type: Loadout
    prototypes: [LimitedPassengerGear]
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -810,6 +810,8 @@
    allowMovement: true
    description: ghost-role-information-BreadDog-description
    rules: ghost-role-information-BreadDog-rules
+    raffle:
+      settings: short
  - type: GhostTakeoverAvailable
  - type: BarkAccent
  - type: Speech
@@ -827,6 +829,7 @@
  - type: Puller
    needsHands: false
  - type: Examiner
+  - type: DoAfter
  - type: CombatMode
  - type: MeleeWeapon
    soundHit:
@@ -834,4 +837,4 @@
    hidden: true
    damage:
      groups:
-        Brute: 1
+        Brute: 1
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -672,6 +672,8 @@
    allowMovement: true
    description: ghost-role-information-Cak-description
    rules: ghost-role-information-Cak-rules
+    raffle:
+      settings: short
  - type: GhostTakeoverAvailable
  - type: OwOAccent
  - type: Speech
@@ -689,6 +691,7 @@
  - type: Puller
    needsHands: false
  - type: Examiner
+  - type: DoAfter
  - type: CombatMode
  - type: MeleeWeapon
    soundHit:
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -12,6 +12,8 @@
    name: ghost-role-information-syndicate-reinforcement-name
    description: ghost-role-information-syndicate-reinforcement-description
    rules: ghost-role-information-syndicate-reinforcement-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobHumanSyndicateAgent
  - type: EmitSoundOnUse
@@ -37,6 +39,8 @@
    name: ghost-role-information-syndicate-monkey-reinforcement-name
    description: ghost-role-information-syndicate-monkey-reinforcement-description
    rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobMonkeySyndicateAgent
    selectablePrototypes: ["SyndicateMonkey", "SyndicateKobold"]
@@ -61,5 +65,7 @@
      name: Syndicate Assault Cyborg
      description: Nuclear operatives needs reinforcements. You, a cold silicon killing machine, will help them.
      rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
+      raffle:
+        settings: default
    - type: GhostRoleMobSpawner
      prototype: PlayerBorgSyndicateAssaultBattery
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -6,8 +6,12 @@
  description: Someone forgot to turn off kettle?
  components:
  - type: Item
+    sprite: Objects/Fun/whistles.rsi
    size: Tiny
+  - type: Sprite
+    sprite: Objects/Fun/whistles.rsi
  - type: Clothing
+    sprite: Objects/Fun/whistles.rsi
    quickEquip: false
    slots: neck
  - type: UseDelay
@@ -16,7 +20,14 @@
    sound:
      collection: BaseWhistle
  - type: Whistle
-    distance: 5
+    distance: 3
+
+- type: entity
+  parent: BaseWhistle
+  id: Whistle
+  components:
+  - type: Sprite
+    state: whistle

 - type: entity
  parent: BaseWhistle
@@ -24,10 +35,11 @@
  description: Sound of it make you feel fear.
  components:
  - type: Sprite
-    sprite: Objects/Fun/whistle.rsi
-    state: securityWhistle
-  - type: Item
-    sprite: Objects/Fun/whistle.rsi
+    state: sec
+  - type: Clothing
+    equippedPrefix: sec
+  - type: Whistle
+    distance: 5

 - type: entity
  parent: BaseWhistle
@@ -36,13 +48,9 @@
  description: A whistle used by Syndicate commanders to draw attention. Avanti!
  components:
  - type: Sprite
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    state: icon
+    state: trench
  - type: Clothing
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    quickEquip: False
-    slots:
-    - neck
+    equippedPrefix: trench
  - type: EmitSoundOnUse
    sound:
      collection: TrenchWhistle
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -212,6 +212,11 @@
    enabled: false
    radius: 8
    energy: 5
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
  - type: Anchorable
  - type: Damageable
    damageContainer: Inorganic
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -313,7 +313,7 @@
  name: mirror shield
  parent: BaseShield
  id: MirrorShield
-  description: Eerily glows red... you hear the geometer whispering
+  description: Glows an eerie red. You hear the Geometer whispering...
  components:
    - type: Sprite
      state: mirror-icon
@@ -321,6 +321,7 @@
      heldPrefix: mirror
    - type: Reflect
      reflectProb: 0.95
+      innate: true
      reflects:
        - Energy
    - type: Blocking #Mirror shield reflects heat/laser, but is relatively weak to everything else.
@@ -408,6 +409,7 @@
    - type: Reflect
      enabled: false
      reflectProb: 0.95
+      innate: true
      reflects:
        - Energy
    - type: Blocking
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -42,6 +42,8 @@
  - type: SolutionTransfer
    maxTransferAmount: 30
    canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: drink
  - type: UserInterface
    interfaces:
      enum.TransferAmountUiKey.Key:
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -48,6 +48,8 @@
  - type: SolutionTransfer
    maxTransferAmount: 30
    canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: beaker
  - type: UserInterface
    interfaces:
      enum.TransferAmountUiKey.Key:
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -136,6 +136,8 @@
    solution: beaker
  - type: SolutionTransfer
    canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: beaker
  - type: UserInterface
    interfaces:
      enum.TransferAmountUiKey.Key:
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  abstract: true
  parent: BaseItem
  id: GasTankBase
@@ -238,3 +238,6 @@
    outputPressure: 101.3
  - type: Clothing
    sprite: Objects/Tanks/plasma.rsi
+    slots:
+    - Belt
+    - suitStorage
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -30,6 +30,39 @@
  - type: IgniteOnCollide
    fireStacks: 0.35

+- type: entity
+  noSpawn: true
+  parent: BaseBulletTrigger
+  id: ProjectileDragonsBreath
+  name: dragon's breath
+  description: Try not to get toasted.
+  components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 3.0
+    energy: 5.0
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: fireball
+      shader: unshaded
+  - type: IgnitionSource
+    temperature: 1000
+    ignited: true
+  - type: RepeatingTrigger
+    delay: 0.5 # line of fire as well as if it hits something
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
+    intensitySlope: 1
+    maxIntensity: 3
+    canCreateVacuum: false
+    deleteAfterExplosion: false
+    repeatable: true
+  - type: TimedDespawn
+    lifetime: 5
+
 - type: entity
  id: ProjectileAnomalyFireball
  name: fireball
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,6 +78,8 @@
    malus: 0
  - type: Reflect
    enabled: false
+    reflectProb: 0.5
+    minReflectProb: 0.25
  - type: IgnitionSource
    temperature: 700

@@ -218,7 +220,7 @@
  name: double-bladed energy sword
  parent: EnergySword
  id: EnergySwordDouble
-  description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
+  description: Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
  components:
  - type: EnergySword
  - type: ItemToggle
@@ -269,7 +271,8 @@
    size: Small
    sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
  - type: Reflect
-    reflectProb: .75
+    reflectProb: .80
+    minReflectProb: .65
    spread: 75
  - type: UseDelay
    delay: 1
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,12 +13,17 @@
    attackRate: 1.5
    damage:
      types:
-        Slash: 17 #cmon, it has to be at least BETTER than the rest.
+        Slash: 15
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Reflect
    enabled: true
-    reflectProb: .1
+    # Design intent: a robust captain or tot can sacrifice movement to make the most of this weapon, but they have to
+    # really restrict themselves to walking speed or less.
+    reflectProb: 0.5
+    velocityBeforeNotMaxProb: 1.0
+    velocityBeforeMinProb: 3.0
+    minReflectProb: 0.1
    spread: 90
  - type: Item
    size: Normal
@@ -83,6 +88,9 @@
    - Back
    - Belt
  - type: Reflect
+    reflectProb: 0.3
+    velocityBeforeNotMaxProb: 6.0 # don't punish ninjas for being ninjas
+    velocityBeforeMinProb: 10.0

 - type: entity
  name: machete
@@ -152,7 +160,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 16
+        Slash: 15
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -164,7 +172,7 @@
  name: The Throngler
  parent: BaseItem
  id: Throngler
-  description: Why would you make this?
+  description: Why would someone make this?
  components:
    - type: Sharp
    - type: Sprite
@@ -185,7 +193,10 @@
        path: /Audio/Effects/explosion_small1.ogg
    - type: Reflect
      enabled: true
-      reflectProb: .25
+      reflectProb: 0.5 # In robust hands, deflects as well as an e-sword
+      velocityBeforeNotMaxProb: 1.0
+      velocityBeforeMinProb: 3.0
+      minReflectProb: 0.1
      spread: 90
    - type: Item
      size: Ginormous
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -6,6 +6,11 @@
  description: Necessary for connecting two space craft together.
  components:
  - type: Docking
+  - type: DockingSignalControl
+  - type: DeviceLinkSource
+    ports:
+      - DoorStatus
+      - DockStatus
  - type: Fixtures
    fixtures:
      fix1:
@@ -75,7 +80,6 @@
  suffix: Glass, Docking
  description: Necessary for connecting two space craft together.
  components:
-  - type: Docking
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
    snapCardinals: false
@@ -127,7 +131,6 @@
  suffix: Glass, Docking
  description: Necessary for connecting two space craft together.
  components:
-  - type: Docking
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
    snapCardinals: false
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -51,6 +51,10 @@
      disposals: !type:Container
  - type: Physics
    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
  - type: Construction
    graph: Toilet
    node: toilet
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -91,7 +91,7 @@
    bulb: Tube
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: ContainerContainer
    containers:
      light_bulb: !type:ContainerSlot
@@ -132,7 +132,7 @@
    hasLampOnSpawn: LightTube
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: AmbientOnPowered
  - type: AmbientSound
    volume: -15
@@ -151,7 +151,7 @@
    hasLampOnSpawn: LedLightTube
    damage:
      types:
-        Heat: 2.5
+        Heat: 1 #LEDs don't get as hot
  - type: PointLight
    radius: 15
    energy: 1
@@ -173,19 +173,19 @@
 - type: entity
  id: PoweredlightExterior
  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Blue
+  suffix: Exterior
  parent: Poweredlight
  components:
  - type: PoweredLight
    hasLampOnSpawn: ExteriorLightTube
    damage:
      types:
-        Heat: 5
+        Heat: 4 #brighter light gets hotter

 - type: entity
  parent: AlwaysPoweredWallLight
  id: AlwaysPoweredLightExterior
-  suffix: Always Powered, Blue
+  suffix: Always Powered, Exterior
  components:
  - type: PointLight
    radius: 12
@@ -204,7 +204,7 @@
    hasLampOnSpawn: SodiumLightTube
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 10
    energy: 2.5
@@ -291,7 +291,7 @@
    bulb: Bulb
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DeviceNetwork
@@ -330,7 +330,7 @@
    hasLampOnSpawn: LedLightBulb
    damage:
      types:
-        Heat: 2.5
+        Heat: 1

 - type: entity
  id: PoweredSmallLight
@@ -345,7 +345,7 @@
    hasLampOnSpawn: LightBulb
    damage:
      types:
-        Heat: 5
+        Heat: 2

 #Emergency Lights
 - type: entity
@@ -400,7 +400,7 @@
    hasLampOnSpawn: LightTubeCrystalCyan
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
@@ -427,7 +427,7 @@
    hasLampOnSpawn: LightTubeCrystalBlue
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
@@ -454,7 +454,7 @@
    hasLampOnSpawn: LightTubeCrystalPink
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
@@ -481,7 +481,7 @@
    hasLampOnSpawn: LightTubeCrystalOrange
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
@@ -508,7 +508,7 @@
    hasLampOnSpawn: LightTubeCrystalRed
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
@@ -535,7 +535,7 @@
    hasLampOnSpawn: LightTubeCrystalGreen
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: PointLight
    radius: 8
    energy: 3
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -79,7 +79,7 @@
    bulb: Tube
    damage:
      types:
-        Heat: 20
+        Heat: 2
  - type: ContainerContainer
    containers:
      light_bulb: !type:ContainerSlot
@@ -124,7 +124,7 @@
    hasLampOnSpawn: LightTube
    damage:
      types:
-        Heat: 20
+        Heat: 2
  - type: StaticPrice
    price: 25
  - type: AmbientOnPowered
@@ -153,7 +153,7 @@
    hasLampOnSpawn: LedLightTube
    damage:
      types:
-        Heat: 20
+        Heat: 1
  - type: StaticPrice
    price: 25
  - type: AmbientOnPowered
--- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -89,7 +89,7 @@
    on: false
    damage:
      types:
-        Heat: 5
+        Heat: 2
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DeviceNetwork
@@ -145,4 +145,4 @@
    volume: 0
    range: 10
    sound:
-      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
+      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -129,6 +129,7 @@
    - PlushiePenguin
    - PlushieHuman
    - ClothingHeadHatCowboyRed
+    - Whistle
  - type: WiresPanel
  - type: Wires
    layoutId: Arcade
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -50,9 +50,44 @@
  - type: ResearchClient
  - type: TechnologyDatabase

+# a lathe that can be sped up with space lube / slowed down with glue
+- type: entity
+  abstract: true
+  parent: BaseLathe
+  id: BaseLatheLube
+  components:
+  - type: ReagentSpeed
+    solution: lube
+    modifiers:
+      SpaceLube: 0.25
+      SpaceGlue: 5
+  - type: SolutionContainerManager
+    solutions:
+      lube:
+        maxVol: 250
+  - type: Spillable
+    solution: lube
+  - type: RefillableSolution
+    solution: lube
+  - type: ExaminableSolution
+    solution: lube
+
+- type: entity
+  abstract: true
+  id: BaseHyperlathe
+  components:
+  - type: Lathe
+    materialUseMultiplier: 0.5
+    timeMultiplier: 1.5
+  - type: LatheHeatProducing
+  - type: ReagentSpeed
+    modifiers:
+      SpaceLube: 0.8 # being faster means less heat so lube needs to be nerfed
+      SpaceGlue: 5 # no change from normal lathe, overheat!!!
+
 - type: entity
  id: Autolathe
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: autolathe
  description: It produces items using metal and glass.
  components:
@@ -215,22 +250,18 @@

 - type: entity
  id: AutolatheHyperConvection
-  parent: Autolathe
+  parent: [Autolathe, BaseHyperlathe]
  name: hyper convection autolathe
  description: A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
  components:
  - type: Sprite
    sprite: Structures/Machines/autolathe_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
  - type: Machine
    board: AutolatheHyperConvectionMachineCircuitboard

 - type: entity
  id: Protolathe
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: protolathe
  description: Converts raw materials into useful objects.
  components:
@@ -334,22 +365,18 @@

 - type: entity
  id: ProtolatheHyperConvection
-  parent: Protolathe
+  parent: [Protolathe, BaseHyperlathe]
  name: hyper convection protolathe
  description: A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
  components:
  - type: Sprite
    sprite: Structures/Machines/protolathe_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
  - type: Machine
    board: ProtolatheHyperConvectionMachineCircuitboard

 - type: entity
  id: CircuitImprinter
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: circuit imprinter
  description: Prints circuit boards for machines.
  components:
@@ -470,22 +497,18 @@

 - type: entity
  id: CircuitImprinterHyperConvection
-  parent: CircuitImprinter
+  parent: [CircuitImprinter, BaseHyperlathe]
  name: hyper convection circuit imprinter
  description: A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively.
  components:
  - type: Sprite
    sprite: Structures/Machines/circuit_imprinter_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
  - type: Machine
    board: CircuitImprinterHyperConvectionMachineCircuitboard

 - type: entity
  id: ExosuitFabricator
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: exosuit fabricator
  description: Creates parts for robotics and other mechanical needs
  components:
@@ -643,7 +666,7 @@

 - type: entity
  id: SecurityTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: security techfab
  description: Prints equipment for use by security crew.
  components:
@@ -764,7 +787,7 @@

 - type: entity
  id: AmmoTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: ammo techfab
  description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy.
  components:
@@ -815,7 +838,7 @@

 - type: entity
  id: MedicalTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
  name: medical techfab
  description: Prints equipment for use by the medbay.
  components:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -96,6 +96,9 @@
        enabled:
          True: { state: gasFilterFOn }
          False: { state: gasFilterF }
+  - type: Construction
+    node: filterflipped
+
  - type: PipeColorVisuals
  - type: NodeContainer
    nodes:
@@ -196,6 +199,8 @@
        !type:PipeNode
        nodeGroupID: Pipe
        pipeDirection: North
+  - type: Construction
+    node: mixerflipped

 - type: entity
  parent: GasPipeBase
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -271,6 +271,8 @@
          bounds: "-0.25,-0.5,0.5,0.5"
        mask:
        - SubfloorMask
+  - type: Construction
+    node: routerflipped

 - type: entity
  id: DisposalJunction
@@ -353,6 +355,8 @@
          bounds: "-0.25,-0.5,0.5,0.5"
        mask:
        - SubfloorMask
+  - type: Construction
+    node: junctionflipped

 - type: entity
  id: DisposalYJunction
@@ -489,3 +493,5 @@
        pipe:
          Free: { state: signal-router-flipped-free }
          Anchored: { state: signal-router-flipped }
+  - type: Construction
+    node: signal_router_flipped
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -5,6 +5,8 @@
  placement:
    mode: SnapgridCenter
  components:
+  - type: Pullable
+  - type: Anchorable
  - type: Sprite
    sprite: Structures/Storage/morgue.rsi
    layers:
@@ -28,11 +30,11 @@
        shape:
          !type:PhysShapeAabb
          bounds: "-0.5,-0.5,0.5,0.5"
-        density: 190
+        density: 1000
        mask:
        - MachineMask
        layer:
-        - WallLayer
+        - HalfWallLayer
  - type: EntityStorage
    isCollidableWhenOpen: true
    showContents: false
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -27,9 +27,9 @@
          bounds: "-0.3,-0.3,0.3,0.3"
        density: 140
        mask:
-        - MachineMask
+        - TableMask
        layer:
-        - MachineLayer
+        - TableLayer
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic