Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds harvester holster #62

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Adds harvester holster #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions code/game/objects/items/storage/holsters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/items/weapons/harvester.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//All the harvester weapons go in here

//Vali Sword
/obj/item/weapon/claymore/harvester
name = "\improper HP-S Harvester blade"
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/machinery/vending/marine_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/machinery/vending/new_marine_vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/items/storage/storage.dmi
View file
Open in desktop
Binary file not shown.
Loading