diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index a4c229c110b..c7695eddc18 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -276,6 +276,12 @@ icon_state = "crutch" item_state = "crutch" +/obj/item/cane/crutch/forearm + name = "forearm crutch" + desc = "A different style of crutch with a handle and a cuff that goes around the forearm for additional support." + icon_state = "forearm_crutch" + item_state = "forearm_crutch" + /obj/item/cane/shillelagh name = "adhomian shillelagh" desc = "A sturdy walking stick made from adhomian wood." diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index be0556a9e8c..b4ef9be8e99 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1485,3 +1485,13 @@ starts_with = list( /obj/item/reagent_containers/food/drinks/bottle/small/burukutu = 6 ) + +/obj/item/storage/box/crutch_pair + starts_with = list( + /obj/item/cane/crutch = 2 + ) + +/obj/item/storage/box/forearm_crutch_pair + starts_with = list( + /obj/item/cane/crutch/forearm = 2 + ) diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 58ea90fd671..d634fcfab94 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -1,5 +1,6 @@ /datum/gear/cane - display_name = "cane" + display_name = "cane and crutch selection" + description = "A selection of canes and crutches." path = /obj/item/cane /datum/gear/cane/New() @@ -8,7 +9,10 @@ cane["cane"] = /obj/item/cane cane["telescopic cane"] = /obj/item/cane/telecane cane["crutch"] = /obj/item/cane/crutch + cane["forearm crutch"] = /obj/item/cane/crutch/forearm cane["white cane"] = /obj/item/cane/telecane/white + cane["pair of crutches"] = /obj/item/storage/box/crutch_pair + cane["pair of forearm crutches"] = /obj/item/storage/box/forearm_crutch_pair gear_tweaks += new /datum/gear_tweak/path(cane) /datum/gear/flask diff --git a/html/changelogs/Greenjoe - newcrutch.yml b/html/changelogs/Greenjoe - newcrutch.yml new file mode 100644 index 00000000000..5f89fa6086a --- /dev/null +++ b/html/changelogs/Greenjoe - newcrutch.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Greenjoe and Plyushsune + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a variation of crutch, selectable in the loadout." + - rscadd: "Adds the ability to select a pair of crutches in the loadout." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index adb07167c09..bf41920d78a 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 747a42e7b66..951fd6329fe 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index cbebf5947fe..1f465b341dd 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ