From 01e04fbc96f717ede73dc0da768f92387ab54441 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sat, 30 Jul 2022 06:38:20 +1000 Subject: [PATCH] Nukie Update 3: Uplink Spring Cleaning (I hit delete and call myself a developer) (#68539) * Toy guns are only available to clown operatives. * Removes from both operative uplinks: Camera Bug, Combat Gloves Plus (already removed from leaders), Guerrilla Gloves, FRAME disc, Radioactive Microlaser, Blood-Red Magboots (the standalone ones, not the modules), Power Beacon, Bioterror everything (including the bundle), Stechkin APS machine pistol and ammo, AI Detector. --- .../modules/uplink/uplink_items/ammunition.dm | 1 + code/modules/uplink/uplink_items/dangerous.dm | 1 + .../uplink/uplink_items/device_tools.dm | 5 +- code/modules/uplink/uplink_items/nukeops.dm | 71 +------------------ .../uplink/uplink_items/stealthy_tools.dm | 1 + 5 files changed, 9 insertions(+), 70 deletions(-) diff --git a/code/modules/uplink/uplink_items/ammunition.dm b/code/modules/uplink/uplink_items/ammunition.dm index 15b9e48a700..6a70d60c90c 100644 --- a/code/modules/uplink/uplink_items/ammunition.dm +++ b/code/modules/uplink/uplink_items/ammunition.dm @@ -17,6 +17,7 @@ cost = 2 surplus = 0 illegal_tech = FALSE + purchasable_from = ~UPLINK_NUKE_OPS // Low progression cost diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index 33025f2c86b..955604f267c 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -17,6 +17,7 @@ item = /obj/item/gun/ballistic/automatic/pistol/toy/riot cost = 2 surplus = 10 + purchasable_from = ~UPLINK_NUKE_OPS // Low progression cost diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm index fa3d2de43f8..5a2df9e4c9f 100644 --- a/code/modules/uplink/uplink_items/device_tools.dm +++ b/code/modules/uplink/uplink_items/device_tools.dm @@ -85,6 +85,7 @@ item = /obj/item/camera_bug cost = 1 surplus = 90 + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/device_tools/military_belt name = "Chest Rig" @@ -117,6 +118,7 @@ item = /obj/item/computer_hardware/hard_drive/portable/virus/frame cost = 4 restricted = TRUE + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/device_tools/frame/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) . = ..() @@ -167,7 +169,7 @@ and wavelength, which controls the delay before the effect kicks in." item = /obj/item/healthanalyzer/rad_laser cost = 3 - + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/device_tools/suspiciousphone name = "Protocol CRAB-17 Phone" @@ -248,6 +250,7 @@ progression_minimum = 30 MINUTES item = /obj/item/sbeacondrop cost = 10 + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/device_tools/powersink name = "Power Sink" diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index e4c867b846d..73ec162b2e5 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -1,11 +1,3 @@ -/datum/uplink_item/bundles_tc/chemical - name = "Bioterror bundle" - desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \ - box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use." - item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle - cost = 30 // normally 42 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - /datum/uplink_item/bundles_tc/bulldog name = "Bulldog bundle" desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \ @@ -159,14 +151,6 @@ surplus = 25 purchasable_from = UPLINK_NUKE_OPS -/datum/uplink_item/dangerous/aps - name = "Stechkin APS Machine Pistol" - desc = "An ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \ - with suppressors. The gun fires in three round bursts." - item = /obj/item/gun/ballistic/automatic/pistol/aps - cost = 10 - purchasable_from = UPLINK_NUKE_OPS - /datum/uplink_item/dangerous/pistol_nukeop name = "Ansem Pistol" desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \ @@ -188,7 +172,7 @@ item = /obj/item/gun/ballistic/automatic/c20r/toy cost = 5 surplus = 0 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_CLOWN_OPS /datum/uplink_item/dangerous/foammachinegun name = "Toy Machine Gun" @@ -197,16 +181,7 @@ item = /obj/item/gun/ballistic/automatic/l6_saw/toy cost = 10 surplus = 0 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - -/datum/uplink_item/stealthy_weapons/combatglovesplus - name = "Combat Gloves Plus" - desc = "A pair of gloves that are fireproof and electrically insulated, however unlike the regular Combat Gloves these use nanotechnology \ - to teach the martial art of krav maga to the wearer." - item = /obj/item/clothing/gloves/krav_maga/combatglovesplus - cost = 5 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - surplus = 0 + purchasable_from = UPLINK_CLOWN_OPS /datum/uplink_item/stealthy_weapons/cqc name = "CQC Manual" @@ -216,13 +191,6 @@ cost = 13 surplus = 0 -/datum/uplink_item/ammo/pistolaps - name = "9mm Stechkin APS Magazine" - desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS machine pistol." - item = /obj/item/ammo_box/magazine/m9mm_aps - cost = 2 - purchasable_from = UPLINK_NUKE_OPS - /datum/uplink_item/ammo/pistol_nukeop name = "10mm Handgun Magazine" desc = "An additional 8-round 10mm magazine, compatible with the Ansem pistol." @@ -426,14 +394,6 @@ item = /obj/item/ammo_casing/caseless/rocket/hedp cost = 6 -/datum/uplink_item/ammo/bioterror - name = "Box of Bioterror Syringes" - desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor \ - and broca systems, making it impossible for them to move or speak for some time." - item = /obj/item/storage/box/syndie_kit/bioterror - cost = 6 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - /datum/uplink_item/ammo/surplus_smg name = "Surplus SMG Magazine" desc = "A cylindrical magazine designed for the PP-95 SMG." @@ -456,16 +416,6 @@ cost = 6 purchasable_from = UPLINK_NUKE_OPS -/datum/uplink_item/explosives/bioterrorfoam - name = "Bioterror Foam Grenade" - desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \ - mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \ - using additional spore toxin. Ensure suit is sealed before use." - item = /obj/item/grenade/chem_grenade/bioterrorfoam - cost = 5 - surplus = 35 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - /datum/uplink_item/explosives/bombanana name = "Bombanana" desc = "A banana with an explosive taste! discard the peel quickly, as it will explode with the force of a Syndicate minibomb \ @@ -678,15 +628,6 @@ cost = 2 purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS -/datum/uplink_item/device_tools/magboots - name = "Blood-Red Magboots" - desc = "A pair of magnetic boots with a Syndicate paintjob that assist with freer movement in space or on-station \ - during gravitational generator failures. These reverse-engineered knockoffs of Nanotrasen's \ - 'Advanced Magboots' slow you down in simulated-gravity environments much like the standard issue variety." - item = /obj/item/clothing/shoes/magboots/syndie - cost = 2 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - /datum/uplink_item/device_tools/assault_pod name = "Assault Pod Targeting Device" desc = "Use this to select the landing zone of your assault pod." @@ -730,14 +671,6 @@ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS restricted = TRUE -/datum/uplink_item/device_tools/guerillagloves - name = "Guerilla Gloves" - desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!" - item = /obj/item/clothing/gloves/tackler/combat/insulated - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - cost = 2 - illegal_tech = FALSE - /datum/uplink_item/implants/antistun name = "CNS Rebooter Implant" desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon." diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm index df20ef32da4..32ece25bd96 100644 --- a/code/modules/uplink/uplink_items/stealthy_tools.dm +++ b/code/modules/uplink/uplink_items/stealthy_tools.dm @@ -24,6 +24,7 @@ activated to get an rough estimate of the AI's presence. Knowing when \ an artificial intelligence is watching you is useful for knowing when to maintain cover." item = /obj/item/multitool/ai_detect + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) cost = 1 /datum/uplink_item/stealthy_tools/chameleon