cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 18:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uplink Adjustment (#10496)

Browse Source
This commit is contained in:
Geeves
2020-11-27 11:52:28 +02:00
committed by GitHub
parent 1762f16344
commit f54a89b9f8
14 changed files with 81 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/datums/uplink/ammunition.dm
View File

@@ -25,13 +25,13 @@
/datum/uplink_item/item/ammo/submachinegundrum
name = "Submachine Gun Drum Magazine (.45)"
item_cost = 6
item_cost = 4
path = /obj/item/ammo_magazine/submachinedrum
desc = "Contains fifty rounds of .45 bullets, for use with the vintage submachine gun."
/datum/uplink_item/item/ammo/submachinegunmag
name = "Submachine Gun Magazine (.45)"
item_cost = 4
item_cost = 2
path = /obj/item/ammo_magazine/submachinemag
desc = "Contains twenty rounds of .45 bullets, for use with the vintage submachine gun."
@@ -41,26 +41,20 @@
path = /obj/item/ammo_magazine/a357
desc = "Contains eight rounds of .357 bullets."
/datum/uplink_item/item/ammo/sniperammo
name = "14.5mm box"
item_cost = 8
path = /obj/item/storage/box/sniperammo
desc = "Contains seven rounds of 14.5mm bullets, for use with the anti-materiel rifle."
/datum/uplink_item/item/ammo/shotgun_shells
name = "Box of Shells"
item_cost = 5
item_cost = 3
path = /obj/item/storage/box/shotgunshells
desc = "Contains eight shotgun buckshot shells."
/datum/uplink_item/item/ammo/plasma_mag
name = "Plasma Shotgun Magazine"
item_cost = 5
item_cost = 3
path = /obj/item/ammo_magazine/plasma
desc = "Contains ten plasma cells."
/datum/uplink_item/item/ammo/rifle_mag
name = "7.62mm clip"
item_cost = 4
item_cost = 2
path = /obj/item/ammo_magazine/boltaction
desc = "Contains five rounds of 7.62mm bullets."

46
code/datums/uplink/devices and tools.dm
View File

@@ -6,13 +6,13 @@
/datum/uplink_item/item/tools/toolbox
name = "Fully Loaded Toolbox"
item_cost = 2
item_cost = 1
path = /obj/item/storage/toolbox/syndicate
desc = "A suspiciously painted toolbox, filled with most of the odds and ends a good-for-nothing traitor would need."
/datum/uplink_item/item/tools/toolbelt
name = "Fully Loaded Tool-belt"
item_cost = 3
item_cost = 2
path = /obj/item/storage/belt/utility/very_full
desc = "A fully loaded tool-belt even Nanotrasen's top Chief Engineer would be proud to wear."
@@ -30,53 +30,53 @@
/datum/uplink_item/item/tools/surge
name = "IPC surge prevention module"
item_cost = 12
item_cost = 10
path = /obj/item/stack/nanopaste/surge
desc = "An internal module that allow operative IPC frames to be protected from EMP pulse. The device has limited use that varies between two to five pulses"
/datum/uplink_item/item/tools/clerical
name = "Morphic Clerical Kit"
item_cost = 3
item_cost = 1
path = /obj/item/storage/box/syndie_kit/clerical
/datum/uplink_item/item/tools/plastique
name = "C-4 (Destroys walls)"
item_cost = 3
item_cost = 2
path = /obj/item/plastique
desc = "A single block of C4, enough to breach any wall."
/datum/uplink_item/item/tools/heavy_vest
name = "Heavy Armor Kit"
item_cost = 4
item_cost = 3
path = /obj/item/storage/box/syndie_kit/armor
desc = "A heavy armor set consisting of a full kit. Not EVA capable."
/datum/uplink_item/item/tools/encryptionkey_radio
name = "Encrypted Radio Channel Key"
item_cost = 4
item_cost = 3
path = /obj/item/device/encryptionkey/syndicate
desc = "An encryption key for use in a headset, intercepts all frequencies and grants access to a secure syndicate frequency."
/datum/uplink_item/item/tools/encryptionkey_binary
name = "Binary Translator Key"
item_cost = 5
item_cost = 2
path = /obj/item/device/encryptionkey/binary
desc = "An encryption key for use in a headset, capable of intercepting stationbound binary communications."
/datum/uplink_item/item/tools/emag
name = "Cryptographic Sequencer"
item_cost = 6
item_cost = 5
path = /obj/item/card/emag
/datum/uplink_item/item/tools/personal_shield
name = "Personal Shield"
desc = "A personal shield that, when kept in your hand and activated, will protect its user from five projectile shots."
item_cost = 6
item_cost = 4
path = /obj/item/device/personal_shield
/datum/uplink_item/item/tools/hacking_tool
name = "Door Hacking Tool"
item_cost = 6
item_cost = 4
path = /obj/item/device/multitool/hacktool
desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \
When in hacking mode this device will grant full access to any standard airlock within 7 to 13 seconds. \
@@ -84,7 +84,7 @@
/datum/uplink_item/item/tools/space_suit
name = "Space Suit"
item_cost = 6
item_cost = 2
path = /obj/item/storage/box/syndie_kit/space
/datum/uplink_item/item/tools/thermal
@@ -99,7 +99,7 @@
/datum/uplink_item/item/tools/teleporter
name = "Teleporter Circuit Board"
item_cost = 10
item_cost = 4
path = /obj/item/circuitboard/teleporter
/datum/uplink_item/item/tools/teleporter/New()
@@ -108,12 +108,12 @@
/datum/uplink_item/item/tools/ai_module
name = "Hacked AI Upload Module"
item_cost = 14
item_cost = 12
path = /obj/item/aiModule/syndicate
/datum/uplink_item/item/tools/supply_beacon
name = "Hacked Supply Beacon (DANGER!)"
item_cost = 14
item_cost = 10
path = /obj/item/supply_beacon
desc = "A hacked supply beacon that will call in a random supply pod when deployed and activated. Steer clear of the area afterwards."
@@ -135,7 +135,7 @@
/datum/uplink_item/item/tools/nightpatch
name = "HUDPatch, Night-Vision"
item_cost = 4
item_cost = 2
path = /obj/item/clothing/glasses/eyepatch/hud/night
/datum/uplink_item/item/tools/aviatortherm
@@ -146,25 +146,25 @@
/datum/uplink_item/item/tools/aviatornight
name = "Aviators, Night-Vision"
item_cost = 4
item_cost = 2
path = /obj/item/clothing/glasses/night/aviator
desc = "A pair of night-vision glasses disguised as aviator shades."
/datum/uplink_item/item/tools/suit_cooling_unit
name = "Portable suit cooling unit"
item_cost = 4
item_cost = 2
path = /obj/item/device/suit_cooling_unit
desc = "A suit cooling unit with a high capacity power cell."
/datum/uplink_item/item/tools/keypad
name = "Keypad Mag-Lock"
item_cost = 4
item_cost = 1
path = /obj/item/device/magnetic_lock/keypad
desc = "A maglock that requires the user to enter a passcode to lock and then later unlock."
/datum/uplink_item/item/tools/personal_ai
name = "Personal AI"
item_cost = 2
item_cost = 1
path = /obj/item/device/paicard
desc = "An unmodified personal AI that can assist you in your ventures."
@@ -182,18 +182,18 @@
/datum/uplink_item/item/tools/jetpack
name = "Jetpack"
item_cost = 5
item_cost = 3
path = /obj/item/tank/jetpack/oxygen
/datum/uplink_item/item/tools/electropack
name = "Electropack"
item_cost = 6
item_cost = 3
path = /obj/item/device/radio/electropack
desc = "A backpack wired with electrodes. Sync up with a signaller, attach to an unwilling host and pulse the signal to shock them."
/datum/uplink_item/item/tools/ammo_display
name = "Holographic Ammo Display"
item_cost = 2
item_cost = 1
path = /obj/item/ammo_display
/datum/uplink_item/item/tools/mesons_glasses

20
code/datums/uplink/exosuit_equipment.dm
View File

@@ -6,7 +6,7 @@
/datum/uplink_item/item/exosuit_equipment/mounted_gun
name = "Mounted Electrolaser Carbine"
desc = "A dual fire mode electrolaser system connected to the exosuit's targetting system."
item_cost = 8
item_cost = 4
path = /obj/item/mecha_equipment/mounted_system/taser
/datum/uplink_item/item/exosuit_equipment/mounted_gun/ion
@@ -18,13 +18,13 @@
/datum/uplink_item/item/exosuit_equipment/mounted_gun/laser
name = "Mounted Laser Rifle"
desc = "An exosuit-mounted laser rifle. Handle with care."
item_cost = 10
item_cost = 8
path = /obj/item/mecha_equipment/mounted_system/taser/laser
/datum/uplink_item/item/exosuit_equipment/mounted_gun/smg
name = "Mounted Machine Gun"
desc = "An exosuit-mounted automatic weapon. Handle with care."
item_cost = 10
item_cost = 8
path = /obj/item/mecha_equipment/mounted_system/taser/smg
/datum/uplink_item/item/exosuit_equipment/mounted_launcher
@@ -38,31 +38,31 @@
/datum/uplink_item/item/exosuit_equipment/mounted_tool
name = "Mounted RFD-C"
desc = "A RFD, modified to construct walls and floors. This one can be mounted on an exosuit."
item_cost = 12
item_cost = 10
path = /obj/item/mecha_equipment/mounted_system/rfd
/datum/uplink_item/item/exosuit_equipment/mounted_tool/clamp
name = "Mounted Clamp"
desc = "A large, heavy industrial cargo loading clamp."
item_cost = 4
item_cost = 3
path = /obj/item/mecha_equipment/clamp
/datum/uplink_item/item/exosuit_equipment/mounted_tool/catapult
name = "Mounted Gravitational Catapult"
desc = "An exosuit-mounted gravitational catapult."
item_cost = 10
item_cost = 8
path = /obj/item/mecha_equipment/catapult
/datum/uplink_item/item/exosuit_equipment/mounted_tool/drill
name = "Mounted Drill"
desc = "An exosuit-mounted drill."
item_cost = 6
item_cost = 4
path = /obj/item/mecha_equipment/drill
/datum/uplink_item/item/exosuit_equipment/mounted_tool/passenger
name = "Mounted Passenger Compartment"
desc = "An exosuit-mounted passenger compartment."
item_cost = 4
item_cost = 3
path = /obj/item/mecha_equipment/sleeper/passenger_compartment
// MEDICAL //
@@ -70,11 +70,11 @@
/datum/uplink_item/item/exosuit_equipment/mounted_medical
name = "Mounted Sleeper"
desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities."
item_cost = 8
item_cost = 6
path = /obj/item/mecha_equipment/sleeper
/datum/uplink_item/item/exosuit_equipment/mounted_medical/drone
name = "Mounted Crisis Dronebay"
desc = "A small shoulder-mounted dronebay containing a rapid response drone capable of moderately stabilizing a patient near the exosuit."
item_cost = 8
item_cost = 5
path = /obj/item/mecha_equipment/crisis_drone

8
code/datums/uplink/grenades.dm
View File

@@ -12,19 +12,19 @@
/datum/uplink_item/item/grenades/anti_photon
name = "5xPhoton Disruption Grenades"
item_cost = 4
item_cost = 2
path = /obj/item/storage/box/anti_photons
desc = "A box of five grenades that cause total darkness in the area they explode in. Circumvented by vision altering headgear. Useful for get-aways."
/datum/uplink_item/item/grenades/smoke
name = "5xSmoke Grenades"
item_cost = 4
item_cost = 2
path = /obj/item/storage/box/smokes
desc = "A box of five grenades that deploy smoke in the thrown area. Targets hidden in smoke are much harder to hit with ranged weaponry."
/datum/uplink_item/item/grenades/emp
name = "5xEMP Grenades"
item_cost = 6
item_cost = 5
path = /obj/item/storage/box/emps
desc = "A box of five grenades that cause a risky EMP explosion, capable of toggling headsets off, permanently destroying IPC units and draining a stationbound completely."
@@ -35,6 +35,6 @@
/datum/uplink_item/item/grenades/cardox
name = "5xCardox Grenades"
item_cost = 8
item_cost = 5
path = /obj/item/storage/box/cardox
desc = "A box of five grenades that deploy cardox smoke in the thrown area. This smoke is incredibly toxic, especially to vaurca. It can also clear K'ois outbreaks with ease."

12
code/datums/uplink/hardsuit_modules.dm
View File

@@ -16,31 +16,31 @@
/datum/uplink_item/item/hardsuit_modules/ewar_voice
name = "Electrowarfare Suite and Voice Synthesiser"
item_cost = 6
item_cost = 5
path = /obj/item/storage/box/syndie_kit/ewar_voice
/datum/uplink_item/item/hardsuit_modules/maneuvering_jets
name = "Maneuvering Jets"
item_cost = 8
item_cost = 6
path = /obj/item/rig_module/maneuvering_jets
/datum/uplink_item/item/hardsuit_modules/egun
name = "Mounted Energy Gun"
item_cost = 12
item_cost = 10
path = /obj/item/rig_module/mounted/egun
/datum/uplink_item/item/hardsuit_modules/power_sink
name = "Power Sink"
item_cost = 12
item_cost = 8
path = /obj/item/rig_module/power_sink
/datum/uplink_item/item/hardsuit_modules/laser_canon
name = "Mounted Laser Cannon"
item_cost = 16
item_cost = 14
path = /obj/item/rig_module/mounted
/datum/uplink_item/item/tools/rig_cooling_unit
name = "mounted suit cooling unit"
item_cost = 8
item_cost = 6
path = /obj/item/rig_module/cooling_unit
desc = "A mounted suit cooling unit for use with hardsuits."

15
code/datums/uplink/highly visible and dangerous weapons.dm
View File

@@ -26,7 +26,7 @@
/datum/uplink_item/item/visible_weapons/g9mm
name = "Silenced 9mm"
item_cost = 8
item_cost = 6
path = /obj/item/storage/box/syndie_kit/g9mm
/datum/uplink_item/item/visible_weapons/hammer
@@ -76,17 +76,12 @@
/datum/uplink_item/item/visible_weapons/ballisticgauntlet
name = "Ballistic Gauntlet"
item_cost = 12
item_cost = 10
path = /obj/item/clothing/gloves/ballistic
/datum/uplink_item/item/visible_weapons/heavysniper
name = "Anti-materiel Rifle"
item_cost = DEFAULT_TELECRYSTAL_AMOUNT
path = /obj/item/gun/projectile/heavysniper
/datum/uplink_item/item/visible_weapons/gatling
name = "Gatling Machine Gun"
item_cost = DEFAULT_TELECRYSTAL_AMOUNT*2
item_cost = 50
path = /obj/item/minigunpack
/datum/uplink_item/item/visible_weapons/chainsaw
@@ -121,10 +116,10 @@
/datum/uplink_item/item/visible_weapons/custom_ka
name = "Kinetic Laser Assembly"
item_cost = 12
item_cost = 8
path = /obj/item/gun/custom_ka/frame01/illegal
/datum/uplink_item/item/visible_weapons/random_weapon
name = "Random Gun"
item_cost = 13
item_cost = 10
path = /obj/item/storage/box/syndie_kit/random_weapon

8
code/datums/uplink/implants.dm
View File

@@ -6,24 +6,24 @@
/datum/uplink_item/item/implants/imp_freedom
name = "Freedom Implant"
item_cost = 6
item_cost = 5
path = /obj/item/storage/box/syndie_kit/imp_freedom
/datum/uplink_item/item/implants/imp_compress
name = "Compressed Matter Implant"
desc = "A box containing a single implanter and matter cartridge. To remove an unintended target, use the implanter in-hand then open the cartridge with a screwdriver."
item_cost = 8
item_cost = 6
path = /obj/item/storage/box/syndie_kit/imp_compress
/datum/uplink_item/item/implants/imp_explosive
name = "Explosive Implant (DANGER!)"
item_cost = 10
item_cost = 8
desc = "A box containing an explosive implant and implanter. Use the implant in-hand to set the explosion size and trigger phrase."
path = /obj/item/storage/box/syndie_kit/imp_explosive
/datum/uplink_item/item/implants/imp_deadman
name = "Deadman Implant (DANGER!)"
item_cost = 8
item_cost = 6
desc = "A box containing an explosive implant and implanter. The implant monitors vitals and will detonate when the subject dies."
path = /obj/item/storage/box/syndie_kit/imp_deadman

6
code/datums/uplink/medical.dm
View File

@@ -11,17 +11,17 @@
/datum/uplink_item/item/medical/combathypo
name = "Combat Hypospray"
item_cost = 5
item_cost = 4
path = /obj/item/reagent_containers/hypospray/combat
/datum/uplink_item/item/medical/surgery
name = "Surgery Kit"
item_cost = 8
item_cost = 5
path = /obj/item/storage/firstaid/surgery
/datum/uplink_item/item/medical/combat
name = "Combat Medical Kit"
item_cost = 6
item_cost = 4
path = /obj/item/storage/firstaid/combat
/datum/uplink_item/item/medical/stimulants

8
code/datums/uplink/revolution.dm
View File

@@ -4,23 +4,23 @@
/datum/uplink_item/item/revolution/armory
name = "Armory Dropper"
desc = "A device that can be used to drop in an armory-worth of guns. Can only be used outside station areas, unless emagged, which is hazardous."
item_cost = 45
item_cost = 40
path = /obj/item/device/orbital_dropper/armory/syndicate
/datum/uplink_item/item/revolution/implants
name = "Box of Aggression Implants"
desc = "A box containing implants that will make their owners increasingly aggressive."
item_cost = 10
item_cost = 6
path = /obj/item/storage/box/aggression
/datum/uplink_item/item/revolution/encryption_keys
name = "Box of Encryption Keys"
desc = "A box of encryption keys that gives the user a safe channel to chatter in. Access safe channel with :x."
item_cost = 15
item_cost = 12
path = /obj/item/storage/box/encryption_key
/datum/uplink_item/item/revolution/softsuits
name = "Crate of Softsuits"
desc = "A crate containing six softsuits, their helmets, and oxygen tanks. Useful for getting out of a pinch."
item_cost = 10
item_cost = 6
path = /obj/structure/closet/crate/secure/gear_loadout/syndicate_softsuits

6
code/datums/uplink/stealth and camouflage items.dm
View File

@@ -32,13 +32,13 @@
/datum/uplink_item/item/stealth_items/chameleon_projector
name = "Chameleon-Projector"
desc = "A device that can be used to mimic common items by scanning, then transforming into them."
item_cost = 8
item_cost = 7
path = /obj/item/device/chameleon
/datum/uplink_item/item/stealth_items/venenum
name = "Vial of Venenum"
desc = "A vial that contains 30u of venemum. Changes DNA structure randomly, effectively masking your appearance until it wears off. Good for 15 minutes of appearance changes."
item_cost = 4
item_cost = 3
path = /obj/item/reagent_containers/glass/beaker/vial/venenum
/datum/uplink_item/item/stealth_items/balaclava
@@ -56,5 +56,5 @@
/datum/uplink_item/item/stealth_items/closet_teleporter
name = "Closet Teleportation Set-up"
desc = "A box of closet teleporters, devices that can be inserted into closets to set up a teleportation network. Has a one minute cooldown after a batch teleport."
item_cost = 4
item_cost = 3
path = /obj/item/storage/box/closet_teleporter

8
code/datums/uplink/stealthy and inconspicuous weapons.dm
View File

@@ -22,7 +22,7 @@
/datum/uplink_item/item/stealthy_weapons/pens
name = "Pen-jector Kit"
desc = "A kit that contains four differently coloured pens. A blue pacifying pen, a green pen containing healing chemicals, and a yellow hyperzine pen."
item_cost = 5
item_cost = 4
path = /obj/item/storage/box/syndie_kit/special_pens
/datum/uplink_item/item/stealthy_weapons/parapen
@@ -32,15 +32,15 @@
/datum/uplink_item/item/stealthy_weapons/concealed_cane
name = "Concealed Cane Sword"
item_cost = 7
item_cost = 4
path = /obj/item/cane/concealed
/datum/uplink_item/item/stealthy_weapons/sleepy_ring
name = "Sleepy Ring"
item_cost = 6
item_cost = 5
path = /obj/item/clothing/ring/reagent/sleepy
/datum/uplink_item/item/stealthy_weapons/sharpened_trap
name = "Sharpened Bear Trap"
item_cost = 5
item_cost = 4
path = /obj/item/trap/sharpened

2
code/game/objects/items/devices/uplink_random_lists.dm
View File

@@ -42,8 +42,6 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/mc9mm)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/revolver)
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/a357)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/heavysniper, 15, 0)
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/sniperammo, 15, 0)
items += new/datum/uplink_random_item(/datum/uplink_item/item/grenades/emp, 50)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/crossbow, 33)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/energy_sword, 75)

4
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -249,7 +249,7 @@
/obj/item/storage/box/syndie_kit/sideeffectbegone
name = "box of sideeffect-be-gone injectors"
desc = "Comes with 2x autoinjectors filled with drugs to counter chemical side-effects. Each injector has 2 uses."
desc = "Comes with 4x autoinjectors filled with drugs to counter chemical side-effects. Each injector has 2 uses."
starts_with = list(
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 2
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 4
)

8
html/changelogs/geeves-antag_coddling.yml Normal file
View File

@@ -0,0 +1,8 @@
author: Geeves
delete-after: True
changes:
- tweak: "Lowered the cost of various uplink items across the board."
- tweak: "The sideeffect b-gone injector box on the uplink now spawns with four injectors."
- rscdel: "Removed the AMR and its ammo from the uplink."