From 3ede5aa47051cd2ae57e83d7735d94381fcf97ed Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 17 Jul 2014 19:59:07 -0400 Subject: [PATCH] Adds default values for some docking tags Simplifies the mapping of docking controllers by cutting down on the number of tags needed to be entered. Conflicts: code/game/machinery/embedded_controller/simple_docking_controller.dm --- .../game/machinery/embedded_controller/airlock_program.dm | 8 ++++---- .../embedded_controller/simple_docking_controller.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index 29b93b3583e..627f9844a35 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -35,10 +35,10 @@ if (istype(M, /obj/machinery/embedded_controller/radio/airlock)) //if our controller is an airlock controller than we can auto-init our tags var/obj/machinery/embedded_controller/radio/airlock/controller = M - tag_exterior_door = controller.tag_exterior_door - tag_interior_door = controller.tag_interior_door - tag_airpump = controller.tag_airpump - tag_chamber_sensor = controller.tag_chamber_sensor + tag_exterior_door = controller.tag_exterior_door? controller.tag_exterior_door : "[id_tag]_outer" + tag_interior_door = controller.tag_interior_door? controller.tag_interior_door : "[id_tag]_inner" + tag_airpump = controller.tag_airpump? controller.tag_airpump : "[id_tag]_pump" + tag_chamber_sensor = controller.tag_chamber_sensor? controller.tag_chamber_sensor : "[id_tag]_sensor" tag_exterior_sensor = controller.tag_exterior_sensor tag_interior_sensor = controller.tag_interior_sensor memory["secure"] = controller.tag_secure diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm index 93c325d4cc5..1883d363987 100644 --- a/code/game/machinery/embedded_controller/simple_docking_controller.dm +++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm @@ -58,7 +58,7 @@ if (istype(M, /obj/machinery/embedded_controller/radio/simple_docking_controller)) var/obj/machinery/embedded_controller/radio/simple_docking_controller/controller = M - tag_door = controller.tag_door + tag_door = controller.tag_door? controller.tag_door : "[id_tag]_hatch" spawn(10) signal_door("update") //signals connected doors to update their status