diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index f6942031dbf..8cc7145ccd5 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -30,7 +30,6 @@ // Extra powers: #define LASER 9 // harm intent - click anywhere to shoot lasers from eyes -#define GREY 10 //Wingdings for Greys -- Not activatable or researchable //#define HEAL 10 // (Not implemented) healing people with hands //#define SHADOW 11 // (Not implemented) shadow teleportation (create in/out portals anywhere) (25%) //#define SCREAM 12 // (Not implemented) supersonic screaming (25%) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 2888be2e9cc..abe6742fecc 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -276,6 +276,24 @@ flags = RESTRICTED | WHITELISTED syllables = list("blob","plop","pop","bop","boop") +/datum/language/grey + name = "Psionic Communication" + desc = "The grey's psionic communication, less potent version of their distant cousin's telepathy. Talk to other greys within a limited radius." + speech_verb = "expresses" + ask_verb = "inquires" + exclaim_verb = "imparts" + colour = "abductor" + key = "^" + flags = RESTRICTED | HIVEMIND + +/datum/language/grey/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) + ..(speaker,message,speaker.real_name) + +/datum/language/grey/check_special_condition(var/mob/living/carbon/human/other, var/mob/living/carbon/human/speaker) + if(other in range(7, speaker)) + return 1 + return 0 + /datum/language/drask name = "Orluum" desc = "The droning, vibrous language of the Drask. It sounds somewhat like whalesong." diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 5219932a987..aaa0c08bcbc 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -692,7 +692,7 @@ icobase = 'icons/mob/human_races/r_grey.dmi' deform = 'icons/mob/human_races/r_def_grey.dmi' default_language = "Galactic Common" - //language = "Grey" // Perhaps if they ever get a hivemind + language = "Psionic Communication" unarmed_type = /datum/unarmed_attack/punch darksight = 5 // BOOSTED from 2 eyes = "grey_eyes_s" @@ -703,7 +703,7 @@ "lungs" = /obj/item/organ/internal/lungs, "liver" = /obj/item/organ/internal/liver/grey, "kidneys" = /obj/item/organ/internal/kidneys, - "brain" = /obj/item/organ/internal/brain, + "brain" = /obj/item/organ/internal/brain/grey, "appendix" = /obj/item/organ/internal/appendix, "eyes" = /obj/item/organ/internal/eyes, ) @@ -728,8 +728,6 @@ C.dna.SetSEState(REMOTETALKBLOCK,0,1) C.mutations -= REMOTE_TALK genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED) - C.mutations.Add(GREY) - C.update_mutations() ..() /datum/species/diona diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f72e7baaf89..876a1d9c98b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -94,10 +94,7 @@ proc/get_radio_key_from_channel(var/channel) verb = "stammers" speech_problem_flag = 1 - if(GREY in mutations) - message = "[message]" - - else if(COMIC in mutations) + if(COMIC in mutations) message = "[message]" if(!IsVocal()) diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm index da59165dce8..7c84bdc2019 100644 --- a/code/modules/surgery/organs/subtypes/grey.dm +++ b/code/modules/surgery/organs/subtypes/grey.dm @@ -1,3 +1,16 @@ /obj/item/organ/internal/liver/grey alcohol_intensity = 1.6 species = "Grey" + +/obj/item/organ/internal/brain/grey + icon_state = "brain-x" + mmi_icon_state = "mmi_alien" + species = "Grey" + +/obj/item/organ/internal/brain/grey/insert(var/mob/living/carbon/M, var/special = 0) + ..() + M.add_language("Psionic Communication") + +/obj/item/organ/internal/brain/grey/remove(var/mob/living/carbon/M, var/special = 0) + ..() + M.remove_language("Psionic Communication") diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 39e684f0843..9e875544250 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -327,7 +327,6 @@ h1.alert, h2.alert {color: #000000;} .bold {font-weight: bold;} .center {text-align: center;} .red {color: #FF0000;} -.grey {font-family: "Wingdings", cursive, sans-serif;} .skeleton {color: #585858; font-weight: bold; font-style: italic;} .gutter {color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;} .orange {color: #ffa500;} diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi index a8d8e668828..1a24c945dff 100644 Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ