Merge branch 'master' into why

DeltaV-Station · Mar 30, 2024 · 2fbb342 · 2fbb342
2 parents c6699ac + fd3b1b0
commit 2fbb342
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git 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
diff --git 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
@@ -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