linters please

IrisSS13 · Dec 22, 2024 · 6e078bb · 6e078bb
1 parent 18c7dc3
commit 6e078bb
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 13 deletions.
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
@@ -15,14 +15,15 @@
 	var/datum/callback/butcher_callback
 
 /datum/component/butchering/Initialize(
-	speed = 6 SECONDS, // IRIS EDIT: Originally 8 SECONDS
+	speed = 6 SECONDS,
 	effectiveness = 100,
 	bonus_modifier = 0,
 	butcher_sound = 'sound/effects/butcher.ogg',
 	disabled = FALSE,
 	can_be_blunt = FALSE,
 	butcher_callback,
 )
+// IRIS EDIT: Originally 8 SECONDS
 	src.speed = speed
 	src.effectiveness = effectiveness
 	src.bonus_modifier = bonus_modifier

diff --git a/code/game/objects/items/tools/spess_knife.dm b/code/game/objects/items/tools/spess_knife.dm
@@ -29,10 +29,11 @@
 /obj/item/spess_knife/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-		speed = 6 SECONDS, \ // IRIS EDIT: Originally 8 SECONDS
+		speed = 6 SECONDS, \
 		effectiveness = 100, \
 		disabled = TRUE, \
 	)
+	// IRIS EDIT: Originally 8 SECONDS
 	options = list(
 		NO_TOOL = image(icon = 'icons/obj/tools.dmi', icon_state = initial(icon_state)),
 		TOOL_KNIFE = image(icon = 'icons/obj/tools.dmi', icon_state = "[initial(icon_state)]_[TOOL_KNIFE]"),

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

diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm
@@ -27,9 +27,10 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
 	AddComponent(/datum/component/butchering, \
-	speed = 6 SECONDS, \ // IRIS EDIT: Originally 8 SECONDS
+	speed = 6 SECONDS, \
 	effectiveness = 70, \
 	)
+	// IRIS EDIT: Originally 8 SECONDS
 	AddComponent(/datum/component/light_eater)
 
 /obj/item/light_eater/equipped(mob/user, slot, initial = FALSE)

diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
@@ -503,9 +503,10 @@
 /obj/item/hatchet/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 6 SECONDS, \ // IRIS EDIT: Originally 7 SECONDS
+	speed = 6 SECONDS, \
 	effectiveness = 100, \
 	)
+	// IRIS EDIT: Originally 7 SECONDS
 
 /obj/item/hatchet/suicide_act(mob/living/user)
 	user.visible_message(span_suicide("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))

diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -236,9 +236,10 @@
 	. = ..()
 	AddComponent(
 		/datum/component/butchering, \
-		speed = 6 SECONDS, \ // IRIS EDIT: Originally 7 SECONDS
+		speed = 6 SECONDS, \
 		effectiveness = 110, \
 	)
+	// IRIS EDIT: Originally 7 SECONDS
 
 /obj/item/nullrod/vibro/spellblade
 	name = "dormant spellblade"
@@ -535,9 +536,10 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
 	AddComponent(/datum/component/butchering, \
-	speed = 6 SECONDS, \ // IRIS EDIT: Originally 8 SECONDS
+	speed = 6 SECONDS, \
 	effectiveness = 70, \
 	)
+	// IRIS EDIT: Originally 8 SECONDS
 
 // Unholy Blessing - Just a reskinned dark blessing.
 

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

diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -673,9 +673,10 @@
 	SSpoints_of_interest.make_point_of_interest(src)
 	AddComponent(\
 		/datum/component/butchering, \
-		speed = 11.5 SECONDS, \ // IRIS EDIT: Originally 15 SECONDS
+		speed = 11.5 SECONDS, \
 		effectiveness = 90, \
 	)
+	// IRIS EDIT: Originally 15 SECONDS
 
 /obj/item/melee/ghost_sword/Destroy()
 	for(var/mob/dead/observer/G in spirits)

diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -262,9 +262,10 @@
 	. = ..()
 	AddComponent(/datum/component/caltrop, min_damage = force)
 	AddComponent(/datum/component/butchering, \
-		speed = 15 SECONDS, \ // IRIS EDIT: Originally 20 SECONDS
+		speed = 15 SECONDS, \
 		effectiveness = 55, \
 	)
+	// IRIS EDIT: Originally 20 SECONDS
 
 /// Mimics the appearance and properties of the passed in bottle.
 /// Takes the broken bottle to mimic, and the thing the bottle was broken agaisnt as args

diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
@@ -226,10 +226,11 @@
 /obj/item/scalpel/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/butchering, \
-	speed = 6 SECONDS * toolspeed, \ // IRIS EDIT: Originally 8 SECONDS
+	speed = 6 SECONDS * toolspeed, \
 	effectiveness = 100, \
 	bonus_modifier = 0, \
 	)
+	// IRIS EDIT: Originally 8 SECONDS
 	AddElement(/datum/element/eyestab)
 
 /obj/item/scalpel/get_surgery_tool_overlay(tray_extended)

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