From f77a71fc04deba6b8127180b3d23ae8a3ac0dcbe Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Fri, 22 Feb 2013 02:06:02 +0000 Subject: [PATCH] This should fix the following runtimes: The following runtime has occured 18248 time(s). runtime error: Cannot execute null.IsIndexCut(). proc name: isWireCut (/obj/item/device/radio/proc/isWireCut) source file: radio.dm,185 usr: Azerthene Severn (/mob/living/carbon/human) src: the security radio headset (/obj/item/device/radio/headset/headset_sec/department/med) The following runtime has occured 165 time(s). runtime error: bad index proc name: recalculateChannels (/obj/item/device/radio/headset/proc/recalculateChannels) source file: headset.dm,261 usr: Burningface (/mob/new_player) src: the security radio headset (/obj/item/device/radio/headset/headset_sec/department/engi) It also makes the mirror automatically shave women when used. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5760 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Sigyn/Department Sec/jobs.dm | 1 + code/game/objects/structures/mirror.dm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm index 4ba263f8c8a..b0e35f845c1 100644 --- a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm +++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm @@ -88,6 +88,7 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") return 1 /obj/item/device/radio/headset/headset_sec/department/New() + ..() if(radio_controller) initialize() recalculateChannels() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index c6a448be97e..4e9e9f639a6 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -26,6 +26,8 @@ if(userloc != H.loc) return //no tele-grooming if(new_style) H.f_style = new_style + else + H.f_style = "Shaved" //handle normal hair var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in hair_styles_list