Skip to content

Commit

Permalink
adds arnolds machete to loadout (#211)
Browse files Browse the repository at this point in the history
Good fluff option, same as a regular machete.
  • Loading branch information
AndroBetel authored Apr 6, 2024
1 parent 1b52945 commit 7104b9c
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 3 deletions.
9 changes: 7 additions & 2 deletions code/game/objects/items/storage/large_holster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,17 @@
name = "\improper QH20 pattern M2100 custom machete scabbard"
desc = "A large leather scabbard used to carry a M2100 \"Ngájhe\" machete. It can be strapped to the back or the armor."
icon_state = "arnold-machete-pouch"
flags_equip_slot = SLOT_WAIST|SLOT_BACK
can_hold = list(/obj/item/weapon/sword/machete)

/obj/item/storage/large_holster/machete/arnold/full/fill_preset_inventory()
new /obj/item/weapon/sword/machete/arnold(src)

/obj/item/storage/large_holster/machete/arnold/weak
name = "\improper QH20 pattern M2100 machete scabbard"
desc = "A large leather scabbard used to carry a M2100 machete. It can be strapped to the back or the armor."

/obj/item/storage/large_holster/machete/arnold/weak/fill_preset_inventory()
new /obj/item/weapon/sword/machete/arnold/weak(src)

/obj/item/storage/large_holster/katana
name = "\improper katana scabbard"
desc = "A large, vibrantly colored katana scabbard used to carry a Japanese sword. It can be strapped to the back or worn at the belt. Because of the sturdy wood casing of the scabbard, it makes an okay defensive weapon in a pinch."
Expand Down
8 changes: 7 additions & 1 deletion code/game/objects/items/weapons/blades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,16 @@

/obj/item/weapon/sword/machete/arnold
name = "\improper M2100 \"Ngájhe\" machete"
desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit."
desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit ."
icon_state = "arnold-machete"
item_state = "arnold-machete"
force = MELEE_FORCE_TIER_11

/obj/item/weapon/sword/machete/arnold/weak
name = "\improper M2100 machete"
desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. This one has been poorly maintained and as such can't really outperform adopted M2132 machete."
force = MELEE_FORCE_STRONG

/obj/item/weapon/sword/hefa
name = "HEFA sword"
icon_state = "hefasword"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,11 @@ var/global/list/gear_datums_by_name = list()
path = /obj/item/storage/box/M1911_loadout
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/m2100_machete
display_name = "M2100 Machete"
path = /obj/item/storage/large_holster/machete/arnold/weak
allowed_origins = USCM_ORIGINS

/datum/gear/drink
category = "Canned drinks"

Expand Down
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_lefthand_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_slot.dmi
Binary file not shown.

0 comments on commit 7104b9c

Please sign in to comment.