From cfb1ad5551394767af4b1c380fbb020304c2206c Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Mon, 15 Oct 2012 16:45:18 +0000 Subject: [PATCH] Committing for Aranclanos: Fixes issue 986. (Constructed normal walls named wrong) Fixes issue 1000. (Destroyed vent still shows up in air alarm) Fixes issue 1003. (Glowshrooms don't give off light when planted!) Fixes issue 1004. (Issues with (?) Command) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4884 316c924e-a436-60f5-8080-3fe189b3f50e --- code/ATMOSPHERICS/components/unary/vent_pump.dm | 14 ++++++++++---- .../ATMOSPHERICS/components/unary/vent_scrubber.dm | 14 ++++++++++---- code/game/gamemodes/cult/runes.dm | 2 ++ code/game/machinery/hydroponics.dm | 6 +++--- code/game/objects/structures/false_walls.dm | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index c4c9b50e59e..b58a12b8b80 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -5,6 +5,7 @@ name = "Air Vent" desc = "Has a valve and pump attached to it" + var/area/initial_loc level = 1 var/area_uid var/id_tag = null @@ -41,10 +42,10 @@ icon_state = "in" New() - var/area/A = get_area(loc) - if (A.master) - A = A.master - area_uid = A.uid + initial_loc = get_area(loc) + if (initial_loc.master) + initial_loc = initial_loc.master + area_uid = initial_loc.uid if (!id_tag) assign_uid() id_tag = num2text(uid) @@ -321,3 +322,8 @@ "You hear ratchet.") new /obj/item/pipe(loc, make_from=src) del(src) + + /obj/machinery/atmospherics/unary/vent_pump/Del() + initial_loc.air_scrub_info -= id_tag + ..() + return diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 6b14c0cd149..21484d25e19 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -7,6 +7,7 @@ level = 1 + var/area/initial_loc var/id_tag = null var/frequency = 1439 var/datum/radio_frequency/radio_connection @@ -24,10 +25,10 @@ var/radio_filter_out var/radio_filter_in New() - var/area/A = get_area(loc) - if (A.master) - A = A.master - area_uid = A.uid + initial_loc = get_area(loc) + if (initial_loc.master) + initial_loc = initial_loc.master + area_uid = initial_loc.uid if (!id_tag) assign_uid() id_tag = num2text(uid) @@ -257,3 +258,8 @@ "You hear ratchet.") new /obj/item/pipe(loc, make_from=src) del(src) + + /obj/machinery/atmospherics/unary/vent_scrubber/Del() + initial_loc.air_scrub_info -= id_tag + ..() + return diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 80aefacab18..a0b8c84a20a 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -109,6 +109,7 @@ var/list/sacrificed = list() "\red You hear an anguished scream.") if(is_convertable_to_cult(M.mind)) ticker.mode.add_cultist(M.mind) + M.mind.special_role = "Cultist" M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." return 1 @@ -390,6 +391,7 @@ var/list/sacrificed = list() else ticker.mode.cult+=D.mind + D.mind.special_role = "Cultist" D << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." D << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index f2c0abb759e..16fd85b8dc6 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -194,11 +194,11 @@ obj/machinery/hydroponics/proc/updateicon() if(src.harvest) overlays += image('icons/obj/hydroponics.dmi', icon_state="over_harvest3") - if(!luminosity) - if(istype(myseed,/obj/item/seeds/glowshroom)) - SetLuminosity(round(myseed.potency/10)) + if(istype(myseed,/obj/item/seeds/glowshroom)) + SetLuminosity(round(myseed.potency/10)) else SetLuminosity(0) + return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 7c0fe9edba7..b3e8f852125 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -143,7 +143,7 @@ if(istype(W, /obj/item/weapon/screwdriver)) var/turf/T = get_turf(src) user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.") - if(!mineral) + if(!mineral || mineral == "metal") T.ReplaceWithWall() else T.ReplaceWithMineralWall(mineral)