From d7ef4cba68fd5ab938519450b147f8ef7ceb7730 Mon Sep 17 00:00:00 2001 From: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:01:09 +0100 Subject: [PATCH] dual hearing aids in loadout + hearing aid case (#21349) Adds a new hearing aid case item, capable of holding a pair of hearing aids. This is added to the hearing aid selection in the loadout, allowing you to start with a pair of hearing aids. (also adds names to each of the hearing aid types) --- .../game/objects/items/devices/hearing_aid.dm | 28 ++++++++- .../preference_setup/loadout/items/ears.dm | 6 ++ html/changelogs/greenjoe - hearingaidpair.yml | 58 ++++++++++++++++++ icons/obj/item/device/hearing_aid.dmi | Bin 1171 -> 1245 bytes 4 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/greenjoe - hearingaidpair.yml diff --git a/code/game/objects/items/devices/hearing_aid.dm b/code/game/objects/items/devices/hearing_aid.dm index f9079c82a9a..c94a656220b 100644 --- a/code/game/objects/items/devices/hearing_aid.dm +++ b/code/game/objects/items/devices/hearing_aid.dm @@ -1,5 +1,5 @@ /obj/item/device/hearing_aid - name = "hearing aid" + name = "grey hearing aid" desc = "A device that allows the naturally deaf to hear, to an extent." icon = 'icons/obj/item/device/hearing_aid.dmi' icon_state = "hearing_aid" @@ -8,18 +8,44 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/device/hearing_aid/black + name = "black hearing aid" icon_state = "hearing_aid-b" item_state = "hearing_aid-b" /obj/item/device/hearing_aid/silver + name = "silver hearing aid" icon_state = "hearing_aid-s" item_state = "hearing_aid-s" /obj/item/device/hearing_aid/white + name = "white hearing aid" icon_state = "hearing_aid-w" item_state = "hearing_aid-w" /obj/item/device/hearing_aid/skrell + name = "skrellian hearing aid" desc = "A device that allows the naturally deaf to hear, to an extent. It seems to be Skrellian in design." icon_state = "hearing_aid_skrell" item_state = "hearing_aid_skrell" + +/obj/item/storage/hearing_aid_case + name = "hearing aid case" + desc = "A small plastic case designed to hold a pair of hearing aids." + w_class = WEIGHT_CLASS_SMALL + can_hold = list(/obj/item/device/hearing_aid) + icon = 'icons/obj/item/device/hearing_aid.dmi' + icon_state = "hearing_aid_case" + storage_slots = 2 + starts_with = list(/obj/item/device/hearing_aid = 2) + +/obj/item/storage/hearing_aid_case/black + starts_with = list(/obj/item/device/hearing_aid/black = 2) + +/obj/item/storage/hearing_aid_case/silver + starts_with = list(/obj/item/device/hearing_aid/silver = 2) + +/obj/item/storage/hearing_aid_case/white + starts_with = list(/obj/item/device/hearing_aid/white = 2) + +/obj/item/storage/hearing_aid_case/skrell + starts_with = list(/obj/item/device/hearing_aid/skrell = 2) diff --git a/code/modules/client/preference_setup/loadout/items/ears.dm b/code/modules/client/preference_setup/loadout/items/ears.dm index f7383388022..64e33e063f0 100644 --- a/code/modules/client/preference_setup/loadout/items/ears.dm +++ b/code/modules/client/preference_setup/loadout/items/ears.dm @@ -32,6 +32,7 @@ /datum/gear/ears/hearing_aid display_name = "hearing aid selection" + description = "A selection of hearing aids. If you select a pair, you should pick a wristbound or clip-on radio to keep both ears free for the hearing aids." path = /obj/item/device/hearing_aid cost = 1 @@ -43,4 +44,9 @@ hearingaids["hearing aid, silver"] = /obj/item/device/hearing_aid/silver hearingaids["hearing aid, white"] = /obj/item/device/hearing_aid/white hearingaids["hearing aid, skrellian"] = /obj/item/device/hearing_aid/skrell + hearingaids["hearing aid pair, black"] = /obj/item/storage/hearing_aid_case/black + hearingaids["hearing aid pair, grey"] = /obj/item/storage/hearing_aid_case + hearingaids["hearing aid pair, silver"] = /obj/item/storage/hearing_aid_case/silver + hearingaids["hearing aid pair, white"] = /obj/item/storage/hearing_aid_case/white + hearingaids["hearing aid pair, skrellian"] = /obj/item/storage/hearing_aid_case/skrell gear_tweaks += new /datum/gear_tweak/path(hearingaids) diff --git a/html/changelogs/greenjoe - hearingaidpair.yml b/html/changelogs/greenjoe - hearingaidpair.yml new file mode 100644 index 00000000000..231ee4a59d0 --- /dev/null +++ b/html/changelogs/greenjoe - hearingaidpair.yml @@ -0,0 +1,58 @@ +################################ +# 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 + +# 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 hearing aid case item, capable of holding a pair of hearing aids, adding it to the hearing aid selection in the loadout." diff --git a/icons/obj/item/device/hearing_aid.dmi b/icons/obj/item/device/hearing_aid.dmi index ade3ec89a67af2ca91ed3e47875413b33ea05c55..3f0c4b6de402a4742696803455cad9dc3a58b793 100644 GIT binary patch delta 1149 zcmV-@1cLjM3Ec^hBmq~EB~O2FaB$1Z%m4rXo}Qj*Z6F~40004WQchCV=-0C=30(@hG(Fc1acb#jW(t}Fg@>qc6n3wwo-nz0Gi3YlQ8 zZ?J+JMc!^Eya(T6QmR9H?0VIlI{Bc${ywX{s#j|%lDE<2Ww({Wksp6uTo#TdQXUIO zCir>O#@j*)>jUT4jTDz)ZnVtbvU;LVy#5~#P`nxtOErL+TmU@`c^LID>Pe6%p`HYK zG+zTv6LdgJ1-+wp3*?;*(=S}9+P-;xohQ*k{81FTyUzds19M44K~#90?VI6}+8`8# zK@&xjO&jCxj$7aVISYT$MwpQV3=us&-;eDMLoa+imyIc{5QGpyNK$0vc$(@F3wY+q z)kJWR!=v}=57bzW|aRfBH zDH%gRL91;gWQ6v)l!y_!f<=*SBTHdNCJ|fIJ%oS>3Rw)PVJ3el1Pf zj=mkFF--O6bhoY!v3Fc(jjUXxbbQ7U(D0^Y3;_kL&MzS&w2yX)7@;c&_;>$yWF=yY zx`z-jK~WY%YM6fsigK_j$`UX^J2%7*HMs#k92^R8KSBs0gb+dqA#Y3Q8>@fbQ{H)1 zuN9 z-JgHn48y7xqW<{!Na6U3)aHv0v3Jb9nI*VL>G+Hzpy5r)7y=5`w{I)R2ra?>$7!~W zEQKo=^pAg0-U~aj3b94qLkO6lsML@eW`d#`tW;G2CTQn|*r6sjz=wl_0{0_?5JCtc zgb*?p--~0K7s`<;p$quu1y-mdM&t3;317fBGqA$U-~M3rhz0!fQiVVWA%qY@2qAlsMY}g(@zdny0vf%gEH*$nmLFfqe8SEP1&olZd z(E+z;PYa!(FoNI->JKw;2|6Fo06Wxe$}ZnVmZGr@As>SFu|xDTw4MD6B>D*t*`9ANvPz=dqoUY{F$5Nbru7Dbze*RnmH5>v& zjZh!Hv#~p)o&WZjnDV-?xG9g}Z$&(zu%UnAX;_fG~h`Z+P=DyFq|6$PT z;CeZ?tFdf98yqU)uLf?Ny;g)Xx1`eY&C-H~&E2UBGnAfeEJ|Qnx4GUdLt9ga?bLc} z&2=MoOX`kFSPA^>KWsoRAq9Psp7oVf}n@@ zF7Ez1JA8HBn>hQ2oOABH_1$u=e=7q6v!$ntV@SoEx3?3+XB#lICawrrsn8en_5c6N zswM4e&n0Gg2vmQ!liw!G=Ur4@-#lfZDx-SaPuN zk@}BMXD-Ru+SuCOJufj!!~algU=mPl&&vgxg{NlhS;bz!oBC?AB&+Z}rJF5HjB|6N zy~19^O<$VST6bX8tz5Lk})eSuz3P^^$ItJld(?R_NnRp03#Tlca#(U)^JWIPM0Prb}x_Tt;J9nQJ= zP3G+Wn)CQU4*9TK*Jj!=yNzwAJXGzU!fF z+FkFyel>MJc7Mg@{WGvRW5e#h8>gS-2d`#X0RJ#Sh3vgz@YnF(*| z&;K>xxgY5`k5#8Fx2FyB<>#Lg{l~2lyKpDl z@wgwKdv<#F9EvV6@-UCM(eQ|O7Qb;3Zap?^#w=S8*V SJUIFoB;x7n=d#Wzp$P!iiS0@N