From a47109950cdcf3a5dc73c6798d9e9a8e581e95a7 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Fri, 20 Jul 2012 12:01:02 +0300 Subject: [PATCH] Removed null organ debugging (no conclusive results) and broken access changing on airlocks during air alarms --- code/game/machinery/alarm.dm | 16 ++++++++-------- code/modules/mob/organ/organ_external.dm | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 87a5db7820b..c5143b9ceda 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -360,22 +360,22 @@ if(!E.density) spawn(0) E.close() - sleep(10) + /*sleep(10) if(E.density) E:air_locked = E.req_access E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon() + E.update_icon()*/ if(E.operating) spawn(10) E.close() - if(E.density) + /*if(E.density) E:air_locked = E.req_access E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon() - else if(!E:locked) //Don't lock already bolted doors. + E.update_icon()*/ + /*else if(!E:locked) //Don't lock already bolted doors. E:air_locked = E.req_access E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon() + E.update_icon()*/ proc/air_doors_open(manual) var/area/A = get_area(loc) @@ -391,13 +391,13 @@ E.open() continue - if(istype(E, /obj/machinery/door/airlock)) + /*if(istype(E, /obj/machinery/door/airlock)) if((!E:arePowerSystemsOn()) || (E.stat & NOPOWER)) continue if(!isnull(E:air_locked)) //Don't mess with doors locked for other reasons. if(E.density) E:req_access = E:air_locked E:air_locked = null - E.update_icon() + E.update_icon()*/ /////////// //HACKING// diff --git a/code/modules/mob/organ/organ_external.dm b/code/modules/mob/organ/organ_external.dm index 86a72ad8d32..8a2bb5d98c2 100644 --- a/code/modules/mob/organ/organ_external.dm +++ b/code/modules/mob/organ/organ_external.dm @@ -84,11 +84,11 @@ min_broken_damage = 15 body_part = HAND_LEFT -/datum/organ/Del() +/*/datum/organ/Del() CRASH("Some dawg tried to delete this sexy datum. Here's the data.") /obj/item/weapon/organ/Del() - CRASH("Some dawg tried to delete this sexy organ. Here's the data.") + CRASH("Some dawg tried to delete this sexy organ. Here's the data.")*/ obj/item/weapon/organ