From 547a80eb22ba624516d19d37476c05a1d4e74676 Mon Sep 17 00:00:00 2001 From: 81Denton <32391752+81Denton@users.noreply.github.com> Date: Sun, 28 Jan 2018 00:29:04 +0100 Subject: [PATCH 1/2] [Ready] Rebalances Chameleon Kits for lowpop (#34972) * :cl: Denton, Anonmare, kevinz000 tweak: Removed the player minimum on syndicate chameleon kits. rscdel: To compensate, regular chameleon kits no longer contain noslip shoes. tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips). /:cl: Chameleon kits were given a minimum player limit due to the noslips that come with them. This PR removes the player limit as well as the noslips, but lowers the TC cost by 2. That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo. * Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype. --- code/game/objects/items/storage/uplink_kits.dm | 8 ++++---- code/modules/awaymissions/mission_code/snowdin.dm | 2 +- code/modules/clothing/chameleon.dm | 14 ++++++++++---- code/modules/flufftext/Hallucination.dm | 2 +- code/modules/uplink/uplink_items.dm | 7 +++---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 7ce832acd3..f2fe0bd475 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -6,7 +6,7 @@ new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set new /obj/item/clothing/mask/chameleon(src) // Goes with above new /obj/item/card/id/syndicate(src) // 2 tc - new /obj/item/clothing/shoes/chameleon(src) // 2 tc + new /obj/item/clothing/shoes/chameleon/noslip(src) // 2 tc new /obj/item/device/camera_bug(src) // 1 tc new /obj/item/device/multitool/ai_detect(src) // 1 tc new /obj/item/device/encryptionkey/syndicate(src) // 2 tc @@ -55,7 +55,7 @@ new /obj/item/melee/transforming/energy/sword/saber(src) new /obj/item/clothing/glasses/thermal/syndi(src) new /obj/item/card/emag(src) - new /obj/item/clothing/shoes/chameleon(src) + new /obj/item/clothing/shoes/chameleon/noslip(src) new /obj/item/device/encryptionkey/syndicate(src) new /obj/item/grenade/syndieminibomb(src) @@ -96,7 +96,7 @@ new /obj/item/dnainjector/telemut/darkbundle(src) new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) new /obj/item/card/id/syndicate(src) - new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks + new /obj/item/clothing/shoes/chameleon/noslip(src) //because slipping while being a dark lord sucks new /obj/item/spellbook/oneuse/summonitem(src) if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks @@ -323,7 +323,7 @@ new /obj/item/clothing/under/chameleon/broken(src) new /obj/item/clothing/suit/chameleon/broken(src) new /obj/item/clothing/gloves/chameleon/broken(src) - new /obj/item/clothing/shoes/chameleon/broken(src) + new /obj/item/clothing/shoes/chameleon/noslip/broken(src) new /obj/item/clothing/glasses/chameleon/broken(src) new /obj/item/clothing/head/chameleon/broken(src) new /obj/item/clothing/mask/chameleon/broken(src) diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 4c3b54fa0d..4a069f26c0 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -134,7 +134,7 @@ /obj/item/grenade/plastic/c4 = 7, /obj/item/grenade/clusterbuster/smoke = 15, /obj/item/clothing/under/chameleon = 13, - /obj/item/clothing/shoes/chameleon = 10, + /obj/item/clothing/shoes/chameleon/noslip = 10, /obj/item/borg/upgrade/ddrill = 3, /obj/item/borg/upgrade/soh = 3) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index ac3718394d..ee02702862 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -386,7 +386,6 @@ item_color = "black" desc = "A pair of black shoes." permeability_coefficient = 0.05 - flags_1 = NOSLIP_1 resistance_flags = NONE pockets = /obj/item/storage/internal/pocket/shoes armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50) @@ -404,10 +403,17 @@ /obj/item/clothing/shoes/chameleon/emp_act(severity) chameleon_action.emp_randomise() -/obj/item/clothing/shoes/chameleon/broken/Initialize() +/obj/item/clothing/shoes/chameleon/noslip + name = "black shoes" + icon_state = "black" + item_color = "black" + desc = "A pair of black shoes." + flags_1 = NOSLIP_1 + +/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() . = ..() - chameleon_action.emp_randomise(INFINITY) - + chameleon_action.emp_randomise(INFINITY) + /obj/item/gun/energy/laser/chameleon name = "practice laser gun" desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice." diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index b759c7c816..44876c7858 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -573,7 +573,7 @@ GLOBAL_LIST_INIT(hallucinations_major, list( /obj/item/gun/energy/kinetic_accelerator/crossbow, /obj/item/melee/transforming/energy/sword/saber,\ /obj/item/storage/box/syndicate, /obj/item/storage/box/emps,\ /obj/item/cartridge/virus/syndicate, /obj/item/clothing/under/chameleon,\ - /obj/item/clothing/shoes/chameleon, /obj/item/card/id/syndicate,\ + /obj/item/clothing/shoes/chameleon/noslip, /obj/item/card/id/syndicate,\ /obj/item/clothing/mask/chameleon, /obj/item/clothing/glasses/thermal,\ /obj/item/device/chameleon, /obj/item/card/emag, /obj/item/grenade/plastic/x4,\ /obj/item/storage/toolbox/syndicate, /obj/item/aiModule,\ diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index fa8b00ac93..ae69442620 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -710,21 +710,20 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. 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!" item = /obj/item/storage/box/syndie_kit/chameleon - cost = 4 + cost = 2 exclude_modes = list(/datum/game_mode/nuclear) - player_minimum = 12 /datum/uplink_item/stealthy_tools/syndigaloshes name = "No-Slip Chameleon Shoes" desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \ They do not work on heavily lubricated surfaces." - item = /obj/item/clothing/shoes/chameleon + item = /obj/item/clothing/shoes/chameleon/noslip cost = 2 exclude_modes = list(/datum/game_mode/nuclear) player_minimum = 20 /datum/uplink_item/stealthy_tools/syndigaloshes/nuke - item = /obj/item/clothing/shoes/chameleon + item = /obj/item/clothing/shoes/chameleon/noslip cost = 4 exclude_modes = list() include_modes = list(/datum/game_mode/nuclear)