diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index aa61cdc813..753e7e6096 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -32,11 +32,15 @@ var/uplink_welcome = "Illegal Uplink Console:" var/uplink_uses = 10 var/list/datum/uplink_item/uplink_items = list( + "Ammunition" = list( + new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, ".357", "RA"), + new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "9mm", "R9"), + new/datum/uplink_item(/obj/item/weapon/dart_cartridge, 2, "Darts", "AD"), + ), "Highly Visible and Dangerous Weapons" = list( - new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "Ammo-9mm", "R9"), - new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, "Ammo-357", "RA"), new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"), new/datum/uplink_item(/obj/item/weapon/melee/energy/sword, 4, "Energy Sword", "ES"), + new/datum/uplink_item(/obj/item/weapon/gun/dartgun, 5, "Dart Gun", "DG"), new/datum/uplink_item(/obj/item/weapon/gun/energy/crossbow, 5, "Energy Crossbow", "XB"), new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/g9mm, 5, "Silenced 9mm", "S9"), new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"), @@ -48,7 +52,8 @@ new/datum/uplink_item(/obj/item/weapon/cane/concealed, 2, "Concealed Cane Sword", "CC"), new/datum/uplink_item(/obj/item/weapon/cartridge/syndicate, 3, "Detomatix PDA Cartridge", "DC"), new/datum/uplink_item(/obj/item/weapon/pen/paralysis, 3, "Paralysis Pen", "PP"), - new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/cigarette, 4, "Cigarette Kit", "BH") + new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/cigarette, 4, "Cigarette Kit", "BH"), + new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/toxin, 4, "Random Toxin - Beaker", "RT") ), "Stealth and Camouflage Items" = list( new/datum/uplink_item(/obj/item/weapon/card/id/syndicate, 2, "Agent ID card", "AC"), @@ -80,8 +85,8 @@ new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/imp_uplink, 10, "Uplink Implant (Contains 5 Telecrystals)", "UI") ), "Medical" = list( - new/datum/uplink_item(/obj/item/weapon/storage/box/donkpockets, 1, "Box of Donk-Pockets", "DP"), - new/datum/uplink_item(/obj/item/weapon/storage/firstaid/surgery, 3, "Surgery kit", "SK"), + new/datum/uplink_item(/obj/item/weapon/storage/box/donkpockets, 1, "Box of Sin-Pockets", "DP"), + new/datum/uplink_item(/obj/item/weapon/storage/firstaid/surgery, 5, "Surgery kit", "SK"), new/datum/uplink_item(/obj/item/weapon/storage/firstaid/combat, 5, "Combat medical kit", "CM") ), "(Pointless) Badassery" = list( diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 5441f83cca..cc67c59517 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -28,3 +28,30 @@ new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/random + flags = 0 + var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin + random_reagent_list = list( + list("mindbreaker" = 10, "space_drugs" = 20) = 3, + list("carpotoxin" = 15) = 2, + list("impedrezene" = 15) = 2, + list("zombiepowder" = 10) = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/random/New() + ..() + if(is_open_container()) + flags ^= OPENCONTAINER + + var/list/picked_reagents = pickweight(random_reagent_list) + for(var/reagent in picked_reagents) + reagents.add_reagent(reagent, picked_reagents[reagent]) + + var/list/names = new + for(var/datum/reagent/R in reagents.reagent_list) + names += R.name + + desc = "Contains [english_list(names)]." + update_icon() diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 1032c64787..4d862f9f05 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -30,6 +30,7 @@ new /obj/item/ammo_magazine/a357(src) new /obj/item/weapon/card/emag(src) new /obj/item/weapon/plastique(src) + new /obj/item/weapon/plastique(src) return if("murder") @@ -47,6 +48,7 @@ return if("hacker") + new /obj/item/device/encryptionkey/syndicate(src) new /obj/item/weapon/aiModule/syndicate(src) new /obj/item/weapon/card/emag(src) new /obj/item/device/encryptionkey/binary(src) @@ -62,10 +64,9 @@ return if("smoothoperator") - new /obj/item/weapon/gun/projectile/pistol(src) - new /obj/item/weapon/silencer(src) - new /obj/item/weapon/soap/syndie(src) + new /obj/item/weapon/storage/box/syndie_kit/g9mm(src) new /obj/item/weapon/storage/bag/trash(src) + new /obj/item/weapon/soap/syndie(src) new /obj/item/bodybag(src) new /obj/item/clothing/under/suit_jacket(src) new /obj/item/clothing/shoes/laceup(src) @@ -174,9 +175,17 @@ /obj/item/weapon/storage/box/syndie_kit/g9mm/New() ..() new /obj/item/weapon/gun/projectile/pistol(src) - new /obj/item/weapon/storage/bag/trash(src) new /obj/item/weapon/silencer(src) +/obj/item/weapon/storage/box/syndie_kit/toxin + name = "toxin kit" + desc = "An apple will not be enough to keep the doctor away after this." + +/obj/item/weapon/storage/box/syndie_kit/toxin/New() + ..() + new /obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin(src) + new /obj/item/weapon/reagent_containers/syringe(src) + /obj/item/weapon/storage/box/syndie_kit/cigarette name = "\improper Tricky smokes" desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up."