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

final pass of merging with my branch

Browse Source 
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
This commit is contained in:
Ater Ignis
2012-11-16 18:54:43 +04:00
parent 4ed9b40cb9
commit 8c5b8f8d50
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/projectile/special.dm
View File

@@ -79,7 +79,8 @@
on_hit(var/atom/target, var/blocked = 0)
var/mob/living/M = target
if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
// if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
if(ishuman(target) && (PLANT in M.mutations)) //Plantmen possibly get mutated and damaged by the rays.
if(prob(15))
M.apply_effect((rand(30,80)),IRRADIATE)
M.Weaken(5)
@@ -116,7 +117,8 @@
on_hit(var/atom/target, var/blocked = 0)
var/mob/M = target
if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
// if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
if(ishuman(target) && (PLANT in M.mutations)) //These rays make plantmen fat.
if(M.nutrition < 500) //sanity check
M.nutrition += 30
else if (istype(target, /mob/living/carbon/))