From 25ee0ddadeaa7f41b481ee83f9d848ca851d50f1 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Thu, 10 Jan 2019 19:23:47 +0000 Subject: [PATCH] Syndie Bundle Rework --- .../items/weapons/storage/uplink_kits.dm | 69 +++++++++++++++---- .../drinks/drinks/drinkingglass.dm | 4 +- .../projectiles/guns/projectile/sniper.dm | 8 +++ 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index b4d4a89c7b1..b8e5be3966c 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,85 +1,124 @@ /obj/item/storage/box/syndicate/ New() ..() - switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "gadgets" = 1))) - if("bloodyspai") + switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "gadgets" = 1, "maddoctor" = 1, "professional" = 1, "clownop" = 1))) + if("bloodyspai") // 28TC new /obj/item/twohanded/garrote(src) new /obj/item/pinpointer/advpinpointer(src) new /obj/item/clothing/mask/gas/voice(src) new /obj/item/clothing/under/chameleon(src) new /obj/item/card/id/syndicate(src) - new /obj/item/storage/box/syndie_kit/emp(src) + new /obj/item/flashlight/emp(src) + new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) + new /obj/item/clothing/glasses/hud/security/chameleon(src) new /obj/item/camera_bug(src) return - if("thief") + if("thief") // 30TC new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) new /obj/item/chameleon(src) new /obj/item/clothing/gloves/color/black/thief(src) new /obj/item/card/id/syndicate(src) + new /obj/item/storage/box/syndie_kit/safecracking(src) return - if("bond") + if("bond") // 16TC + Healing Cocktail + Krav Maga new /obj/item/gun/projectile/automatic/pistol(src) new /obj/item/suppressor(src) new /obj/item/ammo_box/magazine/m10mm/hp(src) + new /obj/item/ammo_box/magazine/m10mm/ap(src) new /obj/item/encryptionkey/syndicate(src) - new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) + new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src) // This drink heals now + new /obj/item/card/id/syndicate(src) + new /obj/item/storage/box/syndie_kit/emp(src) new /obj/item/implanter/krav_maga(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src) return - if("sabotage") + if("sabotage") // 31TC + RPD + Insuls new /obj/item/powersink(src) new /obj/item/grenade/syndieminibomb(src) new /obj/item/card/emag(src) new /obj/item/grenade/clusterbuster/n2o(src) - new /obj/item/storage/box/syndie_kit/space(src) new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/rcd/preloaded(src) + new /obj/item/storage/box/syndie_kit/space(src) return - if("payday") + if("payday") // 29TC new /obj/item/gun/projectile/revolver(src) new /obj/item/ammo_box/a357(src) new /obj/item/card/emag(src) new /obj/item/grenade/plastic/x4(src) new /obj/item/card/id/syndicate(src) + new /obj/item/thermal_drill(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/mask/gas/clown_hat(src) return - if("implant") + if("implant") // 35TC new /obj/item/implanter/uplink(src) new /obj/item/implanter/adrenalin(src) new /obj/item/implanter/storage(src) new /obj/item/implanter/freedom(src) return - if("hacker") + if("hacker") // 22TC + Ion law uploader new /obj/item/aiModule/syndicate(src) new /obj/item/encryptionkey/binary(src) + new /obj/item/encryptionkey/syndicate(src) new /obj/item/aiModule/toyAI(src) + new /obj/item/card/emag(src) return - if("darklord") + if("darklord") // 23TC + TK implant new /obj/item/melee/energy/sword/saber/red(src) new /obj/item/melee/energy/sword/saber/red(src) 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/syndigaloshes(src) + new /obj/item/clothing/mask/gas/voice(src) return - if("gadgets") + if("gadgets") // 30TC new /obj/item/clothing/gloves/color/yellow/power(src) new /obj/item/pen/sleepy(src) + new /obj/item/clothing/shoes/syndigaloshes(src) new /obj/item/clothing/glasses/thermal/syndi(src) new /obj/item/flashlight/emp(src) - new /obj/item/clothing/shoes/syndigaloshes(src) new /obj/item/stamp/chameleon(src) new /obj/item/multitool/ai_detect(src) return + if("maddoctor") // 31TC + new /obj/item/storage/backpack/duffel/syndie/surgery(src) + new /obj/item/pen/sleepy(src) + new /obj/item/implanter/traitor(src) // Mindslave Implant + new /obj/item/rad_laser(src) + new /obj/item/dnascrambler(src) + new /obj/item/clothing/gloves/color/latex/nitrile(src) + return + + if("professional") // 30TC + new /obj/item/gun/projectile/automatic/sniper_rifle/soporific(src) // Unique version that starts with soporific rounds loaded and cannot be suppressed + new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) + new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) + new /obj/item/pen/edagger(src) + new /obj/item/clothing/glasses/thermal/syndi(src) + new /obj/item/storage/toolbox/syndicate(src) + new /obj/item/clothing/under/suit_jacket(src) + return + + if("clownop") // 34TC + new /obj/item/storage/backpack/clown/syndie(src) // Honk Infiltration Kit + new /obj/item/card/id/syndicate(src) + new /obj/item/gun/projectile/automatic/c20r/toy(src) + new /obj/item/grenade/clown_grenade(src) + new /obj/item/pizza_bomb(src) + new /obj/item/cartridge/syndicate(src) + new /obj/item/implanter/freedom(src) // GET THAT FUKKEN CLOWN + return + /obj/item/storage/box/syndie_kit name = "Box" desc = "A sleek, sturdy box" diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 0a63aef5db0..f5bd0e8e4eb 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -63,6 +63,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss list_reagents = list("devilskiss" = 50) - + /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail - list_reagents = list("alliescocktail" = 50) \ No newline at end of file + list_reagents = list("alliescocktail" = 25, "omnizine" = 25) \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 6bc265d7556..7a610246a21 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -28,6 +28,14 @@ desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" origin_tech = "combat=7;syndicate=6" +/obj/item/gun/projectile/automatic/sniper_rifle/soporific + name = "Soporific sniper rifle" + desc = "A sniper rifle that's primarily used to fire non-lethal soporific rounds." + origin_tech = "combat=7;syndicate=6" + mag_type = /obj/item/ammo_box/magazine/sniper_rounds/soporific + can_unsuppress = 0 + can_suppress = 0 + //Normal Boolets /obj/item/ammo_box/magazine/sniper_rounds name = "sniper rounds (.50)"