From 78cc7379d48070612d027bfa7f94affcf26807f8 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
Date: Wed, 2 Jan 2013 17:30:40 +0000
Subject: [PATCH] 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
---
code/FEA/FEA_fire.dm | 35 +++++++++++-------
code/game/objects/items/blueprints.dm | 2 +-
.../objects/items/weapons/gift_wrappaper.dm | 2 +-
.../modules/mob/living/silicon/robot/robot.dm | 3 ++
code/modules/research/designs.dm | 2 +-
code/modules/research/research.dm | 2 +-
code/unused/dna_mutations.dm | 2 +-
icons/mob/robots.dmi | Bin 69502 -> 69556 bytes
8 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/code/FEA/FEA_fire.dm b/code/FEA/FEA_fire.dm
index 1ef4c74558f..1bd31295e88 100644
--- a/code/FEA/FEA_fire.dm
+++ b/code/FEA/FEA_fire.dm
@@ -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
\ No newline at end of file
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index e85867232b5..6847c684d17 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -64,7 +64,7 @@ move an amendment to the drawing.
"}
if (AREA_SPECIAL)
text += {"
-This place doesn't noted on these blueprints.
+This place isn't noted on these blueprints.
"}
else
return
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index c56a1acd86e..2f3e6960411 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -191,4 +191,4 @@
else
user << "\blue You need more paper."
else
- user << "Theyre moving around too much. a Straitjacket would help."
\ No newline at end of file
+ user << "They are moving around too much. A straightjacket would help."
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 479175007b6..f156a972b21 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -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"
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 71a82e18544..01a720bf302 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -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"
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 3f2462cb3c9..137d0ed8565 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -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.
diff --git a/code/unused/dna_mutations.dm b/code/unused/dna_mutations.dm
index 5ff2ec8185c..205798cd6ff 100644
--- a/code/unused/dna_mutations.dm
+++ b/code/unused/dna_mutations.dm
@@ -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 :
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 03d2cdc61158ca7e9da829283bc07f9a89d955c7..3e4ac55d2de05e06409ca458285f02ad59c28a56 100644
GIT binary patch
delta 6062
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