cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
Conflicts:
	code/modules/virus2/effect.dm
This commit is contained in:
Mloc-Argent
2013-08-20 21:57:01 +01:00
parent 7bcb5f5648 c188e46efc
commit 31d1307ed2
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/virus2/effect.dm
View File

@@ -48,6 +48,22 @@
proc/deactivate(var/mob/living/carbon/mob) proc/deactivate(var/mob/living/carbon/mob)
////////////////////////SPECIAL///////////////////////////////// ////////////////////////SPECIAL/////////////////////////////////
/*/datum/disease2/effect/alien
name = "Unidentified Foreign Body"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
mob << "\red You feel something tearing its way out of your stomach..."
mob.adjustToxLoss(10)
mob.updatehealth()
if(prob(40))
if(mob.client)
mob.client.mob = new/mob/living/carbon/alien/larva(mob.loc)
else
new/mob/living/carbon/alien/larva(mob.loc)
var/datum/disease2/disease/D = mob:virus2
mob:gib()
del D*/
/datum/disease2/effect/invisible /datum/disease2/effect/invisible
name = "Waiting Syndrome" name = "Waiting Syndrome"
stage = 1 stage = 1