From 1b914dd3a36962af3a1bde97588d49d40a4f0a84 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Tue, 23 Jan 2018 21:16:56 +0500 Subject: [PATCH] minor edits and a fix --- code/game/machinery/doors/airlock.dm | 3 ++- code/game/objects/structures/door_assembly.dm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 58fbecd1987..5f12a4f0076 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -56,7 +56,7 @@ var/list/airlock_overlays = list() var/obj/item/weapon/airlock_electronics/electronics = null var/hasShocked = 0 //Prevents multiple shocks from happening var/obj/item/weapon/note //Any papers pinned to the airlock - var/previous_airlock //what airlock assembly mineral plating was applied to + var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass" var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock @@ -435,6 +435,7 @@ About the new airlock wires panel: if("deny") if(!stat) update_icon(AIRLOCK_DENY) + playsound(src,doorDeni,50,0,3) sleep(6) update_icon(AIRLOCK_CLOSED) icon_state = "closed" diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 967e7c8034b..60f5a4003c7 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -2,8 +2,8 @@ name = "airlock assembly" icon = 'icons/obj/doors/airlocks/station/public.dmi' icon_state = "construction" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES var/mineral = null @@ -22,6 +22,7 @@ /obj/structure/door_assembly/New() update_icon() update_name() + ..() /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics)