Adds 3 new disabilities

lh13284 · Jan 18, 2015 · b64efc6 · b64efc6
1 parent e9b864a
commit b64efc6
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 16 deletions.
diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
@@ -18,7 +18,10 @@
 #define STEALTH		"Cloak Of Darkness"
 #define CHAMELEON	"Chameleon"
 #define WACKY		"Wacky"
-#define MUT_MUTE		"Mute"
+#define JOKE		"Joke"
+#define VINETA		"Vineta"
+#define PAPYRUS		"Papyrus"
+#define MUT_MUTE	"Mute"
 #define SMILE		"Smile"
 #define UNINTELLIGABLE		"Unintelligable"
 #define SWEDISH		"Swedish"
@@ -61,7 +64,7 @@
 #define DNA_FACIAL_HAIR_STYLE_BLOCK	6
 #define DNA_HAIR_STYLE_BLOCK		7
 
-#define DNA_STRUC_ENZYMES_BLOCKS	23
+#define DNA_STRUC_ENZYMES_BLOCKS	26
 #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
@@ -9,6 +9,40 @@
 		message = "<span class='sans'>[message]</span>"
 	return message
 
+/datum/mutation/human/joke
+	name = "Joke"
+	quality = MINOR_NEGATIVE
+	text_gain_indication = "<span class='jokerman'>You feel an off sensation in your voicebox.</span>"
+	text_lose_indication = "<span class='notice'>The off sensation passes.</span>"
+
+/datum/mutation/human/joke/say_mod(var/message)
+	if(message)
+		message = "<span class='jokerman'>[message]</span>"
+	return message
+
+/datum/mutation/human/papyrus
+	name = "Papyrus"
+	quality = MINOR_NEGATIVE
+	text_gain_indication = "<span class='papyrus'>You feel an off sensation in your voicebox.</span>"
+	text_lose_indication = "<span class='notice'>The off sensation passes.</span>"
+
+/datum/mutation/human/papyrus/say_mod(var/message)
+	if(message)
+		message = "<span class='papyrus'>[message]</span>"
+	return message
+
+/datum/mutation/human/vineta
+	name = "Vineta"
+	quality = MINOR_NEGATIVE
+	text_gain_indication = "<span class='vineta'>You feel an off sensation in your voicebox.</span>"
+	text_lose_indication = "<span class='notice'>The off sensation passes.</span>"
+
+/datum/mutation/human/vineta/say_mod(var/message)
+	if(message)
+		message = "<span class='vineta'>[message]</span>"
+	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
@@ -288,6 +288,42 @@
 		..()
 		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/html/changelogs/Iamgoofball.yml b/html/changelogs/Iamgoofball.yml
@@ -3,4 +3,4 @@ author: Iamgoofball
 delete-after: True
 
 changes: 
-  - rscadd: "Adds 6 new Disabilites and 2 new genetic powers."
+  - rscadd: "Adds 9 new Disabilites and 2 new genetic powers."
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
@@ -31,19 +31,6 @@ em						{font-style: normal;	font-weight: bold;}
 .medradio				{color: #337296;}
 .engradio				{color: #fb5613;}
 .suppradio				{color: #a8732b;}
-.servradio				{color: #6eaa2c;}
-.syndradio				{color: #6d3f40;}
-.dsquadradio			{color: #686868;}
-.aiprivradio			{color: #ff00ff;}
-
-.alert					{color: #ff0000;}
-h1.alert, h2.alert		{color: #000000;}
-
-.emote					{					font-style: italic;}
-.selecteddna			{color: #ffffff; 	background-color: #001B1B}
-
-.attack					{color: #ff0000;}
-.disarm					{color: #990000;}
 .passive				{color: #660000;}
 
 .userdanger				{color: #ff0000;	font-weight: bold;}
@@ -68,6 +55,9 @@ 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;}
 
 BIG IMG.icon 			{width: 32px; height: 32px;}