Balance changes

Fluffy-Frontier · Oct 4, 2023 · 29e3f7b · 29e3f7b
1 parent dbfa136
commit 29e3f7b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/tff_modular/modules/dm_construct13/code/tools/physic_gun.dm b/tff_modular/modules/dm_construct13/code/tools/physic_gun.dm
@@ -178,12 +178,12 @@
 		pause_atom(handlet_atom)
 		return
 	else if(LAZYACCESS(modifiers, CTRL_CLICK))
-		release_atom()
+		repulse(handlet_atom, physgun_user)
 		return
 	else if(LAZYACCESS(modifiers, ALT_CLICK))
 		rotate_object(handlet_atom)
 		return
-	repulse(handlet_atom, physgun_user)
+	release_atom()
 
 /obj/item/physic_manipulation_tool/proc/on_living_resist(mob/living)
 	SIGNAL_HANDLER

diff --git a/tff_modular/modules/dm_construct13/code/tools/physic_tool_moodes/phys_size.dm b/tff_modular/modules/dm_construct13/code/tools/physic_tool_moodes/phys_size.dm
@@ -21,10 +21,13 @@
 		var/mob/living/living_target = target
 		if(living_target.client)
 			return
-	target.pixel_x *= value
-	target.pixel_y *= value
-	target.transform = target.transform.Scale(value)
 	var/translate_x = value * ( target.transform.b / value )
 	var/translate_y = value * ( target.transform.e / value )
+	if(((translate_x || translate_y) >= 8) || ((translate_x || translate_y) <= 0.125))
+		translate_x = target.transform.b
+		translate_y = target.transform.e
 	target.transform = target.transform.Translate(translate_x, translate_y)
+	target.pixel_x *= value
+	target.pixel_y *= value
+	target.transform = target.transform.Scale(value)
 	target.maptext_height = 32 * value
diff --git a/tff_modular/modules/dm_construct13/code/tools/physic_tool_moodes/phys_spawn.dm b/tff_modular/modules/dm_construct13/code/tools/physic_tool_moodes/phys_spawn.dm
@@ -1,3 +1,6 @@
+#define SPAWN_MODE_MOB_COOLDOWN 5 SECONDS
+#define SPAWN_MODE_MEGAFAUNA_COOLDOWN 30 SECONDS
+
 /datum/phystool_mode/spawn_mode
 	name = "Spawn mode"
 	desc = "LMB for spawn, use button for choise spawn type."
@@ -8,9 +11,11 @@
 		/obj/cascade_portal,
 		/obj/singularity,
 		/obj/effect,
+		/mob/living/basic/supermatter_spider,
 		/area,
 		/turf
 	)
+	COOLDOWN_DECLARE(spawn_cooldown)
 
 /datum/phystool_mode/spawn_mode/use_act(mob/user)
 	. = ..()
@@ -31,9 +36,21 @@
 
 /datum/phystool_mode/spawn_mode/main_act(atom/target, mob/user)
 	. = ..()
+
 	if(!selected_object)
 		user.balloon_alert(user, "Select type first!")
 		return FALSE
 
+	if(!COOLDOWN_FINISHED(src, spawn_cooldown))
+		user.balloon_alert(user, "Wait!")
+		return FALSE
+	var/target_cooldown
+	if(ispath(selected_object, /mob/living/simple_animal/hostile/megafauna))
+		target_cooldown = SPAWN_MODE_MEGAFAUNA_COOLDOWN
+	if(ispath(selected_object, /mob/living))
+		target_cooldown = SPAWN_MODE_MOB_COOLDOWN
+	if(target_cooldown)
+		COOLDOWN_START(src, spawn_cooldown, target_cooldown)
+
 	new selected_object(get_turf(target))
 	return TRUE