diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm index bb9fd71fe62..88c88ff0923 100644 --- a/code/datums/uplink_items/uplink_nuclear.dm +++ b/code/datums/uplink_items/uplink_nuclear.dm @@ -663,6 +663,7 @@ /datum/uplink_item/stealthy_tools/chameleon/nuke reference = "NCHAM" + item = /obj/item/storage/box/syndie_kit/chameleon/nuke cost = 30 excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 99ce40fe217..3a601fa24f9 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -468,7 +468,16 @@ While the mask is active, your voice will sound unrecognizable to others." reference = "CVMM" item = /obj/item/clothing/mask/gas/voice_modulator/chameleon - cost = 8 + cost = 5 + excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + +/datum/uplink_item/stealthy_tools/voice_changer + name = "Chameleon Voice Changer Mask" + desc = "A syndicate gas mask equipped with chameleon technology and a voice changer for disguising your voice. \ + Use it to impersonate or obfuscate your identity when talking and make nobody the wiser!" + reference = "CVCM" + item = /obj/item/clothing/mask/chameleon/voice_change + cost = 10 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/stealthy_tools/silicon_cham_suit @@ -692,10 +701,10 @@ /datum/uplink_item/stealthy_tools/chameleon name = "Chameleon Kit" desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \ - Due to budget cuts, the shoes don't provide protection against slipping. The set comes with a complementary chameleon stamp." + Due to budget cuts, the shoes don't provide protection against slipping." reference = "CHAM" item = /obj/item/storage/box/syndie_kit/chameleon - cost = 20 + cost = 10 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/stealthy_tools/syndigaloshes diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 016f9af8e51..df9ba215193 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -149,7 +149,8 @@ /obj/item/clothing/under/chameleon = 2, /obj/item/stamp/chameleon = 2, /obj/item/clothing/shoes/chameleon/noslip = 5, - /obj/item/clothing/mask/chameleon = 2, + /obj/item/clothing/mask/chameleon = 4, + /obj/item/clothing/mask/chameleon/voice_change = 2, /obj/item/clothing/mask/gas/voice_modulator = 2, /obj/item/clothing/mask/gas/voice_modulator/chameleon = 2, /obj/item/dnascrambler = 1, diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index dbc5d3f5ced..7d76006723e 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -112,7 +112,7 @@ /obj/item/storage/backpack/clown/syndie/populate_contents() new /obj/item/clothing/under/rank/civilian/clown(src) new /obj/item/clothing/shoes/magboots/clown(src) - new /obj/item/clothing/mask/chameleon(src) + new /obj/item/clothing/mask/chameleon/voice_change(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/pda/clown(src) new /obj/item/storage/box/survival(src) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 7788121da5d..b3a24992c50 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -144,7 +144,7 @@ /obj/item/clothing/gloves/combat, // accounted in belt + toolbox /obj/item/flashlight/emp) // 4TC -/// 168TC + Telekinesis +/// 170TC + Telekinesis /obj/item/storage/box/syndie_kit/bundle/darklord name = "Dark Lord Bundle" desc = "Turn your anger into hate and your hate into suffering with a mix of energy swords and magical powers. DO IT." @@ -155,7 +155,7 @@ /obj/item/dnainjector/telemut/darkbundle, // ?TC /obj/item/clothing/suit/hooded/chaplain_hoodie, // 0TC /obj/item/clothing/glasses/meson/engine/tray, // 0TC - /obj/item/clothing/mask/chameleon, // 8TC + /obj/item/clothing/mask/chameleon/voice_change, // 10TC /obj/item/card/id/syndicate, // 10TC /obj/item/clothing/shoes/chameleon/noslip, // 10TC /obj/item/encryptionkey/syndicate) // 10TC @@ -403,11 +403,26 @@ new /obj/item/clothing/shoes/chameleon(src) new /obj/item/clothing/glasses/chameleon(src) new /obj/item/clothing/head/chameleon(src) - new /obj/item/clothing/mask/chameleon(src) new /obj/item/storage/backpack/chameleon(src) new /obj/item/radio/headset/chameleon(src) - new /obj/item/stamp/chameleon(src) new /obj/item/pda/chameleon(src) + new /obj/item/clothing/mask/chameleon(src) + +/obj/item/storage/box/syndie_kit/chameleon/nuke + name = "operative's chameleon kit" + +/obj/item/storage/box/syndie_kit/chameleon/nuke/populate_contents() + new /obj/item/clothing/under/chameleon(src) + new /obj/item/clothing/suit/chameleon(src) + new /obj/item/clothing/gloves/chameleon(src) + new /obj/item/clothing/shoes/chameleon(src) + new /obj/item/clothing/glasses/chameleon(src) + new /obj/item/clothing/head/chameleon(src) + new /obj/item/storage/backpack/chameleon(src) + new /obj/item/radio/headset/chameleon(src) + new /obj/item/pda/chameleon(src) + new /obj/item/stamp/chameleon(src) + new /obj/item/clothing/mask/chameleon/voice_change(src) /obj/item/storage/box/syndie_kit/dart_gun name = "dart gun kit" diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm b/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm index 65799fc1043..029ffa7a8cb 100644 --- a/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm +++ b/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm @@ -54,7 +54,7 @@ new /obj/item/clothing/under/chameleon(src) new /obj/item/clothing/suit/chameleon(src) new /obj/item/clothing/head/chameleon(src) - new /obj/item/clothing/mask/chameleon(src) + new /obj/item/clothing/mask/chameleon/voice_change(src) new /obj/item/card/id/syndicate(src) new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) new /obj/item/lighter/zippo(src) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 0bc12e7c74b..713ef6f8c4d 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -469,8 +469,6 @@ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) - var/obj/item/voice_changer/voice_changer - var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/clothing/mask/chameleon/Initialize(mapload) @@ -482,10 +480,7 @@ chameleon_action.chameleon_blacklist = list() chameleon_action.initialize_disguises() - voice_changer = new(src) - /obj/item/clothing/mask/chameleon/Destroy() - QDEL_NULL(voice_changer) QDEL_NULL(chameleon_action) return ..() @@ -497,6 +492,23 @@ . = ..() chameleon_action.emp_randomise(INFINITY) +/obj/item/clothing/mask/chameleon/voice_change + name = "gas mask" + desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." + icon_state = "swat" + item_state = "swat" + + var/obj/item/voice_changer/voice_changer + +/obj/item/clothing/mask/chameleon/voice_change/Destroy() + QDEL_NULL(voice_changer) + return ..() + +/obj/item/clothing/mask/chameleon/voice_change/Initialize(mapload) + . = ..() + + voice_changer = new(src) + /obj/item/clothing/shoes/chameleon name = "black shoes" icon_state = "black"