cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
CaelAislinn
2012-02-07 03:28:09 +10:00
parent 2c1940c5e7 3dd16986fc
commit 87838c7cc5
17 changed files with 99 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/detective_work.dm
View File

@@ -358,7 +358,7 @@ obj/machinery/computer/forensic_scanning
scan_process = 0
scan_name = scanning.name
scan_data = "<u>[scanning]</u><br><br>"
if (scanning.blood_DNA)
if (scanning.blood_DNA.len)
scan_data += "Blood Found:<br>"
for(var/i = 1, i < (scanning.blood_DNA.len + 1), i++)
var/list/templist = scanning.blood_DNA[i]