diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 62318c25b8b..a8ccbba9889 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -874,11 +874,13 @@ /obj/item/clothing/suit/hooded/wintercoat/hydro = 3, /obj/item/clothing/suit/jacket/bomber/hydro = 3, /obj/item/clothing/suit/storage/labcoat/hydro = 3, + /obj/item/clothing/suit/storage/labcoat/hydro/alt = 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/head/cowboyhat/hydro = 3, /obj/item/clothing/accessory/armband/hydro = 3, /obj/item/clothing/accessory/armband/service = 3, /obj/item/storage/backpack/botany = 2, @@ -897,11 +899,13 @@ /obj/item/clothing/suit/hooded/wintercoat/hydro = 75, /obj/item/clothing/suit/jacket/bomber/hydro = 75, /obj/item/clothing/suit/storage/labcoat/hydro = 75, + /obj/item/clothing/suit/storage/labcoat/hydro/alt = 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/head/cowboyhat/hydro = 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/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index f0419a629b6..d9b33fe0ae5 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -168,6 +168,11 @@ path = /obj/item/clothing/head/cowboyhat/sec allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective") +/datum/gear/hat/cowboyhat/hydro + display_name = "Cowboy hat, botany" + path = /obj/item/clothing/head/cowboyhat/hydro + allowed_roles = list("Botanist") + /datum/gear/hat/beret_purple display_name = "Beret, purple" path = /obj/item/clothing/head/beret/purple_normal diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index a6bd9822dce..831d544497e 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -215,6 +215,11 @@ desc = "Secway is your horse." icon_state = "cowboyhat_sec" +/obj/item/clothing/head/cowboyhat/hydro + name = "botany cowboy hat" + desc = "For the Farmer in us all." + icon_state = "cowboyhat_botany" + /obj/item/clothing/head/fedora name = "fedora" desc = "A great hat ruined by being within fifty yards of you." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ee3cf46728c..be25a2da304 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -92,11 +92,16 @@ insert_max = 2 /obj/item/clothing/suit/storage/labcoat/hydro - name = "hydroponics labcoat" - desc = "A suit that protects against minor chemical spills. Has green research markings." + name = "botany labcoat" + desc = "A suit that protects against minor chemical spills. Has blue research markings." icon_state = "labcoat_botany_open" allowed = list(/obj/item/plant_analyzer, /obj/item/reagent_containers/glass/bottle, /obj/item/storage/bag/plants, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/paper) +/obj/item/clothing/suit/storage/labcoat/hydro/alt + name = "hydroponics labcoat" + desc = "A suit that protects against minor chemical spills. Has brown research markings." + icon_state = "labcoat_hydro_open" + /obj/item/clothing/suit/storage/labcoat/abductor name = "alien labcoat" desc = "A comfortable suit for alien scientists. Has pink markings." diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index cc1bae10c47..4619c3569dd 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index a56b12519df..fd1a0222878 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 15bbb5552b0..d0721641982 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 4c1882e45ed..1224f0d88d1 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi index 75db79d6ffd..555e9368e4f 100644 Binary files a/icons/mob/clothing/species/drask/mask.dmi and b/icons/mob/clothing/species/drask/mask.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/coat.dmi b/icons/mob/clothing/species/drask/suits/coat.dmi index 0ef9fbb2432..9a633b6a28d 100644 Binary files a/icons/mob/clothing/species/drask/suits/coat.dmi and b/icons/mob/clothing/species/drask/suits/coat.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/labcoat.dmi b/icons/mob/clothing/species/drask/suits/labcoat.dmi index 679d70499fd..4c426bf0917 100644 Binary files a/icons/mob/clothing/species/drask/suits/labcoat.dmi and b/icons/mob/clothing/species/drask/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi index 8e074d22774..2e536eec791 100644 Binary files a/icons/mob/clothing/species/grey/back.dmi and b/icons/mob/clothing/species/grey/back.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index b24cc171a0b..dce34e2285b 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi index f538df71b05..7bd1ee8a5ec 100644 Binary files a/icons/mob/clothing/species/grey/mask.dmi and b/icons/mob/clothing/species/grey/mask.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/coat.dmi b/icons/mob/clothing/species/grey/suits/coat.dmi index bf92fb96d4c..4774fa37a84 100644 Binary files a/icons/mob/clothing/species/grey/suits/coat.dmi and b/icons/mob/clothing/species/grey/suits/coat.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/labcoat.dmi b/icons/mob/clothing/species/grey/suits/labcoat.dmi index 5515b2ee805..3d8dae3db0d 100644 Binary files a/icons/mob/clothing/species/grey/suits/labcoat.dmi and b/icons/mob/clothing/species/grey/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/coat.dmi b/icons/mob/clothing/species/kidan/suits/coat.dmi index 4ec5ec93074..3e30443c9d5 100644 Binary files a/icons/mob/clothing/species/kidan/suits/coat.dmi and b/icons/mob/clothing/species/kidan/suits/coat.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/labcoat.dmi b/icons/mob/clothing/species/kidan/suits/labcoat.dmi index 818766b5b04..6478f205586 100644 Binary files a/icons/mob/clothing/species/kidan/suits/labcoat.dmi and b/icons/mob/clothing/species/kidan/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index e5f07349aab..c0d4d966385 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 6d0d63e5b73..309276f1f23 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/clothing/species/skrell/mask.dmi b/icons/mob/clothing/species/skrell/mask.dmi index 2e68903ec9e..1e274f8deb5 100644 Binary files a/icons/mob/clothing/species/skrell/mask.dmi and b/icons/mob/clothing/species/skrell/mask.dmi differ diff --git a/icons/mob/clothing/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi index a396b27bce7..2a2c6d39492 100644 Binary files a/icons/mob/clothing/species/tajaran/mask.dmi and b/icons/mob/clothing/species/tajaran/mask.dmi differ diff --git a/icons/mob/clothing/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi index bd848dd1ab2..686c842d9e1 100644 Binary files a/icons/mob/clothing/species/unathi/mask.dmi and b/icons/mob/clothing/species/unathi/mask.dmi differ diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi index 837e5e960cd..bb72eb8e4d9 100644 Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 337cad1c5e7..831c4300dad 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi index 86d1dd9fec6..ebce5166bc8 100644 Binary files a/icons/mob/clothing/species/vox/mask.dmi and b/icons/mob/clothing/species/vox/mask.dmi differ diff --git a/icons/mob/clothing/species/vox/suits/coat.dmi b/icons/mob/clothing/species/vox/suits/coat.dmi index 7b2fedd23d3..205c132603a 100644 Binary files a/icons/mob/clothing/species/vox/suits/coat.dmi and b/icons/mob/clothing/species/vox/suits/coat.dmi differ diff --git a/icons/mob/clothing/species/vox/suits/labcoat.dmi b/icons/mob/clothing/species/vox/suits/labcoat.dmi index 8a45098c751..029fd69c04d 100644 Binary files a/icons/mob/clothing/species/vox/suits/labcoat.dmi and b/icons/mob/clothing/species/vox/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi index 728972e85b0..7ed51283ee2 100644 Binary files a/icons/mob/clothing/species/vulpkanin/mask.dmi and b/icons/mob/clothing/species/vulpkanin/mask.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 67a28e5d424..89c02e9f3c1 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/coat.dmi b/icons/mob/clothing/suits/coat.dmi index 10f091740e4..1db6dbec04e 100644 Binary files a/icons/mob/clothing/suits/coat.dmi and b/icons/mob/clothing/suits/coat.dmi differ diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi index a00b0523949..242f3348c11 100644 Binary files a/icons/mob/clothing/suits/labcoat.dmi and b/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ff2189c87c7..59c25c14f1f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 276e7818221..757c0e92656 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 7a612c89816..3ccb3ef445f 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index 0360a9a5ff5..d0ad73e09d1 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index fcb34ee49b4..eea30da1304 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 875b48b9675..e757fd09ab9 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/coat.dmi b/icons/obj/clothing/suits/coat.dmi index 7db8c1d156c..4ade4ce6773 100644 Binary files a/icons/obj/clothing/suits/coat.dmi and b/icons/obj/clothing/suits/coat.dmi differ diff --git a/icons/obj/clothing/suits/labcoat.dmi b/icons/obj/clothing/suits/labcoat.dmi index aaff0144343..1e0ef3f50a7 100644 Binary files a/icons/obj/clothing/suits/labcoat.dmi and b/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 7b17cc58ec5..06445fee88d 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ