diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 6c49c0b631..81e483ef96 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -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." diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 6d8c8f7231..2f3410238a 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -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" diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0607f83ff6..321ce98fd9 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -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" diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index d2aaf3697b..3b3245f321 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index a040ddb7a6..f6fa1b2be3 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index a09244c301..1877a23923 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 92978c9e14..3ab0dbfa52 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ