Merge pull request #394 from VampyrBytes/master

Genetics fixes
This commit is contained in:
ZomgPonies
2014-08-18 19:19:58 -04:00
5 changed files with 19 additions and 10 deletions
@@ -50,7 +50,8 @@
/mob/living/carbon/human/grey/New(var/new_loc)
..(new_loc, "Grey")
mutations.Add(M_REMOTE_TALK)
spell_list += new /obj/effect/proc_holder/spell/wizard/targeted/remotetalk
/mob/living/carbon/human/human/New(var/new_loc)
..(new_loc, "Human")
@@ -106,6 +107,7 @@
if(!delay_ready_dna)
dna.ready_dna(src)
/mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
if ((!( yes ) || now_pushing))
return
+1 -1
View File
@@ -1865,7 +1865,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
holder.icon_state = "hudscientopia"
hud_list[NATIONS_HUD] = holder
update_power_buttons()
hud_updateflag = 0
/mob/living/carbon/human/proc/process_nations()