Merge pull request #5138 from Citadel-Station-13/upstream-merge-34972

[MIRROR] [Ready] Rebalances Chameleon Kits for lowpop
This commit is contained in:
LetterJay
2018-01-28 03:59:10 -06:00
committed by GitHub
5 changed files with 19 additions and 14 deletions
@@ -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)
+10 -4
View File
@@ -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."
+1 -1
View File
@@ -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,\
+3 -4
View File
@@ -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)