diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index beb852f10f..a2081851e1 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -528,6 +528,16 @@ item_color = "assistant_formal" can_adjust = FALSE +/obj/item/clothing/under/staffassistant + name = "staff assistant's jumpsuit" + desc = "It's a generic grey jumpsuit. That's about what assistants are worth, anyway." + icon = 'goon/icons/obj/item_js_rank.dmi' + alternate_worn_icon = 'goon/icons/mob/worn_js_rank.dmi' + icon_state = "assistant" + item_state = "gy_suit" + item_color = "assistant" + mutantrace_variation = NONE + /obj/item/clothing/under/blacktango name = "black tango dress" desc = "Filled with Latin fire." @@ -935,5 +945,4 @@ icon_state = "christmasfemaleg" item_state = "christmasfemaleg" body_parts_covered = CHEST|GROIN - can_adjust = FALSE - + can_adjust = FALSE \ No newline at end of file diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 4bd21ea7f2..0b1d8e1072 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -154,8 +154,9 @@ /obj/item/clothing/suit/jacket/letterman_syndie = 5, /obj/item/clothing/under/jabroni = 2, /obj/item/clothing/suit/vapeshirt = 2, - /obj/item/clothing/under/geisha = 4,, - /obj/item/clothing/under/keyholesweater = 3) + /obj/item/clothing/under/geisha = 4, + /obj/item/clothing/under/keyholesweater = 3, + /obj/item/clothing/under/staffassistant = 5) premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4, /obj/item/clothing/head/mailman = 2, /obj/item/clothing/under/rank/mailman = 2, diff --git a/goon/icons/mob/worn_js_rank.dmi b/goon/icons/mob/worn_js_rank.dmi new file mode 100644 index 0000000000..8235c3ff3d Binary files /dev/null and b/goon/icons/mob/worn_js_rank.dmi differ diff --git a/goon/icons/obj/item_js_rank.dmi b/goon/icons/obj/item_js_rank.dmi new file mode 100644 index 0000000000..b61e07a155 Binary files /dev/null and b/goon/icons/obj/item_js_rank.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index 86823f5661..e5910d3d5d 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -1,7 +1,7 @@ /datum/gear/greytidestationwide - name = "Grey jumpsuit" + name = "Staff Assistant's jumpsuit" category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/color/grey + path = /obj/item/clothing/under/staffassistant restricted_roles = list("Assistant") /datum/gear/neetsuit