harvester holster (#62)

PMC-Unga-Marines · Aug 1, 2024 · 9d797cb · 9d797cb
1 parent d32dc3e
commit 9d797cb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
@@ -370,28 +370,33 @@
 /obj/item/storage/holster/blade/machete
 	name = "\improper H5 pattern M2132 machete scabbard"
 	desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the back, waist or armor."
-	icon = 'icons/obj/items/storage/storage.dmi'
 	icon_state = "machete_holster"
 	flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK
 	holsterable_allowed = list(
 		/obj/item/weapon/claymore/mercsword/machete,
-		/obj/item/weapon/claymore/harvester,
 	)
 	can_hold = list(
 		/obj/item/weapon/claymore/mercsword/machete,
-		/obj/item/weapon/claymore/harvester,
 	)
 
 /obj/item/storage/holster/blade/machete/full/Initialize(mapload)
 	. = ..()
 	var/obj/item/new_item = new /obj/item/weapon/claymore/mercsword/machete(src)
 	INVOKE_ASYNC(src, PROC_REF(handle_item_insertion), new_item)
 
-/obj/item/storage/holster/blade/machete/full_harvester
-	icon = 'icons/obj/items/storage/storage.dmi'
+/obj/item/storage/holster/blade/harvester
 	name = "H5 Pattern M2132 harvester scabbard"
+	desc = "A large leather scabbard used to carry a M2132 harvester blade. It can be strapped to the back, waist or armor."
+	icon_state = "harvester_holster"
+	flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK
+	holsterable_allowed = list(
+		/obj/item/weapon/claymore/harvester,
+	)
+	can_hold = list(
+		/obj/item/weapon/claymore/harvester,
+	)
 
-/obj/item/storage/holster/blade/machete/full_harvester/Initialize(mapload)
+/obj/item/storage/holster/blade/harvester/full/Initialize(mapload)
 	. = ..()
 	var/obj/item/new_item = new /obj/item/weapon/claymore/harvester(src)
 	INVOKE_ASYNC(src, PROC_REF(handle_item_insertion), new_item)

diff --git a/code/game/objects/items/weapons/harvester.dm b/code/game/objects/items/weapons/harvester.dm
@@ -1,5 +1,3 @@
-//All the harvester weapons go in here
-
 //Vali Sword
 /obj/item/weapon/claymore/harvester
 	name = "\improper HP-S Harvester blade"

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -70,7 +70,7 @@
 			/obj/item/storage/belt/knifepouch = -1,
 			/obj/item/storage/holster/blade/tomahawk/full = -1,
 			/obj/item/storage/holster/blade/machete/full = -1,
-			/obj/item/storage/holster/blade/machete/full_harvester = -1,
+			/obj/item/storage/holster/blade/harvester/full = -1,
 			/obj/item/weapon/twohanded/spear/tactical = -1,
 			/obj/item/weapon/twohanded/spear/tactical/harvester = -1,
 			/obj/item/weapon/twohanded/glaive/harvester = -1,
@@ -299,7 +299,7 @@
 			/obj/item/storage/belt/knifepouch = -1,
 			/obj/item/storage/holster/blade/tomahawk/full = -1,
 			/obj/item/storage/holster/blade/machete/full = -1,
-			/obj/item/storage/holster/blade/machete/full_harvester = -1,
+			/obj/item/storage/holster/blade/harvester/full = -1,
 			/obj/item/weapon/twohanded/spear/tactical = -1,
 			/obj/item/weapon/twohanded/spear/tactical/harvester = -1,
 			/obj/item/weapon/twohanded/glaive/harvester = -1,
@@ -528,7 +528,7 @@
 			/obj/item/storage/belt/knifepouch = -1,
 			/obj/item/storage/holster/blade/tomahawk/full = -1,
 			/obj/item/storage/holster/blade/machete/full = -1,
-			/obj/item/storage/holster/blade/machete/full_harvester = -1,
+			/obj/item/storage/holster/blade/harvester/full = -1,
 			/obj/item/weapon/twohanded/spear/tactical = -1,
 			/obj/item/weapon/twohanded/spear/tactical/harvester = -1,
 			/obj/item/weapon/twohanded/glaive/harvester = -1,
@@ -1273,7 +1273,7 @@
 			/obj/item/storage/holster/t19 = -1,
 			/obj/item/storage/holster/blade/tomahawk/full = -1,
 			/obj/item/storage/holster/blade/machete/full = -1,
-			/obj/item/storage/holster/blade/machete/full_harvester = -1,
+			/obj/item/storage/holster/blade/harvester/full = -1,
 			/obj/item/weapon/twohanded/glaive/harvester = -1,
 			/obj/item/storage/belt/utility/full =-1,
 			/obj/item/storage/belt/medical_small = -1,

diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm
@@ -932,7 +932,7 @@
 	desc = "A set of specialized gear for close-quarters combat and enhanced chemical effectiveness."
 	gear_to_spawn = list(
 		/obj/item/armor_module/module/chemsystem,
-		/obj/item/storage/holster/blade/machete/full_harvester,
+		/obj/item/storage/holster/blade/harvester/full,
 		/obj/item/paper/chemsystem,
 	)
 /obj/effect/vendor_bundle/tyr

diff --git a/icons/obj/items/storage/storage.dmi b/icons/obj/items/storage/storage.dmi