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
This commit is contained in:
petethegoat@gmail.com
2012-10-15 16:45:18 +00:00
parent 606e40729a
commit cfb1ad5551
5 changed files with 26 additions and 12 deletions

View File

@@ -5,6 +5,7 @@
name = "Air Vent" name = "Air Vent"
desc = "Has a valve and pump attached to it" desc = "Has a valve and pump attached to it"
var/area/initial_loc
level = 1 level = 1
var/area_uid var/area_uid
var/id_tag = null var/id_tag = null
@@ -41,10 +42,10 @@
icon_state = "in" icon_state = "in"
New() New()
var/area/A = get_area(loc) initial_loc = get_area(loc)
if (A.master) if (initial_loc.master)
A = A.master initial_loc = initial_loc.master
area_uid = A.uid area_uid = initial_loc.uid
if (!id_tag) if (!id_tag)
assign_uid() assign_uid()
id_tag = num2text(uid) id_tag = num2text(uid)
@@ -321,3 +322,8 @@
"You hear ratchet.") "You hear ratchet.")
new /obj/item/pipe(loc, make_from=src) new /obj/item/pipe(loc, make_from=src)
del(src) del(src)
/obj/machinery/atmospherics/unary/vent_pump/Del()
initial_loc.air_scrub_info -= id_tag
..()
return

View File

@@ -7,6 +7,7 @@
level = 1 level = 1
var/area/initial_loc
var/id_tag = null var/id_tag = null
var/frequency = 1439 var/frequency = 1439
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
@@ -24,10 +25,10 @@
var/radio_filter_out var/radio_filter_out
var/radio_filter_in var/radio_filter_in
New() New()
var/area/A = get_area(loc) initial_loc = get_area(loc)
if (A.master) if (initial_loc.master)
A = A.master initial_loc = initial_loc.master
area_uid = A.uid area_uid = initial_loc.uid
if (!id_tag) if (!id_tag)
assign_uid() assign_uid()
id_tag = num2text(uid) id_tag = num2text(uid)
@@ -257,3 +258,8 @@
"You hear ratchet.") "You hear ratchet.")
new /obj/item/pipe(loc, make_from=src) new /obj/item/pipe(loc, make_from=src)
del(src) del(src)
/obj/machinery/atmospherics/unary/vent_scrubber/Del()
initial_loc.air_scrub_info -= id_tag
..()
return

View File

@@ -109,6 +109,7 @@ var/list/sacrificed = list()
"\red You hear an anguished scream.") "\red You hear an anguished scream.")
if(is_convertable_to_cult(M.mind)) if(is_convertable_to_cult(M.mind))
ticker.mode.add_cultist(M.mind) ticker.mode.add_cultist(M.mind)
M.mind.special_role = "Cultist"
M << "<font color=\"purple\"><b><i>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.</b></i></font>" M << "<font color=\"purple\"><b><i>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.</b></i></font>"
M << "<font color=\"purple\"><b><i>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.</b></i></font>" M << "<font color=\"purple\"><b><i>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.</b></i></font>"
return 1 return 1
@@ -390,6 +391,7 @@ var/list/sacrificed = list()
else else
ticker.mode.cult+=D.mind ticker.mode.cult+=D.mind
D.mind.special_role = "Cultist"
D << "<font color=\"purple\"><b><i>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.</b></i></font>" D << "<font color=\"purple\"><b><i>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.</b></i></font>"
D << "<font color=\"purple\"><b><i>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.</b></i></font>" D << "<font color=\"purple\"><b><i>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.</b></i></font>"

View File

@@ -194,11 +194,11 @@ obj/machinery/hydroponics/proc/updateicon()
if(src.harvest) if(src.harvest)
overlays += image('icons/obj/hydroponics.dmi', icon_state="over_harvest3") overlays += image('icons/obj/hydroponics.dmi', icon_state="over_harvest3")
if(!luminosity) if(istype(myseed,/obj/item/seeds/glowshroom))
if(istype(myseed,/obj/item/seeds/glowshroom)) SetLuminosity(round(myseed.potency/10))
SetLuminosity(round(myseed.potency/10))
else else
SetLuminosity(0) SetLuminosity(0)
return return

View File

@@ -143,7 +143,7 @@
if(istype(W, /obj/item/weapon/screwdriver)) if(istype(W, /obj/item/weapon/screwdriver))
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.") 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() T.ReplaceWithWall()
else else
T.ReplaceWithMineralWall(mineral) T.ReplaceWithMineralWall(mineral)