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 03d2cdc6115..3e4ac55d2de 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ