Merge pull request #10535 from Hatterhat/greytide-standard-uniform

staff assistant jumpsuit gang
This commit is contained in:
Ghom
2020-01-15 14:53:26 +01:00
committed by GitHub
5 changed files with 16 additions and 6 deletions
+11 -2
View File
@@ -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
+3 -2
View File
@@ -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,
Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

@@ -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