From c84f7704855abaccc1762f46723848e419852f3a Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:03:37 +0800 Subject: [PATCH] fixes #14239 (#14246) --- .../loadout/loadout_factions.dm | 10 +++-- code/modules/clothing/head/soft_caps.dm | 4 +- html/changelogs/wezzy_capfix.yml | 41 ++++++++++++++++++ icons/obj/clothing/hats/soft_caps.dmi | Bin 32900 -> 32893 bytes 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/wezzy_capfix.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 78d5daffc51..10f3ca5ee1a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -77,16 +77,18 @@ /datum/gear/faction/zavodskoi_beret/alt display_name = "brown zavodskoi beret" path = /obj/item/clothing/head/beret/corporate/zavod - sort_category = "Factions" + faction = "Zavodskoi Interstellar" + +/datum/gear/faction/zavodskoi_softcap + display_name = "brown zavodskoi cap" + path = /obj/item/clothing/head/softcap/zavod + faction = "Zavodskoi Interstellar" /datum/gear/faction/zavodskoi_softcap/alt display_name = "black zavodskoi cap" path = /obj/item/clothing/head/softcap/zavod/alt faction = "Zavodskoi Interstellar" -/datum/gear/faction/zavodskoi_softcap - display_name = "brown zavodskoi cap" - path = /obj/item/clothing/head/softcap/zavod /datum/gear/faction/zavodskoi_labcoat display_name = "zavodskoi labcoat" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 3b8dbea29cd..3278eae8cb3 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -152,8 +152,8 @@ item_state = "zav" /obj/item/clothing/head/softcap/zavod/alt - icon_state = "zavalt_cap" - item_state = "zavalt_cap" + icon_state = "zavalt" + item_state = "zavalt" /obj/item/clothing/head/softcap/zeng desc = "A company-issue Zeng-Hu cap. It feels synthetic to the touch." diff --git a/html/changelogs/wezzy_capfix.yml b/html/changelogs/wezzy_capfix.yml new file mode 100644 index 00000000000..7efb0658ffb --- /dev/null +++ b/html/changelogs/wezzy_capfix.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: + - bugfix: "Fixes Zavodskoi cap and beret being unable to spawn." diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index e0517a7b4ac4d78d53bd9e28469e2d23c552faeb..2615fde1a7137b6a041cef438a0aeaeef449ca0c 100644 GIT binary patch delta 727 zcmV;|0x122fdc)20+1wsyLwbubVOxyV{&P5bZKvH004NLotM3C+%OP?>(f&Rb|2)& z?KOdo;0pT{44PU|3y73JGBWO-J_Q9!b`j06vw<0a^X=@Bx^I6!{kgofkI$E8k(hJ} z?YVvU_Psg1YnO-i-2VF6oCZ-h21_ zixVBY?!^!t&dZwUcwWUty%nOPcohR1yXpqiAQ8XMG)UxsZ$S+bse4d^MCvBgAd!yE z@UnkXo;o$hZ_y7W%xQA~j5aaAXA?6KtGK*|Oau+Nf=`Y`Rt*Y?+ysc&3ODX zP-IMUGeXP1DzW@#gjW9ZVG)NQqZelO0uEom=?gf1A?JTH%VCzAS>W6^vmmi=WMN-pt%f`6j^~msf(rn=ZjYJ(u91mP>GG5+M0~`}FeIK0aTXf7nmI-QHYF JU9;~3m3<-Of}Gt`py46j6oZR$0di@1pQOV#szcJnb^cC#=&cC+vRTG(YZaQ>`@W|q}3ys{dG zRaQfWZDACMyrE%#1_L*Pft$fVhi&R3LcUGuq})$*# z8|kG_6CJy4V@MX~Wh7aiS9MXlLb4REYG7kG-GDA?!tXPG7d7#>po^NQd(cHq)J^E3 zCOS65%lye@>YZ%wqMu5b)8YUaEn(V|I!tpx$a@_v~ Q-pk2P${EjAv*-eqeVX@idH?_b