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

[MIRROR] fix two runtimes in virus code (#9793)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-04 17:38:24 -07:00
committed by GitHub
parent 57f2302d2b
commit 343b05a12e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/diseases/_disease.dm
View File

@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
break break
var/direction = get_dir(current, target) var/direction = get_dir(current, target)
var/turf/next = get_step(current, direction) var/turf/next = get_step(current, direction)
if(!current.CanZASPass() || !next.CanZASPass(get_turf(turn(direction, 100)))) if(!current.CanZASPass(next))
break break
current = next current = next

18
code/game/objects/effects/decals/Cleanable/humans.dm
View File

@@ -76,7 +76,7 @@ var/global/list/image/splatter_cache=list()
/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp) /obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
if(perp.is_incorporeal()) if(perp.is_incorporeal())
return return
if (!istype(perp)) if(!istype(perp))
return return
if(amount < 1) if(amount < 1)
return return
@@ -274,21 +274,37 @@ var/global/list/image/splatter_cache=list()
return ..() return ..()
/obj/effect/decal/cleanable/mucus/Crossed(mob/living/carbon/human/perp) /obj/effect/decal/cleanable/mucus/Crossed(mob/living/carbon/human/perp)
if(perp.is_incorporeal())
return
if(!istype(perp))
return
if(viruses) if(viruses)
for(var/datum/disease/D in viruses) for(var/datum/disease/D in viruses)
perp.ContractDisease(D) perp.ContractDisease(D)
/obj/effect/decal/cleanable/mucus/attack_hand(mob/living/carbon/human/perp) /obj/effect/decal/cleanable/mucus/attack_hand(mob/living/carbon/human/perp)
if(perp.is_incorporeal())
return
if(!istype(perp))
return
if(viruses) if(viruses)
for(var/datum/disease/D in viruses) for(var/datum/disease/D in viruses)
perp.ContractDisease(D) perp.ContractDisease(D)
/obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp) /obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
if(perp.is_incorporeal())
return
if(!istype(perp))
return
if(viruses) if(viruses)
for(var/datum/disease/D in viruses) for(var/datum/disease/D in viruses)
perp.ContractDisease(D) perp.ContractDisease(D)
/obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp) /obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
if(perp.is_incorporeal())
return
if(!istype(perp))
return
if(viruses) if(viruses)
for(var/datum/disease/D in viruses) for(var/datum/disease/D in viruses)
perp.ContractDisease(D) perp.ContractDisease(D)