regex and banishing tribal.dm once more

shiptest-ss13 · Sep 13, 2024 · 5902a54 · 5902a54
1 parent 12c6006
commit 5902a54
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 227 deletions.
diff --git a/code/datums/components/crafting/recipes/tribal.dm b/code/datums/components/crafting/recipes/tribal.dm
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
@@ -502,7 +502,7 @@
 
 /obj/item/cane
 	name = "cane"
-	desc = "A cane used by a true gentleman. Or a clown."
+	desc = "A cane used by a true gentleman."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "cane"
 	item_state = "stick"

diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
@@ -20,7 +20,6 @@
 						/obj/item/lava_staff,
 						/obj/item/ship_in_a_bottle,
 						/obj/item/clothing/shoes/clown_shoes/banana_shoes,
-						/obj/item/kitchen/knife/envy,
 						/obj/item/veilrender/vealrender,
 						/obj/item/clothing/suit/armor/ascetic)
 

diff --git a/tools/UpdatePaths/Scripts/2890_melee.txt b/tools/UpdatePaths/Scripts/2890_melee.txt
diff --git a/tools/UpdatePaths/Scripts/2932_melee.txt b/tools/UpdatePaths/Scripts/2932_melee.txt
@@ -0,0 +1,11 @@
+/obj/item/kitchen/knife : /obj/item/melee/knife/kitchen
+/obj/item/kitchen/knife/plastic : /obj/item/melee/knife/plastic
+/obj/item/kitchen/knife/letter_opener : /obj/item/melee/knife/letter_opener
+/obj/item/kitchen/knife/combat : /obj/item/melee/knife/combat
+/obj/item/kitchen/knife/combat/bone : /obj/item/melee/knife/bone
+/obj/item/kitchen/knife/combat/survival : /obj/item/melee/knife/survival
+/obj/item/kitchen/knife/switchblade : /obj/item/melee/knife/switchblade
+
+/obj/item/spear : /obj/item/melee/spear
+/obj/item/spear/bonespear : /obj/item/melee/spear/bone
+/obj/item/melee/spear/bonespear : /obj/item/melee/spear/bone