diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 8e74878479d..6594514bbe4 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -847,6 +847,7 @@ vend_reply = "Thank you for using the HydroDrobe!" products = list(/obj/item/clothing/under/rank/civilian/hydroponics = 3, + /obj/item/clothing/under/rank/civilian/hydroponics/alt = 3, /obj/item/reagent_containers/glass/bucket = 3, /obj/item/clothing/suit/apron = 3, /obj/item/clothing/suit/apron/overalls = 3, @@ -854,6 +855,10 @@ /obj/item/clothing/suit/jacket/bomber/hydro = 3, /obj/item/clothing/suit/storage/labcoat/hydro = 3, /obj/item/clothing/mask/bandana/botany = 3, + /obj/item/clothing/head/beret/hydroponics = 3, + /obj/item/clothing/head/beret/hydroponics_alt = 3, + /obj/item/clothing/head/soft/hydroponics = 3, + /obj/item/clothing/head/soft/hydroponics_alt = 3, /obj/item/clothing/accessory/armband/hydro = 3, /obj/item/clothing/accessory/armband/service = 3, /obj/item/storage/backpack/botany = 2, @@ -865,6 +870,7 @@ contraband = list(/obj/item/toy/figure/crew/botanist = 1) prices = list(/obj/item/clothing/under/rank/civilian/hydroponics = 50, + /obj/item/clothing/under/rank/civilian/hydroponics/alt = 50, /obj/item/reagent_containers/glass/bucket = 15, /obj/item/clothing/suit/apron = 50, /obj/item/clothing/suit/apron/overalls = 50, @@ -872,6 +878,10 @@ /obj/item/clothing/suit/jacket/bomber/hydro = 75, /obj/item/clothing/suit/storage/labcoat/hydro = 75, /obj/item/clothing/mask/bandana/botany = 20, + /obj/item/clothing/head/beret/hydroponics = 20, + /obj/item/clothing/head/beret/hydroponics_alt = 20, + /obj/item/clothing/head/soft/hydroponics = 20, + /obj/item/clothing/head/soft/hydroponics_alt = 20, /obj/item/clothing/accessory/armband/hydro = 20, /obj/item/clothing/accessory/armband/service = 20, /obj/item/storage/backpack/botany = 50, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm index bd885e2eaef..f31ed0b7fdc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm @@ -11,6 +11,9 @@ new /obj/item/clothing/suit/apron/overalls(src) new /obj/item/storage/bag/plants/portaseeder(src) new /obj/item/clothing/under/rank/civilian/hydroponics(src) + new /obj/item/clothing/under/rank/civilian/hydroponics/alt(src) + new /obj/item/clothing/head/soft/hydroponics + new /obj/item/clothing/head/soft/hydroponics_alt new /obj/item/plant_analyzer(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/mask/bandana/botany(src) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 8b4d03c7183..00a33aeab4c 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -87,6 +87,16 @@ path = /obj/item/clothing/head/soft/janitorpurple allowed_roles = list("Janitor") +/datum/gear/hat/caphydroblue + display_name = "Cap, hydroponics blue" + path = /obj/item/clothing/head/soft/hydroponics + allowed_roles = list("Botanist") + +/datum/gear/hat/caphydrobrown + display_name = "Cap, hydroponics brown" + path = /obj/item/clothing/head/soft/hydroponics_alt + allowed_roles = list("Botanist") + /datum/gear/hat/capred display_name = "Cap, red" path = /obj/item/clothing/head/soft/red @@ -202,6 +212,16 @@ path = /obj/item/clothing/head/beret/janitor allowed_roles = list("Janitor") +/datum/gear/hat/beret_job/hydroponics + display_name = "Beret, hydroponics blue" + path = /obj/item/clothing/head/beret/hydroponics + allowed_roles = list("Botanist") + +/datum/gear/hat/beret_job/hydroponics_alt + display_name = "Beret, hydroponics brown" + path = /obj/item/clothing/head/beret/hydroponics_alt + allowed_roles = list("Botanist") + /datum/gear/hat/beret_job/hop display_name = "Beret, head of personnel" path = /obj/item/clothing/head/beret/hop diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 21d1dfe8eb8..441c3490c40 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -20,6 +20,10 @@ /datum/gear/uniform/suit main_typepath = /datum/gear/uniform/suit +/datum/gear/uniform/suit/job + main_typepath = /datum/gear/uniform/suit/job + subtype_selection_cost = FALSE + /datum/gear/uniform/turtleneck main_typepath = /datum/gear/uniform/turtleneck @@ -362,6 +366,12 @@ allowed_roles = list("Head of Security") //Service + +/datum/gear/uniform/suit/job/hydroponics_alt + display_name = "Jumpsuit, hydroponics brown" + path = /obj/item/clothing/under/rank/civilian/hydroponics/alt + allowed_roles = list("Botanist") + /datum/gear/uniform/skirt/job/clown display_name = "Skirt, clown" path = /obj/item/clothing/under/rank/civilian/clown/skirt diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 06b02881d01..3e07f3854c4 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -89,7 +89,7 @@ icon_state = "beret_officer" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 60 - dog_fashion = /datum/dog_fashion/head/beret/sec + dog_fashion = /datum/dog_fashion/head/beret/sec /obj/item/clothing/head/beret/sec/corporate name = "corporate security beret" @@ -182,6 +182,26 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' ) +/obj/item/clothing/head/beret/hydroponics + name = "botany beret" + desc = "A green beret with a blue service insignia emblazoned on it. It smells dizzying." + icon_state = "beret_hydroponics" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/hydroponics_alt + name = "hydroponics beret" + desc = "A green beret with a brown service insignia emblazoned on it. It smells dizzying." + icon_state = "beret_hydroponics_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + //Medical /obj/item/clothing/head/beret/cmo name = "chief medical officer's beret" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index e8a8fd25eba..a32878ae1d0 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -129,6 +129,18 @@ icon_state = "janitorpurplesoft" item_color = "janitorpurple" +/obj/item/clothing/head/soft/hydroponics + name = "botanist's cap" + desc = "It's a green baseball hat with a blue service shield." + icon_state = "hydroponicssoft" + item_color = "hydroponics" + +/obj/item/clothing/head/soft/hydroponics_alt + name = "hydroponics cap" + desc = "It's a green baseball hat with a brown service shield." + icon_state = "hydroponics_altsoft" + item_color = "hydroponics_alt" + /obj/item/clothing/head/soft/paramedic name = "\improper EMT cap" desc = "It's a blue baseball hat with a white medical shield." diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index f8475e2eaed..c5056822aec 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -139,13 +139,19 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/rank/civilian/hydroponics - desc = "It's a jumpsuit designed to protect against minor plant-related hazards." + desc = "It's a jumpsuit designed to protect against minor plant-related hazards. This one has blue markings." name = "botanist's jumpsuit" icon_state = "hydroponics" item_state = "g_suit" item_color = "hydroponics" permeability_coefficient = 0.50 +/obj/item/clothing/under/rank/civilian/hydroponics/alt + desc = "It's a jumpsuit designed to protect against minor plant-related hazards. This one has brown markings." + name = "hydroponicist's jumpsuit" + icon_state = "hydroponics_alt" + item_color = "hydroponics_alt" + /obj/item/clothing/under/rank/civilian/janitor name = "janitor's jumpsuit" desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 60597c195c0..6f0d4672bc5 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index 4f4525665a4..1dd0f50c76b 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index c86a59301fe..ab316179f65 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi index c71cf0e1ea1..244108f9f57 100644 Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi index d1af2865290..21e122b8c69 100644 Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/beret.dmi b/icons/mob/clothing/species/kidan/head/beret.dmi index 0594c08205c..b6425147e50 100644 Binary files a/icons/mob/clothing/species/kidan/head/beret.dmi and b/icons/mob/clothing/species/kidan/head/beret.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/softcap.dmi b/icons/mob/clothing/species/kidan/head/softcap.dmi index 29e0e005c8c..42a454f59ef 100644 Binary files a/icons/mob/clothing/species/kidan/head/softcap.dmi and b/icons/mob/clothing/species/kidan/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi index 86e3f13f48c..dd9ad46ae7d 100644 Binary files a/icons/mob/clothing/species/kidan/under/civilian.dmi and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 0eb1cac6269..dcf5b7e161b 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index 5ad21a16c4c..1f8e4048bd6 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 290386e3d8e..13be0a65ea3 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi index cd16d01996a..b008bdda825 100644 Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 443a2c4e216..b19cb6bb75d 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 38b4ca2de00..80e1b8a3ae3 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 7008897a4ee..8f47355857e 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index 66ab655f000..ea3d454fddb 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index fbb7c0a84e6..30669bb3a6e 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 0c8d0cf8ea2..2fe864121ad 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ