From f6714a5927587430b9a7da0e507029825966e159 Mon Sep 17 00:00:00 2001
From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Date: Thu, 28 Mar 2024 22:56:14 +0100
Subject: [PATCH 1/2] Makes mail teleporter craftable. (#832)

* Makes mail teleporter craftable.

Makes a mail teleporter craftable and only provides the board to the LO's locker.
The point of this PR is to allow courier's to perhaps still be able to keep goin, even if the mail teleporter that was mapped was nuked/destroyed/vanished.
To-do:
Figure out why it gives an error and not make it when you do all steps and screwdriver it.

* makes it craftable.

* Makes it work

* Update mailTeleporter.yml

* Update heads.yml

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
---
 .../Objects/Devices/CircuitBoards/production.yml | 16 ++++++++++++++++
 .../Structures/Machines/mailTeleporter.yml       | 14 ++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index 0e4c262b543..fc40ea16397 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -65,3 +65,19 @@
     - type: ReverseEngineering
       recipes:
         - DeepFryerMachineCircuitboard
+
+- type: entity
+  id: MailTeleporterMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: mail teleporter machine board
+  components:
+    - type: Sprite
+      state: supply
+    - type: MachineBoard
+      prototype: MailTeleporter
+      requirements:
+        Capacitor: 1
+        MatterBin: 1
+      materialRequirements:
+        Steel: 4
+        Cable: 4
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
index 9bcaef52bbf..6430e94105a 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MailTeleporter
-  parent: BaseStructureDynamic
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: mail teleporter
   description: Teleports mail addressed to the crew of this station.
   components:
@@ -37,11 +37,11 @@
         !type:DamageTrigger
         damage: 75
       behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: machineFrame
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: ApcPowerReceiver
@@ -56,3 +56,5 @@
           True: {visible: true}
           False: {visible: false}
   - type: PowerSwitch
+  - type: Machine
+    board: MailTeleporterMachineCircuitboard

From fd3b1b0b3c3353b3c9cf7950077e055ad1d41f66 Mon Sep 17 00:00:00 2001
From: Fluffiest Floofers <thebluewulf@gmail.com>
Date: Fri, 29 Mar 2024 21:46:22 +0100
Subject: [PATCH 2/2] Migrate MagicalLamp to Lamp (#1034)

* bye funny magic lamp

* buh
---
 Resources/Migrations/deltaMigrations.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml
index 5081d04dc5d..ad30788a9a5 100644
--- a/Resources/Migrations/deltaMigrations.yml
+++ b/Resources/Migrations/deltaMigrations.yml
@@ -99,3 +99,7 @@ SpaceTickSpawnerNPC: SpaceTickSpawner
 # 2024-03-07
 LockableButtonBrig: LockableButtonSecurity
 SignDirectionalICU: SignDirectionalIcu
+
+# 2024-03-29
+#Remove whenever holoparasite isn't broken I suppose
+MagicalLamp: Lamp