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

Made it possible for mob to be infected with several viruses at once.

Browse Source
This commit is contained in:
Chinsky
2013-06-09 13:31:16 +04:00
parent 5703b8089d
commit 7a8a822a92
16 changed files with 106 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defines.dm
+1 -2
View File
@@ -2,8 +2,7 @@
gender = MALE
var/list/stomach_contents = list()
var/brain_op_stage = 0.0
var/datum/disease2/disease/virus2 = null
var/list/datum/disease2/disease/resistances2 = list()
var/list/datum/disease2/disease/virus2 = list()
var/antibodies = 0
var/silent = null //Can't talk. Value goes down every life proc.
code/modules/mob/living/carbon/human/life.dm
+17 -16
View File
@@ -1326,28 +1326,29 @@
if(bodytemperature > 406)
for(var/datum/disease/D in viruses)
D.cure()
if(virus2) virus2.cure(src)
if(!virus2)
for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
if(B.virus2 && get_infection_chance())
infect_virus2(src,B.virus2)
for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
if(M.virus2 && get_infection_chance())
infect_virus2(src,M.virus2)
else
if(isnull(virus2)) // Trying to figure out a runtime error that keeps repeating
for (var/datum/disease2/disease/V in virus2)
V.cure(src)
for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
if(B.virus2.len && get_infection_chance(src))
for (var/datum/disease2/disease/V in B.virus2)
infect_virus2(src,V)
for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
if(M.virus2.len && get_infection_chance(src))
for (var/datum/disease2/disease/V in M.virus2)
infect_virus2(src,V)
for (var/datum/disease2/disease/V in virus2)
if(isnull(V)) // Trying to figure out a runtime error that keeps repeating
CRASH("virus2 nulled before calling activate()")
else
virus2.activate(src)
V.activate(src)
// activate may have deleted the virus
if(!virus2) return
if(!V) continue
// check if we're immune
if(virus2.antigen & src.antibodies) virus2.dead = 1
if(V.antigen & src.antibodies) V.dead = 1
return
return
proc/handle_stomach()
spawn(0)
code/modules/mob/living/carbon/monkey/life.dm
+20 -14
View File
@@ -150,28 +150,34 @@
emote("gasp")
updatehealth()
proc/handle_virus_updates()//copypaste from mob/carbon/human/life.dm
proc/handle_virus_updates()
if(status_flags & GODMODE) return 0 //godmode
if(bodytemperature > 406)
for(var/datum/disease/D in viruses)
D.cure()
if(!virus2)
for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
if(B.virus2 && get_infection_chance())
infect_virus2(src,B.virus2)
for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
if(M.virus2 && get_infection_chance())
infect_virus2(src,M.virus2)
else
if(isnull(virus2)) // Trying to figure out a runtime error that keeps repeating
for (var/datum/disease2/disease/V in virus2)
V.cure(src)
for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
if(B.virus2.len && get_infection_chance(src))
for (var/datum/disease2/disease/V in B.virus2)
infect_virus2(src,V)
for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
if(M.virus2.len && get_infection_chance(src))
for (var/datum/disease2/disease/V in M.virus2)
infect_virus2(src,V)
for (var/datum/disease2/disease/V in virus2)
if(isnull(V)) // Trying to figure out a runtime error that keeps repeating
CRASH("virus2 nulled before calling activate()")
else
virus2.activate(src)
V.activate(src)
// activate may have deleted the virus
if(!virus2) return
if(!V) continue
// check if we're immune
if(virus2.antigen & src.antibodies) virus2.dead = 1
if(V.antigen & src.antibodies) V.dead = 1
return
proc/breathe()
if(reagents)