Changeling Rebuff (#3393)

* a

* Update changeling.dm

* a

* a

* Update mutations.dm

* Update mutations.dm

* a

* Changeling Trueform Timer

Yes

* a

* Update true_changeling.dm

code/game/gamemodes/changeling/changeling.dm

@@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
 	<span class='green'>Changelings</span>: Accomplish the objectives assigned to you.\n\
 	<span class='notice'>Crew</span>: Root out and eliminate the changeling menace."
 
-	var/const/changeling_amount = 4 //hard limit on changelings if scaling is turned off
+	var/const/changeling_amount = 6 //hard limit on changelings if scaling is turned off //SKYRAT EDIT CHANGE - ORIGINAL: 4
 	var/list/changelings = list()
 
 /datum/game_mode/changeling/pre_setup()

code/modules/antagonists/changeling/changeling.dm

@@ -19,23 +19,25 @@
 
 	var/list/stored_profiles = list() //list of datum/changelingprofile
 	var/datum/changelingprofile/first_prof = null
-	var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation.
+	var/dna_max = 8 //How many extra DNA strands the changeling can store for transformation. // SKYRAT EDIT CHANGE : ORIGINAL: 6
 	var/absorbedcount = 0
 	var/trueabsorbs = 0//dna gained using absorb, not dna sting
-	var/chem_charges = 20
-	var/chem_storage = 75
-	var/chem_recharge_rate = 0.5
+	var/chem_charges = 75 //SKYRAT EDIT CHANGE - ORIGINAL: 20
+	var/chem_storage = 125 //SKYRAT EDIT CHANGE - ORIGINAL: 75
+	var/chem_recharge_rate = 2 //SKYRAT EDIT CHANGE - ORIGINAL: 1
 	var/chem_recharge_slowdown = 0
 	var/sting_range = 2
 	var/geneticdamage = 0
 	var/was_absorbed = FALSE //if they were absorbed by another ling already.
 	var/isabsorbing = FALSE
 	var/islinking = FALSE
-	var/geneticpoints = 10
-	var/total_geneticspoints = 10
-	var/total_chem_storage = 75
+	var/geneticpoints = 15 //SKYRAT EDIT CHANGE - ORIGINAL: 10
+	var/total_geneticspoints = 15 //SKYRAT EDIT CHANGE - ORIGINAL: 10
+	var/total_chem_storage = 125 //SKYRAT EDIT CHANGE - ORIGINAL: 75
 	var/purchasedpowers = list()
 
+	var/true_form_death //SKYRAT EDIT ADDITION: The time that the horror form died.
+
 	var/mimicing = ""
 	var/canrespec = FALSE//set to TRUE in absorb.dm
 	var/changeling_speak = 0

code/modules/antagonists/changeling/powers/adrenaline.dm

@@ -13,6 +13,7 @@
 	..()
 	to_chat(user, "<span class='notice'>Energy rushes through us.</span>")
 	user.SetKnockdown(0)
+	user.setStaminaLoss(0) //SKYRAT EDIT ADDITION
 	user.set_resting(FALSE)
 	user.reagents.add_reagent(/datum/reagent/medicine/changelingadrenaline, 4) //20 seconds
 	user.reagents.add_reagent(/datum/reagent/medicine/changelinghaste, 3) //6 seconds, for a really quick burst of speed

code/modules/antagonists/changeling/powers/mutations.dm

@@ -155,7 +155,7 @@
 	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
 	item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
-	force = 25
+	force = 30 //SKYRAT EDIT - ORIGINAL: 25
 	throwforce = 0 //Just to be on the safe side
 	throw_range = 0
 	throw_speed = 0
@@ -163,8 +163,8 @@
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
 	sharpness = SHARP_EDGED
-	wound_bonus = -20
-	bare_wound_bonus = 20
+	wound_bonus = 20 //SKYRAT EDIT - ORIGINAL: -20
+	bare_wound_bonus = 30 //SKYRAT EDIT: ORIGINAL: 20
 	var/can_drop = FALSE
 	var/fake = FALSE
 

modular_skyrat/modules/horrorform/code/modules/antagonists/changeling/powers/horror_form.dm

@@ -1,4 +1,3 @@
-
 /datum/action/changeling/horror_form //Horror Form: turns the changeling into a terrifying abomination
 	name = "Horror Form"
 	desc = "We tear apart our human disguise, revealing our true form."

modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm

@@ -15,8 +15,8 @@
 	icon_living = "horror"
 	icon_dead = "horror_dead"
 	mob_biotypes = MOB_ORGANIC
-	speed = 1
-	stop_automated_movement = 1
+	speed = 0.5
+	stop_automated_movement = FALSE
 	status_flags = CANPUSH
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
@@ -25,9 +25,9 @@
 	maxHealth = 500 //Very durable
 	health = 500
 	healable = 0
-	environment_smash = 1
-	melee_damage_lower = 30
-	melee_damage_upper = 40
+	environment_smash = TRUE
+	melee_damage_lower = 40
+	melee_damage_upper = 50
 //	see_in_dark = 8
 //	see_invisible = SEE_INVISIBLE_MINIMUM
 	wander = 0
@@ -109,6 +109,8 @@
 		stored_changeling.Paralyze(10 SECONDS) //Make them helpless for 10 seconds
 		stored_changeling.adjustBruteLoss(30, TRUE, TRUE)
 		stored_changeling.status_flags &= ~GODMODE
+		var/datum/antagonist/changeling/C = mind.has_antag_datum(/datum/antagonist/changeling)
+		C.true_form_death = world.time
 		qdel(src)
 	else
 		visible_message("<span class='warning'>[src] lets out a waning scream as it falls, twitching, to the floor.</span>")