From 446f44d8c03a37d1f9e698579e4b0dde3ca35bcf Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Wed, 5 May 2021 19:43:06 -0400 Subject: [PATCH] Removes meme hairstyle. (#11787) --- .../abstract/new_player/sprite_accessories.dm | 14 +++--- html/changelogs/dansemacabre-hairbegone.yml | 41 ++++++++++++++++++ icons/mob/human_face/facial_hair_multiply.dmi | Bin 1482 -> 1011 bytes 3 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/dansemacabre-hairbegone.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index d7d34c37347..032a7a34ac1 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -178,11 +178,11 @@ Follow by example and make good judgement based on length which list to include name = "Bedhead 3" icon_state = "hair_bedhead3" chatname = "wavy hair" - + bedhead4 name = "Bedhead 4" icon_state = "hair_bedhead4" - length = 3 + length = 4 chatname = "messy locks" beehive @@ -1914,16 +1914,12 @@ Follow by example and make good judgement based on length which list to include name = "Wise Beard" icon_state = "facial_wise" - brokenman + chinstrap2 icon = 'icons/mob/human_face/facial_hair_multiply.dmi' - name = "Broken Man" - icon_state = "facial_brokenman" + name = "Chinstrap, Alt" + icon_state = "facial_chinstrap_ii" icon_blend_mode = ICON_MULTIPLY - chinstrap2 - name = "Chinstrap, Alt" - icon_state = "facial_chinstrap_ii" - stark name = "Stark" icon_state = "facial_stark" diff --git a/html/changelogs/dansemacabre-hairbegone.yml b/html/changelogs/dansemacabre-hairbegone.yml new file mode 100644 index 00000000000..e6f45bb0df2 --- /dev/null +++ b/html/changelogs/dansemacabre-hairbegone.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: DanseMacabre + +# 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: + - rscdel: "Removed the broken man facial hair style." diff --git a/icons/mob/human_face/facial_hair_multiply.dmi b/icons/mob/human_face/facial_hair_multiply.dmi index 5010a2f3257f095fe05eda8e7154e22a26c042bb..b1dd35e830a9d9df2bf0d222c3088b8fab56dda3 100644 GIT binary patch literal 1011 zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgAGXbBqvD&sp(ZA5hX6E#mPmP1tppJc?=8{ zb9ztj<~rmc(E70Ixn|oEasABg6IpI5Rkj+Wn78O7rEp#`pRk@5IEk zm%dKmoAh(yg`};wn$APC zW6mZn+v;ce!GCi%P4b!j@sQBAM>8kY``TA_`i3XpwW?qiT^4v!+t2V50|T?Tr;B4q z#hkZy&ig)gkZ|~TUR!I%Z71I7!_Vt1iXyxc_+?hI_itnFO31(L^vywOO-GBpVP)Z; zy6GocZYaM_b@LM`KWxzA^3##u;dEMqljMQ`HjOK9m}J@#zs}tMddpcohrL#<=64q+ z8#pZF30QHH^~U$w?K8g_7mI$}#Pg;0{zhf%eIIvrRM^Vj&#dXuJoozzQ%{BE$JxRY zXLk4GCksC`e02N7nX4iBzs{|H*RW!!qYJ?+5Tx3$I( zqSu$RUD1nc;rO~x^@p+XjLmcH4zGXIQp72CilNmAF0|I5|q)D9%K6> zD*O7m6Kp8T>%x~)-;`4s=6$jQ0~Xa1Zp^M2j>U1w@e zooRn>*VmW4i6MLKb-_Z@tN*_3h?4hCKcIR;RpM#r24IpTF+jh{uVHx;@pI?t+y~F?j literal 1482 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%f^Q%H4N?cNllZ!G7N;32F7#J$% z^q$_!)odWr_Rw-?SM$52_Uj_OT#R1mo>EaktG3V_a!@S3C5^WFXAB=05tTj8R^Z~bk#50@dyv^hRf`>k!cg)e{Id7N)H`}^JRb2jPZ z?!KGGnec*hg5AG4{tYF3e@)+?f4=zp_F2vak<;GGhlgI>nj3wj{$--V-+h)q7ipjV z^!J~C?6lNO`OcD63y)80oA7z-L-%8nyZ^1`G+;|e+jjr`SEq8NIedgQcYyM|3^_2vzMJ~hkT=`6O`{@cG+Y2C9}gLjv+?zKFyn`_H*J^t_ShwCai zUH9DE)1vgZ>i@3`-)g)k+j94>c)l@h z59dy%kFos(VisH2&3fBEY1yjRQMRlc8<{cF#>$KP*=^=AzcV-ft=;k=_n+p&i9LJ< zEgvk8yL_18Cf~I8d;Y!O*JUOjd_41$)Q9f^OzEwMbllh_oPL;sR8)u)ndnfR_9}kg XS8LAmLG>xX!kNL-)z4*}Q$iB}UecKd