cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 05:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm
This commit is contained in:
PsiOmegaDelta
2015-07-10 12:57:46 +02:00
parent 6246d3bd9d e0ed7c3e69
commit 265802d270
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/virus2/disease2.dm
+1 -1
View File
@@ -118,7 +118,7 @@
//uniqueID = rand(0,10000)
var/datum/disease2/effectholder/holder = pick(effects)
holder.minormutate()
infectionchance = min(50,infectionchance + rand(0,10))
//infectionchance = min(50,infectionchance + rand(0,10))
/datum/disease2/disease/proc/majormutate()
uniqueID = rand(0,10000)
code/modules/virus2/helpers.dm
+3 -3
View File
@@ -50,7 +50,7 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
if (vector == "Airborne")
var/obj/item/I = M.wear_mask
if (istype(I))
protection = max(protection, round(0.06*I.armor["bio"]))
protection = max(protection, I.armor["bio"])
return prob(protection)
@@ -147,12 +147,12 @@ proc/airborne_can_reach(turf/source, turf/target)
// log_debug("Could not reach target")
if (vector == "Contact")
if (in_range(src, victim))
if (Adjacent(victim))
// log_debug("In range, infecting")
infect_virus2(victim,V)
//contact goes both ways
if (victim.virus2.len > 0 && vector == "Contact")
if (victim.virus2.len > 0 && vector == "Contact" && Adjacent(victim))
// log_debug("Spreading [vector] diseases from [victim] to [src]")
var/nudity = 1