From c09f8f65eb8cc6433d2723adfb6bc487518a78c0 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 14:52:12 -0400 Subject: [PATCH 1/8] Removes Grey's Wingdings --- code/__DEFINES/genetics.dm | 2 -- code/modules/mob/living/carbon/human/species/station.dm | 2 -- code/modules/mob/living/say.dm | 3 --- 3 files changed, 7 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index e6988ca745e..482a25baf1b 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%) @@ -123,4 +122,3 @@ #define NUTRITION_LEVEL_FED 350 #define NUTRITION_LEVEL_HUNGRY 250 #define NUTRITION_LEVEL_STARVING 150 - diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 7f5daa824d5..96e9ffd8381 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -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 85eea65bbab..ce3f7d1a430 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -93,9 +93,6 @@ 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) message = "[message]" From 312e1546d2da793c474a3dfab3d215f524ff3bfc Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 15:49:44 -0400 Subject: [PATCH 2/8] Fixes An Errant Else If --- code/modules/mob/living/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index ce3f7d1a430..5912440bdeb 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -93,7 +93,7 @@ proc/get_radio_key_from_channel(var/channel) verb = "stammers" speech_problem_flag = 1 - else if(COMIC in mutations) + if(COMIC in mutations) message = "[message]" if(!IsVocal()) From 77e20435c88c8a8c4fe2d414933184a6450fadbd Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 15:59:49 -0400 Subject: [PATCH 3/8] Removes the style --- code/modules/mob/living/say.dm | 2 +- goon/browserassets/css/browserOutput.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 5912440bdeb..ca22eac68bd 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -93,7 +93,7 @@ proc/get_radio_key_from_channel(var/channel) verb = "stammers" speech_problem_flag = 1 - if(COMIC in mutations) + if(COMIC in mutations) message = "[message]" if(!IsVocal()) 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;} From 574eff21ad119b1330fed1933f5aca27fded9aa0 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 20:35:54 -0400 Subject: [PATCH 4/8] Grey Language --- code/modules/mob/language.dm | 20 +++++++++++++++++- .../living/carbon/human/species/station.dm | 4 ++-- code/modules/surgery/organs/subtypes/grey.dm | 14 ++++++++++++ icons/obj/assemblies.dmi | Bin 28853 -> 29693 bytes 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index bc8182f4049..27ea96ffa2e 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -107,7 +107,7 @@ to_chat(player, msg_dead) continue - else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player, speaker))) + else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player, speaker) == 1)) to_chat(player, msg) /datum/language/proc/check_special_condition(var/mob/other, var/mob/living/speaker) @@ -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." + 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(14, 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 96e9ffd8381..626412f79d8 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, ) diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm index da59165dce8..aa09c6c6cdd 100644 --- a/code/modules/surgery/organs/subtypes/grey.dm +++ b/code/modules/surgery/organs/subtypes/grey.dm @@ -1,3 +1,17 @@ /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) + ..() + if("Psionic Communication" in M.languages) + M.remove_language("Psionic Communication") \ No newline at end of file diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi index a8d8e6688280bc38c45e6caef6c7e070b616899b..1a24c945dff4c54b8b44aa827861a2ac68c07c98 100644 GIT binary patch delta 10891 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 Yj;f`J`ompr2>5#TME!A*!fXHk0BJA7$p8QV delta 10044 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 I-Xi3`0FtFab^rhX From 74520a9a0b365b4ece10b5f700f7b5849a4dcb33 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 22:01:09 -0400 Subject: [PATCH 5/8] Language Removal Fix --- code/modules/surgery/organs/subtypes/grey.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm index aa09c6c6cdd..5a09b6e37d7 100644 --- a/code/modules/surgery/organs/subtypes/grey.dm +++ b/code/modules/surgery/organs/subtypes/grey.dm @@ -13,5 +13,5 @@ /obj/item/organ/internal/brain/grey/remove(var/mob/living/carbon/M, var/special = 0) ..() - if("Psionic Communication" in M.languages) + if(/datum/language/grey in M.languages) M.remove_language("Psionic Communication") \ No newline at end of file From c169dfc3d36b76e66055cbddc46539a79824bada Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 1 Jul 2016 22:09:46 -0400 Subject: [PATCH 6/8] Makes the description reflect the nature of the language better --- code/modules/mob/language.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 27ea96ffa2e..5d5aea5d47f 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -278,7 +278,7 @@ /datum/language/grey name = "Psionic Communication" - desc = "The grey's psionic communication, less potent version of their distant cousin's telepathy." + 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" From 963ca2ca79f8500ff719c43a563ab1e6db437c8f Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Mon, 11 Jul 2016 13:06:40 -0400 Subject: [PATCH 7/8] ACTUALLY Resolves The Merge Conflicts (Remember To Save, Kids) --- code/__DEFINES/genetics.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index fc874959cff..d44fed0cb05 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -122,12 +122,9 @@ #define NUTRITION_LEVEL_FED 350 #define NUTRITION_LEVEL_HUNGRY 250 #define NUTRITION_LEVEL_STARVING 150 -<<<<<<< HEAD -======= //Used for calculations for negative effects of having genetics powers #define DEFAULT_GENE_STABILITY 100 #define GENE_INSTABILITY_MINOR 5 #define GENE_INSTABILITY_MODERATE 10 #define GENE_INSTABILITY_MAJOR 15 ->>>>>>> 26e13f270f62f6104106ed087a318469ad4d9d02 From 46954091e6f9da55f7319b9a086346d1c9965bd3 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Mon, 11 Jul 2016 22:28:35 -0400 Subject: [PATCH 8/8] Minor Tweaks --- code/modules/mob/language.dm | 4 ++-- code/modules/surgery/organs/subtypes/grey.dm | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 2f10ee1022c..abe6742fecc 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -107,7 +107,7 @@ to_chat(player, msg_dead) continue - else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player, speaker) == 1)) + else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player, speaker))) to_chat(player, msg) /datum/language/proc/check_special_condition(var/mob/other, var/mob/living/speaker) @@ -290,7 +290,7 @@ ..(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(14, speaker)) + if(other in range(7, speaker)) return 1 return 0 diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm index 5a09b6e37d7..7c84bdc2019 100644 --- a/code/modules/surgery/organs/subtypes/grey.dm +++ b/code/modules/surgery/organs/subtypes/grey.dm @@ -13,5 +13,4 @@ /obj/item/organ/internal/brain/grey/remove(var/mob/living/carbon/M, var/special = 0) ..() - if(/datum/language/grey in M.languages) - M.remove_language("Psionic Communication") \ No newline at end of file + M.remove_language("Psionic Communication")