Makes Jungleland Good (#22669)

* makes jungleland good

* cooldown fix

* tar king stuff

Author: SapphicOverload

code/__DEFINES/colors.dm

@@ -108,6 +108,7 @@
 #define COLOR_VIOLET "#B900F7"
 #define COLOR_STRONG_VIOLET "#6927C5"
 #define COLOR_DARK_PURPLE "#551A8B"
+#define COLOR_TAR_PURPLE "#553F8A"
 
 #define COLOR_ORANGE "#FF9900"
 #define COLOR_IRISH_ORANGE "#FF883E"

code/__DEFINES/maths.dm

@@ -5,6 +5,7 @@
 #define NUM_E 2.71828183
 
 #define PI 3.1416
+#define SQRT_2 1.414214
 #define INFINITY 1e31 //closer then enough
 
 #define SHORT_REAL_LIMIT 16777216

code/__DEFINES/say.dm

@@ -79,6 +79,7 @@
 #define SPAN_CULTLARGE "cultlarge"
 #define SPAN_HELIUM "small"
 #define SPAN_PROGENITOR "progenitor"
+#define SPAN_COLOSSUS "colossus"
 
 //bitflag #defines for return value of the radio() proc.
 #define ITALICS			(1<<0)

code/datums/components/afterimage.dm

@@ -18,15 +18,17 @@
 	//cycles colors
 	var/last_colour = 0
 	var/color_cycle = FALSE
+	var/fade_color
 	var/list/hsv
 
-/datum/component/after_image/Initialize(duration = 15, rest_time = 1, color_cycle = FALSE)
+/datum/component/after_image/Initialize(duration = 15, rest_time = 1, color_cycle = FALSE, fade_color)
 	if(!ismovable(parent))
 		return COMPONENT_INCOMPATIBLE
 	owner = parent
 	src.rest_time = rest_time
 	src.duration = duration
 	src.color_cycle = color_cycle
+	src.fade_color = fade_color
 	last_colour = world.time
 
 /datum/component/after_image/RegisterWithParent()
@@ -75,7 +77,10 @@
 	F.pixel_x = (traveled * x_modifier) + owner.pixel_x
 	F.pixel_y = (traveled * y_modifier) + owner.pixel_y
 
-	//give them a random colours
+	//give them colors
+	if(fade_color)
+		F.color = fade_color
+		return
 	if(!color_cycle)
 		return
 	if(!hsv)

code/game/objects/items/grenades/plastic.dm

@@ -32,9 +32,12 @@
 
 /obj/item/grenade/plastic/Destroy()
 	qdel(nadeassembly)
+	if(target)
+		UnregisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS)
+		target.update_appearance()
+		target = null
 	nadeassembly = null
-	target = null
-	..()
+	return ..()
 
 /obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params)
 	if(!nadeassembly && istype(I, /obj/item/assembly_holder))
@@ -55,7 +58,7 @@
 		nadeassembly = null
 		update_appearance(UPDATE_ICON)
 		return
-	..()
+	return ..()
 
 /obj/item/grenade/plastic/prime()
 	var/turf/location
@@ -136,13 +139,17 @@
 			I.throw_range = max(1, (I.throw_range - 3))
 			I.embedding = I.embedding.setRating(embed_chance = 0)
 
-		target.add_overlay(plastic_overlay, TRUE)
+		RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(update_attached_overlays))
+		target.update_appearance(UPDATE_OVERLAYS)
 		if(!nadeassembly)
 			to_chat(user, span_notice("You plant the bomb. Timer counting down from [det_time]."))
 			addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
 		else
 			qdel(src)	//How?
 
+/obj/item/grenade/plastic/proc/update_attached_overlays(atom/source, list/overlay_list)
+	overlay_list += plastic_overlay
+
 /obj/item/grenade/plastic/proc/shout_syndicate_crap(mob/M)
 	if(!M)
 		return
@@ -194,6 +201,9 @@
 
 /obj/item/grenade/plastic/c4/Destroy()
 	qdel(wires)
+	if(target)
+		UnregisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS)
+		target.update_appearance(UPDATE_OVERLAYS)
 	wires = null
 	target = null
 	return ..()

code/modules/mob/living/simple_animal/animal_defense.dm

@@ -6,7 +6,7 @@
 		M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
 		playsound(src, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
 		var/shove_dir = get_dir(M, src)
-		if(!Move(get_step(src, shove_dir), shove_dir))
+		if(move_resist > M.move_force || !Move(get_step(src, shove_dir), shove_dir))
 			log_combat(M, src, "shoved", "failing to move it")
 			M.visible_message(span_danger("[M.name] shoves [src]!"),
 				span_danger("You shove [src]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src))

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

@@ -325,6 +325,7 @@
 		approaching_target = TRUE
 	else
 		approaching_target = FALSE
+	set_glide_size(DELAY_TO_GLIDE_SIZE(delay))
 	walk_to(src, target, minimum_distance, delay)
 
 /mob/living/simple_animal/hostile/adjustHealth(amount, updating_health = TRUE, forced = FALSE)

code/modules/mob/mob.dm

@@ -87,7 +87,7 @@
 	update_config_movespeed()
 	update_movespeed(TRUE)
 
-/mob/New()
+/mob/New(loc, ...)
 	// This needs to happen IMMEDIATELY. I'm sorry :(
 	GenerateTag()
 	return ..()

code/modules/mob/mob_movement.dm

@@ -155,7 +155,7 @@
 
 	var/diagonal = (direct & (direct - 1)) && mob.loc == n
 	if(diagonal) //moved diagonally successfully
-		add_delay *= 1.414214 // sqrt(2)
+		add_delay *= SQRT_2 // sqrt(2)
 	mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay))
 	move_delay += add_delay
 	if(.) // If mob is null here, we deserve the runtime

yogstation/code/datums/components/walks.dm

@@ -81,7 +81,7 @@
 			L.forceMove(T)
 			finalize_move(L, T)
 			if(direction & (direction - 1)) //extra delay for diagonals
-				add_delay *= 1.414214 // sqrt(2)
+				add_delay *= SQRT_2 // sqrt(2)
 			L.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay))
 			move_delay += add_delay
 			return TRUE