From fbc78615f34e2fa615b2768487f4011876e803e7 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:51:10 +0000 Subject: [PATCH] Adds the Europan beanie (#20126) This adds the submariner's beanie to the game and loadout, a piece of warm headwear particularly common to Europa. Sprited by and at request of Noble Row. ![image](https://github.com/user-attachments/assets/a64948f8-04a9-40ab-86fe-3c0fd6076381) --- .../preference_setup/loadout/items/head.dm | 5 ++ code/modules/clothing/head/winter_hats.dm | 6 ++ html/changelogs/hazelmouse-somanybeanies.yml | 58 ++++++++++++++++++ icons/obj/item/clothing/head/beanie.dmi | Bin 822 -> 2010 bytes 4 files changed, 69 insertions(+) create mode 100644 html/changelogs/hazelmouse-somanybeanies.yml diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 4de1325c01d..55d4f3550ba 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -340,6 +340,11 @@ path = /obj/item/clothing/head/beanie/winter flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION +/datum/gear/head/submariner_beanie + display_name = "submariner beanie" + path = /obj/item/clothing/head/beanie/submariner + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/head/nonla display_name = "non la hat" path = /obj/item/clothing/head/nonla diff --git a/code/modules/clothing/head/winter_hats.dm b/code/modules/clothing/head/winter_hats.dm index b6857b1a142..5bda46acc5a 100644 --- a/code/modules/clothing/head/winter_hats.dm +++ b/code/modules/clothing/head/winter_hats.dm @@ -55,3 +55,9 @@ icon_state = "winterbeanie" item_state = "winterbeanie" has_accents = TRUE + +/obj/item/clothing/head/beanie/submariner + name = "submariner's beanie" + desc = "A design of tightly fitting beanie particularly popular among the dock workers of Europa. Favored among anyone who prides a warm head." + icon_state = "dock_beanie" + item_state = "dock_beanie" diff --git a/html/changelogs/hazelmouse-somanybeanies.yml b/html/changelogs/hazelmouse-somanybeanies.yml new file mode 100644 index 00000000000..1ff1cb6a214 --- /dev/null +++ b/html/changelogs/hazelmouse-somanybeanies.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: hazelmouse + +# 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 the submariner's beanie to the loadout, a tight piece of headwear common among the dock workers of Europa." diff --git a/icons/obj/item/clothing/head/beanie.dmi b/icons/obj/item/clothing/head/beanie.dmi index aab389c3c2773fc56ea47281c0b4d8d17d6ed680..f423fc69e587339db5b27118e817fdf649de9e8d 100644 GIT binary patch delta 1904 zcmZuydpOezAK%~s$~7>UZ+Y=OFENT%jjS0+hh&U-+oB1?|r}knDq=_ zbqa;@*l}fj@ptE~)e>W0^*KG<$^G_It${hf*%xWUs8m~o@%L}*i}9(cscX+J&imjl zTv*wAk-mvzl6QB6tDi@k&e6LSd&B1iO1vKE`wkY%`L^{=Nj3K1Bb7?^ue|okd-g)q z-_(pM(Rj102-B7->mvs{fQB;QK4PLB0GisFOn#8^+50*H(z&_0Swq}M?9JKUa!$XN zmX^xyUfQr2e@53n#frHSFln25e!YoOn;@Cri01^Fl_u^QRt{g@60V->SpqsAeuHQc zjgklcp^lA;G8`Wt-(K9Bn~TOJC2>6WJL0zrN!(k~M!Zb{uZgPb1W+gq4Go661twiq z6CRJt51pOx7-=^AOeYjSsH@KHmi|RBfz%vt%w!wOA}+1}!V$}Rjt?d8i&!>@Fu|0Z zsR~PGG20I^;t%*{?5%F|b-#EW&5IegbXzJt)X7IgU8AWFXazD)k5^CMi(C|Y2k$t2 z+E-Zc&8~Z}X`{$FP z4`k9wh!c})#k-XF68hhrtdEHw!UG!z=*{J$n`JIqQ5WT388;#Ll<}LNyd8Ht7N<$C(ZO@olB)dZ+@Hrt-KXSZk|t$Nf_4vjL#7Kw3PAEe1#~is5yjBq7oKeZ`?(L@eyX3>^S&*ZVIq5;WX(NPdU7!s z3z$UoDZ?^qW4>q;lq|yO+sB>|Cu@^Fh0onnUD`DLz-cq+qh^AQ^x{Am^sQ>lrzKDCf=0UyK_;wQ~m_Qx@9MH6IFU*b-g2DWkaT-`sUd;c!-Txjk z7z7H5X(mPi0I)Ro8}0LWYvSnb{Qt%obGLGBtWZp5~U)i+2z8;V9 zC|{OFn74EbTiw2-!vmjxkGShIHuJ9E_GUFen4Y5HL%aIRoy9yPWI2I5qIjtUXhY1n zmX;PNJ3G74jSU>Ch0En4afWH#)Po3qncqt4O<;T|0h~N5o7_J6o>JRomwEE@4h|J5 zF8V7V(Av!~g;9*{z>Vp_LH~`V$qr8c{QUf=DDO0pIjzMvWae^xD;*WQ?HvHJ)g|xt z^yMix3)xt(o~G>GGM|M{S7hssdGr=nl|7*DD8@tJ2$L7tf=#e5El6>HcBeHx95Nmy&^EWWx>5bK7GZ$x$|cxcLvf aELfITwNbT0w%&R2FUix*$F|&fq!a= zvVyCh3pfk`5}0Ckv6@no0006tNklzA|96+#b$%>Cw1|f%INN08Y9~-I77DsIv(l>9T|kW zMmjcld1ee=$QI<@nB82PHt1QJyMOMHH0Yh%%=Lf`o*qZi0FEAKx-v@5e^EYkWPQwJ z%)CMxasU^ooC|b=8c+(|I17>cw!LR=Es}K$?D+F&gNzpZ2*4nH7UTiyHyP6i2AwtS zE_n=6Sqm21) z!mlBj2Z75Au>6wGGM5+p^1BfPTwZ`Yz!)%jL7dDJ6*;)P0E_48jx=EMf_E^_gu(Tz z5N~r`hk3zsqB>ZC!G5k`NJn%|g}(?4z`UMoc!kzKo-N|Ma6Jm~L1;{r7pm{iPa0G5 z!ms6pfl2g)!B<`wvhzanb$^gbo%4c8Hh4Se#tElWCjo{qjF9)&$+K9W4ct2UZiaX6 zjeo#jlMOoGL6sg`v>B3X&q#~^kt{_udG-Gkyxwzp0Tb;9FnJ*Y?+0*s;etW9AHd}W zOtc@sys)%>h4aGg oLW6z`bu}$*p-?Ck3WXFt0V&8^