Merge pull request #6960 from Iamgoofball/goonetics

Added 2 new powers and 9 new disabilities from goon and /vg/!
This commit is contained in:
Remie Richards
2015-01-19 17:47:33 +00:00
13 changed files with 465 additions and 26 deletions
+1 -4
View File
@@ -21,9 +21,7 @@
/mob/living/carbon/human/treat_message(message)
if(dna)
message = dna.species.handle_speech(message,src)
if (dna.check_mutation(HULK))
message = "[uppertext(replacetext(message, ".", "!"))]!!" //because I don't know how to code properly in getting vars from other files -Bro
message = dna.mutations_say_mods(message)
if(viruses.len)
for(var/datum/disease/pierrot_throat/D in viruses)
@@ -38,7 +36,6 @@
temp_message[H] = "HONK"
pick_list -= H //Make sure that you dont HONK the same word twice
message = list2text(temp_message, " ")
message = ..(message)
return message
+1
View File
@@ -160,3 +160,4 @@
var/atom/movable/remote_control //Calls relaymove() to whatever it is
var/turf/listed_turf = null //the current turf being examined in the stat panel
var/last_movement = 0 // Last world.time the mob actually moved of its own accord.
+1
View File
@@ -199,6 +199,7 @@
step(mob, pick(cardinal))
else
. = ..()
mob.last_movement=world.time
moving = 0
if(mob && .)