diff --git a/code/datums/goon_mutations_disabilities.dm b/code/datums/goon_mutations_disabilities.dm
deleted file mode 100644
index 9da8e51307e..00000000000
--- a/code/datums/goon_mutations_disabilities.dm
+++ /dev/null
@@ -1,184 +0,0 @@
-/datum/mutation/human/wacky
- name = "Wacky"
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel an off sensation in your voicebox."
- text_lose_indication = "The off sensation passes."
-
-/datum/mutation/human/wacky/get_spans()
- return list(SPAN_SANS)
-
-/datum/mutation/human/mute
- name = "Mute"
- quality = NEGATIVE
- text_gain_indication = "You feel unable to express yourself at all."
- text_lose_indication = "You feel able to speak freely again."
-
-/datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner)
- if(..()) return
- owner.disabilities |= MUTE
-
-/datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
- if(..()) return
- owner.disabilities &= ~MUTE
-
-/datum/mutation/human/smile
- name = "Smile"
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)"
- text_lose_indication = "Everything is terrible again. :("
-
-/datum/mutation/human/smile/say_mod(var/message)
- if(message)
- message = " [message] "
- //Time for a friendly game of SS13
- message = replacetext(message," stupid "," smart ")
- message = replacetext(message," retard "," genius ")
- message = replacetext(message," unrobust "," robust ")
- message = replacetext(message," dumb "," smart ")
- message = replacetext(message," awful "," great ")
- message = replacetext(message," gay ",pick(" nice "," ok "," alright "))
- message = replacetext(message," horrible "," fun ")
- message = replacetext(message," terrible "," terribly fun ")
- message = replacetext(message," terrifying "," wonderful ")
- message = replacetext(message," gross "," cool ")
- message = replacetext(message," disgusting "," amazing ")
- message = replacetext(message," loser "," winner ")
- message = replacetext(message," useless "," useful ")
- message = replacetext(message," oh god "," cheese and crackers ")
- message = replacetext(message," jesus "," gee wiz ")
- message = replacetext(message," weak "," strong ")
- message = replacetext(message," kill "," hug ")
- message = replacetext(message," murder "," tease ")
- message = replacetext(message," ugly "," beautiful ")
- message = replacetext(message," douchbag "," nice guy ")
- message = replacetext(message," whore "," lady ")
- message = replacetext(message," nerd "," smart guy ")
- message = replacetext(message," moron "," fun person ")
- message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ")
- message = replacetext(message," sex "," hug fight ")
- message = replacetext(message," idiot "," genius ")
- message = replacetext(message," fat "," thin ")
- message = replacetext(message," beer "," water with ice ")
- message = replacetext(message," drink "," water ")
- message = replacetext(message," feminist "," empowered woman ")
- message = replacetext(message," i hate you "," you're mean ")
- message = replacetext(message," nigger "," african american ")
- message = replacetext(message," jew "," jewish ")
- message = replacetext(message," shit "," shiz ")
- message = replacetext(message," crap "," poo ")
- message = replacetext(message," slut "," tease ")
- message = replacetext(message," ass "," butt ")
- message = replacetext(message," damn "," dang ")
- message = replacetext(message," fuck "," ")
- message = replacetext(message," penis "," privates ")
- message = replacetext(message," cunt "," privates ")
- message = replacetext(message," dick "," jerk ")
- message = replacetext(message," vagina "," privates ")
- return trim(message)
-
-/datum/mutation/human/unintelligable
- name = "Unintelligable"
- quality = NEGATIVE
- text_gain_indication = "You can't seem to form any coherent thoughts!"
- text_lose_indication = "Your mind feels more clear."
-
-/datum/mutation/human/unintelligable/say_mod(var/message)
- if(message)
- var/prefix=copytext(message,1,2)
- if(prefix == ";")
- message = copytext(message,2)
- else if(prefix in list(":","#"))
- prefix += copytext(message,2,3)
- message = copytext(message,3)
- else
- prefix=""
-
- var/list/words = text2list(message," ")
- var/list/rearranged = list()
- for(var/i=1;i<=words.len;i++)
- var/cword = pick(words)
- words.Remove(cword)
- var/suffix = copytext(cword,length(cword)-1,length(cword))
- while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
- cword = copytext(cword,1 ,length(cword)-1)
- suffix = copytext(cword,length(cword)-1,length(cword) )
- if(length(cword))
- rearranged += cword
- message = "[prefix][uppertext(list2text(rearranged," "))]!!"
- return message
-
-/datum/mutation/human/swedish
- name = "Swedish"
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel Swedish, however that works."
- text_lose_indication = "The feeling of Swedishness passes."
-
-/datum/mutation/human/swedish/say_mod(var/message)
- if(message)
- message = replacetext(message,"w","v")
- if(prob(30))
- message += " Bork[pick("",", bork",", bork, bork")]!"
- return message
-
-/datum/mutation/human/chav
- name = "Chav"
- quality = MINOR_NEGATIVE
- text_gain_indication = "Ye feel like a reet prat like, innit?"
- text_lose_indication = "You no longer feel like being rude and sassy."
-
-/datum/mutation/human/chav/say_mod(var/message)
- if(message)
- message = " [message] "
- message = replacetext(message," looking at "," gawpin' at ")
- message = replacetext(message," great "," bangin' ")
- message = replacetext(message," man "," mate ")
- message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
- message = replacetext(message," what "," wot ")
- message = replacetext(message," drink "," wet ")
- message = replacetext(message," get "," giz ")
- message = replacetext(message," what "," wot ")
- message = replacetext(message," no thanks "," wuddent fukken do one ")
- message = replacetext(message," i don't know "," wot mate ")
- message = replacetext(message," no "," naw ")
- message = replacetext(message," robust "," chin ")
- message = replacetext(message," hi "," how what how ")
- message = replacetext(message," hello "," sup bruv ")
- message = replacetext(message," kill "," bang ")
- message = replacetext(message," murder "," bang ")
- message = replacetext(message," windows "," windies ")
- message = replacetext(message," window "," windy ")
- message = replacetext(message," break "," do ")
- message = replacetext(message," your "," yer ")
- message = replacetext(message," security "," coppers ")
- return trim(message)
-
-/datum/mutation/human/elvis
- name = "Elvis"
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel pretty good, honeydoll."
- text_lose_indication = "You feel a little less conversation would be great."
-
-/datum/mutation/human/elvis/on_life(mob/living/carbon/human/owner)
- switch(pick(1,2))
- if(1)
- if(prob(15))
- var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
- var/dancemoves = pick(dancetypes)
- owner.visible_message("[owner] busts out some [dancemoves] moves!")
- if(2)
- if(prob(15))
- owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
-
-/datum/mutation/human/elvis/say_mod(var/message)
- if(message)
- message = " [message] "
- message = replacetext(message," i'm not "," I aint ")
- message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
- message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
- message = replacetext(message," out of "," outta ")
- message = replacetext(message," thank you "," thank you, thank you very much ")
- message = replacetext(message," what are you "," whatcha ")
- message = replacetext(message," yes ",pick(" sure", "yea "))
- message = replacetext(message," faggot "," square ")
- message = replacetext(message," muh valids "," getting my kicks ")
- return trim(message)
diff --git a/code/datums/goon_mutations_powers.dm b/code/datums/goon_mutations_powers.dm
deleted file mode 100644
index a2e64ff37ee..00000000000
--- a/code/datums/goon_mutations_powers.dm
+++ /dev/null
@@ -1,43 +0,0 @@
-/datum/mutation/human/stealth
- name = "Cloak Of Darkness"
- quality = POSITIVE
- get_chance = 10
- lowest_value = 256 * 14
- text_gain_indication = "You begin to fade into the shadows."
- text_lose_indication = "You become fully visible."
-
-
-/datum/mutation/human/stealth/on_life(mob/living/carbon/human/owner)
- var/turf/simulated/T = get_turf(owner)
- if(!istype(T))
- return
- if(T.lighting_lumcount <= 2)
- owner.alpha -= 25
- else
- owner.alpha = round(255 * 0.80)
-
-/datum/mutation/human/stealth/on_losing(mob/living/carbon/human/owner)
- ..()
- owner.alpha = 255
-
-/datum/mutation/human/chameleon
- name = "Chameleon"
- quality = POSITIVE
- get_chance = 10
- lowest_value = 256 * 14
- text_gain_indication = "You feel one with your surroundings."
- text_lose_indication = "You feel oddly exposed."
- var/last_location
-
-/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
- if(owner.loc != last_location)
- owner.alpha = round(255 * 0.80)
- last_location = owner.loc
- if((world.time - owner.next_move) >= 30 && !owner.stat && owner.canmove && !owner.restrained())
- owner.alpha -= 25
- else
- owner.alpha = round(255 * 0.80)
-
-/datum/mutation/human/chameleon/on_losing(mob/living/carbon/human/owner)
- ..()
- owner.alpha = 255
\ No newline at end of file
diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm
index 1548615ddd0..ec466f65e72 100644
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations.dm
@@ -50,7 +50,7 @@
. = on_losing(owner)
/datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/owner)
- if(src in owner.dna.mutations)
+ if(!owner || (src in owner.dna.mutations))
return 1
owner.dna.mutations.Add(src)
gain_indication(owner)
@@ -78,7 +78,7 @@
return
/datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner)
- if(owner.dna.mutations.Remove(src))
+ if(owner && (owner.dna.mutations.Remove(src)))
lose_indication(owner)
owner << text_lose_indication
return 0
@@ -124,7 +124,8 @@
owner.emote("collapse")
/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
- ..()
+ if(..())
+ return
owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
/datum/mutation/human/hulk/say_mod(var/message)
@@ -181,7 +182,8 @@
owner.see_in_dark = 8
/datum/mutation/human/x_ray/on_losing(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
if((SEE_MOBS & owner.permanent_sight_flags) && (SEE_OBJS & owner.permanent_sight_flags) && (SEE_TURFS & owner.permanent_sight_flags)) //Xray flag combo
return
owner.see_in_dark = initial(owner.see_in_dark)
@@ -194,11 +196,13 @@
text_gain_indication = "You can't see very well."
/datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
owner.disabilities |= NEARSIGHT
/datum/mutation/human/nearsight/on_losing(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
owner.disabilities &= ~NEARSIGHT
/datum/mutation/human/epilepsy
@@ -256,7 +260,8 @@
owner.disabilities |= CLUMSY
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
owner.disabilities &= ~CLUMSY
/datum/mutation/human/tourettes
@@ -301,7 +306,8 @@
owner.disabilities |= DEAF
/datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
owner.disabilities &= ~DEAF
/datum/mutation/human/blind
@@ -315,7 +321,8 @@
owner.disabilities |= BLIND
/datum/mutation/human/blind/on_losing(mob/living/carbon/human/owner)
- if(..()) return
+ if(..())
+ return
owner.disabilities &= ~BLIND
/datum/mutation/human/race
@@ -334,7 +341,8 @@
return
/datum/mutation/human/race/on_losing(mob/living/carbon/monkey/owner)
- if(..()) return
+ if(..())
+ return
. = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
/datum/mutation/human/laser_eyes
@@ -347,3 +355,244 @@
/datum/mutation/human/laser_eyes/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
if(owner.a_intent == "harm")
owner.LaserEyes(target)
+
+
+
+////////////////////////////// Goon powers /////////////////////////////////////////
+
+/datum/mutation/human/stealth
+ name = "Cloak Of Darkness"
+ quality = POSITIVE
+ get_chance = 10
+ lowest_value = 256 * 14
+ text_gain_indication = "You begin to fade into the shadows."
+ text_lose_indication = "You become fully visible."
+
+
+/datum/mutation/human/stealth/on_life(mob/living/carbon/human/owner)
+ var/turf/simulated/T = get_turf(owner)
+ if(!istype(T))
+ return
+ if(T.lighting_lumcount <= 2)
+ owner.alpha -= 25
+ else
+ owner.alpha = round(255 * 0.80)
+
+/datum/mutation/human/stealth/on_losing(mob/living/carbon/human/owner)
+ if(..())
+ return
+ owner.alpha = 255
+
+/datum/mutation/human/chameleon
+ name = "Chameleon"
+ quality = POSITIVE
+ get_chance = 10
+ lowest_value = 256 * 14
+ text_gain_indication = "You feel one with your surroundings."
+ text_lose_indication = "You feel oddly exposed."
+ var/last_location
+
+/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
+ if(owner.loc != last_location)
+ owner.alpha = round(255 * 0.80)
+ last_location = owner.loc
+ if((world.time - owner.next_move) >= 30 && !owner.stat && owner.canmove && !owner.restrained())
+ owner.alpha -= 25
+ else
+ owner.alpha = round(255 * 0.80)
+
+/datum/mutation/human/chameleon/on_losing(mob/living/carbon/human/owner)
+ if(..())
+ return
+ owner.alpha = 255
+
+
+
+//////////////////// Goon disabilities //////////////////////////////////////////
+
+/datum/mutation/human/wacky
+ name = "Wacky"
+ quality = MINOR_NEGATIVE
+ text_gain_indication = "You feel an off sensation in your voicebox."
+ text_lose_indication = "The off sensation passes."
+
+/datum/mutation/human/wacky/get_spans()
+ return list(SPAN_SANS)
+
+/datum/mutation/human/mute
+ name = "Mute"
+ quality = NEGATIVE
+ text_gain_indication = "You feel unable to express yourself at all."
+ text_lose_indication = "You feel able to speak freely again."
+
+/datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner)
+ if(..())
+ return
+ owner.disabilities |= MUTE
+
+/datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
+ if(..())
+ return
+ owner.disabilities &= ~MUTE
+
+/datum/mutation/human/smile
+ name = "Smile"
+ quality = MINOR_NEGATIVE
+ text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)"
+ text_lose_indication = "Everything is terrible again. :("
+
+/datum/mutation/human/smile/say_mod(var/message)
+ if(message)
+ message = " [message] "
+ //Time for a friendly game of SS13
+ message = replacetext(message," stupid "," smart ")
+ message = replacetext(message," retard "," genius ")
+ message = replacetext(message," unrobust "," robust ")
+ message = replacetext(message," dumb "," smart ")
+ message = replacetext(message," awful "," great ")
+ message = replacetext(message," gay ",pick(" nice "," ok "," alright "))
+ message = replacetext(message," horrible "," fun ")
+ message = replacetext(message," terrible "," terribly fun ")
+ message = replacetext(message," terrifying "," wonderful ")
+ message = replacetext(message," gross "," cool ")
+ message = replacetext(message," disgusting "," amazing ")
+ message = replacetext(message," loser "," winner ")
+ message = replacetext(message," useless "," useful ")
+ message = replacetext(message," oh god "," cheese and crackers ")
+ message = replacetext(message," jesus "," gee wiz ")
+ message = replacetext(message," weak "," strong ")
+ message = replacetext(message," kill "," hug ")
+ message = replacetext(message," murder "," tease ")
+ message = replacetext(message," ugly "," beautiful ")
+ message = replacetext(message," douchbag "," nice guy ")
+ message = replacetext(message," whore "," lady ")
+ message = replacetext(message," nerd "," smart guy ")
+ message = replacetext(message," moron "," fun person ")
+ message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ")
+ message = replacetext(message," sex "," hug fight ")
+ message = replacetext(message," idiot "," genius ")
+ message = replacetext(message," fat "," thin ")
+ message = replacetext(message," beer "," water with ice ")
+ message = replacetext(message," drink "," water ")
+ message = replacetext(message," feminist "," empowered woman ")
+ message = replacetext(message," i hate you "," you're mean ")
+ message = replacetext(message," nigger "," african american ")
+ message = replacetext(message," jew "," jewish ")
+ message = replacetext(message," shit "," shiz ")
+ message = replacetext(message," crap "," poo ")
+ message = replacetext(message," slut "," tease ")
+ message = replacetext(message," ass "," butt ")
+ message = replacetext(message," damn "," dang ")
+ message = replacetext(message," fuck "," ")
+ message = replacetext(message," penis "," privates ")
+ message = replacetext(message," cunt "," privates ")
+ message = replacetext(message," dick "," jerk ")
+ message = replacetext(message," vagina "," privates ")
+ return trim(message)
+
+/datum/mutation/human/unintelligable
+ name = "Unintelligable"
+ quality = NEGATIVE
+ text_gain_indication = "You can't seem to form any coherent thoughts!"
+ text_lose_indication = "Your mind feels more clear."
+
+/datum/mutation/human/unintelligable/say_mod(var/message)
+ if(message)
+ var/prefix=copytext(message,1,2)
+ if(prefix == ";")
+ message = copytext(message,2)
+ else if(prefix in list(":","#"))
+ prefix += copytext(message,2,3)
+ message = copytext(message,3)
+ else
+ prefix=""
+
+ var/list/words = text2list(message," ")
+ var/list/rearranged = list()
+ for(var/i=1;i<=words.len;i++)
+ var/cword = pick(words)
+ words.Remove(cword)
+ var/suffix = copytext(cword,length(cword)-1,length(cword))
+ while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
+ cword = copytext(cword,1 ,length(cword)-1)
+ suffix = copytext(cword,length(cword)-1,length(cword) )
+ if(length(cword))
+ rearranged += cword
+ message = "[prefix][uppertext(list2text(rearranged," "))]!!"
+ return message
+
+/datum/mutation/human/swedish
+ name = "Swedish"
+ quality = MINOR_NEGATIVE
+ text_gain_indication = "You feel Swedish, however that works."
+ text_lose_indication = "The feeling of Swedishness passes."
+
+/datum/mutation/human/swedish/say_mod(var/message)
+ if(message)
+ message = replacetext(message,"w","v")
+ if(prob(30))
+ message += " Bork[pick("",", bork",", bork, bork")]!"
+ return message
+
+/datum/mutation/human/chav
+ name = "Chav"
+ quality = MINOR_NEGATIVE
+ text_gain_indication = "Ye feel like a reet prat like, innit?"
+ text_lose_indication = "You no longer feel like being rude and sassy."
+
+/datum/mutation/human/chav/say_mod(var/message)
+ if(message)
+ message = " [message] "
+ message = replacetext(message," looking at "," gawpin' at ")
+ message = replacetext(message," great "," bangin' ")
+ message = replacetext(message," man "," mate ")
+ message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
+ message = replacetext(message," what "," wot ")
+ message = replacetext(message," drink "," wet ")
+ message = replacetext(message," get "," giz ")
+ message = replacetext(message," what "," wot ")
+ message = replacetext(message," no thanks "," wuddent fukken do one ")
+ message = replacetext(message," i don't know "," wot mate ")
+ message = replacetext(message," no "," naw ")
+ message = replacetext(message," robust "," chin ")
+ message = replacetext(message," hi "," how what how ")
+ message = replacetext(message," hello "," sup bruv ")
+ message = replacetext(message," kill "," bang ")
+ message = replacetext(message," murder "," bang ")
+ message = replacetext(message," windows "," windies ")
+ message = replacetext(message," window "," windy ")
+ message = replacetext(message," break "," do ")
+ message = replacetext(message," your "," yer ")
+ message = replacetext(message," security "," coppers ")
+ return trim(message)
+
+/datum/mutation/human/elvis
+ name = "Elvis"
+ quality = MINOR_NEGATIVE
+ text_gain_indication = "You feel pretty good, honeydoll."
+ text_lose_indication = "You feel a little less conversation would be great."
+
+/datum/mutation/human/elvis/on_life(mob/living/carbon/human/owner)
+ switch(pick(1,2))
+ if(1)
+ if(prob(15))
+ var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
+ var/dancemoves = pick(dancetypes)
+ owner.visible_message("[owner] busts out some [dancemoves] moves!")
+ if(2)
+ if(prob(15))
+ owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
+
+/datum/mutation/human/elvis/say_mod(var/message)
+ if(message)
+ message = " [message] "
+ message = replacetext(message," i'm not "," I aint ")
+ message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
+ message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
+ message = replacetext(message," out of "," outta ")
+ message = replacetext(message," thank you "," thank you, thank you very much ")
+ message = replacetext(message," what are you "," whatcha ")
+ message = replacetext(message," yes ",pick(" sure", "yea "))
+ message = replacetext(message," faggot "," square ")
+ message = replacetext(message," muh valids "," getting my kicks ")
+ return trim(message)
diff --git a/tgstation.dme b/tgstation.dme
index 2780021997d..78ec543eb6e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -152,8 +152,6 @@
#include "code\datums\datacore.dm"
#include "code\datums\datumvars.dm"
#include "code\datums\gas_mixture.dm"
-#include "code\datums\goon_mutations_disabilities.dm"
-#include "code\datums\goon_mutations_powers.dm"
#include "code\datums\hud.dm"
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"