speeds up most butchering by 25% to a max of 6sec

IrisSS13 · Dec 20, 2024 · 2b6cf05 · 2b6cf05
1 parent 5de52b2
commit 2b6cf05
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
@@ -1,6 +1,6 @@
 /datum/component/butchering
 	/// Time in deciseconds taken to butcher something
-	var/speed = 8 SECONDS
+	var/speed = 6 SECONDS
 	/// Percentage effectiveness; numbers above 100 yield extra drops
 	var/effectiveness = 100
 	/// Percentage increase to bonus item chance
@@ -15,7 +15,7 @@
 	var/datum/callback/butcher_callback
 
 /datum/component/butchering/Initialize(
-	speed = 8 SECONDS,
+	speed = 6 SECONDS,
 	effectiveness = 100,
 	bonus_modifier = 0,
 	butcher_sound = 'sound/effects/butcher.ogg',

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -258,7 +258,7 @@
 		species_exception = string_list(species_exception)
 
 	if(sharpness && force > 5) //give sharp objects butchering functionality, for consistency
-		AddComponent(/datum/component/butchering, speed = 8 SECONDS * toolspeed)
+		AddComponent(/datum/component/butchering, speed = 6 SECONDS * toolspeed)
 
 	if(!greyscale_config && greyscale_colors && (greyscale_config_worn || greyscale_config_belt || greyscale_config_inhand_right || greyscale_config_inhand_left))
 		update_greyscale()

diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
@@ -40,7 +40,7 @@ GLOBAL_DATUM(bridge_axe, /obj/item/fireaxe)
 		GLOB.bridge_axe = src
 
 	AddComponent(/datum/component/butchering, \
-		speed = 10 SECONDS, \
+		speed = 7.5 SECONDS, \
 		effectiveness = 80, \
 		bonus_modifier = 0 , \
 		butcher_sound = hitsound, \

diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
@@ -37,7 +37,7 @@
 ///Adds the butchering component, used to override stats for special cases
 /obj/item/knife/proc/set_butchering()
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS - force, \
+	speed = 6 SECONDS - force, \
 	effectiveness = 100, \
 	bonus_modifier = force - 10, \
 	)
@@ -113,7 +113,7 @@
 
 /obj/item/knife/hunting/set_butchering()
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS - force, \
+	speed = 6 SECONDS - force, \
 	effectiveness = 100, \
 	bonus_modifier = force + 10, \
 	)

diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
@@ -51,7 +51,7 @@
 		)
 
 	AddComponent(/datum/component/butchering, \
-		speed = 10 SECONDS, \
+		speed = 7.5 SECONDS, \
 		effectiveness = 70, \
 	)
 	AddComponent(/datum/component/two_handed, \

diff --git a/code/game/objects/items/tools/spess_knife.dm b/code/game/objects/items/tools/spess_knife.dm
@@ -29,7 +29,7 @@
 /obj/item/spess_knife/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-		speed = 8 SECONDS, \
+		speed = 6 SECONDS, \
 		effectiveness = 100, \
 		disabled = TRUE, \
 	)

diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
@@ -1147,7 +1147,7 @@ Striking a noncultist, however, will tear their flesh."}
 /obj/item/melee/cultblade/halberd/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-		speed = 10 SECONDS, \
+		speed = 7.5 SECONDS, \
 		effectiveness = 90, \
 	)
 	AddComponent(/datum/component/two_handed, \

diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm
@@ -27,7 +27,7 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS, \
+	speed = 6 SECONDS, \
 	effectiveness = 70, \
 	)
 	AddComponent(/datum/component/light_eater)

diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
@@ -503,7 +503,7 @@
 /obj/item/hatchet/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 7 SECONDS, \
+	speed = 6 SECONDS, \
 	effectiveness = 100, \
 	)
 

diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -236,7 +236,7 @@
 	. = ..()
 	AddComponent(
 		/datum/component/butchering, \
-		speed = 7 SECONDS, \
+		speed = 6 SECONDS, \
 		effectiveness = 110, \
 	)
 
@@ -535,7 +535,7 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS, \
+	speed = 6 SECONDS, \
 	effectiveness = 70, \
 	)
 

diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
@@ -139,7 +139,7 @@
 /obj/item/shovel/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 15 SECONDS, \
+	speed = 11.5 SECONDS, \
 	effectiveness = 40, \
 	)
 	//it's sharp, so it works, but barely.

diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -673,7 +673,7 @@
 	SSpoints_of_interest.make_point_of_interest(src)
 	AddComponent(\
 		/datum/component/butchering, \
-		speed = 15 SECONDS, \
+		speed = 11.5 SECONDS, \
 		effectiveness = 90, \
 	)
 

diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -262,7 +262,7 @@
 	. = ..()
 	AddComponent(/datum/component/caltrop, min_damage = force)
 	AddComponent(/datum/component/butchering, \
-		speed = 20 SECONDS, \
+		speed = 15 SECONDS, \
 		effectiveness = 55, \
 	)
 

diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
@@ -226,7 +226,7 @@
 /obj/item/scalpel/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS * toolspeed, \
+	speed = 6 SECONDS * toolspeed, \
 	effectiveness = 100, \
 	bonus_modifier = 0, \
 	)

diff --git a/modular_nova/modules/exp_corps/code/tomahawk.dm b/modular_nova/modules/exp_corps/code/tomahawk.dm
@@ -28,6 +28,6 @@
 /obj/item/melee/tomahawk/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 7 SECONDS, \
+	speed = 6 SECONDS, \
 	effectiveness = 100, \
 	)
diff --git a/modular_nova/modules/reagent_forging/code/forge_weapons.dm b/modular_nova/modules/reagent_forging/code/forge_weapons.dm
@@ -87,7 +87,7 @@
 /obj/item/forging/reagent_weapon/dagger/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 8 SECONDS, \
+	speed = 6 SECONDS, \
 	effectiveness = 100, \
 	bonus_modifier = force + 7, \
 	)