diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index d04a108570b..4017a15a7ca 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -5,6 +5,7 @@ icon_state = "wardrobe_sealed" item_state = "wardrobe" w_class = 4 + layer = BACKGROUND_LAYER + OBJ_LAYER var descriptor = "various clothing" seal_torn = 0 diff --git a/code/game/events/EventProcs/miniblob.dm b/code/game/events/EventProcs/miniblob.dm index 95fef4c910e..8f6f0883ee4 100644 --- a/code/game/events/EventProcs/miniblob.dm +++ b/code/game/events/EventProcs/miniblob.dm @@ -1,6 +1,11 @@ /proc/mini_blob_event() var/turf/T = pick(blobstart) + if(istype(T, turf/simulated/wall)) + T.ReplaceWithPlating() + for(var/atom/A in T) + if(A.density) + del(A) var/obj/effect/blob/bl = new /obj/effect/blob( T.loc, 30 ) spawn(0) bl.Life() @@ -14,7 +19,7 @@ dotheblobbaby() spawn(15000) blobevent = 0 - spawn(rand(30, 60)) //Delayed announcements to keep the crew on their toes. + spawn(rand(600, 1800)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()].", "Biohazard Alert") world << sound('outbreak5.ogg') diff --git a/code/modules/DetectiveWork/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm index 55f34ac5806..15ff3e9960f 100644 --- a/code/modules/DetectiveWork/detective_work.dm +++ b/code/modules/DetectiveWork/detective_work.dm @@ -261,7 +261,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) temp += " Blood:
" for(var/j = 1, j <= blood.len, j++) - temp += "      [blood[j]]
" + var/list/templist2 = blood[j] + temp += "      Type: [templist2[2]], DNA: [templist2[1]]
" else temp = "ERROR. Database not found!
" temp += "
{Delete this Dossier}" @@ -297,7 +298,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) P.info += " Blood:
" for(var/j = 1, j <= blood.len, j++) - P.info += "      [blood[j]]
" + var/list/templist2 = blood[j] + P.info += "      Type: [templist2[2]], DNA: [templist2[1]]
" else usr << "ERROR. Database not found!
" if("auxiliary") @@ -317,7 +319,8 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) temp += " Blood:
" for(var/j = 1, j <= blood.len, j++) - temp += "      [blood[j]]
" + var/list/templist2 = blood[j] + temp += "      Type: [templist2[2]], DNA: [templist2[1]]
" else temp = "ERROR. Database not found!
" temp += "
{Delete This Record}" @@ -342,7 +345,9 @@ obj/machinery/computer/forensic_scanning if(blood && blood.len) P.info += " Blood:
" for(var/j = 1, j <= blood.len, j++) - P.info += "      [blood[j]]
" + var/list/templist2 = blood[j] + P.info += "      Type: [templist2[2]], DNA: [templist2[1]]
" + else usr << "ERROR. Database not found!
" if("scan") @@ -382,7 +387,7 @@ obj/machinery/computer/forensic_scanning scan_data += "Blood Found:
" for(var/i = 1, i <= scanning.blood_DNA.len, i++) var/list/templist = scanning.blood_DNA[i] - scan_data += "-Blood type: [templist[2]]\nDNA: [templist[1]]

" + scan_data += "Blood type: [templist[2]]\nDNA: [templist[1]]

" else scan_data += "No Blood Found

" if(!scanning.fingerprints)