Merge pull request #696 from Citadel-Station-13/upstream-merge-25458

[MIRROR] Belligerent now prevents you from running even between chants

code/datums/status_effects/buffs.dm

@@ -13,6 +13,7 @@
 /datum/status_effect/shadow_mend/on_apply()
 	owner.visible_message("<span class='notice'>Violet light wraps around [owner]'s body!</span>", "<span class='notice'>Violet light wraps around your body!</span>")
 	playsound(owner, 'sound/magic/Teleport_app.ogg', 50, 1)
+	return ..()
 
 /datum/status_effect/shadow_mend/tick()
 	owner.adjustBruteLoss(-15)
@@ -77,6 +78,7 @@
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
 	progbar.update(duration - world.time)
+	return ..()
 
 /datum/status_effect/vanguard_shield/tick()
 	progbar.update(duration - world.time)
@@ -129,6 +131,7 @@
 	animate(owner, color = oldcolor, time = 150, easing = EASE_IN)
 	addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 150)
 	playsound(owner, 'sound/magic/Ethereal_Enter.ogg', 50, 1)
+	return ..()
 
 /datum/status_effect/inathneqs_endowment/on_remove()
 	add_logs(owner, null, "lost Inath-neq's invulnerability")
@@ -180,6 +183,7 @@
 /datum/status_effect/his_grace/on_apply()
 	add_logs(owner, null, "gained His Grace's stun immunity")
 	owner.add_stun_absorption("hisgrace", INFINITY, 3, null, "His Grace protects you from the stun!")
+	return ..()
 
 /datum/status_effect/his_grace/tick()
 	bloodlust = 0
@@ -213,6 +217,7 @@
 
 /datum/status_effect/wish_granters_gift/on_apply()
 	to_chat(owner, "<span class='notice'>Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...</span>")
+	return ..()
 
 /datum/status_effect/wish_granters_gift/on_remove()
 	owner.revive(full_heal = 1, admin_revive = 1)

code/datums/status_effects/debuffs.dm

@@ -29,3 +29,50 @@
 	owner.adjustBruteLoss(0.1)
 	owner.adjustFireLoss(0.1)
 	owner.adjustToxLoss(0.2, TRUE, TRUE)
+
+/datum/status_effect/belligerent
+	id = "belligerent"
+	duration = 70
+	tick_interval = 0 //tick as fast as possible
+	status_type = STATUS_EFFECT_REPLACE
+	alert_type = /obj/screen/alert/status_effect/belligerent
+	var/leg_damage_on_toggle = 2 //damage on initial application and when the owner tries to toggle to run
+	var/cultist_damage_on_toggle = 10 //damage on initial application and when the owner tries to toggle to run, but to cultists
+
+/obj/screen/alert/status_effect/belligerent
+	name = "Belligerent"
+	desc = "<b><font color=#880020>Kneel, her-eti'c.</font></b>"
+	icon_state = "belligerent"
+	alerttooltipstyle = "clockcult"
+
+/datum/status_effect/belligerent/on_apply()
+	return do_movement_toggle(TRUE)
+
+/datum/status_effect/belligerent/tick()
+	if(!do_movement_toggle())
+		qdel(src)
+
+/datum/status_effect/belligerent/proc/do_movement_toggle(force_damage)
+	var/number_legs = owner.get_num_legs()
+	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.null_rod_check() && number_legs)
+		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
+			if(GLOB.ratvar_awakens)
+				owner.Weaken(1)
+			if(iscultist(owner))
+				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, "l_leg")
+				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, "r_leg")
+			else
+				owner.apply_damage(leg_damage_on_toggle * 0.5, BURN, "l_leg")
+				owner.apply_damage(leg_damage_on_toggle * 0.5, BURN, "r_leg")
+		if(owner.m_intent != MOVE_INTENT_WALK)
+			if(!iscultist(owner))
+				to_chat(owner, "<span class='warning'>Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!</span>")
+			else //Cultists take extra burn damage
+				to_chat(owner, "<span class='warning'>Your leg[number_legs > 1 ? "s burn":" burns"] with pain!</span>")
+			owner.toggle_move_intent()
+		return TRUE
+	return FALSE
+
+/datum/status_effect/belligerent/on_remove()
+	if(owner.m_intent == MOVE_INTENT_WALK)
+		owner.toggle_move_intent()

code/datums/status_effects/gas.dm

@@ -16,6 +16,7 @@
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
 	owner.add_overlay(cube)
 	owner.update_canmove()
+	return ..()
 
 /datum/status_effect/freon/tick()
 	owner.update_canmove()

code/datums/status_effects/status_effect.dm

@@ -31,10 +31,9 @@
 /datum/status_effect/proc/start_ticking()
 	if(!src)
 		return
-	if(!owner)
+	if(!owner || !on_apply())
 		qdel(src)
 		return
-	on_apply()
 	if(duration != -1)
 		duration = world.time + initial(duration)
 	tick_interval = world.time + initial(tick_interval)
@@ -55,6 +54,8 @@
 		qdel(src)
 
 /datum/status_effect/proc/on_apply() //Called whenever the buff is applied.
+	return TRUE
+
 /datum/status_effect/proc/tick() //Called every tick.
 /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
 /datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted