From cde18f64c056321d674c3c53a2d5331c90046570 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Thu, 27 Feb 2025 13:25:32 +0000 Subject: [PATCH] Quick-E-Burger loadout fixes (#20523) Resolves https://github.com/Aurorastation/Aurora.3/issues/20493 PRing on behalf of goblin.stev, should resolve various bugs with the QEB stuff. --- .../loadout/items/factions.dm | 11 +++- .../changelogs/hazelmouse-quickeburgerfix.yml | 59 ++++++++++++++++++ icons/clothing/suits/quickeburger_apron.dmi | Bin 604 -> 600 bytes 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/hazelmouse-quickeburgerfix.yml diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 770bea7f1a2..fb1f0bebe5d 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -760,7 +760,6 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co orion_labcoats["orion corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/orion/alt orion_labcoats["orion winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/orion orion_labcoats["orion winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/orion/alt - orion_labcoats["Quick-E-Burger apron"] = /obj/item/clothing/accessory/apron/qeburgerapron gear_tweaks += new /datum/gear_tweak/path(orion_labcoats) /datum/gear/faction/orion_headwear @@ -780,10 +779,18 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co orion_headwear["Quick-E-Burger visor"] = /obj/item/clothing/head/qeburger_visor gear_tweaks += new /datum/gear_tweak/path(orion_headwear) +/datum/gear/faction/orion_qeburger_apron + display_name = "Quick-E-Burger apron" + description = "An apron for employees of Quick-E-Burger, a subsidiary of Orion Express." + path = /obj/item/clothing/accessory/apron/qeburgerapron + slot = slot_wear_suit + faction = "Orion Express" + /datum/gear/faction/orion_qeburger_suit display_name = "Quick-E-Burger jumpsuit" - description = "A jumpsuit for employees of Quick-E-Burger." + description = "A jumpsuit for employees of Quick-E-Burger, a subsidiary of Orion Express." path = /obj/item/clothing/under/qeburgerjumpsuit + slot = slot_w_uniform faction = "Orion Express" //SCC diff --git a/html/changelogs/hazelmouse-quickeburgerfix.yml b/html/changelogs/hazelmouse-quickeburgerfix.yml new file mode 100644 index 00000000000..514ef044441 --- /dev/null +++ b/html/changelogs/hazelmouse-quickeburgerfix.yml @@ -0,0 +1,59 @@ +################################ +# 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: goblin.stev & 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: + - bugfix: "All Quick-E-Burger loadout options should now correctly display in the loadout." + - bugfix: "The Quick-E-Burger apron should now appear ingame when worn as a suit, and both the apron and jumpsuit shouldn't spawn inside the players' bag at roundstart." diff --git a/icons/clothing/suits/quickeburger_apron.dmi b/icons/clothing/suits/quickeburger_apron.dmi index e15b9d6646fe5cc7243083f56de5c851536fccf1..898530e310f58bccb3fd699a1c6d4699d33fd176 100644 GIT binary patch delta 40 ycmV+@0N4NA1lRV_Y{s91jXF^Y1@yx!l>T&^eQxgpU delta 44 zcmcb?a))I?1Y_sK$Woc6SaBD{u6vJyVs=dtjrkjM;2$GHQ