Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

code/modules/mob/_modifiers/cloning.dm

@@ -61,3 +61,66 @@
 
 	outgoing_melee_damage_percent = 0.5 //50% less outgoing melee damage.
 	attack_speed_percent = 1.2 //20% slower attack speed.
+
+//////////////////////
+//Surgical Modifiers// As of writing, limited to the 'Frankenstein' modifier.
+//////////////////////
+
+/datum/modifier/franken_sickness
+	name = "surgically attached brain"
+	desc = "You feel weak, as your central nervous system is still recovering from being repaired."
+
+	on_created_text = "<span class='warning'><font size='3'>You feel... off, and your head hurts.</font></span>"
+	on_expired_text = "<span class='notice'><font size='3'>You feel some strength returning to you.</font></span>"
+
+	max_health_percent = 0.9				// -10% max health.
+	incoming_damage_percent = 1.1			// 10% more incoming damage.
+	incoming_hal_damage_percent = 1.5		// 50% more halloss damage, stacking on the previous 1.1 widespread.
+	outgoing_melee_damage_percent = 0.9		// 10% less melee damage.
+	disable_duration_percent = 1.25			// Stuns last 25% longer.
+	incoming_healing_percent = 0.9			// -10% to all healing
+	slowdown = 0.5							// Slower, by a smidge.
+	evasion = -5							// 5% easier to hit.
+	accuracy_dispersion = 1					// Inaccurate trait level of tile dispersion.
+
+	stacks = MODIFIER_STACK_ALLOWED //You have somehow had the surgery done twice. Your brain is very, very fucked, but I won't say no.
+
+/datum/modifier/franken_sickness/can_apply(var/mob/living/L)
+	if(!ishuman(L))
+		return FALSE
+	if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
+		return FALSE
+
+	return ..()
+
+/datum/modifier/franken_sickness/tick()
+	if(holder.stat != DEAD)
+		if(istype(holder, /mob/living/carbon/human))
+			var/mob/living/carbon/human/F = holder
+			if(F.can_defib)
+				F.can_defib = 0
+
+/datum/modifier/franken_sickness/on_expire() //Not permanent, but its child is.
+	holder.add_modifier(/datum/modifier/franken_recovery, 0)
+
+/datum/modifier/franken_recovery //When Franken_Sickness expires, this will be permanently applied in its place.
+	name = "neural recovery"
+	desc = "You feel out of touch, as your central nervous system is still recovering from being repaired."
+
+	on_created_text = "<span class='warning'><font size='3'>You feel... off. Everything is fuzzy.</font></span>"
+	on_expired_text = "<span class='notice'><font size='3'>You feel your senses returning to you.</font></span>"
+
+	incoming_hal_damage_percent = 1.5		// 50% more halloss damage.
+	disable_duration_percent = 1.25			// Stuns last 25% longer.
+	evasion = -5							// 5% easier to hit.
+	accuracy_dispersion = 1					// Inaccurate trait level of tile dispersion.
+
+	stacks = MODIFIER_STACK_ALLOWED
+
+/datum/modifier/franken_recovery/can_apply(var/mob/living/L)
+	if(!ishuman(L))
+		return FALSE
+	if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
+		return FALSE
+
+	return ..()

code/modules/mob/_modifiers/modifiers.dm

@@ -39,7 +39,7 @@
 	var/haste							// If set to 1, the mob will be 'hasted', which makes it ignore slowdown and go really fast.
 	var/evasion							// Positive numbers reduce the odds of being hit. Negative numbers increase the odds.
 	var/bleeding_rate_percent			// Adjusts amount of blood lost when bleeding.
-	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder. Every 15% is equal to one tile easier or harder, just like evasion.
+	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder.
 	var/accuracy_dispersion				// Positive numbers make gun firing cover a wider tile range, and therefore more inaccurate.  Negatives help negate dispersion penalties.
 	var/metabolism_percent				// Adjusts the mob's metabolic rate, which affects reagent processing.  Won't affect mobs without reagent processing.
 	var/icon_scale_percent				// Makes the holder's icon get scaled up or down.
@@ -208,13 +208,13 @@
 		effects += "You move at maximum speed, and cannot be slowed by any means."
 
 	if(!isnull(evasion))
-		effects += "You are [abs(evasion * 15)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."
+		effects += "You are [abs(evasion)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."
 
 	if(!isnull(bleeding_rate_percent))
 		effects += "You bleed [multipler_to_percentage(bleeding_rate_percent, TRUE)] [bleeding_rate_percent > 1.0 ? "faster" : "slower"]."
 
 	if(!isnull(accuracy))
-		effects += "It is [abs(accuracy * 15)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."
+		effects += "It is [abs(accuracy)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."
 
 	if(!isnull(accuracy_dispersion))
 		effects += "Projectiles you fire are [accuracy_dispersion > 0 ? "more" : "less"] likely to stray from your intended target."

code/modules/mob/_modifiers/modifiers_misc.dm

@@ -60,9 +60,9 @@ the artifact triggers the rage.
 	pain_immunity = TRUE					// Avoid falling over from shock (at least until it expires).
 
 	// The less good stuff.
-	accuracy = -5							// Aiming requires focus.
+	accuracy = -75							// Aiming requires focus.
 	accuracy_dispersion = 3					// Ditto.
-	evasion = -3							// Too angry to dodge.
+	evasion = -45							// Too angry to dodge.
 
 	var/nutrition_cost = 150
 	var/exhaustion_duration = 2 MINUTES 	// How long the exhaustion modifier lasts after it expires. Set to 0 to not apply one.
@@ -157,7 +157,7 @@ the artifact triggers the rage.
 	attack_speed_percent = 1.5
 	outgoing_melee_damage_percent = 0.6
 	disable_duration_percent = 1.5
-	evasion = -2
+	evasion = -30
 
 /datum/modifier/berserk_exhaustion/on_applied()
 	holder.visible_message("<span class='warning'>\The [holder] looks exhausted.</span>")
@@ -177,6 +177,6 @@ the artifact triggers the rage.
 	stacks = MODIFIER_STACK_EXTEND
 
 	// Just being mad isn't gonna overclock your body when you're a beepboop.
-	accuracy = -5				// Aiming requires focus.
+	accuracy = -75				// Aiming requires focus.
 	accuracy_dispersion = 3		// Ditto.
-	evasion = -3				// Too angry to dodge.
+	evasion = -45				// Too angry to dodge.