Merge pull request #15675 from Fox-McCloud/his-grace-ascended

Implements Better His Grace

code/modules/arcade/prize_datums.dm

@@ -251,6 +251,12 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
 	typepath = /obj/item/toy/foamblade
 	cost = 100
 
+/datum/prize_item/wind_up_toolbox
+	name = "Wind Up Toolbox"
+	desc = "A replica toolbox that rumbles when you turn the key."
+	typepath = /obj/item/toy/windup_toolbox
+	cost = 100
+
 /datum/prize_item/redbutton
 	name = "Shiny Red Button"
 	desc = "PRESS IT!"

code/modules/mining/equipment/survival_pod.dm

@@ -323,7 +323,7 @@
 						/obj/item/lava_staff,
 						/obj/item/katana/energy,
 						/obj/item/hierophant_club,
-						/obj/item/storage/toolbox/green/memetic,
+						/obj/item/his_grace,
 						/obj/item/gun/projectile/automatic/l6_saw,
 						/obj/item/gun/magic/staff/chaos,
 						/obj/item/gun/magic/staff/spellblade,

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -214,7 +214,7 @@
 	var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency,	//which toolboxes can be made into floorbots
 								/obj/item/storage/toolbox/electrical,
 								/obj/item/storage/toolbox/mechanical,
-								/obj/item/storage/toolbox/green,
+								/obj/item/storage/toolbox/artistic,
 								/obj/item/storage/toolbox/syndicate,
 								/obj/item/storage/toolbox/fakesyndi)
 
@@ -223,8 +223,6 @@
 		return
 	if(!is_type_in_list(src, allowed_toolbox))
 		return
-	if(type == /obj/item/storage/toolbox/green/memetic)
-		return
 	if(contents.len >= 1)
 		to_chat(user, "<span class='warning'>They won't fit in, as there is already stuff inside.</span>")
 		return
@@ -242,7 +240,7 @@
 				B.toolbox_color = "or"
 			if(/obj/item/storage/toolbox/electrical)
 				B.toolbox_color = "y"
-			if(/obj/item/storage/toolbox/green)
+			if(/obj/item/storage/toolbox/artistic)
 				B.toolbox_color = "g"
 			if(/obj/item/storage/toolbox/syndicate)
 				B.toolbox_color = "s"

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

@@ -69,7 +69,7 @@ Difficulty: Medium
 			ranged_cooldown = world.time + ranged_cooldown_time
 		else
 			visible_message("<span class='warning'><b>[src] charges!</b></span>")
-			SpinAnimation(speed = 20, loops = 5)
+			SpinAnimation(speed = 20, loops = 5, parallel = FALSE)
 			ranged = 0
 			retreat_distance = 0
 			minimum_distance = 0

code/modules/mob/living/status_procs.dm

@@ -365,9 +365,6 @@
 // STUN
 
 /mob/living/Stun(amount, updating = 1, force = 0)
-	if(status_flags & CANSTUN || force)
-		if(absorb_stun(amount, force))
-			return FALSE
 	return SetStunned(max(stunned, amount), updating, force)
 
 /mob/living/SetStunned(amount, updating = 1, force = 0) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
@@ -377,6 +374,8 @@
 		. = STATUS_UPDATE_NONE
 
 	if(status_flags & CANSTUN || force)
+		if(absorb_stun(amount, force))
+			return STATUS_UPDATE_NONE
 		stunned = max(amount, 0)
 		if(updating)
 			update_canmove()
@@ -405,9 +404,6 @@
 // WEAKEN
 
 /mob/living/Weaken(amount, updating = 1, force = 0)
-	if(status_flags & CANWEAKEN || force)
-		if(absorb_stun(amount, force))
-			return FALSE
 	return SetWeakened(max(weakened, amount), updating, force)
 
 /mob/living/SetWeakened(amount, updating = 1, force = 0)
@@ -416,6 +412,8 @@
 		updating = FALSE
 		. = STATUS_UPDATE_NONE
 	if(status_flags & CANWEAKEN || force)
+		if(absorb_stun(amount, force))
+			return STATUS_UPDATE_NONE
 		weakened = max(amount, 0)
 		if(updating)
 			update_canmove()	//updates lying, canmove and icons