diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index fd69e6493b1..9d4fba5c06f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -1,11 +1,22 @@ // Suit slot /datum/gear/suit - display_name = "apron, blue" + display_name = "apron, botanist" path = /obj/item/clothing/suit/apron slot = slot_wear_suit sort_category = "Suits and Overwear" cost = 2 +/datum/gear/suit/colorapron + display_name = "apron, multipurpose" + path = /obj/item/clothing/suit/apron/colored + slot = slot_wear_suit + sort_category = "Suits and Overwear" + cost = 2 + +/datum/gear/suit/colorapron/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/suit/leather display_name = "jacket selection" description = "A selection of jackets." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 11224784fa3..09abdee6d08 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -4,15 +4,22 @@ //Botonist /obj/item/clothing/suit/apron - name = "apron" - desc = "A basic blue apron." - icon_state = "apron" - item_state = "apron" + name = "botanist apron" + desc = "A basic blue apron meant for botanists." + icon_state = "blueapron" + item_state = "blueapron" blood_overlay_type = "armor" body_parts_covered = 0 allowed = list (/obj/item/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/fertilizer,/obj/item/material/minihoe) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS +obj/item/clothing/suit/apron/colored + name = "multipurpose apron" + desc = "A multipurpose apron that comes in many colors." + icon_state = "apron" + item_state = "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/clothing/suit/apron/overalls name = "coveralls" desc = "A set of denim overalls." diff --git a/html/changelogs/Kaedwuff - Colored Aprons.yml b/html/changelogs/Kaedwuff - Colored Aprons.yml new file mode 100644 index 00000000000..c230025fd4d --- /dev/null +++ b/html/changelogs/Kaedwuff - Colored Aprons.yml @@ -0,0 +1,42 @@ +################################ +# 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: Kaedwuff + +# 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: + - rscadd: "Added multipurpose aprons to the loadout. They can come in any color you desire, and can hold several kitchen and bar items, such as the drink shaker, booze and condiment bottles, and knives." + - tweak: "Blue aprons are now called 'botanist aprons', to fit with their intended role as a botanist item." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 161cae1391f..1994a42a5b6 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e4eedf40ca8..914a6d95ec1 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ