From b56aefae74e07a8cdadc4361aae2ec8872ddfc64 Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 22 Feb 2016 18:51:33 +0100 Subject: [PATCH] Makes burglar alerts activate poddoors. Adds generic lock/unlock helpers to /door --- code/game/area/areas.dm | 5 ++--- code/game/machinery/doors/airlock.dm | 6 ++++++ code/game/machinery/doors/door.dm | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 46a0943b171..4a193ebea4d 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -166,12 +166,11 @@ //Trigger alarm effect RA.set_fire_alarm_effect() //Lockdown airlocks - for(var/obj/machinery/door/airlock/DOOR in RA) + for(var/obj/machinery/door/DOOR in RA) spawn(0) DOOR.close() if(DOOR.density) - DOOR.locked = 1 - DOOR.update_icon() + DOOR.lock() for (var/obj/machinery/camera/C in RA) cameras += C diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5d19a01de31..1d700fb7598 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -80,12 +80,18 @@ var/list/airlock_overlays = list() airlock_material = "glass" update_icon() +/obj/machinery/door/airlock/lock() + bolt() + /obj/machinery/door/airlock/proc/bolt() if(locked) return locked = 1 update_icon() +/obj/machinery/door/airlock/unlock() + unbolt() + /obj/machinery/door/airlock/proc/unbolt() if(!locked) return diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 5f1322f6a32..bf5497f1b7e 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -269,4 +269,10 @@ icon = 'icons/obj/doors/doormorgue.dmi' /obj/machinery/door/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) - return 0 \ No newline at end of file + return 0 + +/obj/machinery/door/proc/lock() + return + +/obj/machinery/door/proc/unlock() + return \ No newline at end of file