diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 26449d93f85..3efc1a8b0aa 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1841,7 +1841,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Syndicate Bundle" desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive." reference = "SYB" - item = /obj/item/storage/box/syndicate + item = /obj/item/storage/box/syndie_kit/bundle cost = 20 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) @@ -1850,7 +1850,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "A crate containing 50 telecrystals worth of random syndicate leftovers." reference = "SYSC" cost = 20 - item = /obj/item/storage/box/syndicate + item = /obj/item/storage/box/syndie_kit/bundle excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) var/crate_value = 50 diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 92d7abc3097..d35e01b6527 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -280,7 +280,7 @@ if(17) //Tator Kit T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate(drop_location()) + new /obj/item/storage/box/syndie_kit/bundle(drop_location()) create_smoke(2) if(18) //Captain ID diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index f4dc545880d..4346e907f5c 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -364,6 +364,21 @@ new /obj/item/grenade/chem_grenade/facid(src) //1 new /obj/item/grenade/chem_grenade/saringas(src) //1 +/obj/item/storage/belt/grenade/tactical // Traitor bundle version + name = "tactical grenadier belt" + storage_slots = 20 // Not as many slots as the nukie one + max_combined_w_class = 40 + +/obj/item/storage/belt/grenade/tactical/populate_contents() + for(var/I in 1 to 5) + new /obj/item/grenade/smokebomb(src) + new /obj/item/grenade/gluon(src) + new /obj/item/grenade/plastic/c4(src) // Five of each + for(var/I in 1 to 2) + new /obj/item/grenade/frag(src) + new /obj/item/grenade/empgrenade(src) // Two of each + new /obj/item/grenade/syndieminibomb(src) // One minibomb + /obj/item/storage/belt/military/abductor name = "agent belt" desc = "A belt used by abductor agents." diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 5b7d1631516..d88c7c0611e 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,124 +1,148 @@ -/obj/item/storage/box/syndicate // Traitor bundles +/obj/item/storage/box/syndie_kit + desc = "A sleek, sturdy box." + icon_state = "box_of_doom" - var/static/list/spy = list( // 37TC + one 0TC - /obj/item/clothing/under/chameleon, // 2TC - /obj/item/clothing/mask/chameleon, // 0TC +/obj/item/storage/box/syndie_kit/bundle // Traitor bundles + + var/static/list/spy = list( // 37TC + /obj/item/clothing/under/chameleon, // 1TC + /obj/item/clothing/mask/chameleon, // 1TC /obj/item/card/id/syndicate, // 2TC /obj/item/clothing/shoes/chameleon/noslip, // 2TC - /obj/item/camera_bug, // 1TC - /obj/item/multitool/ai_detect, // 1TC - /obj/item/encryptionkey/syndicate, // 2TC - /obj/item/twohanded/garrote, // 10TC + /obj/item/clothing/glasses/hud/security/chameleon, // 2TC + /obj/item/implanter/storage, // 8TC + /obj/item/pen/edagger, // 2TC /obj/item/pinpointer/advpinpointer, // 4TC /obj/item/storage/fancy/cigarettes/cigpack_syndicate, // 2TC - /obj/item/flashlight/emp, // 2TC - /obj/item/clothing/glasses/hud/security/chameleon, // 2TC - /obj/item/chameleon) // 7TC + /obj/item/flashlight/emp, // 4TC + /obj/item/chameleon, // 7TC + /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/thief = list( // 39TC + var/static/list/agent13 = list( // 37TC + /obj/item/clothing/under/chameleon, // 1TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/gun/projectile/automatic/pistol, // 4TC + /obj/item/suppressor, // 1TC + /obj/item/ammo_box/magazine/m10mm, // 1TC + /obj/item/ammo_box/magazine/m10mm/hp, // 2TC + /obj/item/twohanded/garrote, // 6TC + /obj/item/door_remote/omni/access_tuner, // 6TC + /obj/item/clothing/glasses/chameleon/thermal, // 6TC + /obj/item/implanter/freedom, // 6TC + /obj/item/coin/gold, // 0TC + /obj/item/encryptionkey/syndicate) // 2TC + + var/static/list/thief = list( // 37TC /obj/item/gun/energy/kinetic_accelerator/crossbow, // 12TC /obj/item/chameleon, // 7TC /obj/item/clothing/glasses/chameleon/thermal, // 6TC /obj/item/clothing/gloves/color/black/thief, // 6TC /obj/item/card/id/syndicate, // 2TC - /obj/item/clothing/shoes/chameleon/noslip, // 2TC /obj/item/storage/backpack/satchel_flat, // 2TC /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/bond = list( // 33TC + three 0TC + var/static/list/bond = list( // 32TC /obj/item/gun/projectile/automatic/pistol, // 4TC /obj/item/suppressor, // 1TC - /obj/item/ammo_box/magazine/m10mm/hp, // 3TC + /obj/item/ammo_box/magazine/m10mm/ap, // 2TC /obj/item/ammo_box/magazine/m10mm/ap, // 2TC /obj/item/clothing/under/suit/really_black, // 0TC /obj/item/card/id/syndicate, // 2TC /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC + /obj/item/storage/box/syndie_kit/emp, // 2TC + /obj/item/clothing/glasses/hud/security/chameleon, // 2TC /obj/item/encryptionkey/syndicate, // 2TC /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail, // 0TC - /obj/item/dnascrambler, // 4TC - /obj/item/storage/box/syndie_kit/emp, // 2TC + /obj/item/dnascrambler, // 2TC /obj/item/CQC_manual) // 13TC - var/static/list/sabotage = list( // 41TC + two 0TC - /obj/item/grenade/plastic/c4, // 1TC - /obj/item/grenade/plastic/c4, // 1TC - /obj/item/camera_bug, // 1TC - /obj/item/powersink, // 10TC - /obj/item/cartridge/syndicate, // 6TC + var/static/list/infiltrator = list( // 34TC + RCD & Mesons Autoimplanter + /obj/item/storage/box/syndie_kit/teleporter, // 8TC + /obj/item/clothing/gloves/color/black/krav_maga, // 10TC + /obj/item/clothing/glasses/chameleon/thermal, // 6TC + /obj/item/pinpointer/advpinpointer, // 4TC /obj/item/rcd/preloaded, // 0TC - /obj/item/card/emag, // 6TC - /obj/item/clothing/gloves/color/yellow, // 0TC - /obj/item/grenade/syndieminibomb, // 6TC - /obj/item/grenade/clusterbuster/n2o, // 4TC /obj/item/storage/box/syndie_kit/space, // 4TC + /obj/item/autosurgeon/organ/syndicate/meson_eyes, // 0TC /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/payday = list( // 36TC + four 0TC + var/static/list/payday = list( // 35TC /obj/item/gun/projectile/revolver, // 13TC /obj/item/ammo_box/a357, // 3TC /obj/item/ammo_box/a357, // 3TC /obj/item/card/emag, // 6TC - /obj/item/jammer, // 5TC + /obj/item/jammer, // 4TC /obj/item/card/id/syndicate, // 2TC - /obj/item/clothing/under/suit/really_black, //0TC - /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, //0TC - /obj/item/clothing/gloves/color/latex/nitrile, //0 TC + /obj/item/clothing/under/suit/really_black, // 0TC + /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC + /obj/item/clothing/gloves/color/latex/nitrile, // 0 TC /obj/item/clothing/mask/gas/clown_hat, // 0TC - /obj/item/grenade/plastic/c4, //1TC + /obj/item/grenade/plastic/c4, // 1TC /obj/item/thermal_drill/diamond_drill, // 1TC /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/implant = list( // 39TC + ten free TC - /obj/item/implanter/freedom, // 5TC + var/static/list/implant = list( // 41TC + /obj/item/implanter/freedom, // 6TC /obj/item/implanter/uplink, // 14TC (ten free TC) - /obj/item/implanter/emp, // 0TC + /obj/item/implanter/emp, // 1TC /obj/item/implanter/adrenalin, // 8TC /obj/item/implanter/explosive, // 2TC /obj/item/implanter/storage, // 8TC /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/hacker = list( // 37TC + two 0TC - /obj/item/aiModule/syndicate, // 12TC + var/static/list/hacker = list( // 39TC + Toy AI Uploader + /obj/item/melee/energy/sword/saber/blue, // 8TC /obj/item/card/emag, // 6TC /obj/item/encryptionkey/syndicate, // 2TC /obj/item/encryptionkey/binary, // 5TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/storage/box/syndie_kit/emp, // 2TC /obj/item/aiModule/toyAI, // 0TC /obj/item/clothing/glasses/chameleon/thermal, // 6TC /obj/item/storage/belt/military/traitor/hacker, // 3TC /obj/item/clothing/gloves/combat, // 0TC /obj/item/multitool/ai_detect, // 1TC - /obj/item/flashlight/emp) // 2TC + /obj/item/flashlight/emp) // 4TC - var/static/list/darklord = list( // 24TC + two 0TC + var/static/list/darklord = list( // 33TC + TK /obj/item/melee/energy/sword/saber/red, // 8TC /obj/item/melee/energy/sword/saber/red, // 8TC + /obj/item/clothing/gloves/color/yellow/power, // 10TC /obj/item/dnainjector/telemut/darkbundle, // 0TC /obj/item/clothing/suit/hooded/chaplain_hoodie, // 0TC + /obj/item/clothing/glasses/meson/engine/tray, // 0TC + /obj/item/clothing/mask/chameleon, // 1TC /obj/item/card/id/syndicate, // 2TC /obj/item/clothing/shoes/chameleon/noslip, // 2TC - /obj/item/clothing/mask/chameleon, // 2TC /obj/item/encryptionkey/syndicate) // 2TC - var/static/list/professional = list( // 34TC + two 0TC - /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator, // 16TC + var/static/list/professional = list( // 38TC + /obj/item/gun/projectile/automatic/sniper_rifle/syndicate, // 16TC + /obj/item/ammo_box/magazine/sniper_rounds, // 4TC + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, // 5TC /obj/item/ammo_box/magazine/sniper_rounds/penetrator, // 5TC - /obj/item/ammo_box/magazine/sniper_rounds/soporific, // 3TC /obj/item/clothing/glasses/chameleon/thermal, // 6TC /obj/item/clothing/gloves/combat, // 0 TC /obj/item/clothing/under/suit/really_black, // 0 TC /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC - /obj/item/pen/edagger, // 2TC /obj/item/encryptionkey/syndicate) // 2TC -/obj/item/storage/box/syndicate/populate_contents() - var/list/bundle = pick(spy, thief, bond, sabotage, payday, implant, hacker, darklord, professional) + var/static/list/grenadier = list( // 20TC + Tactical Grenadier Belt + /obj/item/storage/belt/grenade/tactical, // Contains 2 Frag and EMP grenades, 5 C4 Explosives, 5 Smoke and Gluon grenades and 1 Minibomb grenade ~20TC Estimate + /obj/item/gun/projectile/automatic/pistol, // 4TC + /obj/item/ammo_box/magazine/m10mm/fire, // 2TC + /obj/item/ammo_box/magazine/m10mm/fire, // 2TC + /obj/item/storage/box/syndie_kit/hardsuit, // 6TC + /obj/item/clothing/gloves/combat, // 0TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/shoes/chameleon/noslip, // 2TC + /obj/item/encryptionkey/syndicate) // 2TC + +/obj/item/storage/box/syndie_kit/bundle/populate_contents() + var/list/bundle = pick(spy, agent13, thief, bond, infiltrator, payday, implant, hacker, darklord, professional, grenadier) for(var/item in bundle) new item(src) -/obj/item/storage/box/syndie_kit - desc = "A sleek, sturdy box." - icon_state = "box_of_doom" - /obj/item/storage/box/syndie_kit/space name = "Boxed Space Suit and Helmet" can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate) diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 956795cdc81..82c8e4a551f 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -25,16 +25,6 @@ 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/syndicate/penetrator - name = "syndicate penetrator sniper rifle" - -/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator/Initialize(mapload) - . = ..() - desc += " It comes loaded with a penetrator magazine, but can use different magazines." - - QDEL_NULL(magazine) - magazine = new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) - /obj/item/gun/projectile/automatic/sniper_rifle/update_icon_state() if(magazine) icon_state = "sniper-mag" diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index c87987303d2..e676ed727f5 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -88,6 +88,11 @@ uses = 1 starting_organ = /obj/item/organ/internal/cyberimp/arm/gun/laser +/obj/item/autosurgeon/organ/syndicate/meson_eyes + desc = "A single use autosurgeon that contains a pair of cybernetic meson eyes. A screwdriver can be used to remove it, but implants can't be placed back in." + uses = 1 + starting_organ = /obj/item/organ/internal/eyes/cybernetic/meson + /obj/item/autosurgeon/organ/syndicate/thermal_eyes starting_organ = /obj/item/organ/internal/eyes/cybernetic/thermals/hardened