diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 9d8fbfae4f16d..657ab180ca7bb 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(security_depts_prefs, sort_list(list(
SEC_DEPT_SUPPLY,
)))
- //Backpacks
+//Backpacks
#define DBACKPACK "Department Backpack"
#define DDUFFELBAG "Department Duffel Bag"
#define DSATCHEL "Department Satchel"
@@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(backpacklist, list(
RSATCHEL, //MONKESTATION
))
- //Suit/Skirt
+//Suit/Skirt
#define PREF_SUIT "Jumpsuit"
#define PREF_SKIRT "Jumpskirt"
diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
index df577a26065c1..108d94b77e149 100644
--- a/code/datums/greyscale/config_types/greyscale_configs.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -1341,3 +1341,248 @@
/datum/greyscale_config/rebellion_mask/worn
name = "Rebellion mask (Worn)"
icon_file = 'icons/mob/clothing/mask.dmi'
+
+// Plasmaman
+
+// Helmet
+/datum/greyscale_config/plasmaman_helmet
+ name = "Plasmaman Helmet"
+ icon_file = 'icons/obj/clothing/head/plasmaman_hats.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet.json'
+
+/datum/greyscale_config/plasmaman_helmet/base //bases
+ name = "Plasmaman Helmet Base (No Visor)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn
+ name = "Plasmaman Helmet (Worn)"
+ icon_file = 'icons/mob/clothing/head/plasmaman_head.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn/base //bases
+ name = "Plasmaman Helmet Base (No Visor) (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left
+ name = "Plasmaman Helmet (Held), Left"
+ icon_file = 'icons/mob/inhands/clothing/plasmaman_lefthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left/base //bases
+ name = "Plasmaman Helmet Base (No Visor) (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right
+ name = "Plasmaman Helmet (Held), Right"
+ icon_file = 'icons/mob/inhands/clothing/plasmaman_righthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_right.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right/base //bases
+ name = "Plasmaman Helmet Base (No Visor) (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_right.json'
+
+// Sleek
+
+/datum/greyscale_config/plasmaman_helmet/sleek
+ name = "Plasmaman Helmet (Sleek)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn/sleek
+ name = "Plasmaman Helmet (Sleek) (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left/sleek
+ name = "Plasmaman Helmet (Sleek) (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right/sleek
+ name = "Plasmaman Helmet (Sleek) (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_right.json'
+
+// Alternative (HoS, Warden and Jani)
+
+/datum/greyscale_config/plasmaman_helmet/stripe
+ name = "Plasmaman Helmet (Striped)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn/stripe
+ name = "Plasmaman Helmet (Striped) (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left/stripe
+ name = "Plasmaman Helmet (Striped) (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right/stripe
+ name = "Plasmaman Helmet (Striped) (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_right.json'
+
+// Threate Jobs Plasmaman Helmets
+
+/datum/greyscale_config/plasmaman_helmet/clown
+ name = "Plasmaman Clown Helmet"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn/clown
+ name = "Plasmaman Clown Helmet (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left/clown
+ name = "Plasmaman Clown Helmet (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right/clown
+ name = "Plasmaman Clown Helmet (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_right.json'
+
+/datum/greyscale_config/plasmaman_helmet/mime
+ name = "Plasmaman Mime Helmet"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet.json'
+
+/datum/greyscale_config/plasmaman_helmet/worn/mime
+ name = "Plasmaman Mime Helmet (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_left/mime
+ name = "Plasmaman Mime Helmet (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_helmet/inhand_right/mime
+ name = "Plasmaman Mime Helmet (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_right.json'
+
+// Suit
+
+/datum/greyscale_config/plasmaman_suit
+ name = "Plasmaman Suit"
+ icon_file = 'icons/obj/clothing/under/plasmaman.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit.json'
+
+/datum/greyscale_config/plasmaman_suit/base //bases
+ name = "Plasmaman Suit Base"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base.json'
+
+/datum/greyscale_config/plasmaman_suit/worn
+ name = "Plasmaman Suit (Worn)"
+ icon_file = 'icons/mob/clothing/under/plasmaman.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/base //bases
+ name = "Plasmaman Suit Base (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left
+ name = "Plasmaman Suit (Held), Left"
+ icon_file = 'icons/mob/inhands/clothing/plasmaman_lefthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/base //bases
+ name = "Plasmaman Suit Base (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right
+ name = "Plasmaman Suit (Held), Right"
+ icon_file = 'icons/mob/inhands/clothing/plasmaman_righthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_right.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/base //bases
+ name = "Plasmaman Suit Base (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_right.json'
+
+// Sleek
+
+/datum/greyscale_config/plasmaman_suit/sleek // since i don't want to extend the file more its being set by icon state
+ name = "Plasmaman Suit (Sleek)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/sleek
+ name = "Plasmaman Suit (Sleek) (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/sleek
+ name = "Plasmaman Suit (Sleek) (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/sleek
+ name = "Plasmaman Suit (Sleek) (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_right.json'
+
+// Symbols (Cross, Engi, Medal)
+
+/datum/greyscale_config/plasmaman_suit/symbol //symbol defined by icon state
+ name = "Plasmaman Suit (Symbols)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/symbol
+ name = "Plasmaman Suit (Symbols) (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ name = "Plasmaman Suit (Symbols) (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ name = "Plasmaman Suit (Symbols) (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_right.json'
+
+// Threate Jobs
+
+/datum/greyscale_config/plasmaman_suit/clown
+ name = "Plasmaman Clown Suit"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/clown
+ name = "Plasmaman Clown Suit (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/clown
+ name = "Plasmaman Clown Suit (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/clown
+ name = "Plasmaman Clown Suit (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_right.json'
+
+/datum/greyscale_config/plasmaman_suit/mime
+ name = "Plasmaman Mime Suit"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/mime
+ name = "Plasmaman Mime Suit (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/mime
+ name = "Plasmaman Mime Suit (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/mime
+ name = "Plasmaman Mime Suit (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_right.json'
+
+// Striped (HoS, Para, Jani, Warden, Chef)
+
+/datum/greyscale_config/plasmaman_suit/striped
+ name = "Plasmaman Suit Striped"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/striped
+ name = "Plasmaman Suit Striped (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_worn.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ name = "Plasmaman Suit Striped (Held), Left"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_left.json'
+
+/datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ name = "Plasmaman Suit Striped (Held), Right"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_right.json'
+
+// Double Belt
+
+/datum/greyscale_config/plasmaman_suit/doublebelt
+ name = "Plasmaman Double Belt Suit"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt.json'
+
+/datum/greyscale_config/plasmaman_suit/worn/doublebelt
+ name = "Plasmaman Double Belt Suit (Worn)"
+ json_config = 'code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt_worn.json'
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet.json b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet.json
new file mode 100644
index 0000000000000..544ae8728b90c
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet.json
@@ -0,0 +1,51 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_light",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_welding",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_left.json
new file mode 100644
index 0000000000000..156a707d2d764
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_left.json
@@ -0,0 +1,15 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_right.json
new file mode 100644
index 0000000000000..d12c411bfb8c8
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_inhand_right.json
@@ -0,0 +1,15 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_worn.json
new file mode 100644
index 0000000000000..bc7b275e8cd86
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/clown/plasmaman_clown_helmet_worn.json
@@ -0,0 +1,51 @@
+{
+ "plasmaman_helmet_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_w",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_w_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_w",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_light_w",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_w_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_w",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_screen_welding_w",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet.json b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet.json
new file mode 100644
index 0000000000000..b927e33bf247b
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet.json
@@ -0,0 +1,44 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ],
+ "plasmaman_helmet_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_light",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ],
+ "plasmaman_helmet_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_welding",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_left.json
new file mode 100644
index 0000000000000..86e385b6221ba
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_left.json
@@ -0,0 +1,16 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_right.json
new file mode 100644
index 0000000000000..ff8853c498d3d
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_inhand_right.json
@@ -0,0 +1,16 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_worn.json
new file mode 100644
index 0000000000000..039b051a7292c
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/default/plasmaman_helmet_worn.json
@@ -0,0 +1,44 @@
+{
+ "plasmaman_helmet_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ],
+ "plasmaman_helmet_w_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_light_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ],
+ "plasmaman_helmet_w_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_welding_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet.json b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet.json
new file mode 100644
index 0000000000000..2f22c9a2ca702
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet.json
@@ -0,0 +1,46 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_light",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_welding",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_left.json
new file mode 100644
index 0000000000000..650b69132d456
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_left.json
@@ -0,0 +1,15 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_right.json
new file mode 100644
index 0000000000000..f65b886c14634
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_inhand_right.json
@@ -0,0 +1,15 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_worn.json
new file mode 100644
index 0000000000000..15d1cda4631e0
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/mime/plasmaman_mime_helmet_worn.json
@@ -0,0 +1,46 @@
+{
+ "plasmaman_helmet_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_w",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_w_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_w",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_light_w",
+ "blend_mode": "overlay"
+ }
+ ],
+ "plasmaman_helmet_w_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_screen_welding_w",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base.json b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base.json
new file mode 100644
index 0000000000000..5ab220c818e65
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base.json
@@ -0,0 +1,16 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "stripes",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_left.json
new file mode 100644
index 0000000000000..5ab220c818e65
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_left.json
@@ -0,0 +1,16 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "stripes",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_right.json
new file mode 100644
index 0000000000000..5ab220c818e65
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_inhand_right.json
@@ -0,0 +1,16 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "stripes",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_worn.json
new file mode 100644
index 0000000000000..5040dad0cfe19
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/plasmaman_helmet_base_worn.json
@@ -0,0 +1,16 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "stripes_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek.json b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek.json
new file mode 100644
index 0000000000000..45654dbc41068
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek.json
@@ -0,0 +1,44 @@
+{
+ "plasmaman_helmet_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ],
+ "plasmaman_helmet_s_light": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s_light",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ],
+ "plasmaman_helmet_s_welding": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s_welding",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_left.json
new file mode 100644
index 0000000000000..e3e046a7032bc
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_left.json
@@ -0,0 +1,16 @@
+{
+ "plasmaman_helmet_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_right.json
new file mode 100644
index 0000000000000..e3e046a7032bc
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_inhand_right.json
@@ -0,0 +1,16 @@
+{
+ "plasmaman_helmet_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_worn.json
new file mode 100644
index 0000000000000..bdcb62ec7ea1e
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/sleek/plasmaman_helmet_sleek_worn.json
@@ -0,0 +1,44 @@
+{
+ "plasmaman_helmet_s_w": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ],
+ "plasmaman_helmet_s_worn_light": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s_light_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ],
+ "plasmaman_helmet_s_worn_welding": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_helmet_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_s_welding_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped.json b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped.json
new file mode 100644
index 0000000000000..3908cbfb68b35
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped.json
@@ -0,0 +1,62 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ],
+ "plasmaman_helmet_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_light",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ],
+ "plasmaman_helmet_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_welding",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_left.json
new file mode 100644
index 0000000000000..286f980191c5c
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_left.json
@@ -0,0 +1,22 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_right.json
new file mode 100644
index 0000000000000..3156b1554cd9e
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_inhand_right.json
@@ -0,0 +1,22 @@
+{
+ "plasmaman_helmet": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_worn.json b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_worn.json
new file mode 100644
index 0000000000000..7b0cd47df1a47
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/helmet/striped/plasmaman_helmet_striped_worn.json
@@ -0,0 +1,62 @@
+{
+ "plasmaman_helmet_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ],
+ "plasmaman_helmet_w_light": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_light_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ],
+ "plasmaman_helmet_w_welding": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_helmet/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "long_stripe_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "screen_welding_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit.json b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit.json
new file mode 100644
index 0000000000000..f3d9493aaf9e3
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit.json
@@ -0,0 +1,21 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_overalls",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_left.json
new file mode 100644
index 0000000000000..f3d9493aaf9e3
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_left.json
@@ -0,0 +1,21 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_overalls",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_right.json
new file mode 100644
index 0000000000000..f3d9493aaf9e3
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_inhand_right.json
@@ -0,0 +1,21 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_overalls",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_worn.json
new file mode 100644
index 0000000000000..2378e6aa6f79d
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/clown/plasmaman_clown_suit_worn.json
@@ -0,0 +1,21 @@
+{
+ "plasmaman_suit_w": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "clown_overalls_w",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit.json b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit.json
new file mode 100644
index 0000000000000..c3e74c38117bd
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit.json
@@ -0,0 +1,22 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_left.json
new file mode 100644
index 0000000000000..f5ac0d29b6fd6
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_left.json
@@ -0,0 +1,22 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_right.json
new file mode 100644
index 0000000000000..70fdc32f0dd11
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_inhand_right.json
@@ -0,0 +1,22 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_worn.json
new file mode 100644
index 0000000000000..c1a1a0800ed23
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/default/plasmaman_suit_worn.json
@@ -0,0 +1,27 @@
+{
+ "plasmaman_suit_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt.json b/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt.json
new file mode 100644
index 0000000000000..f5e5a7e7443fc
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt.json
@@ -0,0 +1,48 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "double_belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ],
+ "medal": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "double_belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt_worn.json
new file mode 100644
index 0000000000000..ac8095e2588ad
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/doublebelt/plasmaman_suit_doublebelt_worn.json
@@ -0,0 +1,58 @@
+{
+ "plasmaman_suit_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "double_belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ],
+ "medal_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "double_belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal_w",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit.json b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit.json
new file mode 100644
index 0000000000000..204bc86c19823
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit.json
@@ -0,0 +1,27 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_stripes",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_left.json
new file mode 100644
index 0000000000000..160b0b83a8301
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_left.json
@@ -0,0 +1,27 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_stripes",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_right.json
new file mode 100644
index 0000000000000..f849ebfbb0bb5
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_inhand_right.json
@@ -0,0 +1,27 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_stripes",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_worn.json
new file mode 100644
index 0000000000000..7893f8d2a4dff
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/mime/plasmaman_mime_suit_worn.json
@@ -0,0 +1,32 @@
+{
+ "plasmaman_suit_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "mime_stripes_w",
+ "blend_mode": "overlay"
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base.json b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base.json
new file mode 100644
index 0000000000000..b7d84349acbe2
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base.json
@@ -0,0 +1,28 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pants",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_left.json
new file mode 100644
index 0000000000000..b7d84349acbe2
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_left.json
@@ -0,0 +1,28 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pants",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_right.json
new file mode 100644
index 0000000000000..b7d84349acbe2
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_inhand_right.json
@@ -0,0 +1,28 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pants",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_worn.json
new file mode 100644
index 0000000000000..bb9215c765d5d
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/plasmaman_suit_base_worn.json
@@ -0,0 +1,28 @@
+{
+ "": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pants_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "buttons_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek.json b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek.json
new file mode 100644
index 0000000000000..5437e08637e30
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek.json
@@ -0,0 +1,66 @@
+{
+ "plasmaman_suit_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ],
+ "tie": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_left.json
new file mode 100644
index 0000000000000..5437e08637e30
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_left.json
@@ -0,0 +1,66 @@
+{
+ "plasmaman_suit_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ],
+ "tie": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_right.json
new file mode 100644
index 0000000000000..5437e08637e30
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_inhand_right.json
@@ -0,0 +1,66 @@
+{
+ "plasmaman_suit_s": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ],
+ "tie": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_worn.json
new file mode 100644
index 0000000000000..52114e8d14039
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/sleek/plasmaman_suit_sleek_worn.json
@@ -0,0 +1,83 @@
+{
+ "plasmaman_suit_s_w": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ }
+ ],
+ "tie_w": [
+ {
+ "type": "icon_state",
+ "icon_state": "plasmaman_suit_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [2]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_s_w",
+ "blend_mode": "overlay",
+ "color_ids": [3]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bracers_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "kneepads_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "tie_w",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped.json b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped.json
new file mode 100644
index 0000000000000..82378a1b3bab8
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped.json
@@ -0,0 +1,28 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_left.json
new file mode 100644
index 0000000000000..cbb5c44e56c42
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_left.json
@@ -0,0 +1,28 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_right.json
new file mode 100644
index 0000000000000..53ad4601e9231
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_inhand_right.json
@@ -0,0 +1,28 @@
+{
+ "plasmaman_suit": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_stripe",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_worn.json
new file mode 100644
index 0000000000000..be322b3d023db
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/striped/plasmaman_suit_striped_worn.json
@@ -0,0 +1,33 @@
+{
+ "plasmaman_suit_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "bands_stripe_w",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols.json b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols.json
new file mode 100644
index 0000000000000..a2869802e04c4
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols.json
@@ -0,0 +1,80 @@
+{
+ "cross": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "cross",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "sign": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "sign",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "medal": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_left.json b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_left.json
new file mode 100644
index 0000000000000..fd76e45b6773f
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_left.json
@@ -0,0 +1,80 @@
+{
+ "cross": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "cross",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "sign": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "sign",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "medal": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_left/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_right.json b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_right.json
new file mode 100644
index 0000000000000..d6e433768e87d
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_inhand_right.json
@@ -0,0 +1,80 @@
+{
+ "cross": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "cross",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "sign": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "sign",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ],
+ "medal": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/inhand_right/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_worn.json b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_worn.json
new file mode 100644
index 0000000000000..1f295029aaed4
--- /dev/null
+++ b/code/datums/greyscale/json_configs/plasmaman/suit/symbols/plasmaman_suit_symbols_worn.json
@@ -0,0 +1,95 @@
+{
+ "cross_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "cross_w",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ],
+ "sign_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "sign_w",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ],
+ "medal_w": [
+ {
+ "type": "reference",
+ "reference_type": "/datum/greyscale_config/plasmaman_suit/worn/base",
+ "blend_mode": "overlay",
+ "color_ids": [1, 2, 3, 7]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "belt_w",
+ "blend_mode": "overlay",
+ "color_ids": [4]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "seal_w",
+ "blend_mode": "overlay",
+ "color_ids": [5]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "medal_w",
+ "blend_mode": "overlay",
+ "color_ids": [6]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "soles",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index 875daf86b4e20..977de236ddc89 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -77,7 +77,7 @@
)
/datum/preference/choiced/jumpsuit/icon_for(value)
- switch (value)
+ switch(value)
if (PREF_SUIT)
return /obj/item/clothing/under/color/grey
if (PREF_SKIRT)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index c4c789926765e..74df962590989 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -627,17 +627,6 @@ BLIND // can't see anything
tint ^= initial(tint)
update_icon_state()
-/obj/item/clothing/head/helmet/space/plasmaman/visor_toggling() //handles all the actual toggling of flags
- up = !up
- SEND_SIGNAL(src, COMSIG_CLOTHING_VISOR_TOGGLE, up)
- clothing_flags ^= visor_flags
- flags_inv ^= visor_flags_inv
- icon_state = "[initial(icon_state)]"
- if(visor_vars_to_toggle & VISOR_FLASHPROTECT)
- flash_protect ^= initial(flash_protect)
- if(visor_vars_to_toggle & VISOR_TINT)
- tint ^= initial(tint)
-
/obj/item/clothing/proc/can_use(mob/user)
if(user && ismob(user))
if(!user.incapacitated())
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index 02f65c4b31ff8..1b608f95ab68c 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -5,9 +5,19 @@
gloves = /obj/item/clothing/gloves/color/plasmaman
head = /obj/item/clothing/head/helmet/space/plasmaman
mask = /obj/item/clothing/mask/breath
- r_hand= /obj/item/tank/internals/plasmaman/belt/full
+ r_hand = /obj/item/tank/internals/plasmaman/belt/full
internals_slot = ITEM_SLOT_HANDS
+/datum/outfit/plasmaman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ var/obj/item/clothing/head/helmet/space/plasmaman/envirohelmet = H.get_item_by_slot(ITEM_SLOT_HEAD)
+ var/obj/item/clothing/under/plasmaman/envirosuit = H.get_item_by_slot(ITEM_SLOT_ICLOTHING)
+ envirohelmet.handle_style_change(H.jumpsuit_style)
+ envirohelmet.update_greyscale()
+ H.update_worn_head()
+ envirosuit.handle_style_change(H.jumpsuit_style)
+ envirosuit.update_greyscale()
+ H.update_worn_undersuit()
+
/datum/outfit/plasmaman/security
name = "Security Plasmaman"
@@ -57,7 +67,7 @@
/datum/outfit/plasmaman/viro
name = "Virology Plasmaman"
- uniform = /obj/item/clothing/under/plasmaman/viro
+ uniform = /obj/item/clothing/under/plasmaman/medical/viro
gloves = /obj/item/clothing/gloves/color/plasmaman/white
head = /obj/item/clothing/head/helmet/space/plasmaman/viro
mask = /obj/item/clothing/mask/breath/medical
@@ -65,7 +75,7 @@
/datum/outfit/plasmaman/chemist
name = "Chemist Plasmaman"
- uniform = /obj/item/clothing/under/plasmaman/chemist
+ uniform = /obj/item/clothing/under/plasmaman/medical/chemist
gloves = /obj/item/clothing/gloves/color/plasmaman/white
head = /obj/item/clothing/head/helmet/space/plasmaman/chemist
mask = /obj/item/clothing/mask/breath/medical
@@ -101,9 +111,9 @@
/datum/outfit/plasmaman/atmospherics
name = "Atmospherics Plasmaman"
- uniform = /obj/item/clothing/under/plasmaman/atmospherics
+ uniform = /obj/item/clothing/under/plasmaman/engineering/atmospherics
gloves = /obj/item/clothing/gloves/color/plasmaman/atmos
- head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
+ head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/atmospherics
/datum/outfit/plasmaman/cargo
name = "Cargo Plasmaman"
@@ -210,14 +220,14 @@
/datum/outfit/plasmaman/chief_engineer
name = "Chief Engineer Plasmaman"
- uniform = /obj/item/clothing/under/plasmaman/chief_engineer
+ uniform = /obj/item/clothing/under/plasmaman/engineering/chief_engineer
gloves = /obj/item/clothing/gloves/color/plasmaman/chief_engineer
- head = /obj/item/clothing/head/helmet/space/plasmaman/chief_engineer
+ head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/chief_engineer
/datum/outfit/plasmaman/chief_medical_officer
name = "Chief Medical Officer Plasmaman"
- uniform = /obj/item/clothing/under/plasmaman/chief_medical_officer
+ uniform = /obj/item/clothing/under/plasmaman/medical/chief_medical_officer
gloves = /obj/item/clothing/gloves/color/plasmaman/white
head = /obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer
mask = /obj/item/clothing/mask/breath/medical
@@ -252,7 +262,7 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/centcom_intern
/datum/outfit/plasmaman/party_janitor
- name = "ERP Cleaning Plasmaman"
+ name = "ERP Cleaning Plasmaman" //dear god
uniform = /obj/item/clothing/under/plasmaman/janitor
gloves = /obj/item/clothing/gloves/color/plasmaman/janny
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index d5c244a678624..fcc7f42d9040e 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -42,12 +42,21 @@
/obj/item/clothing/head/helmet/space/plasmaman
name = "plasma envirosuit helmet"
desc = "A special containment helmet that allows plasma-based lifeforms to exist safely in an oxygenated environment. It is space-worthy, and may be worn in tandem with other EVA gear."
- icon = 'icons/obj/clothing/head/plasmaman_hats.dmi'
- worn_icon = 'icons/mob/clothing/head/plasmaman_head.dmi'
+ icon = 'icons/obj/clothing/under/plasmaman.dmi'
+ worn_icon = 'icons/mob/clothing/under/plasmaman.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/plasmaman_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/plasmaman_righthand.dmi'
clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | PLASMAMAN_HELMET_EXEMPT | PLASMAMAN_PREVENT_IGNITION | HEADINTERNALS
- icon_state = "plasmaman-helm"
- inhand_icon_state = "plasmaman-helm"
- strip_delay = 80
+ icon_state = "plasmaman_helmet"
+ worn_icon_state = "plasmaman_helmet_w"
+ inhand_icon_state = "plasmaman_helmet"
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right
+ /// helmet -> stripes -> visor
+ greyscale_colors = "#d15b1b#a747c0#bd6abd"
+ strip_delay = 8 SECONDS
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
armor_type = /datum/armor/space_plasmaman
@@ -56,12 +65,19 @@
light_outer_range = 4
light_on = FALSE
can_stack_hat = FALSE //has it's own hat stacking logic
+ /// Boolean to see if helmet light is on
var/helmet_on = FALSE
+ /// Boolean to see if a smile is drawn on the helmet
var/smile = FALSE
+ /// Color of said smile
var/smile_color = "#FF0000"
- var/visor_icon = "envisor"
+ /// Used to differentiate between different helmet colors on GAGs
var/smile_state = "envirohelm_smile"
var/obj/item/clothing/head/attached_hat
+ /// Used for the "sleek" icon state variant of this helmet
+ var/sleek_greyscale_colors = "#39393f#bd6abd"
+ /// Used for security "sleek" icon state variant
+ var/cowl = FALSE
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen)
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
@@ -85,6 +101,22 @@
else
. += span_notice("There's nothing placed on the helmet.")
+/obj/item/clothing/head/helmet/space/plasmaman/proc/handle_style_change(style)
+ if(style != PREF_SKIRT)
+ icon_state = initial(icon_state)
+ worn_icon_state = initial(worn_icon_state)
+ inhand_icon_state = initial(inhand_icon_state)
+ return
+ icon_state = "plasmaman_helmet_s"
+ worn_icon_state = "plasmaman_helmet_s_w"
+ inhand_icon_state = "plasmaman_helmet_s"
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/sleek
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/sleek
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/sleek
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/sleek
+ greyscale_colors = sleek_greyscale_colors
+ update_appearance(UPDATE_ICON)
+
/obj/item/clothing/head/helmet/space/plasmaman/click_alt(mob/user)
toggle_welding_screen(user)
return CLICK_ACTION_SUCCESS
@@ -97,30 +129,44 @@
return ..()
/obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_welding_screen(mob/living/user)
- if(weldingvisortoggle(user))
- if(helmet_on)
- to_chat(user, span_notice("Your helmet's torch can't pass through your welding visor!"))
- helmet_on = FALSE
- set_light_on(FALSE)
- playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
- update_appearance(UPDATE_ICON)
- else
- playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
- update_appearance(UPDATE_ICON)
+ if(!weldingvisortoggle(user))
+ return
+ if(helmet_on)
+ to_chat(user, span_notice("Your helmet's torch can't pass through your welding visor!"))
+ helmet_on = FALSE
+ set_light_on(FALSE)
+ playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Welding visors don't just come from nothing
+ update_appearance(UPDATE_ICON)
+
+/obj/item/clothing/head/helmet/space/plasmaman/visor_toggling()
+ . = ..()
+ update_appearance(UPDATE_ICON)
/obj/item/clothing/head/helmet/space/plasmaman/update_icon_state()
. = ..()
- icon_state = "[initial(icon_state)][helmet_on ? "-light":""]"
- inhand_icon_state = icon_state
+ if(greyscale_config != /datum/greyscale_config/plasmaman_helmet/sleek)
+ icon_state = initial(icon_state)
+ worn_icon_state = initial(worn_icon_state)
+ inhand_icon_state = initial(inhand_icon_state)
+ else
+ icon_state = "plasmaman_helmet_s"
+ worn_icon_state = "plasmaman_helmet_s_w"
+ inhand_icon_state = "plasmaman_helmet_s"
+ if(helmet_on)
+ icon_state = "[icon_state]_light"
+ worn_icon_state = "[worn_icon_state]_light"
+ if(!up)
+ icon_state = "[icon_state]_welding"
+ worn_icon_state = "[worn_icon_state]_welding"
/obj/item/clothing/head/helmet/space/plasmaman/update_overlays()
. = ..()
- if(smile)
+ if(smile && up)
var/mutable_appearance/smiley = mutable_appearance(icon, smile_state)
smiley.color = smile_color
. += smiley
- if(!up)
- . += visor_icon
+ if(cowl)
+ . += mutable_appearance('monkestation/code/modules/blueshift/gags/icons/plasmaman.dmi', "security_cowl")
/obj/item/clothing/head/helmet/space/plasmaman/attackby(obj/item/hitting_item, mob/living/user)
. = ..()
@@ -152,14 +198,16 @@
///By the by, helmets have the update_icon_updates_onmob element, so we don't have to call mob.update_worn_head()
/obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(mutable_appearance/standing, isinhands)
. = ..()
- if(!isinhands && smile)
+ if(isinhands)
+ return
+ if(smile)
var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', smile_state)
M.color = smile_color
. += M
- if(!isinhands && attached_hat)
+ if(cowl)
+ . += mutable_appearance('monkestation/code/modules/blueshift/gags/icons/plasmaman.dmi', "security_cowl_w")
+ if(attached_hat)
. += attached_hat.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
- if(!isinhands && !up)
- . += mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', visor_icon)
/obj/item/clothing/head/helmet/space/plasmaman/wash(clean_types)
. = NONE
@@ -176,6 +224,7 @@
if(!up)
to_chat(user, span_notice("Your helmet's torch can't pass through your welding visor!"))
set_light_on(FALSE)
+ helmet_on = FALSE
else
set_light_on(TRUE)
else
@@ -205,224 +254,293 @@
/obj/item/clothing/head/helmet/space/plasmaman/security
name = "security plasma envirosuit helmet"
desc = "A plasmaman containment helmet designed for security officers, protecting them from burning alive, alongside other undesirables."
- icon_state = "security_envirohelm"
- inhand_icon_state = null
armor_type = /datum/armor/plasmaman_security
+ greyscale_colors = "#a52f29#39393f#bd6abd"
+ sleek_greyscale_colors = "#39393f#a52f29"
+
+/obj/item/clothing/head/helmet/space/plasmaman/security/handle_style_change(style)
+ . = ..()
+ if(style != PREF_SKIRT)
+ cowl = FALSE
+ return
+ cowl = TRUE
/obj/item/clothing/head/helmet/space/plasmaman/secmed
name = "security medical envirosuit helmet"
desc = "A new pattern plasmaman helmet for those qualified as security medical personnel. This is still EVA rated too!"
- icon_state = "secmed_envirohelm"
+ greyscale_colors = "#918f8c#a52f29#bd6abd"
+ sleek_greyscale_colors = "#39393f#a52f29"
/obj/item/clothing/head/helmet/space/plasmaman/security/warden
name = "warden's plasma envirosuit helmet"
desc = "A plasmaman containment helmet designed for the warden. A pair of white stripes being added to differeciate them from other members of security."
- icon_state = "warden_envirohelm"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/stripe
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/stripe
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/stripe
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/stripe
+ greyscale_colors = "#a52f29#39393f#ebebeb#bd6abd"
+ sleek_greyscale_colors = "#39393f#a52f29"
/obj/item/clothing/head/helmet/space/plasmaman/security/head_of_security
name = "head of security's plasma envirosuit helmet"
- desc = "A special containment helmet designed for the Head of Security. A pair of gold stripes are added to differentiate them from other members of security."
- icon_state = "hos_envirohelm"
- inhand_icon_state = null
+ desc = "A special containment helmet designed for the Head of Security. \
+ A pair of gold stripes are added to differentiate them from other members of security."
armor_type = /datum/armor/security_head_of_security
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/stripe
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/stripe
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/stripe
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/stripe
+ greyscale_colors = "#a52f29#39393f#e6a345#bd6abd"
+ sleek_greyscale_colors = "#39393f#a52f29"
/obj/item/clothing/head/helmet/space/plasmaman/prisoner
name = "prisoner's plasma envirosuit helmet"
desc = "A plasmaman containment helmet for prisoners."
- icon_state = "prisoner_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#d15b1b#39393f#bd6abd"
+ sleek_greyscale_colors = "#39393f#bd6abd"
/obj/item/clothing/head/helmet/space/plasmaman/medical
name = "medical doctor's plasma envirosuit helmet"
desc = "An envirohelmet designed for plasmaman medical doctors, having two stripes down its length to denote as much."
- icon_state = "doctor_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#5fa4cc#bd6abd"
+ sleek_greyscale_colors = "#39393f#5fa4cc"
/obj/item/clothing/head/helmet/space/plasmaman/paramedic
name = "paramedic plasma envirosuit helmet"
desc = "An envirohelmet designed for plasmaman paramedics, with darker blue stripes compared to the medical model."
- icon_state = "paramedic_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#364660#eeeeee#bd6abd"
+ sleek_greyscale_colors = "#39393f#364660"
/obj/item/clothing/head/helmet/space/plasmaman/viro
name = "virology plasma envirosuit helmet"
desc = "The helmet worn by the safest people on the station, those who are completely immune to the monstrosities they create."
- icon_state = "virologist_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#40992e#bd6abd"
+ sleek_greyscale_colors = "#39393f#40992e"
/obj/item/clothing/head/helmet/space/plasmaman/chemist
name = "chemistry plasma envirosuit helmet"
desc = "A plasmaman envirosuit designed for chemists, two orange stripes going down its face."
- icon_state = "chemist_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#d15b1b#bd6abd"
+ sleek_greyscale_colors = "#39393f#d15b1b"
/obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer
name = "chief medical officer's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Chief Medical Officer. A gold stripe applied to differentiate them from other medical staff."
- icon_state = "cmo_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#5eb8b8#bd6abd"
+ sleek_greyscale_colors = "#254559#5eb8b8"
/obj/item/clothing/head/helmet/space/plasmaman/science
name = "science plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for scientists."
- icon_state = "scientist_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#b347a1#bd6abd"
+ sleek_greyscale_colors = "#39393f#b347a1"
/obj/item/clothing/head/helmet/space/plasmaman/robotics
name = "robotics plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for roboticists."
- icon_state = "roboticist_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#39393f#88242d#bd6abd"
+ sleek_greyscale_colors = "#39393f#88242d"
/obj/item/clothing/head/helmet/space/plasmaman/genetics
name = "geneticist's plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for geneticists."
- icon_state = "geneticist_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#4a77a1#bd6abd"
+ sleek_greyscale_colors = "#39393f#4a77a1"
/obj/item/clothing/head/helmet/space/plasmaman/research_director
name = "research director's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Research Director. A light brown design is applied to differentiate them from other scientists."
- icon_state = "rd_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#bcad6c#b347a1#bd6abd"
+ sleek_greyscale_colors = "#254559#b347a1"
/obj/item/clothing/head/helmet/space/plasmaman/engineering
name = "engineering plasma envirosuit helmet"
desc = "A space-worthy helmet specially designed for engineer plasmamen, the usual purple stripes being replaced by engineering's orange."
- icon_state = "engineer_envirohelm"
- inhand_icon_state = null
armor_type = /datum/armor/plasmaman_engineering
+ greyscale_colors = "#deb63d#d15b1b#bd6abd"
+ sleek_greyscale_colors = "#39393f#d15b1b"
-/obj/item/clothing/head/helmet/space/plasmaman/atmospherics
+/obj/item/clothing/head/helmet/space/plasmaman/engineering/atmospherics
name = "atmospherics plasma envirosuit helmet"
- desc = "A space-worthy helmet specially designed for atmos technician plasmamen, the usual purple stripes being replaced by atmos' blue. Has improved thermal shielding."
- icon_state = "atmos_envirohelm"
- inhand_icon_state = null
- armor_type = /datum/armor/plasmaman_atmospherics
+ desc = "A space-worthy helmet specially designed for atmos technician plasmamen, \
+ the usual purple stripes being replaced by atmos' blue. Has improved thermal shielding."
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT // Same protection as the Atmospherics Hardhat
+ greyscale_colors = "#deb63d#47bfff#bd6abd"
+ sleek_greyscale_colors = "#39393f#47bfff"
-/obj/item/clothing/head/helmet/space/plasmaman/chief_engineer
+/obj/item/clothing/head/helmet/space/plasmaman/engineering/chief_engineer
name = "chief engineer's plasma envirosuit helmet"
- desc = "A special containment helmet designed for the Chief Engineer, the usual purple stripes being replaced by the chief's green. Has improved thermal shielding."
- icon_state = "ce_envirohelm"
- inhand_icon_state = null
- armor_type = /datum/armor/plasmaman_chief_engineer
+ desc = "A special containment helmet designed for the Chief Engineer, \
+ the usual purple stripes being replaced by the chief's green. Has improved thermal shielding."
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT // Same protection as the Atmospherics Hardhat
-
+ greyscale_colors = "#deb63d#2e992e#bd6abd"
+ sleek_greyscale_colors = "#254559#2e992e"
/obj/item/clothing/head/helmet/space/plasmaman/cargo
name = "cargo plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for cargo techs and quartermasters."
- icon_state = "cargo_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#d0d7da#c99840#bd6abd"
+ sleek_greyscale_colors = "#39393f#c99840"
/obj/item/clothing/head/helmet/space/plasmaman/mining
name = "mining plasma envirosuit helmet"
desc = "A khaki helmet given to plasmamen miners operating on lavaland."
- icon_state = "explorer_envirohelm"
- inhand_icon_state = null
- visor_icon = "explorer_envisor"
+ greyscale_colors = "#796755#9a428e#bd6abd"
+ sleek_greyscale_colors = "#39393f#9a428e"
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
- icon_state = "chap_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#39393f#a747c0#bd6abd"
+ sleek_greyscale_colors = "#39393f#dbaa14"
/obj/item/clothing/head/helmet/space/plasmaman/white
name = "white plasma envirosuit helmet"
desc = "A generic white envirohelm."
- icon_state = "white_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#a747c0#bd6abd"
+ sleek_greyscale_colors = "#39393f#eeeeee"
/obj/item/clothing/head/helmet/space/plasmaman/curator
name = "curator's plasma envirosuit helmet"
- desc = "A slight modification on a traditional voidsuit helmet, this helmet was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Despite their limitations, these helmets still see use by historians and old-school plasmamen alike."
+ desc = "A slight modification on a traditional voidsuit helmet, \
+ this helmet was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. \
+ Despite their limitations, these helmets still see use by historians and old-school plasmamen alike."
+ icon = 'icons/obj/clothing/head/plasmaman_hats.dmi'
+ worn_icon = 'icons/mob/clothing/head/plasmaman_head.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
+ actions_types = list(/datum/action/item_action/toggle_welding_screen)
icon_state = "prototype_envirohelm"
inhand_icon_state = "void_helmet"
- actions_types = list(/datum/action/item_action/toggle_welding_screen)
+ worn_icon_state = "prototype_envirohelm"
smile_state = "prototype_smile"
- visor_icon = "prototype_envisor"
+
+/obj/item/clothing/head/helmet/space/plasmaman/curator/handle_style_change(style)
+ return
+
+/obj/item/clothing/head/helmet/space/plasmaman/curator/update_icon_state()
+ . = ..()
+ if(helmet_on)
+ icon_state = initial(icon_state)
+ worn_icon_state = initial(worn_icon_state)
/obj/item/clothing/head/helmet/space/plasmaman/botany
name = "botany plasma envirosuit helmet"
- desc = "A green and blue envirohelmet designating its wearer as a botanist. While not specifically designed for it, it would protect against minor plant-related injuries."
- icon_state = "botany_envirohelm"
- inhand_icon_state = null
+ desc = "A green and blue envirohelmet designating its wearer as a botanist. \
+ While not specifically designed for it, it would protect against minor plant-related injuries."
+ greyscale_colors = "#50d967#557efc#bd6abd"
+ sleek_greyscale_colors = "#39393f#557efc"
/obj/item/clothing/head/helmet/space/plasmaman/janitor
name = "janitor's plasma envirosuit helmet"
desc = "A grey helmet bearing a pair of purple stripes, designating the wearer as a janitor."
- icon_state = "janitor_envirohelm"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/stripe
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/stripe
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/stripe
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/stripe
+ greyscale_colors = "#b3b3b3#a747c0#ffe269#bd6abd"
+ sleek_greyscale_colors = "#39393f#a747c0"
/obj/item/clothing/head/helmet/space/plasmaman/mime
name = "mime envirosuit helmet"
desc = "The make-up is painted on, it's a miracle it doesn't chip. It's not very colourful."
- icon_state = "mime_envirohelm"
- inhand_icon_state = null
- visor_icon = "mime_envisor"
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/mime
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/mime
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/mime
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/mime
+ greyscale_colors = "#eeeeee#a52f29"
+
+/obj/item/clothing/head/helmet/space/plasmaman/mime/handle_style_change(style)
+ return
/obj/item/clothing/head/helmet/space/plasmaman/clown
name = "clown envirosuit helmet"
desc = "The make-up is painted on, it's a miracle it doesn't chip. 'HONK!'"
- icon_state = "clown_envirohelm"
- inhand_icon_state = null
- visor_icon = "clown_envisor"
+ greyscale_config = /datum/greyscale_config/plasmaman_helmet/clown
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_helmet/worn/clown
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_helmet/inhand_left/clown
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_helmet/inhand_right/clown
smile_state = "clown_smile"
+ greyscale_colors = "#ffc0ff#e91111"
+
+/obj/item/clothing/head/helmet/space/plasmaman/clown/handle_style_change(style)
+ return
/obj/item/clothing/head/helmet/space/plasmaman/head_of_personnel
name = "head of personnel's envirosuit helmet"
- desc = "A special containment helmet designed for the Head of Personnel. Embarrassingly enough, it looks way too much like the captain's design save for the red stripes."
- icon_state = "hop_envirohelm"
- inhand_icon_state = null
+ desc = "A special containment helmet designed for the Head of Personnel. \
+ Embarrassingly enough, it looks way too much like the captain's design save for the red stripes."
+ greyscale_colors = "#3e6588#a52f29#bd6abd"
+ sleek_greyscale_colors = "#254559#3e6588"
/obj/item/clothing/head/helmet/space/plasmaman/captain
name = "captain's plasma envirosuit helmet"
- desc = "A special containment helmet designed for the Captain. Embarrassingly enough, it looks way too much like the Head of Personnel's design save for the gold stripes. I mean, come on. Gold stripes can fix anything."
- icon_state = "captain_envirohelm"
- inhand_icon_state = null
+ desc = "A special containment helmet designed for the Captain. \
+ Embarrassingly enough, it looks way too much like the Head of Personnel's design save for the gold stripes. \
+ I mean, come on. Gold stripes can fix anything."
armor_type = /datum/armor/plasmaman_captain
+ greyscale_colors = "#41579a#e6a345#bd6abd"
+ sleek_greyscale_colors = "#254559#e6a345"
/obj/item/clothing/head/helmet/space/plasmaman/centcom_commander
name = "CentCom commander plasma envirosuit helmet"
- desc = "A special containment helmet designed for the Higher Central Command Staff. Not many of these exist, as CentCom does not usually employ plasmamen to higher staff positions due to their complications."
- icon_state = "commander_envirohelm"
- inhand_icon_state = null
+ desc = "A special containment helmet designed for the Higher Central Command Staff. \
+ Not many of these exist, as CentCom does not usually employ plasmamen to higher staff positions due to their complications."
+ greyscale_colors = "#46b946#e6b917#bd6abd"
+ sleek_greyscale_colors = "#46b946#e6b917"
/obj/item/clothing/head/helmet/space/plasmaman/centcom_official
name = "CentCom official plasma envirosuit helmet"
desc = "A special containment helmet designed for CentCom Staff. They sure do love their green."
- icon_state = "official_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#336637#cbcdd1#bd6abd"
+ sleek_greyscale_colors = "#46b946#cbcdd1"
/obj/item/clothing/head/helmet/space/plasmaman/centcom_intern
name = "CentCom intern plasma envirosuit helmet"
desc = "A special containment helmet designed for CentCom Staff. You know, so any coffee spills don't kill the poor sod."
- icon_state = "intern_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#12b560#39393f#bd6abd"
+ sleek_greyscale_colors = "#46b946#39393f"
/obj/item/clothing/head/helmet/space/plasmaman/syndie
name = "tacticool envirosuit helmet"
- desc = "There's no doubt about it, this helmet puts you above ALL of the other plasmamen. If you see another plasmaman wearing a helmet like this, it's either because they're a fellow badass, \
- or they've murdered one of your fellow badasses and have taken it from them as a trophy. Either way, anyone wearing this deserves at least a cursory nod of respect."
- icon_state = "syndie_envirohelm"
- inhand_icon_state = null
+ desc = "There's no doubt about it, this helmet puts you above ALL of the other plasmamen. If you see another plasmaman wearing a helmet like this, \
+ it's either because they're a fellow badass, or they've murdered one of your fellow badasses and have taken it from them as a trophy. \
+ Either way, anyone wearing this deserves at least a cursory nod of respect."
+ greyscale_colors = "#61423f#b22c20#b22c20"
+ sleek_greyscale_colors = "#61423f#b22c20"
/obj/item/clothing/head/helmet/space/plasmaman/bitrunner
name = "bitrunner's plasma envirosuit helmet"
desc = "An envirohelmet with extended blue light filters for bitrunning plasmamen."
- icon_state = "bitrunner_envirohelm"
+ greyscale_colors = "#39393f#c99840#c99840"
+ sleek_greyscale_colors = "#39393f#c99840"
-/obj/item/clothing/head/helmet/space/plasmaman/signal_tech
+/obj/item/clothing/head/helmet/space/plasmaman/engineering/signal_tech
name = "network admin's plasma envirosuit helmet"
desc = "A space-worthy helmet specially designed for network admin plasmamen, the usual purple stripes being replaced by a unique bright green."
- icon_state = "signal_tech_envirohelm"
- inhand_icon_state = null
+ greyscale_colors = "#deb63d#00ff33#bd6abd"
+ sleek_greyscale_colors = "#39393f#00ff33"
/obj/item/clothing/head/helmet/space/plasmaman/bunny_ears // i would remove this if it wasn't for the fact the bunny wand would kill plasmamen without it - NK
name = "bunny eared plasma envirosuit helmet"
desc = "An envirohelmet designed for plasmaman bunny themed waiters, it has a pair of bunny ears welded onto the helmet."
+ icon = 'icons/obj/clothing/head/plasmaman_hats.dmi'
worn_icon = 'icons/mob/clothing/head_32x48.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "bunny_envirohelm"
+ inhand_icon_state = "plasmaman-helm"
+ worn_icon_state = "bunny_envirohelm"
+
+/obj/item/clothing/head/helmet/space/plasmaman/bunny_ears/handle_style_change(style)
+ return
diff --git a/code/modules/clothing/under/jobs/Plasmaman/centcom.dm b/code/modules/clothing/under/jobs/Plasmaman/centcom.dm
index c2717e0d0dc4f..d96ecc5912b4f 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/centcom.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/centcom.dm
@@ -1,17 +1,38 @@
/obj/item/clothing/under/plasmaman/centcom_commander
name = "CentCom commander plasma envirosuit"
desc = "It's an envirosuit worn by CentCom's highest-tier Commanders."
- icon_state = "commander_envirosuit"
- inhand_icon_state = null
+ icon_state = "medal"
+ worn_icon_state = "medal_w"
+ inhand_icon_state = "medal"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/doublebelt
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/doublebelt
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#46b946#46b946#e6a345#e6a345#e6a345#e6a345#924100"
+ sleek_greyscale_colors = "#46b946#39393f#e6a345#e6a345#e6a345"
/obj/item/clothing/under/plasmaman/centcom_official
name = "CentCom official plasma envirosuit"
desc = "It's an envirosuit worn by CentCom Officers."
- icon_state = "official_envirosuit"
- inhand_icon_state = null
+ icon_state = "medal"
+ worn_icon_state = "medal_w"
+ inhand_icon_state = "medal"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#336637#336637#cbcdd1#336637#336637#cbcdd1#0e190e"
+ sleek_greyscale_colors = "#336637#39393f#cbcdd1#cbcdd1#cbcdd1"
/obj/item/clothing/under/plasmaman/centcom_intern
name = "CentCom intern plasma envirosuit"
desc = "It's an envirosuit worn by those interning for CentCom. The top is styled after a polo shirt for easy identification."
- icon_state = "intern_envirosuit"
- inhand_icon_state = null
+ icon_state = "medal"
+ worn_icon_state = "medal_w"
+ inhand_icon_state = "medal"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#12b560#b3b3b3#39393f#12b560#12b560#b3b3b3#173325"
+ sleek_greyscale_colors = "#12b560#39393f#12b560#39393f#b3b3b3"
diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
index d599080b5c3c3..60c1bd1a4d6c3 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
@@ -1,19 +1,31 @@
//Basically the assistant suit
/obj/item/clothing/under/plasmaman
name = "plasma envirosuit"
- desc = "A special containment suit that allows plasma-based lifeforms to exist safely in an oxygenated environment, and automatically extinguishes them in a crisis. Despite being airtight, it's not spaceworthy."
- icon_state = "plasmaman"
- inhand_icon_state = "plasmaman"
+ desc = "A special containment suit that allows plasma-based lifeforms to exist safely in an oxygenated environment, \
+ and automatically extinguishes them in a crisis. Despite being airtight, it's not spaceworthy."
icon = 'icons/obj/clothing/under/plasmaman.dmi'
worn_icon = 'icons/mob/clothing/under/plasmaman.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/plasmaman_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/plasmaman_righthand.dmi'
+ icon_state = "plasmaman_suit"
+ worn_icon_state = "plasmaman_suit_w"
+ inhand_icon_state = "plasmaman_suit"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right
+ /// suit (upper) -> pants (lower) -> bands -> belt (horizontal stripe) -> seal (vertical stripe) -> buttons
+ greyscale_colors = "#d15b1b#d15b1b#a747c0#d15b1b#d15b1b#612313"
+ /// Used for the "sleek" icon state variant of this suit
+ var/sleek_greyscale_colors = "#d15b1b#39393f#d15b1b#39393f#d15b1b"
clothing_flags = PLASMAMAN_PREVENT_IGNITION
resistance_flags = FIRE_PROOF
armor_type = /datum/armor/under_plasmaman
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
can_adjust = FALSE
- strip_delay = 80
+ strip_delay = 8 SECONDS
var/next_extinguish = 0
- var/extinguish_cooldown = 100
+ var/extinguish_cooldown = 10 SECONDS
var/extinguishes_left = 5
/datum/armor/under_plasmaman
@@ -25,6 +37,22 @@
. = ..()
. += span_notice("There are [extinguishes_left] extinguisher charges left in this suit.")
+/obj/item/clothing/under/plasmaman/proc/handle_style_change(style)
+ if(style != PREF_SKIRT)
+ icon_state = initial(icon_state)
+ worn_icon_state = initial(worn_icon_state)
+ inhand_icon_state = initial(inhand_icon_state)
+ return
+ icon_state = "plasmaman_suit_s"
+ worn_icon_state = "plasmaman_suit_s_w"
+ inhand_icon_state = "plasmaman_suit_s"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/sleek
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/sleek
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/sleek
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/sleek
+ greyscale_colors = sleek_greyscale_colors
+ update_appearance(UPDATE_ICON)
+
/obj/item/clothing/under/plasmaman/proc/Extinguish(mob/living/carbon/human/H)
if(!istype(H))
return
@@ -58,83 +86,114 @@
/obj/item/clothing/under/plasmaman/cargo
name = "cargo plasma envirosuit"
- desc = "A joint envirosuit used by plasmamen quartermasters and cargo techs alike, due to the logistical problems of differenciating the two with the length of their pant legs."
- icon_state = "cargo_envirosuit"
- inhand_icon_state = null
+ desc = "A joint envirosuit used by plasmamen quartermasters and cargo techs alike, \
+ due to the logistical problems of differenciating the two with the length of their pant legs."
+ greyscale_colors = "#c99840#d0d7da#d0d7da#c99840#c99840#794421"
+ sleek_greyscale_colors = "#c99840#39393f#c99840#d0d7da#d0d7da"
/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
- icon_state = "explorer_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#717261#796755#9a428e#717261#717261#989898"
+ sleek_greyscale_colors = "#939393#39393f#939393#39393f#939393"
/obj/item/clothing/under/plasmaman/chef
name = "chef's plasma envirosuit"
desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
- icon_state = "chef_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/striped
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/striped
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ greyscale_colors = "#eeeeee#39393f#39393f#eeeeee#eeeeee#eeeeee#747182"
+ sleek_greyscale_colors = "#f1f1f1#39393f#f1f1f1#39393f#f1f1f1"
/obj/item/clothing/under/plasmaman/enviroslacks
name = "enviroslacks"
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, lawyers, and bartenders alike."
- icon_state = "enviroslacks"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#87502e#a747c0#eeeeee#eeeeee#747182"
+ sleek_greyscale_colors = "#6a84be#39393f#6a84be#39393f#6a84be"
+
+/obj/item/clothing/under/plasmaman/enviroslacks/handle_style_change(style)
+ . = ..()
+ if(style != PREF_SKIRT)
+ icon_state = initial(icon_state)
+ worn_icon_state = initial(worn_icon_state)
+ inhand_icon_state = initial(inhand_icon_state)
+ return
+ icon_state = "tie"
+ worn_icon_state = "tie_w"
+ inhand_icon_state = "tie"
+ update_appearance(UPDATE_ICON)
/obj/item/clothing/under/plasmaman/chaplain
name = "chaplain's plasma envirosuit"
desc = "An envirosuit specially designed for only the most pious of plasmamen."
- icon_state = "chap_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#39393f#39393f#a747c0#39393f#39393f#18191e"
+ sleek_greyscale_colors = "#f1f1f1#39393f#f1f1f1#ffc518#dbaa14"
/obj/item/clothing/under/plasmaman/curator
name = "curator's plasma envirosuit"
- desc = "Made out of a modified voidsuit, this suit was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
+ desc = "Made out of a modified voidsuit, this suit was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. \
+ Due to the modifications, the suit is no longer space-worthy. \
+ Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "prototype_envirosuit"
- inhand_icon_state = null
+ worn_icon_state = "prototype_envirosuit"
+ inhand_icon_state = "void_suit"
+
+/obj/item/clothing/under/plasmaman/curator/handle_style_change(style)
+ return
/obj/item/clothing/under/plasmaman/janitor
name = "janitor's plasma envirosuit"
desc = "A grey and purple envirosuit designated for plasmamen janitors."
- icon_state = "janitor_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/striped
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/striped
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ greyscale_colors = "#b3b3b3#b3b3b3#ffe269#a747c0#b3b3b3#a747c0#514f5b"
+ sleek_greyscale_colors = "#9167b3#39393f#9167b3#39393f#9167b3"
/obj/item/clothing/under/plasmaman/botany
name = "botany envirosuit"
desc = "A green and blue envirosuit designed to protect plasmamen from minor plant-related injuries."
- icon_state = "botany_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#50d967#50d967#557efc#557efc#557efc#215740"
+ sleek_greyscale_colors = "#59c18a#39393f#557efc#39393f#557efc"
/obj/item/clothing/under/plasmaman/mime
name = "mime envirosuit"
desc = "It's not very colourful."
- icon_state = "mime_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/mime
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/mime
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/mime
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/mime
+ greyscale_colors = "#eeeeee#39393f#eeeeee#eeeeee#eeeeee#747182"
+
+/obj/item/clothing/under/plasmaman/mime/handle_style_change(style)
+ return
/obj/item/clothing/under/plasmaman/clown
name = "clown envirosuit"
desc = "'HONK!'"
- icon_state = "clown_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/clown
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/clown
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/clown
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/clown
+ greyscale_colors = "#ffc0ff#ffc0ff"
+
+/obj/item/clothing/under/plasmaman/clown/handle_style_change(style)
+ return
/obj/item/clothing/under/plasmaman/clown/Initialize(mapload)
. = ..()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0)
-/obj/item/clothing/under/plasmaman/bitrunner
- name = "bitrunner envirosuit"
- desc = "An envirosuit specially designed for plasmamen with bad posture."
- icon_state = "bitrunner_envirosuit"
- inhand_icon_state = null
-
-/obj/item/clothing/under/plasmaman/prisoner
- name = "prisoner envirosuit"
- desc = "An orange envirosuit identifying and protecting a criminal plasmaman. Its suit sensors are stuck in the \"Fully On\" position."
- icon_state = "prisoner_envirosuit"
- inhand_icon_state = null
- has_sensor = LOCKED_SENSORS
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
-
/obj/item/clothing/under/plasmaman/clown/Extinguish(mob/living/carbon/human/H)
if(!istype(H))
return
@@ -153,12 +212,36 @@
foam.set_up(4, holder = src, location = H.loc, carry = foamreagent)
foam.start() //Truly terrifying.
-/obj/item/clothing/under/plasmaman/engineering/signal_tech
- name = "network admin plasma envirosuit"
- desc = "An air-tight suit designed to be used by plasmamen employed as network admins, the usual purple stripes being replaced by a unique bright green. It protects the user from fire and acid damage."
- icon_state = "signal_tech_envirosuit"
+/obj/item/clothing/under/plasmaman/bitrunner
+ name = "bitrunner envirosuit"
+ desc = "An envirosuit specially designed for plasmamen with bad posture."
+ greyscale_colors = "#39393f#39393f#c99840#39393f#39393f#915d2b"
+ sleek_greyscale_colors = "#c99840#39393f#c99840#39393f#c99840"
+
+/obj/item/clothing/under/plasmaman/prisoner
+ name = "prisoner envirosuit"
+ desc = "An orange envirosuit identifying and protecting a criminal plasmaman. Its suit sensors are stuck in the \"Fully On\" position."
+ greyscale_colors = "#d15b1b#d15b1b#39393f#39393f#d15b1b#612313#eeeeee"
+ sleek_greyscale_colors = "#d15b1b#39393f#39393f#39393f#39393f"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/doublebelt
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/doublebelt
+ has_sensor = LOCKED_SENSORS
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
/obj/item/clothing/under/plasmaman/plasma_bun // i would remove this if it wasn't for the fact the bunny wand would kill plasmamen without it - NK
name = "plasmabunny envirosuit"
desc = "A plasmaman envirosuit designed for bunny themed waiters, it appears to just be a normal envirosuit with a bunnysuit on top of it"
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "plasmabunny_envirosuit"
+ worn_icon_state = "plasmabunny_envirosuit"
+ inhand_icon_state = "plasmaman"
+
+/obj/item/clothing/under/plasmaman/plasma_bun/handle_style_change(style)
+ return
diff --git a/code/modules/clothing/under/jobs/Plasmaman/command.dm b/code/modules/clothing/under/jobs/Plasmaman/command.dm
index c3b92bc874b4b..ae52ad0393be3 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/command.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/command.dm
@@ -1,7 +1,15 @@
/obj/item/clothing/under/plasmaman/captain
name = "captain's plasma envirosuit"
desc = "It's a blue envirosuit with some gold markings denoting the rank of \"Captain\"."
- icon_state = "captain_envirosuit"
+ icon_state = "medal"
+ worn_icon_state = "medal_w"
+ inhand_icon_state = "medal"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/doublebelt
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/doublebelt
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#41579a#41579a#e6a345#e6a345#e6a345#e6a345#924100"
+ sleek_greyscale_colors = "#41579a#39393f#e6a345#ffd64d#e6a345"
inhand_icon_state = null
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
@@ -16,35 +24,40 @@
/obj/item/clothing/under/plasmaman/head_of_personnel
name = "head of personnel's plasma envirosuit"
desc = "It's an envirosuit worn by someone who works in the position of \"Head of Personnel\"."
- icon_state = "hop_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#3e6588#3e6588#a52f29#3e6588#3e6588#d4d7df"
+ sleek_greyscale_colors = "#3e6588#39393f#a52f29#a52f29#a52f29"
/obj/item/clothing/under/plasmaman/security/head_of_security
name = "head of security's envirosuit"
desc = "A plasmaman containment suit decorated for those few with the dedication to achieve the position of Head of Security."
- icon_state = "hos_envirosuit"
- inhand_icon_state = null
- armor_type = /datum/armor/security_head_of_security
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/striped
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/striped
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ greyscale_colors = "#a52f29#a52f29#39393f#39393f#39393f#e6a345#c06822"
+ sleek_greyscale_colors = "#a52f29#39393f#ffc400#a52f29#39393f"
+ armor_type = /datum/armor/plasmaman_head_of_security
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
-/obj/item/clothing/under/plasmaman/chief_engineer
- name = "chief engineer's plasma envirosuit"
- desc = "An air-tight suit designed to be used by plasmamen insane enough to achieve the rank of \"Chief Engineer\"."
- icon_state = "ce_envirosuit"
- inhand_icon_state = null
- armor_type = /datum/armor/plasmaman_chief_engineer
-
-/datum/armor/plasmaman_chief_engineer
+/datum/armor/plasmaman_head_of_security
+ melee = 10
bio = 100
fire = 95
acid = 95
+ wound = 10
-/obj/item/clothing/under/plasmaman/chief_medical_officer
+/obj/item/clothing/under/plasmaman/engineering/chief_engineer
+ name = "chief engineer's plasma envirosuit"
+ desc = "An air-tight suit designed to be used by plasmamen insane enough to achieve the rank of \"Chief Engineer\"."
+ greyscale_colors = "#ffcd34#eeeeee#2e992e#2e992e#ffcd34#2e992e#8c4722"
+ sleek_greyscale_colors = "#deb63d#39393f#2e992e#e6a345#eeeeee"
+
+/obj/item/clothing/under/plasmaman/medical/chief_medical_officer
name = "chief medical officer's plasma envirosuit"
desc = "It's an envirosuit worn by those with the experience to be \"Chief Medical Officer\"."
- icon_state = "cmo_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#eeeeee#5eb8b8#5eb8b8#5eb8b8#5eb8b8#224d49"
+ sleek_greyscale_colors = "#5eb8b8#39393f#e6a345#5eb8b8#eeeeee"
armor_type = /datum/armor/plasmaman_chief_medical_officer
/datum/armor/plasmaman_chief_medical_officer
@@ -55,8 +68,8 @@
/obj/item/clothing/under/plasmaman/research_director
name = "research director's plasma envirosuit"
desc = "It's an envirosuit worn by those with the know-how to achieve the position of \"Research Director\"."
- icon_state = "rd_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#876c33#bcad6c#b347a1#b347a1#876c33#432913"
+ sleek_greyscale_colors = "#876c33#39393f#bcad6c#b347a1#b347a1"
armor_type = /datum/armor/plasmaman_research_director
/datum/armor/plasmaman_research_director
diff --git a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
index 199ba279f912b..2b50728dc6938 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
@@ -1,24 +1,31 @@
/obj/item/clothing/under/plasmaman/engineering
name = "engineering plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen employed as engineers, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage."
- icon_state = "engineer_envirosuit"
- inhand_icon_state = null
+ icon_state = "sign"
+ worn_icon_state = "sign_w"
+ inhand_icon_state = "sign"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#ffcd34#ffcd34#d15b1b#d15b1b#ffcd34#d15b1b#8c4722" //f6e400
+ sleek_greyscale_colors = "#d15b1b#39393f#deb63d#39393f#deb63d"
armor_type = /datum/armor/plasmaman_engineering
-/datum/armor/plasmaman_engineering
- bio = 100
- fire = 95
- acid = 95
-
-/obj/item/clothing/under/plasmaman/atmospherics
+/obj/item/clothing/under/plasmaman/engineering/atmospherics
name = "atmospherics plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen employed as atmos technicians, the usual purple stripes being replaced by atmos' blue."
- icon_state = "atmos_envirosuit"
- inhand_icon_state = null
- armor_type = /datum/armor/plasmaman_atmospherics
+ greyscale_colors = "#ffcd34#ffcd34#47bfff#47bfff#ffcd34#47bfff#8c4722"
+ sleek_greyscale_colors = "#deb63d#39393f#47bfff#39393f#47bfff"
+/obj/item/clothing/under/plasmaman/engineering/signal_tech
+ name = "network admins plasma envirosuit"
+ desc = "An air-tight suit designed to be used by plasmamen employed as network admins, \
+ the usual purple stripes being replaced by a unique bright green. It protects the user from fire and acid damage."
+ greyscale_colors = "#ffcd34#ffcd34#00ff33#00ff33#ffcd34#00ff33#8c4722"
+ sleek_greyscale_colors = "#deb63d#39393f#00ff33#39393f#00ff33"
-/datum/armor/plasmaman_atmospherics
+/datum/armor/plasmaman_engineering
bio = 100
fire = 95
acid = 95
diff --git a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
index 2159d7f2f2e39..6a2a172bf7d8d 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
@@ -1,41 +1,54 @@
/obj/item/clothing/under/plasmaman/medical
name = "medical plasma envirosuit"
desc = "A suit designed for the station's more plasma-based doctors."
- icon_state = "doctor_envirosuit"
- inhand_icon_state = null
+ icon_state = "cross"
+ worn_icon_state = "cross_w"
+ inhand_icon_state = "cross"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#eeeeee#eeeeee#5fa4cc#eeeeee#eeeeee#5fa4cc#747182"
+ sleek_greyscale_colors = "#6eb3dd#39393f#6eb3dd#39393f#6eb3dd"
+
+/obj/item/clothing/under/plasmaman/medical/chemist
+ name = "chemistry plasma envirosuit"
+ desc = "A plasmaman envirosuit designed for chemists."
+ greyscale_colors = "#eeeeee#eeeeee#d15b1b#eeeeee#d15b1b#d15b1b#8c2a0f"
+ sleek_greyscale_colors = "#eeeeee#39393f#d15b1b#39393f#eeeeee"
+
+/obj/item/clothing/under/plasmaman/medical/viro
+ name = "virology plasma envirosuit"
+ desc = "The suit worn by the safest people on the station, those who are completely immune to the monstrosities they create."
+ greyscale_colors = "#eeeeee#eeeeee#40992e#eeeeee#40992e#40992e#003300"
+ sleek_greyscale_colors = "#eeeeee#39393f#40992e#39393f#eeeeee"
/obj/item/clothing/under/plasmaman/paramedic
name = "paramedic envirosuit"
desc = "A suit designed for the station's plasmaman paramedics."
- icon_state = "paramedic_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/striped
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/striped
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ greyscale_colors = "#364660#364660#eeeeee#eeeeee#364660#364660#16162e"
+ sleek_greyscale_colors = "#364660#39393f#eeeeee#39393f#eeeeee"
+
+//separator go!//
/obj/item/clothing/under/plasmaman/science
name = "science plasma envirosuit"
desc = "A plasmaman envirosuit designed for scientists."
- icon_state = "scientist_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#eeeeee#b347a1#eeeeee#eeeeee#747182"
+ sleek_greyscale_colors = "#eeeeee#39393f#b347a1#39393f#eeeeee"
/obj/item/clothing/under/plasmaman/robotics
name = "robotics plasma envirosuit"
desc = "A plasmaman envirosuit designed for roboticists."
- icon_state = "roboticist_envirosuit"
- inhand_icon_state = null
-
-/obj/item/clothing/under/plasmaman/viro
- name = "virology plasma envirosuit"
- desc = "The suit worn by the safest people on the station, those who are completely immune to the monstrosities they create."
- icon_state = "virologist_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#39393f#39393f#88242d#88242d#88242d#18191e"
+ sleek_greyscale_colors = "#88242d#39393f#eeeeee#39393f#88242d"
/obj/item/clothing/under/plasmaman/genetics
name = "genetics plasma envirosuit"
desc = "A plasmaman envirosuit designed for geneticists."
- icon_state = "geneticist_envirosuit"
- inhand_icon_state = null
-
-/obj/item/clothing/under/plasmaman/chemist
- name = "chemistry plasma envirosuit"
- desc = "A plasmaman envirosuit designed for chemists."
- icon_state = "chemist_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#eeeeee#eeeeee#4a77a1#4a77a1#eeeeee#747182"
+ sleek_greyscale_colors = "#eeeeee#39393f#4a77a1#39393f#eeeeee"
diff --git a/code/modules/clothing/under/jobs/Plasmaman/security.dm b/code/modules/clothing/under/jobs/Plasmaman/security.dm
index b27daaf292d2f..b8a5be5d31345 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/security.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/security.dm
@@ -1,8 +1,8 @@
/obj/item/clothing/under/plasmaman/security
name = "security plasma envirosuit"
desc = "A plasmaman containment suit designed for security officers, offering a limited amount of extra protection."
- icon_state = "security_envirosuit"
- inhand_icon_state = null
+ greyscale_colors = "#a52f29#a52f29#39393f#a52f29#39393f#18191e"
+ sleek_greyscale_colors = "#39393f#39393f#a52f29#39393f#a52f29"
armor_type = /datum/armor/plasmaman_security
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
@@ -16,10 +16,22 @@
/obj/item/clothing/under/plasmaman/security/warden
name = "warden plasma envirosuit"
desc = "A plasmaman containment suit designed for the warden, white stripes being added to differentiate them from other members of security."
- icon_state = "warden_envirosuit"
- inhand_icon_state = null
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/striped
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/striped
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/striped
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/striped
+ greyscale_colors = "#a52f29#a52f29#39393f#a52f29#39393f#eeeeee#18191e"
+ sleek_greyscale_colors = "#a52f29#39393f#eeeeee#39393f#39393f"
/obj/item/clothing/under/plasmaman/secmed
name = "security medical envirosuit"
desc = "A new pattern plasmaman suit for those qualified as security medical personnel."
- icon_state = "secmed_envirosuit"
+ icon_state = "cross"
+ worn_icon_state = "cross_w"
+ inhand_icon_state = "cross"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#918F8c#918F8c#a52f29#918F8c#a52f29#a52f29#3f1329"
+ sleek_greyscale_colors = "#918F8c#39393f#a52f29#39393f#a52f29"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 403493216e765..08d32cbac53d0 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -172,7 +172,6 @@
/obj/item/clothing/under/plasmaman/syndicate
name = "tacticool envirosuit"
desc = "A sinister looking envirosuit, for the boniest of operatives."
- icon_state = "syndie_envirosuit"
+ greyscale_colors = "#61423f#61423f#b22c20#61423f#61423f#1c070e"
has_sensor = NO_SENSORS
resistance_flags = FIRE_PROOF
- inhand_icon_state = null
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 019bd51ec125f..11d30516bd23e 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -100,7 +100,7 @@ There are several things that need to be remembered:
CHECK_SHOULDNT_RENDER(uniform, ITEM_SLOT_ICLOTHING) // monkestation edit: combine TRAIT_ALWAYS_RENDER + TRAIT_NO_WORN_ICON + obscure check into a single define
- var/target_overlay = uniform.icon_state
+ var/target_overlay = RESOLVE_ICON_STATE(uniform) //Selects proper icon from the vars the clothing has (Search define for more.)
if(uniform.adjusted == ALT_STYLE)
target_overlay = "[target_overlay]_d"
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 321db55cb072b..22a2db73356e9 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -20,6 +20,7 @@
inherent_biotypes = MOB_HUMANOID|MOB_MINERAL|MOB_ORGANIC
inherent_respiration_type = RESPIRATION_PLASMA
mutantlungs = /obj/item/organ/internal/lungs/plasmaman
+ mutanteyes = /obj/item/organ/internal/eyes/plasmaman
mutanttongue = /obj/item/organ/internal/tongue/bone/plasmaman
mutantliver = /obj/item/organ/internal/liver/bone/plasmaman
mutantstomach = /obj/item/organ/internal/stomach/bone/plasmaman
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 39fd3397e9cbd..d4bc0f85749ea 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -721,6 +721,12 @@
eye_icon_state = "jelleyes"
icon_state = "eyeballs-jelly"
+/obj/item/organ/internal/eyes/plasmaman
+ name = "plasmabone light receptors"
+ desc = "Eyes that burn with passion! (And when in contact with oxygen)."
+ eye_icon_state = "plasmaeyes"
+ icon_state = "eyeballs-plasmaman"
+
/obj/item/organ/internal/eyes/night_vision/maintenance_adapted
name = "adapted eyes"
desc = "These red eyes look like two foggy marbles. They give off a particularly worrying glow in the dark."
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png
index 309d1a6e84856..ce32bd4184917 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png differ
diff --git a/icons/mob/clothing/head/plasmaman_head.dmi b/icons/mob/clothing/head/plasmaman_head.dmi
index f14a5001b97a7..d051dc2705367 100644
Binary files a/icons/mob/clothing/head/plasmaman_head.dmi and b/icons/mob/clothing/head/plasmaman_head.dmi differ
diff --git a/icons/mob/clothing/head_32x48.dmi b/icons/mob/clothing/head_32x48.dmi
index a08b80f32f65e..acd15a8bcbaae 100644
Binary files a/icons/mob/clothing/head_32x48.dmi and b/icons/mob/clothing/head_32x48.dmi differ
diff --git a/icons/mob/clothing/under/plasmaman.dmi b/icons/mob/clothing/under/plasmaman.dmi
index dc21bcfa7ffc2..6aeb7eb459c8f 100644
Binary files a/icons/mob/clothing/under/plasmaman.dmi and b/icons/mob/clothing/under/plasmaman.dmi differ
diff --git a/icons/mob/inhands/clothing/plasmaman_lefthand.dmi b/icons/mob/inhands/clothing/plasmaman_lefthand.dmi
new file mode 100644
index 0000000000000..f4469c1bbdc2a
Binary files /dev/null and b/icons/mob/inhands/clothing/plasmaman_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/plasmaman_righthand.dmi b/icons/mob/inhands/clothing/plasmaman_righthand.dmi
new file mode 100644
index 0000000000000..242f1d5859c09
Binary files /dev/null and b/icons/mob/inhands/clothing/plasmaman_righthand.dmi differ
diff --git a/icons/mob/species/human/human_face.dmi b/icons/mob/species/human/human_face.dmi
index 6ed7c9d516530..3f2a3f0e40be5 100644
Binary files a/icons/mob/species/human/human_face.dmi and b/icons/mob/species/human/human_face.dmi differ
diff --git a/icons/obj/clothing/head/plasmaman_hats.dmi b/icons/obj/clothing/head/plasmaman_hats.dmi
index 7c746354a4988..38df90da45d13 100644
Binary files a/icons/obj/clothing/head/plasmaman_hats.dmi and b/icons/obj/clothing/head/plasmaman_hats.dmi differ
diff --git a/icons/obj/clothing/under/plasmaman.dmi b/icons/obj/clothing/under/plasmaman.dmi
index a6e6d80b670db..903f61b0a8f85 100644
Binary files a/icons/obj/clothing/under/plasmaman.dmi and b/icons/obj/clothing/under/plasmaman.dmi differ
diff --git a/icons/obj/medical/organs/organs.dmi b/icons/obj/medical/organs/organs.dmi
index 944f1a99e7dac..8a8f6b4a07b53 100644
Binary files a/icons/obj/medical/organs/organs.dmi and b/icons/obj/medical/organs/organs.dmi differ
diff --git a/monkestation/code/modules/blueshield/clothing.dm b/monkestation/code/modules/blueshield/clothing.dm
index f617d8ac2538e..2e80dc0d2e8ec 100644
--- a/monkestation/code/modules/blueshield/clothing.dm
+++ b/monkestation/code/modules/blueshield/clothing.dm
@@ -5,17 +5,22 @@
/obj/item/clothing/head/helmet/space/plasmaman/blueshield
name = "blueshield envirosuit helmet"
desc = "A plasmaman containment helmet designed for certified blueshields, who's job guarding heads should not include self-combustion... most of the time."
- icon = 'monkestation/code/modules/blueshift/icons/obj/clothing/head/plasmaman_hats.dmi'
- worn_icon = 'monkestation/code/modules/blueshift/icons/mob/clothing/head/plasmaman_head.dmi'
- icon_state = "bs_envirohelm"
armor_type = /datum/armor/suit_armor
+ greyscale_colors = "#39393f#2b3f92#bd6abd"
+ sleek_greyscale_colors = "#39393f#2b3f92"
/obj/item/clothing/under/plasmaman/blueshield
name = "blueshield envirosuit"
desc = "A plasmaman containment suit designed for certified blueshields, offering a limited amount of extra protection."
- icon = 'monkestation/code/modules/blueshift/icons/obj/clothing/under/plasmaman.dmi'
- worn_icon = 'monkestation/code/modules/blueshift/icons/mob/clothing/under/plasmaman.dmi'
- icon_state = "bs_envirosuit"
+ icon_state = "medal"
+ worn_icon_state = "medal_w"
+ inhand_icon_state = "medal"
+ greyscale_config = /datum/greyscale_config/plasmaman_suit/symbol
+ greyscale_config_worn = /datum/greyscale_config/plasmaman_suit/worn/symbol
+ greyscale_config_inhand_left = /datum/greyscale_config/plasmaman_suit/inhand_left/symbol
+ greyscale_config_inhand_right = /datum/greyscale_config/plasmaman_suit/inhand_right/symbol
+ greyscale_colors = "#39393f#39393f#2b3f92#2b3f92#2b3f92#2b3f92#1e2e6f"
+ sleek_greyscale_colors = "#2b3f92#39393f#39393f#39393f#39393f"
armor_type = /datum/armor/clothing_under/under_plasmaman_blueshield
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
diff --git a/monkestation/code/modules/blueshift/gags/icons/lefthand/plasmaman.dmi b/monkestation/code/modules/blueshift/gags/icons/lefthand/plasmaman.dmi
new file mode 100644
index 0000000000000..f4469c1bbdc2a
Binary files /dev/null and b/monkestation/code/modules/blueshift/gags/icons/lefthand/plasmaman.dmi differ
diff --git a/monkestation/code/modules/blueshift/gags/icons/plasmaman.dmi b/monkestation/code/modules/blueshift/gags/icons/plasmaman.dmi
new file mode 100644
index 0000000000000..766b2c3ce18aa
Binary files /dev/null and b/monkestation/code/modules/blueshift/gags/icons/plasmaman.dmi differ
diff --git a/monkestation/code/modules/blueshift/gags/icons/righthand/plasmaman.dmi b/monkestation/code/modules/blueshift/gags/icons/righthand/plasmaman.dmi
new file mode 100644
index 0000000000000..242f1d5859c09
Binary files /dev/null and b/monkestation/code/modules/blueshift/gags/icons/righthand/plasmaman.dmi differ
diff --git a/monkestation/code/modules/blueshift/icons/obj/clothing/head/plasmaman_hats.dmi b/monkestation/code/modules/blueshift/icons/obj/clothing/head/plasmaman_hats.dmi
index 75a5d0d7754a5..c6254cad710c8 100644
Binary files a/monkestation/code/modules/blueshift/icons/obj/clothing/head/plasmaman_hats.dmi and b/monkestation/code/modules/blueshift/icons/obj/clothing/head/plasmaman_hats.dmi differ
diff --git a/monkestation/code/modules/clothing/~donator/clothing.dm b/monkestation/code/modules/clothing/~donator/clothing.dm
index aad1536f73345..004dc447a3d83 100644
--- a/monkestation/code/modules/clothing/~donator/clothing.dm
+++ b/monkestation/code/modules/clothing/~donator/clothing.dm
@@ -611,7 +611,17 @@
desc = "A special containment helmet designed for heavy usage. Multiple dings and notches are on this one."
icon = 'icons/donator/obj/clothing/hats.dmi'
worn_icon = 'icons/donator/mob/clothing/head.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "emissionhelm"
+ worn_icon_state = "emissionhelm"
+ inhand_icon_state = null
+
+/obj/item/clothing/head/helmet/space/plasmaman/candlejax/handle_style_change(style)
+ return
// Donation reward for CandleJax
/obj/item/clothing/under/plasmaman/candlejax
@@ -619,7 +629,19 @@
desc = "A modified envirosuit featuring a reserved color scheme."
icon = 'icons/donator/obj/clothing/uniform.dmi'
worn_icon = 'icons/donator/mob/clothing/uniform.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "emissionsuit"
+ worn_icon_state = "emissionsuit"
+ inhand_icon_state = null
+
+/obj/item/clothing/under/plasmaman/candlejax/handle_style_change(style)
+ return
// Donation reward for CandleJax
/obj/item/clothing/head/bio_hood/jax
@@ -634,7 +656,19 @@
desc = "A hazard suit fitted with bio-resistant fibers. Utilizes self-sterilizing pumps fitted in the back."
icon = 'icons/donator/obj/clothing/uniform.dmi'
worn_icon = 'icons/donator/mob/clothing/uniform.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
icon_state = "plasmaman_jax"
+ worn_icon_state = "plasmaman_jax"
+ inhand_icon_state = null
+
+/obj/item/clothing/under/plasmaman/jax2/handle_style_change(style)
+ return
/obj/item/clothing/suit/toggle/labcoat/skyrat/rd/jax
name = "xuracorp enameled labcoat"
diff --git a/monkestation/code/modules/jobs/job_types/network_admin.dm b/monkestation/code/modules/jobs/job_types/network_admin.dm
index 7b440448a7df2..993162de0c97e 100644
--- a/monkestation/code/modules/jobs/job_types/network_admin.dm
+++ b/monkestation/code/modules/jobs/job_types/network_admin.dm
@@ -86,4 +86,4 @@
uniform = /obj/item/clothing/under/plasmaman/engineering/signal_tech
gloves = /obj/item/clothing/gloves/color/plasmaman/engineer
- head = /obj/item/clothing/head/helmet/space/plasmaman/signal_tech
+ head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/signal_tech