diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index f792109e3bd..f0f1ed33670 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -585,6 +585,7 @@ /obj/item/clothing/shoes/white = 2, /obj/item/clothing/shoes/black = 2, /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/accessory/armband/service = 3, /obj/item/reagent_containers/glass/rag = 3, /obj/item/storage/box/dish_drive = 1) @@ -601,6 +602,7 @@ /obj/item/clothing/shoes/white = 20, /obj/item/clothing/shoes/black = 20, /obj/item/clothing/accessory/waistcoat = 20, + /obj/item/clothing/accessory/armband/service = 20, /obj/item/reagent_containers/glass/rag = 5, /obj/item/storage/box/dish_drive = 100) @@ -625,6 +627,7 @@ /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/black = 2, /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/accessory/armband/service = 3, /obj/item/reagent_containers/glass/rag = 3, /obj/item/storage/box/dish_drive = 1) @@ -639,6 +642,7 @@ /obj/item/clothing/shoes/laceup = 30, /obj/item/clothing/shoes/black = 20, /obj/item/clothing/accessory/waistcoat = 20, + /obj/item/clothing/accessory/armband/service = 20, /obj/item/reagent_containers/glass/rag = 5, /obj/item/storage/box/dish_drive = 100) @@ -663,6 +667,7 @@ /obj/item/clothing/suit/storage/labcoat/hydro = 3, /obj/item/clothing/mask/bandana/botany = 3, /obj/item/clothing/accessory/armband/hydro = 3, + /obj/item/clothing/accessory/armband/service = 3, /obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel_hyd = 2, /obj/item/storage/backpack/duffel/hydro = 2) @@ -677,6 +682,7 @@ /obj/item/clothing/suit/storage/labcoat/hydro = 75, /obj/item/clothing/mask/bandana/botany = 20, /obj/item/clothing/accessory/armband/hydro = 20, + /obj/item/clothing/accessory/armband/service = 20, /obj/item/storage/backpack/botany = 50, /obj/item/storage/backpack/satchel_hyd = 50, /obj/item/storage/backpack/duffel/hydro = 50) @@ -699,11 +705,14 @@ /obj/item/clothing/head/soft/purple = 3, /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/shoes/galoshes = 3, + /obj/item/clothing/accessory/armband/service = 3, /obj/item/storage/belt/janitor = 3) contraband = list(/obj/item/toy/figure/crew/janitor = 1) - prices = list(/obj/item/clothing/under/rank/civilian/janitor = 50) + prices = list(/obj/item/clothing/under/rank/civilian/janitor = 50, + /obj/item/clothing/head/soft/purple = 20, + /obj/item/clothing/accessory/armband/service = 20) refill_canister = /obj/item/vending_refill/janidrobe diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 567ad7307b4..3ea92a98d26 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -213,3 +213,13 @@ display_name = "Armband, science" path = /obj/item/clothing/accessory/armband/science allowed_roles = list("Research Director","Scientist", "Roboticist") + +/datum/gear/accessory/armband_job/procedure + display_name = "Armband, procedure" + path = /obj/item/clothing/accessory/armband/procedure + allowed_roles = list("Nanotrasen Representative", "Magistrate", "Internal Affairs Agent") + +/datum/gear/accessory/armband_job/service + display_name = "Armband, service" + path = /obj/item/clothing/accessory/armband/service + allowed_roles = list("Head of Personnel", "Chaplain", "Janitor", "Botanist", "Chef", "Bartender", "Clown", "Mime", "Librarian", "Barber") diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 13bbc917809..b8cc45dbe75 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -58,3 +58,9 @@ desc = "An armband, worn by the crew to display which department they're assigned to. This one is lavender." icon_state = "procedure" item_color = "procedure" + +/obj/item/clothing/accessory/armband/service + name = "service armband" + desc = "An armband, worn by the crew to display which department they're assigned to. This one is mint green." + icon_state = "service" + item_color = "service" diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index e024a61e8d8..b7f50b7f67c 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 1d504561b8e..bd519d6614e 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index f6cdacbae67..d9df8c0547a 100644 Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ