Made fires be garbage collected and not hard deleted on demand.

Committing for S0ldi3rKr4s0 (I hate your name).

Fixes some typos in blueprints.dm, designs.dm, dna_mutations.dm, gift_wrappaper.dm and research.dm.
Gives minerborg some eyes to signify activity (finally)
Made pAI cards need only programming 2.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5452 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2013-01-02 17:30:40 +00:00
parent 0eee76d693
commit 78cc7379d4
8 changed files with 30 additions and 18 deletions
+22 -13
View File
@@ -97,13 +97,13 @@
var/turf/simulated/floor/location = loc
if(!istype(location))
del(src)
Kill()
if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1))
del(src)
Kill()
if(location.air.toxins < 0.5 || location.air.oxygen < 0.5)
del(src)
Kill()
perform_exposure()
@@ -137,18 +137,20 @@
return 0*/
return 1
// Garbage collect itself by nulling reference to it
/obj/effect/hotspot/New()
..()
dir = pick(cardinal)
return
/obj/effect/hotspot/Del()
if (istype(loc, /turf/simulated))
/obj/effect/hotspot/proc/Kill()
DestroyTurf()
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
loc:active_hotspot = null
if(T.active_hotspot == src)
T.active_hotspot = null
loc = null
/obj/effect/hotspot/proc/DestroyTurf()
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
if(T.to_be_destroyed)
var/chance_of_deletion
if (T.heat_capacity) //beware of division by zero
@@ -161,6 +163,13 @@
T.to_be_destroyed = 0
T.max_fire_temperature_sustained = 0
loc = null
/obj/effect/hotspot/New()
..()
dir = pick(cardinal)
return
/obj/effect/hotspot/Del()
if (istype(loc, /turf/simulated))
DestroyTurf()
..()
return
+1 -1
View File
@@ -64,7 +64,7 @@ move an amendment</a> to the drawing.</p>
"}
if (AREA_SPECIAL)
text += {"
<p>This place doesn't noted on these blueprints.</p>
<p>This place isn't noted on these blueprints.</p>
"}
else
return
@@ -191,4 +191,4 @@
else
user << "\blue You need more paper."
else
user << "Theyre moving around too much. a Straitjacket would help."
user << "They are moving around too much. A straightjacket would help."
@@ -779,6 +779,9 @@
if(icon_state =="mopgearrex")
overlays = null
overlays += "eyes-mopgearrex"
if(icon_state =="Miner")
overlays = null
overlays += "eyes-Miner"
else
overlays -= "eyes"
+1 -1
View File
@@ -582,7 +582,7 @@ datum/design/paicard
name = "Personal Artificial Intelligence Card"
desc = "Allows for the construction of a pAI Card"
id = "paicard"
req_tech = list("programming" = 3)
req_tech = list("programming" = 2)
build_type = PROTOLATHE
materials = list("$glass" = 500, "$metal" = 500)
build_path = "/obj/item/device/paicard"
+1 -1
View File
@@ -231,7 +231,7 @@ datum/tech/syndicate
/*
datum/tech/arcane
name = "Arcane Research"
desc = "Research into the acult and arcane field for use in practical science"
desc = "Research into the occult and arcane field for use in practical science"
id = "arcane"
level = 0 //It didn't become "secret" as advertised.
+1 -1
View File
@@ -66,7 +66,7 @@ This system could be expanded to migrate all of our current mutations to. Maybe.
required = 2
get_mutation(var/mob/living/carbon/M)
M << "\blue You a pleasant warmth pulse throughout your body..."
M << "\blue You feel a pleasant warmth pulse throughout your body..."
M.mutations.Add(HEAL)
/* /datum/mutationreq :
Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB