From de12010e31cccf79d6fc2a460579ffffe167e167 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 22 Jan 2015 17:28:13 -0800 Subject: [PATCH] Fixes the font issues, removes 3 mutations R.I.P --- code/__DEFINES/genetics.dm | 5 +-- code/datums/goon_mutations_disabilities.dm | 34 ------------------ .../objects/items/weapons/dna_injector.dm | 36 ------------------- interface/stylesheet.dm | 5 +-- 4 files changed, 2 insertions(+), 78 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index 9c4080a6cfd..f60dddd0758 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -18,9 +18,6 @@ #define STEALTH "Cloak Of Darkness" #define CHAMELEON "Chameleon" #define WACKY "Wacky" -#define JOKE "Joke" -#define VINETA "Vineta" -#define PAPYRUS "Papyrus" #define MUT_MUTE "Mute" #define SMILE "Smile" #define UNINTELLIGABLE "Unintelligable" @@ -64,7 +61,7 @@ #define DNA_FACIAL_HAIR_STYLE_BLOCK 6 #define DNA_HAIR_STYLE_BLOCK 7 -#define DNA_STRUC_ENZYMES_BLOCKS 26 +#define DNA_STRUC_ENZYMES_BLOCKS 23 #define DNA_UNIQUE_ENZYMES_LEN 32 //Transformation proc stuff diff --git a/code/datums/goon_mutations_disabilities.dm b/code/datums/goon_mutations_disabilities.dm index 8e19a7e13c3..decfd10a987 100644 --- a/code/datums/goon_mutations_disabilities.dm +++ b/code/datums/goon_mutations_disabilities.dm @@ -9,40 +9,6 @@ message = "[message]" return message -/datum/mutation/human/joke - name = "Joke" - quality = MINOR_NEGATIVE - text_gain_indication = "You feel an off sensation in your voicebox." - text_lose_indication = "The off sensation passes." - -/datum/mutation/human/joke/say_mod(var/message) - if(message) - message = "[message]" - return message - -/datum/mutation/human/papyrus - name = "Papyrus" - quality = MINOR_NEGATIVE - text_gain_indication = "You feel an off sensation in your voicebox." - text_lose_indication = "The off sensation passes." - -/datum/mutation/human/papyrus/say_mod(var/message) - if(message) - message = "[message]" - return message - -/datum/mutation/human/vineta - name = "Vineta" - quality = MINOR_NEGATIVE - text_gain_indication = "You feel an off sensation in your voicebox." - text_lose_indication = "The off sensation passes." - -/datum/mutation/human/vineta/say_mod(var/message) - if(message) - message = "[message]" - return message - - /datum/mutation/human/mute name = "Mute" quality = NEGATIVE diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index ded1bc0db3f..33308afbfc7 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -288,42 +288,6 @@ ..() add_mutations.Add(mutations_list[WACKY]) -/obj/item/weapon/dnainjector/antijoke - name = "\improper DNA injector (Anti-joke)" - New() - ..() - remove_mutations.Add(mutations_list[JOKE]) - -/obj/item/weapon/dnainjector/jokemut - name = "\improper DNA injector (Joke)" - New() - ..() - add_mutations.Add(mutations_list[JOKE]) - -/obj/item/weapon/dnainjector/antipapyrus - name = "\improper DNA injector (Anti-Papyrus)" - New() - ..() - remove_mutations.Add(mutations_list[PAPYRUS]) - -/obj/item/weapon/dnainjector/papyrusmut - name = "\improper DNA injector (Papyrus)" - New() - ..() - add_mutations.Add(mutations_list[PAPYRUS]) - -/obj/item/weapon/dnainjector/antivineta - name = "\improper DNA injector (Anti-Vineta)" - New() - ..() - remove_mutations.Add(mutations_list[VINETA]) - -/obj/item/weapon/dnainjector/vinetamut - name = "\improper DNA injector (Vineta)" - New() - ..() - add_mutations.Add(mutations_list[VINETA]) - /obj/item/weapon/dnainjector/antimute name = "\improper DNA injector (Anti-Mute)" New() diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index e1d91f0d173..562ba702797 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -68,10 +68,7 @@ h1.alert, h2.alert {color: #000000;} .interface {color: #330033;} .sans {font-family: "Comic Sans MS", cursive, sans-serif;} -.papyrus {font-family: "Papyrus", cursive, sans-serif;} -.vineta {font-family: "Vineta BT", cursive, sans-serif;} -.jokerman {font-family: "Jokerman", cursive, sans-serif;} -.robot {font-family: "OCR A Extended", cursive, sans-serif;} +.robot {font-family: "Courier New", cursive, sans-serif;} BIG IMG.icon {width: 32px; height: 32px;}