From 0f2dd823daa15ea8534d367b83df7620942b4b47 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Fri, 29 Jan 2021 01:42:50 +0800 Subject: [PATCH] More hearing aids (#11060) --- .../game/objects/items/devices/hearing_aid.dm | 22 +++++++--- .../preference_setup/loadout/loadout_ears.dm | 17 +++++++- .../loadout/loadout_utility.dm | 13 ------ html/changelogs/wezzy_more_aids.yml | 41 ++++++++++++++++++ icons/obj/hearing_aid.dmi | Bin 661 -> 1171 bytes 5 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 html/changelogs/wezzy_more_aids.yml diff --git a/code/game/objects/items/devices/hearing_aid.dm b/code/game/objects/items/devices/hearing_aid.dm index 0d879cfa0bc..6b6f1364331 100644 --- a/code/game/objects/items/devices/hearing_aid.dm +++ b/code/game/objects/items/devices/hearing_aid.dm @@ -1,6 +1,6 @@ /obj/item/device/hearing_aid name = "hearing aid" - desc = "A device of Skrellian design. It allows the naturally deaf to hear, to an extent." + desc = "A device that allows the naturally deaf to hear, to an extent." icon = 'icons/obj/hearing_aid.dmi' icon_state = "hearing_aid" item_state = "hearing_aid" @@ -8,7 +8,19 @@ slot_flags = SLOT_EARS w_class = ITEMSIZE_SMALL -/obj/item/device/hearing_aid/human - desc = "A device that allows the naturally deaf to hear, to an extent." - icon_state = "hearing_aid_human" - item_state = "hearing_aid_human" \ No newline at end of file +/obj/item/device/hearing_aid/black + icon_state = "hearing_aid-b" + item_state = "hearing_aid-b" + +/obj/item/device/hearing_aid/silver + icon_state = "hearing_aid-s" + item_state = "hearing_aid-s" + +/obj/item/device/hearing_aid/white + icon_state = "hearing_aid-w" + item_state = "hearing_aid-w" + +/obj/item/device/hearing_aid/skrell + 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" diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index b5e03e15c0b..eedcdf8f1cf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm @@ -23,7 +23,7 @@ /datum/gear/ears/circuitry display_name = "earwear, circuitry (empty)" path = /obj/item/clothing/ears/circuitry - + /datum/gear/ears/earrings display_name = "earring selection" description = "A selection of eye-catching earrings." @@ -36,3 +36,18 @@ earrings["stud earrings"] = /obj/item/clothing/ears/earring/stud earrings["dangle earrings"] = /obj/item/clothing/ears/earring/dangle gear_tweaks += new/datum/gear_tweak/path(earrings) + +/datum/gear/ears/hearing_aid + display_name = "hearing aid selection" + path = /obj/item/device/hearing_aid + cost = 1 + +/datum/gear/ears/hearing_aid/New() + ..() + var/hearingaids = list() + hearingaids["hearing aid, black"] = /obj/item/device/hearing_aid/black + hearingaids["hearing aid, grey"] = /obj/item/device/hearing_aid + 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 + gear_tweaks += new/datum/gear_tweak/path(hearingaids) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 8ab7cc9796b..ce89460ef7b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -50,19 +50,6 @@ fountainpens["silver fountain pen"] = /obj/item/pen/fountain/silver fountainpens["white fountain pen"] = /obj/item/pen/fountain/white gear_tweaks += new/datum/gear_tweak/path(fountainpens) - -/datum/gear/utility/hearing_aid - display_name = "hearing aid selection" - path = /obj/item/device/hearing_aid - cost = 1 - -/datum/gear/utility/hearing_aid/New() - ..() - var/hearingaids = list() - hearingaids["hearing aid, skrell design"] = /obj/item/device/hearing_aid - hearingaids["hearing aid, human design"] = /obj/item/device/hearing_aid/human - gear_tweaks += new/datum/gear_tweak/path(hearingaids) - /datum/gear/utility/paicard display_name = "personal AI device" path = /obj/item/device/paicard diff --git a/html/changelogs/wezzy_more_aids.yml b/html/changelogs/wezzy_more_aids.yml new file mode 100644 index 00000000000..e17d84735b2 --- /dev/null +++ b/html/changelogs/wezzy_more_aids.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds more variations of hearing aids. Moved them to the earwear section." diff --git a/icons/obj/hearing_aid.dmi b/icons/obj/hearing_aid.dmi index b7afd3fba00f5f34aa5084ff37175c63626bfa7d..ade3ec89a67af2ca91ed3e47875413b33ea05c55 100644 GIT binary patch literal 1171 zcmeAS@N?(olHy`uVBq!ia0vp^4?viM8A$4Wo^=^Wc?bA}xE?rgz}LqoIVq{Orbby= z*~G}m*48#MBBHdUWa{L}dw1_%ylBy(0|y@7zi;X0T6y?zWJP&sMtZ@N$??@y0h>2$ z`TwVQ`3#2t-+<$S;_|;n|HeAZKG$NJNQCYH@N=W)k27oE^O5m3HZz+G5$$aCU==C&RZ=AdU)^R?ys}M zSJ%CXvwz4r=gwQ-E$8~TGB7Y(db&7;h@ZL)mcMdi&?7P>MrIE1A>`e?IQ-ABM;y^V~Qa#Dlyp^GI43m>Wf_;luy zjIE8W?cMVdvo!n&IfByV;E~>WS;>m+K!l zRrQlJpOqYbJz$yL>_CHux|4i0Bre?ixizKr-O^a?uovtifA-gJ-xO8Y{Y!jdLbGe^ z*|nKw5m$;=ty;$_T~Zx(*IoZ{%SrAH z&q}g-I*k1}-EB9%=AOS@DKS~BqN=iT=X}E{DoPLgmR+4Gw7jQUKaCsJ6+7#sPIBGV z7w82A#0vScdY!z~-bZ3z^_>o~buXI}eK}`C#Y59j7PXdlfl=|1*{#<2RC1wqHY`TAoCU{-_42G+VaPEe1&xud zPW*k9avI`popTjx;+}BCLK6kYTuIAAr}qCldr?@8WB&BjEFfnCLBo`~_pCX-HVOU* zwjX(%Ddu+4_~74$dZGU1krJw>S)A?f++Fm%W%0|V$4_P^ygC2ZfaiXs<2+WKo=K@q z4{hf49&PE*mC&DlT4PSZjy?5z;@zG$%$J{kO7tJMM(o0!Y{%n%eD2xl-E%0q#K^-u z;zq+G-dX&{MZ8t==UK{E?AJX0S8UVNd%hZ#!X^6FM{BMb?Aq^XR9004jp0{{R3ySfFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+BQ>!oGcP?pF*8Mp zi!&v&s2C_}$i#|4O6|9!a)bX~n&bdb_ z)Jd4D;yT|&cN4bdeBbw8IHBuL=Tq;M176M-G1pojN_73>c`|6Ac zllBhy();R+2vhct&z>@X3&RkiN3Oen-+_c-FlHFXF_W>GVg86sTr#!}^Pk^Pv3+w! z!GyO+b3(y@!|i8~Y~d>4@^@|)BxM_LnwkYkS+^`G9`W`j6zrf0)3s}w9W>#ZY6?NH zgX_L2p77i^!H3JnB%Tid001h!3fJpYFS)>X!D_i=o!u8mZLE{