Merge pull request #227 from SkyMarshal/master

Bug fixes.
This commit is contained in:
SkyMarshal
2012-01-05 16:20:26 -08:00
4 changed files with 5 additions and 4 deletions
+1
View File
@@ -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)
+2 -1
View File
@@ -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.
+1 -2
View File
@@ -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
+1 -1
View File
@@ -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 = "<p>There is some old writing on this floor. You are barely able to read out a few lines from a tangled scribble.</p><p>In a chamber a great mirror lies, cut away it solemn cries. Travel bold as thou might, piercing vastness as a kite.</p><p>HONK!</p>"; 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)