From 5b4df3f5ff76eada07fd2319422e8ee596a4875e Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 16:44:34 -0700 Subject: [PATCH 1/7] Update chameleon.dm --- code/modules/clothing/chameleon.dm | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index a4fb82cc6e0e..a534d64d7a0e 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -306,6 +306,35 @@ /obj/item/clothing/under/chameleon/broken/Initialize() . = ..() chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/under/plasmaman/chameleon + name = "envirosuit" + icon_state = "plasmaman" + item_state = "plasmaman" + desc = "The latest generation of Nanotrasen-designed plasmamen envirosuits. This new version has an extinguisher built into the uniform's workings. While airtight, the suit is not EVA-rated." + sensor_mode = SENSOR_OFF + random_sensor = FALSE + armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 95, ACID = 95) + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/under/plasmaman/chameleon/syndicate + syndicate = TRUE + +/obj/item/clothing/under/plasmaman/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + if(syndicate) + chameleon_action.syndicate = TRUE + chameleon_action.chameleon_type = /obj/item/clothing/under + chameleon_action.chameleon_name = "Jumpsuit" + chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/under/chameleon/emp_act(severity) + . = ..() + if(. & EMP_PROTECT_SELF) + return + chameleon_action.emp_randomise() /obj/item/clothing/suit/chameleon name = "armor" @@ -441,6 +470,34 @@ /obj/item/clothing/head/chameleon/broken/Initialize() . = ..() chameleon_action.emp_randomise(INFINITY) + + /obj/item/clothing/head/helmet/space/plasmaman/chameleon + name = "purple envirosuit helmet" + desc = "A generic purple envirohelm of Nanotrasen design. This updated model comes with a built-in lamp." + icon_state = "purple_envirohelm" + item_state = "purple_envirohelm" + armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 100, ACID = 75) + actions_types = list() + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/head/helmet/space/plasmaman/chameleon/syndicate + syndicate = TRUE + +/obj/item/clothing/head/helmet/space/plasmaman/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + if(syndicate) + chameleon_action.syndicate = TRUE + chameleon_action.chameleon_type = /obj/item/clothing/head/helmet/space + chameleon_action.chameleon_name = "Hat" + chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/head/changeling, only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/head/helmet/space/plasmaman/chameleon/emp_act(severity) + . = ..() + if(. & EMP_PROTECT_SELF) + return + chameleon_action.emp_randomise() /obj/item/clothing/head/chameleon/drone // The camohat, I mean, holographic hat projection, is part of the From 4e85a10beda3b864bafb1c4ece9fff65e1320754 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:07:26 -0700 Subject: [PATCH 2/7] Update uplink_items.dm --- code/modules/uplink/uplink_items.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index a55d96f05567..4e13b624adaa 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1434,6 +1434,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 2 manufacturer = /datum/corporation/traitor/cybersun exclude_modes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/stealthy_tools/chameleon/spawn_item(spawn_path, mob/user, datum/component/uplink/U) + if(is_species(user, /datum/species/plasmaman)) + spawn_path = /obj/item/storage/box/syndie_kit/chameleon/plasmaman + ..() /datum/uplink_item/stealthy_tools/chameleon_proj name = "Chameleon Projector" From 6b9bab6b97e72249135aa4df3099690a81248e78 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:08:54 -0700 Subject: [PATCH 3/7] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 9f0bea5360dc..a084cac7e8e1 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -640,6 +640,22 @@ new /obj/item/radio/headset/chameleon/syndicate(src) new /obj/item/stamp/chameleon/syndicate(src) new /obj/item/pda/chameleon/syndicate(src) + +/obj/item/storage/box/syndie_kit/chameleon/plasmaman + real_name = "chameleon kit" + +/obj/item/storage/box/syndie_kit/chameleon/plasmaman/PopulateContents() + new /obj/item/clothing/under/plasmaman/chameleon/syndicate(src) + new /obj/item/clothing/suit/chameleon/syndicate(src) + new /obj/item/clothing/gloves/chameleon/syndicate(src) + new /obj/item/clothing/shoes/chameleon/syndicate(src) + new /obj/item/clothing/glasses/chameleon/syndicate(src) + new /obj/item/clothing/head/helmet/space/plasmaman/chameleon/syndicate(src) + new /obj/item/clothing/mask/chameleon/syndicate(src) + new /obj/item/storage/backpack/chameleon/syndicate(src) + new /obj/item/radio/headset/chameleon/syndicate(src) + new /obj/item/stamp/chameleon/syndicate(src) + new /obj/item/pda/chameleon/syndicate(src) //5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars. //Not counting the damage it will do while embedded (2*4 = 8, at 15% chance) From 7af5cddeb90e133a001d62c2d913f80c26a6f554 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:32:45 -0700 Subject: [PATCH 4/7] Update code/modules/clothing/chameleon.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index a534d64d7a0e..77ab50655fc0 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -485,7 +485,7 @@ /obj/item/clothing/head/helmet/space/plasmaman/chameleon/Initialize() . = ..() - chameleon_action = new(src) + chameleon_action = new /datum/action/item_action/chameleon/change if(syndicate) chameleon_action.syndicate = TRUE chameleon_action.chameleon_type = /obj/item/clothing/head/helmet/space From 2c633a2710475102f1b85e0be7c14fa442f74cc0 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:32:53 -0700 Subject: [PATCH 5/7] Update code/modules/clothing/chameleon.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 77ab50655fc0..4b3a2a6a51a1 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -471,7 +471,7 @@ . = ..() chameleon_action.emp_randomise(INFINITY) - /obj/item/clothing/head/helmet/space/plasmaman/chameleon +/obj/item/clothing/head/helmet/space/plasmaman/chameleon name = "purple envirosuit helmet" desc = "A generic purple envirohelm of Nanotrasen design. This updated model comes with a built-in lamp." icon_state = "purple_envirohelm" From 71ba23d93e6b9f753f0ec548053bd0affb2ea238 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:35:52 -0700 Subject: [PATCH 6/7] Update code/modules/clothing/chameleon.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 4b3a2a6a51a1..7dae2430ab78 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -327,7 +327,7 @@ chameleon_action.syndicate = TRUE chameleon_action.chameleon_type = /obj/item/clothing/under chameleon_action.chameleon_name = "Jumpsuit" - chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling), only_root_path = TRUE) + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling)), only_root_path = TRUE) chameleon_action.initialize_disguises() /obj/item/clothing/under/chameleon/emp_act(severity) From 2b2f27b0868d7594d840cfaabf90b1bbb0f58f52 Mon Sep 17 00:00:00 2001 From: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:40:24 -0700 Subject: [PATCH 7/7] Update chameleon.dm --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 7dae2430ab78..b66f4b949198 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -327,7 +327,7 @@ chameleon_action.syndicate = TRUE chameleon_action.chameleon_type = /obj/item/clothing/under chameleon_action.chameleon_name = "Jumpsuit" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling)), only_root_path = TRUE) + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling), only_root_path = TRUE) chameleon_action.initialize_disguises() /obj/item/clothing/under/chameleon/emp_act(severity)