diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index e9bbe030953..35f693020e9 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -542,3 +542,17 @@ display_name = "visegradi ponczo" path = /obj/item/clothing/suit/storage/hooded/wintercoat/colorable/ponczo flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/suit/galatea_labcoat + display_name = "galatean labcoat" + description = "A labcoat design used by the Federal Technology of Galatea." + path = /obj/item/clothing/suit/storage/galatea_labcoat + origin_restriction = list(/singleton/origin_item/origin/galatea) + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/galatea_labcoat/New() + ..() + var/list/galatea_labcoat = list() + galatea_labcoat["galatean labcoat"] = /obj/item/clothing/suit/storage/galatea_labcoat + galatea_labcoat["galatean labcoat, alt"] = /obj/item/clothing/suit/storage/galatea_labcoat/alt + gear_tweaks += new /datum/gear_tweak/path(galatea_labcoat) diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 161713c1ef5..4d7f83e2481 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -427,6 +427,13 @@ fetil_dress["fetil dress, gold flairs"] = /obj/item/clothing/under/antillean/goldflair gear_tweaks += new /datum/gear_tweak/path(fetil_dress) +/datum/gear/uniform/miscellaneous/galatea_uniform + display_name = "galatean uniform" + description = "A work uniform often worn by citizens of the Federal Technology of Galatea." + path = /obj/item/clothing/under/galatea + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + origin_restriction = list(/singleton/origin_item/origin/galatea) + /* Uniform Rolled State Adjustment */ diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index c5a31368d90..269971c8919 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -180,3 +180,20 @@ /obj/item/clothing/suit/storage/toggle/labcoat/accent/alt icon_state = "labcoat_accent_alt" item_state = "labcoat_accent_alt" + +/obj/item/clothing/suit/storage/galatea_labcoat + name = "\improper Galatean labcoat" + desc = "A style of labcoat commonly worn by Galatean researchers which is intended to resemble labcoats commonly used throughout the Alliance prior to the Interstellar War’s outbreak in the late 2200s." + icon = 'icons/clothing/suits/coats/galatea.dmi' + icon_state = "labcoat1" + item_state = "labcoat1" + contained_sprite = TRUE + body_parts_covered = UPPER_TORSO|ARMS + allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) + armor = list( + bio = ARMOR_BIO_RESISTANT + ) + +/obj/item/clothing/suit/storage/galatea_labcoat/alt + icon_state = "labcoat2" + item_state = "labcoat2" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 5d0b0ff1f73..5053b5ff5b9 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -724,3 +724,12 @@ item_state = "upburger" contained_sprite = TRUE has_sensor = SUIT_NO_SENSORS + +//Galatea +/obj/item/clothing/under/galatea + name = "\improper Galatean uniform" + desc = "A pair of slacks and matching protected shirt in the traditional black and green colors of a Galatean worker, seeing use across their space for all matter of jobs. Has a small plate to protect against chemical spills and small stab wounds, though providing little actual protection. Traditionally, one's planet of origin is marked on the right side of its high collar while the Technocracy's flag is on the left side of the collar." + icon = 'icons/clothing/under/uniforms/galatea.dmi' + icon_state = "underglove" + item_state = "underglove" + contained_sprite = TRUE diff --git a/html/changelogs/RustingWithYou - stemlords.yml b/html/changelogs/RustingWithYou - stemlords.yml new file mode 100644 index 00000000000..6c840978ebb --- /dev/null +++ b/html/changelogs/RustingWithYou - stemlords.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: RustingWithYou + +# 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: "Adds a Galatean uniform and labcoat." diff --git a/icons/clothing/suits/coats/galatea.dmi b/icons/clothing/suits/coats/galatea.dmi new file mode 100644 index 00000000000..43e15ac00db Binary files /dev/null and b/icons/clothing/suits/coats/galatea.dmi differ diff --git a/icons/clothing/under/uniforms/galatea.dmi b/icons/clothing/under/uniforms/galatea.dmi new file mode 100644 index 00000000000..f798ed68bc8 Binary files /dev/null and b/icons/clothing/under/uniforms/galatea.dmi differ