From 9a050faa9f7cf0c5ccf59a4a4689459d86b02fe2 Mon Sep 17 00:00:00 2001
From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
Date: Sat, 4 May 2024 19:34:40 -0700
Subject: [PATCH] cruft removal

---
 .../BeachRuins/beach_float_resort.dmm         | 10 +------
 .../WasteRuins/wasteplanet_pandora.dmm        |  1 -
 code/game/objects/items/holy_weapons.dm       | 27 -------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
index bbac1ae4e8d9..29ad64707d84 100644
--- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
index 8a63378ced3c..b6298e29f39d 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -35,7 +35,6 @@
 /area/ruin/wasteplanet)
 "bL" = (
 /obj/structure/fluff/divine/convertaltar,
-/obj/item/nullrod/tribal_knife,
 /obj/item/clothing/accessory/pandora_hope,
 /turf/open/indestructible/hierophant/two/waste,
 /area/ruin/wasteplanet)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index cd01cef70503..872d81323cf3 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -671,33 +671,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 
-/obj/item/nullrod/tribal_knife
-	icon_state = "crysknife"
-	item_state = "crysknife"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	name = "arrhythmic knife"
-	w_class = WEIGHT_CLASS_HUGE
-	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	sharpness = IS_SHARP
-	slot_flags = null
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/nullrod/tribal_knife/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 100)
-
-/obj/item/nullrod/tribal_knife/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/nullrod/tribal_knife/process()
-	slowdown = rand(-2, 2)
-
-
 /obj/item/nullrod/pitchfork
 	icon_state = "pitchfork0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'