cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #651 from SkyMarshal/1bea197a

Browse Source 
Bugfixes for the blob, wardrobes, and detective work.
This commit is contained in:
SkyMarshal
2012-03-10 17:24:12 -08:00
parent 3eb2b5586e 1bea197a4c
commit e0171c4598
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/SkyMarshal/wardrobes.dm
+1
View File
@@ -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
code/game/events/EventProcs/miniblob.dm
+6 -1
View File
@@ -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')
code/modules/DetectiveWork/detective_work.dm
+10 -5
View File
@@ -261,7 +261,8 @@ obj/machinery/computer/forensic_scanning
if(blood && blood.len)
temp += "&nbsp<b>Blood:</b><br>"
for(var/j = 1, j <= blood.len, j++)
temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]<br>"
var/list/templist2 = blood[j]
temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [templist2[2]], DNA: [templist2[1]]<br>"
else
temp = "ERROR. Database not found!<br>"
temp += "<br><a href='?src=\ref[src];operation=database;delete_record=[href_list["identifier"]]'>{Delete this Dossier}</a>"
@@ -297,7 +298,8 @@ obj/machinery/computer/forensic_scanning
if(blood && blood.len)
P.info += "&nbsp<b>Blood:</b><br>"
for(var/j = 1, j <= blood.len, j++)
P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]<br>"
var/list/templist2 = blood[j]
P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [templist2[2]], DNA: [templist2[1]]<br>"
else
usr << "ERROR. Database not found!<br>"
if("auxiliary")
@@ -317,7 +319,8 @@ obj/machinery/computer/forensic_scanning
if(blood && blood.len)
temp += "&nbsp<b>Blood:</b><br>"
for(var/j = 1, j <= blood.len, j++)
temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]<br>"
var/list/templist2 = blood[j]
temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [templist2[2]], DNA: [templist2[1]]<br>"
else
temp = "ERROR. Database not found!<br>"
temp += "<br><a href='?src=\ref[src];operation=database;delete_aux=[href_list["identifier"]]'>{Delete This Record}</a>"
@@ -342,7 +345,9 @@ obj/machinery/computer/forensic_scanning
if(blood && blood.len)
P.info += "&nbsp<b>Blood:</b><br>"
for(var/j = 1, j <= blood.len, j++)
P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]<br>"
var/list/templist2 = blood[j]
P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [templist2[2]], DNA: [templist2[1]]<br>"
else
usr << "ERROR. Database not found!<br>"
if("scan")
@@ -382,7 +387,7 @@ obj/machinery/computer/forensic_scanning
scan_data += "Blood Found:<br>"
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]]<br><br>"
scan_data += "Blood type: [templist[2]]\nDNA: [templist[1]]<br><br>"
else
scan_data += "No Blood Found<br><br>"
if(!scanning.fingerprints)