Merge pull request #4238 from Aurorablade/Kungfu

Fethas Carnival of Horrors:crouching tarajan,hidden unathi
This commit is contained in:
Fox McCloud
2016-04-25 04:35:35 -04:00
19 changed files with 1105 additions and 644 deletions
@@ -37,6 +37,8 @@
prev_gender = gender // Debug for plural genders
make_blood()
martial_art = default_martial_art
var/mob/M = src
faction |= "\ref[M]" //what
@@ -55,6 +55,8 @@
switch(M.a_intent)
if(I_HELP)
if(attacker_style && attacker_style.help_act(H, src))//adminfu only...
return 1
if(can_operate(src))
if(health >= config.health_threshold_crit)
if(src.surgeries.len)
@@ -1,3 +1,4 @@
var/global/default_martial_art = new/datum/martial_art
/mob/living/carbon/human
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD)