cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 21:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4000 from Cheridan/terribleidea

Browse Source 
MONKEY MODE REDUX
This commit is contained in:
Aranclanos
2014-06-30 16:27:22 -03:00
parent 134272b744 352d5a5627
commit c65aa2b5a4
10 changed files with 177 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_attackpaw.dm
+1 -5
View File
@@ -15,9 +15,5 @@
apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
for(var/datum/disease/D in M.viruses)
if(istype(D, /datum/disease/jungle_fever))
var/mob/living/carbon/human/H = src
if(src.stat != 2)
H.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
contract_disease(D,1,0)
contract_disease(D,1,0)
return
code/modules/mob/living/carbon/monkey/monkey.dm
+1 -2
View File
@@ -83,8 +83,7 @@
adjustBruteLoss(damage)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
for(var/datum/disease/D in M.viruses)
if(istype(D, /datum/disease/jungle_fever))
contract_disease(D,1,0)
contract_disease(D,1,0)
else
visible_message("<span class='danger'>[M.name] has attempted to bite [name]!</span>", \
"<span class='userdanger'>[M.name] has attempted to bite [name]!</span>")
code/modules/mob/mob_helpers.dm
+1 -1
View File
@@ -408,7 +408,7 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
if(M.mind in ticker.mode.wizards)
return 2
if("monkey")
if(M.viruses && (locate(/datum/disease/jungle_fever) in M.viruses))
if(M.viruses && (locate(/datum/disease/transformation/jungle_fever) in M.viruses))
return 2
return 1
return 0