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

Lack of blood_DNA will no longer lead to all blood mysteriously evaporating.

Browse Source
This commit is contained in:
cib
2012-05-24 10:44:04 +02:00
parent 8f093dea2f
commit 636b2d573a
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -103,7 +103,7 @@ datum
color = "#C80000" // rgb: 200, 0, 0 color = "#C80000" // rgb: 200, 0, 0
on_mob_life(var/mob/living/M) on_mob_life(var/mob/living/M)
if(!data || !data["blood_type"]) if(!data || !data["blood_type"])
..() return
else if(istype(M, /mob/living/carbon/human) && blood_incompatible(data["blood_type"],M.dna.b_type) && !M.changeling) else if(istype(M, /mob/living/carbon/human) && blood_incompatible(data["blood_type"],M.dna.b_type) && !M.changeling)
M.adjustToxLoss(rand(0.5,1.5)) M.adjustToxLoss(rand(0.5,1.5))
M.adjustOxyLoss(rand(1,1.5)) M.adjustOxyLoss(rand(1,1.5))
@@ -136,18 +136,6 @@ datum
M:virus2.dead = 1 M:virus2.dead = 1
/*
if(self.data["virus"])
var/datum/disease/V = self.data["virus"]
if(M.resistances.Find(V.type)) return
if(method == TOUCH)//respect all protective clothing...
M.contract_disease(V)
else //injected
M.contract_disease(V, 1, 0)
return
*/
reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place
if(!istype(T)) return if(!istype(T)) return
var/datum/reagent/blood/self = src var/datum/reagent/blood/self = src
@@ -172,15 +160,6 @@ datum
if(v) if(v)
blood_prop.virus2 = v.getcopy() blood_prop.virus2 = v.getcopy()
// this makes it almost impossible for airborne diseases to spread
// THIS SHIT HAS TO GO, SORRY!
/*
if(T.density==0)
newVirus.spread_type = CONTACT_FEET
else
newVirus.spread_type = CONTACT_HANDS
*/
else if(istype(self.data["donor"], /mob/living/carbon/monkey)) else if(istype(self.data["donor"], /mob/living/carbon/monkey))
var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
if(!blood_prop) if(!blood_prop)