Merge branch 'KabKebab:master' into minor_reworks

code/datums/diseases/advance/symptoms/species.dm

@@ -31,3 +31,19 @@
 
 /datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
 	A.infectable_biotypes &= ~MOB_INORGANIC
+
+/datum/symptom/robotic_adaptation //GS13
+	name = "Electronic propagation"
+	desc = "The virus learns to feed off and utilize electric signals to create computer virus copies of itself, allowing it to work inside of robotic hosts. Any reports stating the virus have tiny programmer socks attached to their cell's membranes are not scientifically accurate and false."
+	stealth = 1
+	resistance = -1
+	stage_speed = 3
+	transmittable = 0
+	level = 5
+	severity = 0
+
+/datum/symptom/robotic_adaptation/OnAdd(datum/disease/advance/A)
+	A.infectable_biotypes |= MOB_ROBOTIC
+
+/datum/symptom/robotic_adaptation/OnRemove(datum/disease/advance/A)
+	A.infectable_biotypes &= ~MOB_ROBOTIC

code/modules/antagonists/disease/disease_abilities.dm

@@ -37,6 +37,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	new /datum/disease_ability/symptom/powerful/flesh_eating,
 //	new /datum/disease_ability/symptom/powerful/genetic_mutation,
 	new /datum/disease_ability/symptom/powerful/inorganic_adaptation,
+	new /datum/disease_ability/symptom/medium/undead_adaptation,
 	new /datum/disease_ability/symptom/powerful/heal/starlight,
 	new /datum/disease_ability/symptom/powerful/heal/oxygen,
 	new /datum/disease_ability/symptom/powerful/heal/chem,
@@ -47,7 +48,8 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	new /datum/disease_ability/symptom/powerful/heal/radiation,
 	new /datum/disease_ability/symptom/powerful/heal/coma,
 	new /datum/disease_ability/symptom/powerful/youth,
-	new /datum/disease_ability/symptom/medium/heal/weight_gain
+	new /datum/disease_ability/symptom/medium/heal/weight_gain, //GS13
+	new /datum/disease_ability/symptom/medium/robotic_adaptation //GS13
 	))
 
 /datum/disease_ability
@@ -411,6 +413,13 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 
 /datum/disease_ability/symptom/powerful/inorganic_adaptation
 	symptoms = list(/datum/symptom/inorganic_adaptation)
+	short_desc = "Allows to infect inorganic races."
+	long_desc = "Allows to infect inorganic races. Includes plasmamen and golems."
+
+/datum/disease_ability/symptom/medium/undead_adaptation
+	symptoms = list(/datum/symptom/undead_adaptation)
+	short_desc = "Allows to infect undead races."
+	long_desc = "Allows to infect undead races. Includes skeletons, zombies, and vampires."
 
 /datum/disease_ability/symptom/powerful/narcolepsy
 	symptoms = list(/datum/symptom/narcolepsy)
@@ -420,11 +429,18 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	short_desc = "Cause victims to become eternally young."
 	long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
 
+//GS13 additions
 /datum/disease_ability/symptom/medium/heal/weight_gain
 	symptoms = list(/datum/symptom/weight_gain)
 	short_desc = "Cause victims to gain weight."
 	long_desc = "Cause victims to gain weight. Boosts stage speed, but weakens all other stats."
 
+/datum/disease_ability/symptom/medium/robotic_adaptation
+	symptoms = list(/datum/symptom/robotic_adaptation)
+	short_desc = "Allows to infect robotic races."
+	long_desc = "Allows to infect robotic races. Includes synthetic lizards and ipcs."
+//--end here
+
 /****HEALING SUBTYPE****/
 
 /datum/disease_ability/symptom/powerful/heal/starlight

code/modules/clothing/suits/miscellaneous.dm

@@ -29,7 +29,7 @@
 	resistance_flags = NONE
 
 /*
- * Posshim's Corpus atire 
+ * Posshim's Corpus atire
  */
 /obj/item/clothing/suit/hooded/corpus/
 	name = "Standard Voidsuit"
@@ -517,6 +517,12 @@
 	icon_state = "letterman_s"
 	item_state = "letterman_s"
 
+/obj/item/clothing/suit/jacket/letterman_gato
+	name = "Gato letterman jacket"
+	desc = "A GATO themed letterman jacket. Perfect for repping your pride in the company as you violently murder russian mobsters"
+	icon_state = "letterman_gato"
+	item_state = "letterman_gato"
+
 /obj/item/clothing/suit/jacket/letterman_nanotrasen
 	name = "blue letterman jacket"
 	desc = "A blue letterman jacket with a proud Nanotrasen N on the back. The tag says that it was made in Space China."

code/modules/vending/clothesmate.dm

@@ -8,6 +8,7 @@
 	vend_reply = "Thank you for using the ClothesMate!"
 	products = list(/obj/item/clothing/head/that = 4,
 		            /obj/item/clothing/head/fedora = 3,
+		            /obj/item/clothing/suit/jacket/letterman_gato = 5,
 		            /obj/item/clothing/glasses/monocle = 3,
 		            /obj/item/clothing/suit/jacket = 4,
 					/obj/item/clothing/suit/jacket/flannel = 4,