From 9f2b59f3f98ce1268ee9009d2a231b5ab0f1a408 Mon Sep 17 00:00:00 2001 From: yackemflam Date: Mon, 22 Aug 2016 18:08:04 +0900 Subject: [PATCH] Fucking hell people, fix these boxes --- .../items/weapons/storage/uplink_kits.dm | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index ee261497d93..4b49c3878cc 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -3,19 +3,22 @@ /obj/item/weapon/storage/box/syndicate/New() ..() switch (pickweight(list("bloodyspai" = 3, "stealth" = 3, "bond" = 1, "screwed" = 3, "sabotage" = 3, "guns" = 1, "murder" = 2, "implant" = 2, "hacker" = 2, "lordsingulo" = 2, "darklord" = 1))) - if("bloodyspai") - new /obj/item/clothing/under/chameleon(src) - new /obj/item/clothing/mask/chameleon(src) - new /obj/item/weapon/card/id/syndicate(src) - new /obj/item/clothing/shoes/chameleon(src) - new /obj/item/device/camera_bug(src) - new /obj/item/device/multitool/ai_detect(src) - new /obj/item/device/encryptionkey/syndicate(src) - new /obj/item/weapon/reagent_containers/syringe/mulligan(src) - new /obj/item/weapon/switchblade(src) + if("bloodyspai") // 27 tc now this is more right + 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/weapon/card/id/syndicate(src) // 2 tc + new /obj/item/clothing/shoes/chameleon(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 + new /obj/item/weapon/reagent_containers/syringe/mulligan(src) // 4 tc + new /obj/item/weapon/switchblade(src) //I'll count this as 2 tc + new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals + new /obj/item/device/flashlight/emp(src) // 2 tc + new /obj/item/device/chameleon(src) // 7 tc return - if("stealth") + if("stealth") // 31 tc new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src) new /obj/item/weapon/pen/sleepy(src) new /obj/item/device/healthanalyzer/rad_laser(src) @@ -24,7 +27,7 @@ new /obj/item/clothing/glasses/thermal/syndi(src) return - if("bond") + if("bond") // 29 tc new /obj/item/weapon/gun/projectile/automatic/pistol(src) new /obj/item/weapon/suppressor(src) new /obj/item/ammo_box/magazine/m10mm(src) @@ -35,7 +38,7 @@ return - if("screwed") + if("screwed") // 29 tc new /obj/item/device/sbeacondrop/bomb(src) new /obj/item/weapon/grenade/syndieminibomb(src) new /obj/item/device/sbeacondrop/powersink(src) @@ -44,9 +47,10 @@ new /obj/item/device/encryptionkey/syndicate(src) return - if("guns") + if("guns") // 28 tc now new /obj/item/weapon/gun/projectile/revolver(src) new /obj/item/ammo_box/a357(src) + new /obj/item/ammo_box/a357(src) new /obj/item/weapon/card/emag(src) new /obj/item/weapon/grenade/plastic/c4(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) @@ -54,14 +58,15 @@ new /obj/item/clothing/under/suit_jacket/really_black(src) return - if("murder") + if("murder") // 22 tc now new /obj/item/weapon/melee/energy/sword/saber(src) new /obj/item/clothing/glasses/thermal/syndi(src) new /obj/item/weapon/card/emag(src) new /obj/item/clothing/shoes/chameleon(src) + new /obj/item/device/encryptionkey/syndicate(src) return - if("implant") + if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it? new /obj/item/weapon/implanter/freedom(src) new /obj/item/weapon/implanter/uplink(src) new /obj/item/weapon/implanter/emp(src) @@ -70,7 +75,7 @@ new /obj/item/weapon/implanter/storage(src) return - if("hacker") + if("hacker") // 26 tc new /obj/item/weapon/aiModule/syndicate(src) new /obj/item/weapon/card/emag(src) new /obj/item/device/encryptionkey/binary(src) @@ -78,14 +83,14 @@ new /obj/item/device/multitool/ai_detect(src) return - if("lordsingulo") + if("lordsingulo") // 24 tc new /obj/item/device/sbeacondrop(src) new /obj/item/clothing/suit/space/syndicate/black/red(src) new /obj/item/clothing/head/helmet/space/syndicate/black/red(src) new /obj/item/weapon/card/emag(src) return - if("sabotage") + if("sabotage") // 26 tc now new /obj/item/weapon/grenade/plastic/c4 (src) new /obj/item/weapon/grenade/plastic/c4 (src) new /obj/item/device/doorCharge(src) @@ -93,13 +98,17 @@ new /obj/item/device/camera_bug(src) new /obj/item/device/sbeacondrop/powersink(src) new /obj/item/weapon/cartridge/syndicate(src) + new /obj/item/weapon/storage/toolbox/syndicate(src) //To actually get to those places + new /obj/item/pizzabox/bomb - if("darklord") + if("darklord") //20 tc + tk + summon item close enough for now new /obj/item/weapon/melee/energy/sword/saber(src) new /obj/item/weapon/melee/energy/sword/saber(src) new /obj/item/weapon/dnainjector/telemut/darkbundle(src) new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) new /obj/item/weapon/card/id/syndicate(src) + new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks + new /obj/item/weapon/spellbook/oneuse/summonitem(src) return /obj/item/weapon/storage/box/syndie_kit