From dbeb80a7259f330f065197d10dc69f5350c212ae Mon Sep 17 00:00:00 2001 From: Jfrost6 <32855708+Jfrost6@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:46:03 -0400 Subject: [PATCH] Adds a new crutch item to the loadout menu and medbay vendor. (#22788) * Adds Crutches * Update prop_summoner.dm * crutches digitigrade approved * Update code/game/objects/items/weaponry.dm Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> * Modularized everything, probably. * Rename crutch to crutch.dm * Added to tgstation.dme * Update crutch.dm * Update modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> --------- Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- .../objects/items/stacks/sheets/sheet_types.dm | 1 + .../icons/mob/inhands/melee_lefthand.dmi | Bin 0 -> 429 bytes .../icons/mob/inhands/melee_righthand.dmi | Bin 0 -> 437 bytes modular_skyrat/master_files/icons/obj/staff.dmi | Bin 0 -> 546 bytes .../game/objects/items/devices/crutch.dm | 12 ++++++++++++ .../loadout_items/loadout_datum_inhands.dm | 4 ++++ .../modules/modular_vending/code/medical.dm | 1 + tgstation.dme | 1 + 8 files changed, 19 insertions(+) create mode 100644 modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi create mode 100644 modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi create mode 100644 modular_skyrat/master_files/icons/obj/staff.dmi create mode 100644 modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm 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 0000000000000000000000000000000000000000..2faf2f018cc80d1ff84985a973afa0bff7794791 GIT binary patch literal 429 zcmV;e0aE^nP)GC)ttc@!6~s2=QdV&Fa{-$R09u3^m!s4^@c;k- z&q+iKluHi6FbqUfYFH!n0!8Hj6%~84fOU@01@}J#A2q~QUc|oYREj6=$eu)s zL)frN9Fb=1#>_8RL6I5=Fo!)bhiev$C^-E(-+B~iOe`u2WKQhK9>P6Y-~u5$mUyTM z+U173%KzVG^F@E4E&!qn05L0@Fe{?{x}55Q4J$>{mpOI2zXB}GC)ttc@!6~s2=QdV&Fa{-$R09u3^m!s4^@c;k- z*GWV{R7i>KltB{0APhxQ2wgj#0NZhIZ-C?Inj^UI{%25T3WVv8taX}hKFNaw3L)C< z-|WzH&LD2R7zDI}a5Bs*ybc1w>pTL^RbDR$SZWb5ARxpdU$6##mJ;9sME5L41$bm} z#BnnDu+c#$D~GLQsDY>fYXJWV5wR+;MkW<7UJdQ`(`I3dkU%p6myCNrd$j`qV=-0C=1w$2$&yAP@z>nmxq}^u}LHV=#sS?_d;#LQP=R>s!#xC=BCdXBcPc z^(n{uf<|A}B)+(DfJWDn2tFQxOENF)p&{4w@ERnEEv5{OhQywh(-$j@vw?Azep);l zlu>2t;Q#;ua7jc#R9J=Wm%WOFFcgK4vSlDoFtyKQEorq8>_n!vu@>uj4c{ja2qbN? z#cqaW{EJT9VTV1X1kRUxZf;^Ujw4>F_@(au0B;Mx7_((rTA#HaX8fOBqz5V%|}F#t#@HzA@>gNQL^DW$kxulG%5S!Mu$5CTdm+O~~O0eIZ` zPid`9p64Khpzr$$z|&2*WiEuk?RJ|OJ3Z9{Yvy%b8zBUeBv~{Eo~XcF=1y8`Bcb6Tyy+2*SNzhMq6jAA$E=kD**0n#+}dQ67WBm#GL9~~@v k73@iNRPXs?@}~ek0b%I%pwGQXz5oCK07*qoM6N<$f|*+GcK`qY literal 0 HcmV?d00001 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"