diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 00f0a631fc6..9725fd58bd8 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -760,6 +760,7 @@ var/datum/gear_tweak/modsuit_configuration/gear_tweak_modsuit_configuration = ne 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 @@ -775,8 +776,16 @@ var/datum/gear_tweak/modsuit_configuration/gear_tweak_modsuit_configuration = ne orion_headwear["beret, orion"] = /obj/item/clothing/head/beret/corporate/orion orion_headwear["orion woolen hat"] = /obj/item/clothing/head/wool/orion orion_headwear["orion woolen hat, alt"] = /obj/item/clothing/head/wool/orion/alt + orion_headwear["orion softcap"] = /obj/item/clothing/head/softcap/orion + 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_suit + display_name = "Quick-E-Burger jumpsuit" + description = "A jumpsuit for employees of Quick-E-Burger." + path = /obj/item/clothing/under/qeburgerjumpsuit + faction = "Orion Express" + //SCC /datum/gear/faction/scc_armband display_name = "SCC armband" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 2667853979f..9ea802f3444 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -815,3 +815,12 @@ desc = "A military-style corporate peaked cap. This one bears the colors of the Private Military Contracting Group." icon_state = "pmc_warden_hat_nologo" item_state = "pmc_warden_hat_nologo" + +//goblin.stev's stuff +/obj/item/clothing/head/qeburger_visor + name = "Quick-E-Burger Food Technician Visor" + desc = "For stylish employees on the retail grind, the Quick-E-Burger Food Technician Visor is the latest in form-first fashion! Supplied and manufactured in bulk by Quick-E-Burger's parent company, Orion Express, the Food Technician Visor is equipped with an innovative easy-to-use velcro headstrap to keep the company's prime product sky-high, and its light-resistant plastic visor is perfect for keeping sun, lights, and disappointed family-members alike out of employees' eyes!" + icon = 'icons/obj/clothing/hats/orion.dmi' + icon_state = "quickeburger_visorcap" + item_state = "quickeburger_visorcap" + contained_sprite = TRUE diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index fc8d385e448..bea9e31a5b1 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -191,3 +191,10 @@ desc = "A peaked cap in a brown colour with a purple brim." icon_state = "custodian_orion" item_state = "custodian_orion" + +//goblin.stev's stuff +/obj/item/clothing/head/softcap/orion + name = "Orion Softcap" + desc = "A company-issue Orion Express cap. For overworked employees that value corporate pride over protection." + icon_state = "orion" + item_state = "orion" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index a5e6a270a2c..d849657fcb6 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -1216,6 +1216,20 @@ /obj/item/reagent_containers/food/drinks/bottle, /obj/item/material/knife ) +// goblinstev's stuff +/obj/item/clothing/accessory/apron/qeburgerapron + name = "Quick-E-Burger Food Technician Apron" + desc = "For industrious employees hard at work, the Quick-E-Burger Food Technician Apron is the perfect protection! Supplied and manufactured in bulk by Quick-E-Burger's parent company, Orion Express, the Food Technician Apron is constructed from highly-resistant rubber with ergonomic quick-fastening security straps to ensure it can be made to fit any employee, of any species, anywhere!" + icon = 'icons/clothing/suits/quickeburger_apron.dmi' + icon_state = "quickeburger_apron" + item_state = "quickeburger_apron" + allowed = list( + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/material/kitchen/utensil, + /obj/item/reagent_containers/food/condiment, + /obj/item/reagent_containers/food/drinks/bottle, + /obj/item/material/knife + ) /********** Aprons End **********/ /********** Overalls Start **********/ diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 1b7eff31519..136eaae0ffb 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -307,3 +307,12 @@ icon_state = "ee_captain" item_state = "ee_captain" contained_sprite = TRUE + +//goblin.stev's stuff +/obj/item/clothing/under/qeburgerjumpsuit + name = "Quick-E-Burger Food Technician Jumpsuit" + desc = "For valued employees on the go, the Quick-E-Burger Food Technician Jumpsuit is the perfect attire! Supplied and manufactured in bulk by Quick-E-Burger's parent company, Orion Express, the Food Technician Jumpsuit is lavishly appointed with a one-size-doesn't-quite-fit-anyone design, including a state-of-the-art button-up fastening system designed to enable quick and easy employee repair!" + icon = 'icons/clothing/under/uniforms/orion.dmi' + icon_state = "quickeburger_jumpsuit" + item_state = "quickeburger_jumpsuit" + contained_sprite = TRUE diff --git a/html/changelogs/ASmallCuteCat - GoblinStevs Quick-E-Burger gear.yml b/html/changelogs/ASmallCuteCat - GoblinStevs Quick-E-Burger gear.yml new file mode 100644 index 00000000000..1e6311218dc --- /dev/null +++ b/html/changelogs/ASmallCuteCat - GoblinStevs Quick-E-Burger gear.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: ASmallCuteCat + +# 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: "Added Quick-E-Burger themed gear and an Orion softcap to the loadout." + - imageadd: "Added goblin.stev's sprites for an Orion Express softcap and Quick-E-Burger visor, jumpsuit, and apron." diff --git a/icons/clothing/suits/quickeburger_apron.dmi b/icons/clothing/suits/quickeburger_apron.dmi new file mode 100644 index 00000000000..e15b9d6646f Binary files /dev/null and b/icons/clothing/suits/quickeburger_apron.dmi differ diff --git a/icons/clothing/under/uniforms/orion.dmi b/icons/clothing/under/uniforms/orion.dmi new file mode 100644 index 00000000000..27d038762e2 Binary files /dev/null and b/icons/clothing/under/uniforms/orion.dmi differ diff --git a/icons/obj/clothing/hats/orion.dmi b/icons/obj/clothing/hats/orion.dmi new file mode 100644 index 00000000000..ec17ec2bb11 Binary files /dev/null and b/icons/obj/clothing/hats/orion.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index e842d2e7a27..1df30b696d1 100644 Binary files a/icons/obj/clothing/hats/soft_caps.dmi and b/icons/obj/clothing/hats/soft_caps.dmi differ