Merge pull request #2860 from VOREStation/polaris-sync-2018-01-27

Polaris Sync 2018-01-27

code/modules/mob/_modifiers/cloning.dm

@@ -39,7 +39,25 @@
 
 // Prevents borging (specifically the MMI part), actual effect is on the MMI.
 /datum/modifier/no_borg
-	name = "Cyboernetic Incompatability"
+	name = "Cybernetic Incompatability"
 	desc = "For whatever reason, your brain is incompatable with direct cybernetic interfaces, such as the MMI."
 
-	flags = MODIFIER_GENETIC
+	flags = MODIFIER_GENETIC
+
+//////////////////////////////////////
+//Species-Specific Cloning Modifiers//
+/////////////////////////////////////
+
+/datum/modifier/cloning_sickness/promethean
+	name = "reformation sickness"
+	desc = "Your core feels damaged, as you were reformed with the improper machinery."
+
+	on_created_text = "<span class='warning'><font size='3'>Your core aches.</font></span>"
+	on_expired_text = "<span class='notice'><font size='3'>You feel your core's strength returning to normal.</font></span>"
+
+	incoming_damage_percent = 1 //Level the incoming damage from the parent modifier. They already take 200% burn.
+	incoming_brute_damage_percent = 1.5 //150% incoming brute damage. Decreases the effectiveness of their 0.75 modifier.
+	incoming_hal_damage_percent = 1.25 //125% incoming halloss.
+
+	outgoing_melee_damage_percent = 0.5 //50% less outgoing melee damage.
+	attack_speed_percent = 1.2 //20% slower attack speed.

code/modules/mob/_modifiers/traits.dm

@@ -64,13 +64,13 @@
 	name = "Larger"
 	desc = "Your body is larger than average."
 
-	icon_scale_percent = 1.2
+	icon_scale_percent = 1.1
 
 /datum/modifier/trait/large
 	name = "Large"
 	desc = "Your body is a bit larger than average."
 
-	icon_scale_percent = 1.1
+	icon_scale_percent = 1.05
 
 /datum/modifier/trait/small
 	name = "Small"

code/modules/mob/_modifiers/traits_phobias.dm

@@ -437,8 +437,7 @@
 				fear_amount += 1
 			if(istype(S.species, /datum/species/shapeshifter/promethean))
 				fear_amount += 4
-			else
-				return
+				
 	return fear_amount
 
 /datum/modifier/trait/phobia/trypanophobe

code/modules/mob/hear_say.dm

@@ -87,7 +87,9 @@
 
 // Checks if the mob's own name is included inside message.  Handles both first and last names.
 /mob/proc/check_mentioned(var/message)
+	var/not_included = list("a", "the", "of", "in", "for", "through", "throughout", "therefore", "here", "there", "then", "now", "I", "you", "they", "he", "she", "by")
 	var/list/valid_names = splittext(real_name, " ") // Should output list("John", "Doe") as an example.
+	valid_names -= not_included
 	var/list/nicknames = splittext(nickname, " ")
 	valid_names += nicknames
 	valid_names += special_mentions()

code/modules/mob/living/carbon/human/species/species.dm

@@ -15,6 +15,7 @@
 
 	var/speech_bubble_appearance = "normal"              // Part of icon_state to use for speech bubbles when talking.  See talk.dmi for available icons.
 	var/fire_icon_state = "humanoid"                     // The icon_state used inside OnFire.dmi for when on fire.
+	var/suit_storage_icon = 'icons/mob/belt_mirror.dmi'  // Icons used for worn items in suit storage slot.
 
 	// Damage overlay and masks.
 	var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi'
@@ -90,6 +91,7 @@
 	var/death_sound
 	var/death_message = "seizes up and falls limp, their eyes dead and lifeless..."
 	var/knockout_message = "has been knocked unconscious!"
+	var/cloning_modifier = /datum/modifier/cloning_sickness
 
 	// Environment tolerance/life processes vars.
 	var/reagent_tag                                   //Used for metabolizing reagents.

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -44,6 +44,8 @@ var/datum/species/shapeshifter/promethean/prometheans
 	burn_mod =		2
 	oxy_mod =		0
 
+	cloning_modifier = /datum/modifier/cloning_sickness/promethean
+
 	cold_level_1 = 280 //Default 260 - Lower is better
 	cold_level_2 = 220 //Default 200
 	cold_level_3 = 130 //Default 120

code/modules/mob/living/carbon/human/species/station/seromi.dm

@@ -33,6 +33,7 @@
 	damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi'
 	damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi'
 	blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi'
+	suit_storage_icon = 'icons/mob/species/seromi/belt_mirror.dmi'
 
 	fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying.
 

code/modules/mob/living/carbon/human/update_icons.dm

@@ -935,7 +935,7 @@ var/global/list/damage_icon_parts = list()
 	if(s_store)
 		var/t_state = s_store.item_state
 		if(!t_state)	t_state = s_store.icon_state
-		overlays_standing[SUIT_STORE_LAYER]	= image("icon" = 'icons/mob/belt_mirror.dmi', "icon_state" = "[t_state]")
+		overlays_standing[SUIT_STORE_LAYER]	= image("icon" = species.suit_storage_icon, "icon_state" = "[t_state]")
 		s_store.screen_loc = ui_sstore1		//TODO
 	else
 		overlays_standing[SUIT_STORE_LAYER]	= null

code/modules/mob/living/life.dm

@@ -208,10 +208,8 @@
 		set_light(min(round(fire_stacks), 3), round(fire_stacks), l_color = "#FF9933")
 		return TRUE
 
-	//VOREStation Add - Glowy trait
 	else if(glow_toggle)
 		set_light(2, l_color = glow_color) //2 is PDA brightness, so neutral in terms of balance
-	//VOREStation Add End
 
 	else
 		set_light(0)

code/modules/mob/living/living_defines.dm

@@ -47,4 +47,8 @@
 
 	var/evasion = 0 // Makes attacks harder to land.  Each number equals 15% more likely to miss.  Negative numbers increase hit chance.
 	var/force_max_speed = 0 // If 1, the mob runs extremely fast and cannot be slowed.
-	var/image/dsoverlay = null //Overlay used for darksight eye adjustments
+  
+	var/image/dsoverlay = null //Overlay used for darksight eye adjustments
+
+	var/glow_toggle = 0					// If they're glowing!
+	var/glow_color = "#FFFFFF"			// The color they're glowing!

code/modules/mob/mob_planes.dm

@@ -34,6 +34,8 @@
 	plane_masters[VIS_D_COLORBLIND] = new /obj/screen/plane_master/colorblindness					//Colorblindness (affects world)
 	plane_masters[VIS_D_COLORBLINDI]= new /obj/screen/plane_master/colorblindness/items 			//Colorblindness (items in HUD, subplane of above, don't toggle)
 
+	plane_masters[VIS_MESONS]		= new /obj/screen/plane_master{plane = PLANE_MESONS} 			//Meson-specific things like open ceilings.
+
 	..()
 
 /datum/plane_holder/Destroy()