From 88ccf969b2f25d04615c9e3f1139464f27b3d773 Mon Sep 17 00:00:00 2001 From: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com> Date: Fri, 28 Oct 2022 02:52:00 +0200 Subject: [PATCH] Adds An Alternate High Visibility Jacket (#14970) --- .../preference_setup/loadout/loadout_suit.dm | 1 + code/modules/clothing/suits/miscellaneous.dm | 9 ++++ html/changelogs/KingOfThePing - 14970 .yml | 41 ++++++++++++++++++ icons/clothing/suits/highvis.dmi | Bin 897 -> 1427 bytes 4 files changed, 51 insertions(+) create mode 100644 html/changelogs/KingOfThePing - 14970 .yml diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 9d2ae62eafc..b819bb48326 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -48,6 +48,7 @@ datum/gear/suit/colorvest jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow jackets["high visibility jacket"] = /obj/item/clothing/suit/storage/toggle/highvis + jackets["high visibility jacket, alt"] = /obj/item/clothing/suit/storage/toggle/highvis_alt jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless jackets["leather coat"] = /obj/item/clothing/suit/storage/leathercoat diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 5f12260643a..3fe49f4a020 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -388,6 +388,15 @@ body_parts_covered = UPPER_TORSO|ARMS contained_sprite = TRUE +/obj/item/clothing/suit/storage/toggle/highvis_alt + name = "high visibility jacket" + desc = "A bright yellow jacket with reflective stripes. For use in operations, engineering, and sometimes even law enforcement in cold and poor weather or when visibility is low." + icon = 'icons/clothing/suits/highvis.dmi' + icon_state = "highvis_alt" + item_state = "highvis_alt" + body_parts_covered = UPPER_TORSO|ARMS + contained_sprite = TRUE + /obj/item/clothing/suit/storage/toggle/track name = "track jacket" desc = "a track jacket, for the athletic." diff --git a/html/changelogs/KingOfThePing - 14970 .yml b/html/changelogs/KingOfThePing - 14970 .yml new file mode 100644 index 00000000000..4dcc2c98089 --- /dev/null +++ b/html/changelogs/KingOfThePing - 14970 .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: KingOfThePing + +# 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 an alternative bright yellow high visibility jacket from Shiptest. It has two pocket slots. Available in the loadout under the jacket selection." diff --git a/icons/clothing/suits/highvis.dmi b/icons/clothing/suits/highvis.dmi index faebaef6113bb33c794a1c45be7b5cff86befd75..172d6febed076c55f48fb1d68489ab25c188cac4 100644 GIT binary patch delta 1284 zcmV+f1^fDe2a^jWiBL{Q4GJ0x0000DNk~Le0001>0001h2m=5B0K2`CDF6TfPLU-s zHi?!5vbzAy)B&HT09#yOZ*qGmC@6V)e}RLHIyyQ>M@KM)%cB4Q00DGTPE!Ct=GbNc z005AYZghX77@n9@LbTaHwImu%n%iL-@K~a(;OgfBjvxS0n19(>vIFe^00dV_L_t(| zob8y6a-%p9gn`%s^J57aVeI^RgN1_6~W3YAKwQvG*S z{&swYS080repJE<__2Fx$`j39ow$k|ugdfJbUuHVyhDr??5}g2*a}kv8q86f*LYKX zkg6ulQE{nGqD9y{RTpM>+thVcclgvz`vUJT&6h5H`V4K`R1oLCFhm=aB}WhKwQd^I zH1!q#|1s}}wplG+ns!J!9EPE7yP9ncfD>5`H{^q+5c9n}*L+Z=QmIrbl}e>jy)5gj#Yf;c zh+y5*0xvS$2^tmQ{Y_Xz z;2Z?3Zekr`^nDzc5yxc7K0dO1-2s2J$b~bwU;&QXB)6HS9z#6Nx1Vz#iHk?SqjDJib zba0)UHxN4{7|il0meaw>cd>ty42EUFn_^kG74G1lpPxLZS2^udse{yhc7-9(+Lq-0 z*~!Tu%V~QpSR{vG4LH4j-=yeJD)`I(R4SE9rBbO>szb8gS}Wvpmi}Io_}|Y5=_Cj9 zL7wIcDE|vq&j0AI^P~Bo@Ha=u=7Wos^S`BVNAp2G9;ARUmk$Oj=YxNtIGztm9n9u~ ziSW^p delta 750 zcmVbgExFXBdX@O-%nC zuju|YP1DN@3HWQ9Jkzy)=Aty+Ps=hd%fwfJ*9zr9zzl#f0j}xMzX%`4I!3I1=1WL1 ze*_;gzCuhF^s>f-wTv^Q6g@JoFV(b#7$L^6;ora3OHHwtu*Ot}71UZ&%7NJ+NENl1 zF+r~B9P@z=ab4*bM!IV|P%Bpe#I59gg}H2}AYIP|0=_%=f|7?xAO?O1VB7M0g?Zaf z2{b)tfY9E80CY0SfmdRY;{x#U^zRkYf5`}`KZ3XdXaQNMP}SQO;E~h!o3J|o_!!|2u>Z((y~FBz z3|D|*7=~dOhVdl`J^Y{h2NW|6dy0PNKlcwP{p?rfTWj+NoZ=ryy6PV|pzb~5e|P(l z*!%&&7|A~nblpE_?Q5nMdepjfe*h>(@DF(X1OK2GKqkUy0o@;f9>e+vqOSP|#|{kp z=iMLZ33&fN&~^Wy6%equA3a37KhP8K{sFIl;2%%{F|;QBEbab4Pr&;JqOSP|z5Q)X z{8>8sf2a5ZnlAYVKfOECz&Ba(e+M*O@(+G`cjiMv3vh~mAnJ;L@NV9@2EM6c|F7%j z4;Y4F7=~edJIZ|j9h?x&QzG