diff --git a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm index 4ea390ed595..620317122b2 100644 --- a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -57,6 +57,7 @@ GLOBAL_LIST_INIT(skyrat_rod_recipes, list( new/datum/stack_recipe("towel bin", /obj/structure/towel_bin/empty, 2, time = 0.5 SECONDS, one_per_turf = FALSE, check_density = FALSE, category = CAT_CONTAINERS), new/datum/stack_recipe("guard rail", /obj/structure/deployable_barricade/guardrail, 2, time = 1 SECONDS, on_solid_ground = TRUE, check_direction = TRUE, category = CAT_STRUCTURE), new/datum/stack_recipe("wrestling ropes", /obj/structure/railing/wrestling, 3, time = 1.8 SECONDS, on_solid_ground = TRUE, check_direction = TRUE, check_density = FALSE, category = CAT_STRUCTURE), + new/datum/stack_recipe("crutch", /obj/item/cane/crutch, 3, time = 10, one_per_turf = FALSE, category = CAT_TOOLS), )) /obj/item/stack/rods/get_main_recipes() diff --git a/modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi b/modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi new file mode 100644 index 00000000000..2faf2f018cc Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi b/modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi new file mode 100644 index 00000000000..993cefaccbb Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/staff.dmi b/modular_skyrat/master_files/icons/obj/staff.dmi new file mode 100644 index 00000000000..e789e519d3b Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/staff.dmi differ diff --git a/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm b/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm new file mode 100644 index 00000000000..77bae224399 --- /dev/null +++ b/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm @@ -0,0 +1,12 @@ +/obj/item/cane/crutch + name = "crutch" + desc = "A crutch usually employed by those recovering from a leg injury." + icon = 'modular_skyrat/master_files/icons/obj/staff.dmi' + icon_state = "crutch" + inhand_icon_state = "crutch" + lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi' + righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi' + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6) + attack_verb_continuous = list("bludgeons", "whacks", "thrashes") + attack_verb_simple = list("bludgeon", "whack", "thrash") + diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_inhands.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_inhands.dm index 021923154eb..02cf23705f1 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_inhands.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_inhands.dm @@ -27,6 +27,10 @@ GLOBAL_LIST_INIT(loadout_inhand_items, generate_loadout_items(/datum/loadout_ite name = "Cane" item_path = /obj/item/cane +/datum/loadout_item/inhand/cane/crutch + name = "Crutch" + item_path = /obj/item/cane/crutch + /datum/loadout_item/inhand/cane/white name = "White Cane" item_path = /obj/item/cane/white diff --git a/modular_skyrat/modules/modular_vending/code/medical.dm b/modular_skyrat/modules/modular_vending/code/medical.dm index c2550123c53..6d55937c183 100644 --- a/modular_skyrat/modules/modular_vending/code/medical.dm +++ b/modular_skyrat/modules/modular_vending/code/medical.dm @@ -1,4 +1,5 @@ /obj/machinery/vending/medical skyrat_products = list( /obj/item/ttsdevice = 3, + /obj/item/cane/crutch = 4, ) diff --git a/tgstation.dme b/tgstation.dme index 73f66c498ea..de0c0e24ed1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6264,6 +6264,7 @@ #include "modular_skyrat\modules\customization\game\objects\items\conversion_kits.dm" #include "modular_skyrat\modules\customization\game\objects\items\instruments.dm" #include "modular_skyrat\modules\customization\game\objects\items\plushes.dm" +#include "modular_skyrat\modules\customization\game\objects\items\devices\crutch.dm" #include "modular_skyrat\modules\customization\game\objects\items\devices\ttsdevice.dm" #include "modular_skyrat\modules\customization\game\objects\items\storage\belt.dm" #include "modular_skyrat\modules\customization\game\objects\items\storage\rings.dm"