From 63de9f1019fd231693108bcf7ae7bf66521ec61e Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Wed, 20 Mar 2013 08:20:39 -0300 Subject: [PATCH 1/2] Fixes a runtime regarding the construction of standard airlocks. Changed two if checks [if (var == "")] for [if(!var)] --- code/game/objects/structures/door_assembly.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 3da595321e0..a214f18191b 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -538,14 +538,17 @@ obj/structure/door_assembly // and mineral doors. |- Ricotez if (mineral) if(mineral == "glass") - if(typetext == "") + if(!typetext) airlock_type = /obj/machinery/door/airlock/glass else airlock_type = text2path("/obj/machinery/door/airlock/glass_[typetext]") else airlock_type = text2path("/obj/machinery/door/airlock/[mineral]") else - airlock_type = text2path("/obj/machinery/door/airlock/[typetext]") + if(!typetext) + airlock_type = /obj/machinery/door/airlock + else + airlock_type = text2path("/obj/machinery/door/airlock/[typetext]") door = new src.airlock_type( src.loc ) //door.req_access = src.req_access door.electronics = src.electronics From ae0c91e8a207e87a118b2d00c74f90c2fac2a6d4 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Wed, 20 Mar 2013 10:25:38 -0300 Subject: [PATCH 2/2] Removed the stun of the electric chair. It was a 10 minute stun. It's open for discussion. --- code/game/objects/structures/electricchair.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 200f0142979..7f2c9572533 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -69,7 +69,6 @@ buckled_mob << "You feel a deep shock course through your body!" sleep(1) buckled_mob.burn_skin(85) - buckled_mob.Stun(600) visible_message("The electric chair went off!", "You hear a deep sharp shock!") A.power_light = light