From b832e1b10635cffe76443414147374538cb17783 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 5 Jan 2012 17:18:23 -0700 Subject: [PATCH 1/2] Numerous bugfixes: Blob can be fire killed (I hope.) Cloning machines should back up to all cloning machines. Sacrifice can sacrifice cultists. (If you converted a sacrifice target.) Fixed a missing tag on a sorter. --- code/game/gamemodes/blob/theblob.dm | 1 + code/game/machinery/cloning.dm | 3 ++- code/game/magic/cultist/runes.dm | 3 +-- maps/tgstation.2.0.8.dmm | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 8788bb1ce4a..553783f8caf 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -172,6 +172,7 @@ temperature_expose(datum/gas_mixture/air, temperature, volume) if(temperature > T0C+200) health -= 0.01 * temperature + update() proc/expand(var/turf/T = null) if(!prob(health)) return//TODO: Change this to prob(health + o2 mols or such) if(!T) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index da43b4c1eb6..6572ca08817 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -350,7 +350,8 @@ if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning. R.fields["mind"] = "\ref[subject.mind]" - src.records += R + for(var/obj/machinery/computer/cloning/F in world) + F.records += R src.temp = "Subject successfully scanned." //Find a specific record by key. diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 2298af13fd9..ffbcc99a8c8 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -549,8 +549,7 @@ var/list/sacrificed = list() var/list/mob/living/carbon/human/cultsinrange = list() var/list/mob/living/carbon/human/victims = list() for(var/mob/living/carbon/human/V in src.loc) - if(!(iscultist(V))) - victims += V + victims += V for(var/mob/living/carbon/C in orange(1,src)) if(iscultist(C)) cultsinrange += C diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 40aa92b1dd5..3b047e11d7d 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -4124,7 +4124,7 @@ "bBp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bBq" = (/obj/structure/closet,/turf/simulated/floor/plating,/area/maintenance/apmaint) "bBr" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating{desc = "

There is some old writing on this floor. You are barely able to read out a few lines from a tangled scribble.

In a chamber a great mirror lies, cut away it solemn cries. Travel bold as thou might, piercing vastness as a kite.

HONK!

"; name = "Old Note #6"},/area/maintenance/apmaint) -"bBs" = (/obj/machinery/light/small{dir = 1},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = list("Engineering","Chief Engineer")},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"bBs" = (/obj/machinery/light/small{dir = 1},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = list("Engineering","Chief Engineer","Robotics")},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bBt" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/apmaint) "bBu" = (/obj/machinery/door/airlock/maintenance{name = "Firefighting equipment"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/apmaint) "bBv" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/helmet/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/maintenance/apmaint) From 5321041af635fa39d761b4eeaca80807ec4f1f5a Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 5 Jan 2012 17:19:57 -0700 Subject: [PATCH 2/2] Update code/game/gamemodes/blob/theblob.dm --- code/game/gamemodes/blob/theblob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 553783f8caf..e5041568d45 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -172,7 +172,7 @@ temperature_expose(datum/gas_mixture/air, temperature, volume) if(temperature > T0C+200) health -= 0.01 * temperature - update() + update() proc/expand(var/turf/T = null) if(!prob(health)) return//TODO: Change this to prob(health + o2 mols or such) if(!T)