cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork

Browse Source 
Notes:
Fucking hell. Makes the detective backend shit non-retarded. <3 Hashtables.
Map changes. Some improvements/adjustments to code to work with the map changes.

Conflicts:
	baystation12.dme
This commit is contained in:
Erthilo
2012-05-10 16:48:01 +01:00
parent 71eec72e40 caae780677
commit 08191c824d
18 changed files with 4752 additions and 4564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Cael_Aislinn/MultiZ.dm
+9 -9
View File
@@ -195,15 +195,15 @@
..()
*/
var/obj/effect/decal/cleanable/blood/B = new(src.loc)
var/list/blood_DNA_temp[1]
blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
B.blood_DNA = blood_DNA_temp
B.virus2 = H.virus2
for(var/datum/disease/D in H.viruses)
var/datum/disease/newDisease = new D.type
B.viruses += newDisease
newDisease.holder = B
// var/obj/effect/decal/cleanable/blood/B = new(src.loc)
// var/list/blood_DNA_temp[1]
// blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
// B.blood_DNA = blood_DNA_temp
// B.virus2 = H.virus2
// for(var/datum/disease/D in H.viruses)
// var/datum/disease/newDisease = new D.type
// B.viruses += newDisease
// newDisease.holder = B
H:weakened = max(H:weakened,2)
H:updatehealth()