diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 6b66b53da2c..39d9163ac5d 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -349,6 +349,8 @@ /obj/item/clothing/under/rank/rnd/roboticist/skirt = 3, /obj/item/clothing/suit/storage/labcoat/roboblack = 3, /obj/item/clothing/suit/storage/labcoat/robowhite = 3, + /obj/item/clothing/head/beret/roboblack = 3, + /obj/item/clothing/head/beret/robowhite = 3, /obj/item/clothing/head/soft/black = 3, /obj/item/clothing/gloves/fingerless = 3, /obj/item/clothing/shoes/laceup = 3, @@ -359,6 +361,8 @@ /obj/item/clothing/under/rank/rnd/roboticist/skirt = 50, /obj/item/clothing/suit/storage/labcoat/roboblack = 75, /obj/item/clothing/suit/storage/labcoat/robowhite = 75, + /obj/item/clothing/head/beret/roboblack = 20, + /obj/item/clothing/head/beret/robowhite = 20, /obj/item/clothing/head/soft/black = 20, /obj/item/clothing/gloves/fingerless = 20, /obj/item/clothing/shoes/laceup = 30, diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index d13b6a0552b..75abf216654 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -173,6 +173,16 @@ path = /obj/item/clothing/head/beret/sci allowed_roles = list("Research Director", "Scientist") +/datum/gear/hat/beret_job/robowhite + display_name = "Beret, robotics" + path = /obj/item/clothing/head/beret/robowhite + allowed_roles = list("Research Director", "Roboticist") + +/datum/gear/hat/beret_job/roboblack + display_name = "Beret, bioengineer" + path = /obj/item/clothing/head/beret/roboblack + allowed_roles = list("Research Director", "Roboticist") + /datum/gear/hat/beret_job/med display_name = "Beret, medical" path = /obj/item/clothing/head/beret/med diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 5d320aac129..d8a2e8bc7c1 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -215,8 +215,18 @@ /obj/item/clothing/head/beret/sci name = "science beret" - desc = "A purple beret with the science insignia emblazoned on it. It has that authentic burning plasma smell." - icon_state = "beret_sci" + desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma." + icon_state = "beret_science" + +/obj/item/clothing/head/beret/robowhite + name = "robotics beret" + desc = "A white beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil." + icon_state = "beret_roboticswhite" + +/obj/item/clothing/head/beret/roboblack + name = "bioengineer beret" + desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil." + icon_state = "beret_roboticsblack" //Medical /obj/item/clothing/head/beret/med diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index a56c730fb28..94dd6f77f3d 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 26a03031c1c..3ee29de8f1d 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/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index a0938af8d2e..45ca6bd8137 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/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b33e22d5b29..1b5ec49ae12 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ