diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index 67bc6e53baa..227c1a64338 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -62,7 +62,7 @@ #define MODE_REVENANT "revenant" #define MODE_GOLEM "golem" -#define DEFAULT_TELECRYSTAL_AMOUNT 25 +#define DEFAULT_TELECRYSTAL_AMOUNT 15 // Defines (NOT FLAGS) for making secret, random, and mixed secret less snowflake-string // and number dependant. @@ -121,4 +121,4 @@ #define VAMP_PRESENCE 0x4 #define VAMP_FRENZIED 0x8 #define VAMP_ISTHRALL 0x10 -#define VAMP_FULLPOWER 0x20 \ No newline at end of file +#define VAMP_FULLPOWER 0x20 diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 477f1e69a0b..2149de5bc48 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -2,59 +2,52 @@ * Ammunition * *************/ /datum/uplink_item/item/ammo - item_cost = 4 + item_cost = 1 category = /datum/uplink_category/ammunition /datum/uplink_item/item/ammo/mc9mm name = "9mm Magazine" - item_cost = 1 path = /obj/item/ammo_magazine/mc9mm desc = "Contains ten rounds of 9mm bullets." /datum/uplink_item/item/ammo/darts name = "Chemical Darts" - item_cost = 1 path = /obj/item/ammo_magazine/chemdart desc = "Contains five chemical darts for use with a dart gun." /datum/uplink_item/item/ammo/fourty_five name = ".45 Pistol Magazine" - item_cost = 2 path = /obj/item/ammo_magazine/c45m desc = "Contains seven rounds of .45 bullets." /datum/uplink_item/item/ammo/submachinegundrum name = "Submachine Gun Drum Magazine (.45)" - item_cost = 4 + item_cost = 2 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 = 2 path = /obj/item/ammo_magazine/submachinemag desc = "Contains twenty rounds of .45 bullets, for use with the vintage submachine gun." /datum/uplink_item/item/ammo/a357 name = ".357 Speedloader" - item_cost = 2 path = /obj/item/ammo_magazine/a357 desc = "Contains eight rounds of .357 bullets." /datum/uplink_item/item/ammo/shotgun_shells name = "Box of Shells" - 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 = 3 + item_cost = 2 path = /obj/item/ammo_magazine/plasma desc = "Contains ten plasma cells." /datum/uplink_item/item/ammo/rifle_mag name = "7.62mm clip" - item_cost = 2 path = /obj/item/ammo_magazine/boltaction - desc = "Contains five rounds of 7.62mm bullets." \ No newline at end of file + desc = "Contains five rounds of 7.62mm bullets." diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index b7b63fef46b..9e7acaa7dc2 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -12,7 +12,7 @@ /datum/uplink_item/abstract/announcements/fake_centcom/New() ..() name = "[current_map.boss_name] Update Announcement" - item_cost = round(DEFAULT_TELECRYSTAL_AMOUNT / 3) + item_cost = 5 desc = "Causes a falsified [current_map.boss_name] Update. Triggers immediately after supplying additional data." /datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user) @@ -32,7 +32,7 @@ name = "Crew Arrival Announcement/Records" desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!" antag_roles = list(MODE_MERCENARY) - item_cost = 8 + item_cost = 4 /datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args) if(!user) @@ -98,7 +98,7 @@ /datum/uplink_item/abstract/announcements/fake_radiation name = "Radiation Storm Announcement" desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment." - item_cost = 4 + item_cost = 3 /datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc) var/static/cooldown = 0 diff --git a/code/datums/uplink/corporate_equipment.dm b/code/datums/uplink/corporate_equipment.dm index 546efeb20f0..3ecd095c49c 100644 --- a/code/datums/uplink/corporate_equipment.dm +++ b/code/datums/uplink/corporate_equipment.dm @@ -3,24 +3,24 @@ /datum/uplink_item/item/corporate_equipment/suit/zavodskoi name = "Revenant Combat Suit" - item_cost = 10 + item_cost = 5 path = /obj/structure/closet/crate/gear_loadout/zavodskoi desc = "A full spaceworthy kit of a Zavodskoi Interstellar Revenant-type combat suit. Heavily resistant against fast projectiles and backpack-portable. Only wearable by Humans and Humanoid IPCs." /datum/uplink_item/item/corporate_equipment/suit/zenghu name = "Dragon Biohazard Control Suit" - item_cost = 10 + item_cost = 5 path = /obj/structure/closet/crate/gear_loadout/zenghu desc = "A full spaceworthy kit of a Zeng-Hu Pharmaceuticals Dragon-type biohazard containment suit. Entirely resistant against radiation in most circumstances. Only wearable by Humans and Humanoid IPCs." /datum/uplink_item/item/corporate_equipment/suit/hephaestus name = "Caiman Drop Suit" - item_cost = 10 + item_cost = 5 path = /obj/structure/closet/crate/gear_loadout/hephaestus desc = "A full spaceworthy kit of a Hephaestus Industries Caiman-type terraforming suit. Very resistant against slow-moving blunt force, but heavy. Only wearable by Humans and Humanoid IPCs." /datum/uplink_item/item/corporate_equipment/suit/einstein name = "Banshee Combat Suit" - item_cost = 10 + item_cost = 5 path = /obj/structure/closet/crate/gear_loadout/einstein - desc = "A full spaceworthy kit of an Einstein Engines Banshee-type infiltration suit. Resistant against lasers, but made of paper against anything else. Only wearable by Humans and Humanoid IPCs." \ No newline at end of file + desc = "A full spaceworthy kit of an Einstein Engines Banshee-type infiltration suit. Resistant against lasers, but made of paper against anything else. Only wearable by Humans and Humanoid IPCs." diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm index 0e85f0da17b..cae29a14615 100644 --- a/code/datums/uplink/devices and tools.dm +++ b/code/datums/uplink/devices and tools.dm @@ -12,25 +12,25 @@ /datum/uplink_item/item/tools/toolbelt name = "Fully Loaded Tool-belt" - item_cost = 2 + item_cost = 1 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." /datum/uplink_item/item/tools/money name = "Operations Funding" - item_cost = 2 + item_cost = 1 path = /obj/item/storage/secure/briefcase/money desc = "A briefcase with 10,000 untraceable credits for funding your sneaky activities." /datum/uplink_item/item/tools/firingpin //todo, make this a special syndicate one instead of just a normal one? name = "Firing Pin" - item_cost = 2 + item_cost = 1 path = /obj/item/device/firing_pin desc = "A Syndicate-branded Firing pin - It should be compatible with nearly every weapon onboard." /datum/uplink_item/item/tools/surge name = "IPC surge prevention module" - item_cost = 10 + item_cost = 3 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" @@ -41,42 +41,42 @@ /datum/uplink_item/item/tools/plastique name = "C-4 (Destroys walls)" - item_cost = 2 + item_cost = 1 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 = 3 + item_cost = 2 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 = 3 + item_cost = 1 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 = 2 + item_cost = 1 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 = 5 + item_cost = 1 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 = 4 + item_cost = 1 path = /obj/item/device/personal_shield /datum/uplink_item/item/tools/hacking_tool name = "Door Hacking Tool" - item_cost = 4 + item_cost = 1 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. \ @@ -89,12 +89,12 @@ /datum/uplink_item/item/tools/thermal name = "Thermal Imaging Glasses" - item_cost = 6 + item_cost = 2 path = /obj/item/clothing/glasses/thermal/syndi /datum/uplink_item/item/tools/powersink name = "Powersink (DANGER!)" - item_cost = 10 + item_cost = 6 path = /obj/item/device/powersink /datum/uplink_item/item/tools/teleporter/New() @@ -103,56 +103,56 @@ /datum/uplink_item/item/tools/ai_module name = "Hacked AI Upload Module" - item_cost = 12 + item_cost = 4 path = /obj/item/aiModule/syndicate /datum/uplink_item/item/tools/supply_beacon name = "Hacked Supply Beacon (DANGER!)" - item_cost = 10 + item_cost = 4 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." /datum/uplink_item/item/tools/advancedpinpointer name = "Advanced pinpointer" - item_cost = 15 + item_cost = 5 path = /obj/item/pinpointer/advpinpointer desc = "An advanced pinpointer that can find any target with DNA along with various other items." /datum/uplink_item/item/tools/syndieborg name = "Syndicate Cyborg Teleporter" - item_cost = 35 + item_cost = 20 path = /obj/item/antag_spawner/borg_tele /datum/uplink_item/item/tools/thermal_drill name = "Thermal Safe Drill" - item_cost = 8 + item_cost = 3 path = /obj/item/thermal_drill /datum/uplink_item/item/tools/heatpatch name = "HUDPatch, Thermal" - item_cost = 6 + item_cost = 2 path = /obj/item/clothing/glasses/eyepatch/hud/thermal /datum/uplink_item/item/tools/nightpatch name = "HUDPatch, Night-Vision" - item_cost = 2 + item_cost = 1 path = /obj/item/clothing/glasses/eyepatch/hud/night /datum/uplink_item/item/tools/aviatortherm name = "Aviators, Thermal" - item_cost = 6 + item_cost = 2 path = /obj/item/clothing/glasses/thermal/aviator desc = "A pair of thermal-vision glasses disguised as aviator shades." /datum/uplink_item/item/tools/aviatornight name = "Aviators, Night-Vision" - item_cost = 2 + item_cost = 1 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 = 2 + item_cost = 1 path = /obj/item/device/suit_cooling_unit desc = "A suit cooling unit with a high capacity power cell." @@ -170,24 +170,24 @@ /datum/uplink_item/item/tools/pin_extractor name = "Firing Pin Extractor" - item_cost = 2 + item_cost = 1 path = /obj/item/device/pin_extractor desc = "An extractor tool capable of extracting firing pins from most firearms." /datum/uplink_item/item/tools/radio_jammer name = "Radio Jammer" - item_cost = 5 + item_cost = 2 path = /obj/item/device/radiojammer desc = "A small jammer that can fit inside a pocket. Capable of disrupting nearby radios and hivenet transmitters." /datum/uplink_item/item/tools/jetpack name = "Jetpack" - item_cost = 3 + item_cost = 1 path = /obj/item/tank/jetpack/oxygen /datum/uplink_item/item/tools/electropack name = "Electropack" - item_cost = 3 + item_cost = 1 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." @@ -199,17 +199,17 @@ /datum/uplink_item/item/tools/mesons_glasses name = "Mesons Scanners" desc = "These glasses make use of meson-scanning technology to allow the wearer to see through solid walls and floors." - item_cost = 2 + item_cost = 1 path = /obj/item/clothing/glasses/meson /datum/uplink_item/item/tools/materials_glasses name = "Optical Material Scanner" desc = "These glasses make use of scanning technology to allow the wearer to see objects through solid walls and floors." - item_cost = 2 + item_cost = 1 path = /obj/item/clothing/glasses/material /datum/uplink_item/item/tools/earmuff_headset name = "Earmuff Headset" desc = "This set of earmuffs has a secret compartment housing radio gear, allowing it to function as a standard headset." - item_cost = 2 - path = /obj/item/device/radio/headset/earmuff \ No newline at end of file + item_cost = 1 + path = /obj/item/device/radio/headset/earmuff diff --git a/code/datums/uplink/exosuit.dm b/code/datums/uplink/exosuit.dm index 54a58e58ba0..69442c9fcce 100644 --- a/code/datums/uplink/exosuit.dm +++ b/code/datums/uplink/exosuit.dm @@ -4,23 +4,23 @@ /datum/uplink_item/item/exosuit/combat name = "Combat Exosuit Dropper" desc = "A device that can be used to drop in a combat exosuit. Can only be used outside station areas, unless emagged, which is hazardous." - item_cost = 40 + item_cost = 25 path = /obj/item/device/orbital_dropper/mecha/combat /datum/uplink_item/item/exosuit/heavy name = "Heavy Exosuit Dropper" desc = "A device that can be used to drop in a heavy exosuit. Can only be used outside station areas, unless emagged, which is hazardous." - item_cost = 35 + item_cost = 20 path = /obj/item/device/orbital_dropper/mecha/heavy /datum/uplink_item/item/exosuit/light name = "Light Exosuit Dropper" desc = "A device that can be used to drop in a light exosuit. Can only be used outside station areas, unless emagged, which is hazardous." - item_cost = 25 + item_cost = 15 path = /obj/item/device/orbital_dropper/mecha /datum/uplink_item/item/exosuit/powerloader name = "Powerloader Exosuit Dropper" desc = "A device that can be used to drop in a powerloader exosuit. Can only be used outside station areas, unless emagged, which is hazardous." - item_cost = 20 - path = /obj/item/device/orbital_dropper/mecha/powerloader \ No newline at end of file + item_cost = 10 + path = /obj/item/device/orbital_dropper/mecha/powerloader diff --git a/code/datums/uplink/exosuit_equipment.dm b/code/datums/uplink/exosuit_equipment.dm index fb009c1c0b4..97cac824b6c 100644 --- a/code/datums/uplink/exosuit_equipment.dm +++ b/code/datums/uplink/exosuit_equipment.dm @@ -6,31 +6,31 @@ /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 = 4 + item_cost = 2 path = /obj/item/mecha_equipment/mounted_system/combat/taser /datum/uplink_item/item/exosuit_equipment/mounted_gun/ion name = "Mounted Ion Rifle" desc = "An exosuit-mounted ion rifle. Handle with care." - item_cost = 12 + item_cost = 7 path = /obj/item/mecha_equipment/mounted_system/combat/ion /datum/uplink_item/item/exosuit_equipment/mounted_gun/laser name = "Mounted Laser Rifle" desc = "An exosuit-mounted laser rifle. Handle with care." - item_cost = 8 + item_cost = 3 path = /obj/item/mecha_equipment/mounted_system/combat/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 = 8 + item_cost = 3 path = /obj/item/mecha_equipment/mounted_system/combat/smg /datum/uplink_item/item/exosuit_equipment/mounted_launcher name = "Mounted Missile Rack" desc = "An SRM-8 missile rack loaded with explosive missiles." - item_cost = 20 + item_cost = 10 path = /obj/item/mecha_equipment/mounted_system/combat/missile // UTILITY // @@ -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 = 10 + item_cost = 5 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 = 3 + item_cost = 1 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 = 8 + item_cost = 2 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 = 4 + item_cost = 1 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 = 3 + item_cost = 1 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 = 6 + item_cost = 1 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 = 5 - path = /obj/item/mecha_equipment/crisis_drone \ No newline at end of file + item_cost = 1 + path = /obj/item/mecha_equipment/crisis_drone diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index e8a26a3b253..f8a1f66bc0f 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -1,6 +1,6 @@ /datum/uplink_item/item/gear_loadout category = /datum/uplink_category/gear_loadout - item_cost = 70 + item_cost = 35 /datum/uplink_item/item/gear_loadout/coalition name = "Coalition of Colonies Assets (Group)" @@ -9,7 +9,7 @@ /datum/uplink_item/item/gear_loadout/coalition_single name = "Coalition of Colonies Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/coalition_single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/eridani name = "Eridani Corporate Federation Assets (Group)" @@ -18,7 +18,7 @@ /datum/uplink_item/item/gear_loadout/eridani_single name = "Eridani Corporate Federation Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/eridani_single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/elyra name = "Serene Republic of Elyra Assets (Group)" @@ -27,7 +27,7 @@ /datum/uplink_item/item/gear_loadout/elyra_single name = "Serene Republic of Elyra Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/elyra_single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/elyra name = "Serene Republic of Elyra Assets (Group)" @@ -36,7 +36,7 @@ /datum/uplink_item/item/gear_loadout/elyra_single name = "Serene Republic of Elyra Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/elyra_single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/sol name = "Sol Alliance Assets (Group)" @@ -45,7 +45,7 @@ /datum/uplink_item/item/gear_loadout/sol_single name = "Sol Alliance Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/sol_single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/dominia name = "Empire of Dominia Assets (Group)" @@ -54,12 +54,12 @@ /datum/uplink_item/item/gear_loadout/dominia_single name = "Empire of Dominia Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single - item_cost = 15 + item_cost = 10 /datum/uplink_item/item/gear_loadout/cowboys name = "Frontier Cowboys (Group)" path = /obj/structure/closet/crate/secure/gear_loadout/ram_ranch - item_cost = 50 + item_cost = 35 /datum/uplink_item/item/gear_loadout/cowboy_single name = "Frontier Cowboy (Single)" @@ -75,4 +75,4 @@ name = "Kosmostrelki Assets (Single)" desc = "A crate containing gear for a single individual.The voidsuit is only usable by Tajara." path = /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single - item_cost = 15 \ No newline at end of file + item_cost = 10 diff --git a/code/datums/uplink/grenades.dm b/code/datums/uplink/grenades.dm index 33ff1c7bcf7..c5ca626be53 100644 --- a/code/datums/uplink/grenades.dm +++ b/code/datums/uplink/grenades.dm @@ -6,41 +6,41 @@ /datum/uplink_item/item/grenades/manhack name = "Viscerator Delivery Grenade" - item_cost = 3 + item_cost = 2 path = /obj/item/grenade/spawnergrenade/manhacks desc = "A grenade that deploys five viscerator combat drones. Deadly in numbers, will not attack you or your allies." /datum/uplink_item/item/grenades/lubed_manhack name = "Lubed Viscerator Delivery Grenade" - item_cost = 8 + item_cost = 4 path = /obj/item/grenade/spawnergrenade/manhacks/lubed desc = "A grenade that deploys five lubed viscerator combat drones. Deadly in numbers, will not attack you or your allies. Works best when killed." /datum/uplink_item/item/grenades/anti_photon name = "5xPhoton Disruption Grenades" - item_cost = 2 + item_cost = 1 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 = 2 + item_cost = 1 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 = 5 + item_cost = 2 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." /datum/uplink_item/item/grenades/frag name = "5xFrag Grenades" - item_cost = 12 + item_cost = 6 path = /obj/item/storage/box/frags /datum/uplink_item/item/grenades/cardox name = "5xCardox Grenades" - item_cost = 5 + item_cost = 2 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." \ No newline at end of file + 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." diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm index 9d28710c91c..35a90951d21 100644 --- a/code/datums/uplink/hardsuit_modules.dm +++ b/code/datums/uplink/hardsuit_modules.dm @@ -6,41 +6,41 @@ /datum/uplink_item/item/hardsuit_modules/thermal name = "Thermal Scanner" - item_cost = 4 + item_cost = 1 path = /obj/item/rig_module/vision/thermal /datum/uplink_item/item/hardsuit_modules/energy_net name = "Net Projector" - item_cost = 5 + item_cost = 3 path = /obj/item/rig_module/fabricator/energy_net /datum/uplink_item/item/hardsuit_modules/ewar_voice name = "Electrowarfare Suite and Voice Synthesiser" - item_cost = 5 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/ewar_voice /datum/uplink_item/item/hardsuit_modules/maneuvering_jets name = "Maneuvering Jets" - item_cost = 6 + item_cost = 1 path = /obj/item/rig_module/maneuvering_jets /datum/uplink_item/item/hardsuit_modules/egun name = "Mounted Energy Gun" - item_cost = 10 + item_cost = 6 path = /obj/item/rig_module/mounted/egun /datum/uplink_item/item/hardsuit_modules/power_sink name = "Power Sink" - item_cost = 8 + item_cost = 2 path = /obj/item/rig_module/power_sink /datum/uplink_item/item/hardsuit_modules/laser_canon name = "Mounted Laser Cannon" - item_cost = 14 + item_cost = 8 path = /obj/item/rig_module/mounted /datum/uplink_item/item/tools/rig_cooling_unit name = "mounted suit cooling unit" - item_cost = 6 + item_cost = 1 path = /obj/item/rig_module/cooling_unit - desc = "A mounted suit cooling unit for use with hardsuits." \ No newline at end of file + desc = "A mounted suit cooling unit for use with hardsuits." diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm index a171b2f4b25..447d9c7f760 100644 --- a/code/datums/uplink/highly visible and dangerous weapons.dm +++ b/code/datums/uplink/highly visible and dangerous weapons.dm @@ -6,117 +6,117 @@ /datum/uplink_item/item/visible_weapons/dartgun name = "Dart Gun" - item_cost = 5 + item_cost = 3 path = /obj/item/gun/projectile/dartgun /datum/uplink_item/item/visible_weapons/crossbow name = "Energy Crossbow" - item_cost = 6 + item_cost = 3 path = /obj/item/gun/energy/crossbow /datum/uplink_item/item/visible_weapons/forcegloves name = "Force Gloves" - item_cost = 5 + item_cost = 3 path = /obj/item/clothing/gloves/force/syndicate /datum/uplink_item/item/visible_weapons/energy_sword name = "Energy Sword" - item_cost = 8 + item_cost = 4 path = /obj/item/melee/energy/sword /datum/uplink_item/item/visible_weapons/g9mm name = "Silenced 9mm" - item_cost = 6 + item_cost = 2 path = /obj/item/storage/box/syndie_kit/g9mm /datum/uplink_item/item/visible_weapons/hammer name = "Kneebreaker Hammer" - item_cost = 5 + item_cost = 3 path = /obj/item/melee/hammer /datum/uplink_item/item/visible_weapons/revolver name = "Revolver" - item_cost = 8 + item_cost = 4 path = /obj/item/gun/projectile/revolver /datum/uplink_item/item/visible_weapons/submachinegun name = "Submachine Gun" - item_cost = 14 + item_cost = 8 path = /obj/item/gun/projectile/automatic/tommygun /datum/uplink_item/item/visible_weapons/landmine name = "Land Mine" - item_cost = 5 + item_cost = 3 path = /obj/item/landmine /datum/uplink_item/item/visible_weapons/emplandmine name = "EMP Land Mine" - item_cost = 4 + item_cost = 3 path = /obj/item/landmine/emp /datum/uplink_item/item/visible_weapons/sleepylandmine name = "N2O Land Mine" - item_cost = 7 + item_cost = 3 path = /obj/item/landmine/n2o /datum/uplink_item/item/visible_weapons/caltrops name = "Caltrops" - item_cost = 4 + item_cost = 1 path = /obj/item/material/caltrops /datum/uplink_item/item/visible_weapons/powerfist name = "Power Fist" - item_cost = 4 + item_cost = 2 path = /obj/item/clothing/gloves/powerfist /datum/uplink_item/item/visible_weapons/clawedgloves name = "Clawed Gauntlets" - item_cost = 5 + item_cost = 3 path = /obj/item/clothing/gloves/claws /datum/uplink_item/item/visible_weapons/ballisticgauntlet name = "Ballistic Gauntlet" - item_cost = 10 + item_cost = 6 path = /obj/item/clothing/gloves/ballistic /datum/uplink_item/item/visible_weapons/gatling name = "Gatling Machine Gun" - item_cost = 50 + item_cost = 30 path = /obj/item/minigunpack /datum/uplink_item/item/visible_weapons/chainsaw name = "Chainsaw" - item_cost = 10 + item_cost = 6 path = /obj/item/material/twohanded/chainsaw/fueled /datum/uplink_item/item/visible_weapons/throwing_star name = "Steel Throwing Star" - item_cost = 2 + item_cost = 1 path = /obj/item/material/star /datum/uplink_item/item/visible_weapons/plasma_shotty name = "Plasma Shotgun" - item_cost = 15 + item_cost = 9 path = /obj/item/gun/projectile/plasma /datum/uplink_item/item/visible_weapons/icelance name = "Icelance Rifle" - item_cost = 6 + item_cost = 3 path = /obj/item/gun/energy/rifle/icelance /datum/uplink_item/item/visible_weapons/boltaction name = "Bolt-Action Rifle" - item_cost = 8 + item_cost = 3 path = /obj/item/gun/projectile/shotgun/pump/rifle /datum/uplink_item/item/visible_weapons/colt name = "Vintage .45 Pistol" - item_cost = 6 + item_cost = 2 path = /obj/item/gun/projectile/colt /datum/uplink_item/item/visible_weapons/custom_ka name = "Kinetic Laser Assembly" - item_cost = 8 + item_cost = 3 path = /obj/item/gun/custom_ka/frame01/illegal /datum/uplink_item/item/visible_weapons/teslagauntlet @@ -126,5 +126,5 @@ /datum/uplink_item/item/visible_weapons/random_weapon name = "Random Gun" - item_cost = 10 + item_cost = 3 path = /obj/item/storage/box/syndie_kit/random_weapon diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm index 4ae8df168fc..3f5d8a67e9c 100644 --- a/code/datums/uplink/implants.dm +++ b/code/datums/uplink/implants.dm @@ -6,24 +6,24 @@ /datum/uplink_item/item/implants/imp_freedom name = "Freedom Implant" - item_cost = 5 + item_cost = 1 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 = 6 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/imp_compress /datum/uplink_item/item/implants/imp_explosive name = "Explosive Implant (DANGER!)" - item_cost = 8 + item_cost = 4 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 = 6 + item_cost = 3 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 diff --git a/code/datums/uplink/martial_arts.dm b/code/datums/uplink/martial_arts.dm index ea995a9d182..b86ad7199d4 100644 --- a/code/datums/uplink/martial_arts.dm +++ b/code/datums/uplink/martial_arts.dm @@ -3,21 +3,21 @@ /datum/uplink_item/item/martial_arts/solcom name = "SolCom" - item_cost = 6 + item_cost = 2 path = /obj/item/martial_manual /datum/uplink_item/item/martial_arts/wrestling name = "Wrestling" - item_cost = 6 + item_cost = 2 path = /obj/item/martial_manual/wrestling /datum/uplink_item/item/martial_arts/swordsmanship name = "Swordsmanship" - item_cost = 5 + item_cost = 2 path = /obj/item/martial_manual/swordsmanship /datum/uplink_item/item/martial_arts/gun_kata name = "Gun-Kata" desc = "A manual containing basic Gun-Kata instruction and techniques. This is for projectile weapons, allowing you to reload by using a gun on a magazine, and automatically ejecting the magazine when it's empty." - item_cost = 4 - path = /obj/item/martial_manual/gun_kata \ No newline at end of file + item_cost = 1 + path = /obj/item/martial_manual/gun_kata diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index 014c1a8c043..999260c3469 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -11,30 +11,30 @@ /datum/uplink_item/item/medical/combathypo name = "Combat Hypospray" - item_cost = 4 + item_cost = 1 path = /obj/item/reagent_containers/hypospray/combat /datum/uplink_item/item/medical/surgery name = "Surgery Kit" - item_cost = 5 + item_cost = 1 path = /obj/item/storage/firstaid/surgery /datum/uplink_item/item/medical/combat name = "Combat Medical Kit" - item_cost = 4 + item_cost = 1 path = /obj/item/storage/firstaid/combat /datum/uplink_item/item/medical/stimulants name = "Box of Combat Stimulants" - item_cost = 4 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/stimulants /datum/uplink_item/item/medical/sideeffectbegone name = "Box of Sideeffect-Be-Gone Injectors" - item_cost = 3 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/sideeffectbegone /datum/uplink_item/item/medical/firstaid name = "Standard First-Aid Kit" - item_cost = 2 + item_cost = 1 path = /obj/item/storage/firstaid/regular diff --git a/code/datums/uplink/ninja_modules.dm b/code/datums/uplink/ninja_modules.dm index 71d714aaca4..2529ac6fc29 100644 --- a/code/datums/uplink/ninja_modules.dm +++ b/code/datums/uplink/ninja_modules.dm @@ -7,65 +7,65 @@ /datum/uplink_item/item/ninja_modules/energency_generator name = "Emergency Power Generator" desc = "An emergency use power generator that gives 1000 power to the suits battery. Has a long cooldown." - item_cost = 4 + item_cost = 2 path = /obj/item/rig_module/emergency_powergenerator /datum/uplink_item/item/ninja_modules/energy_net name = "Energy Net" desc = "An unlimited use net, if the user has enough power, that can be thrown at others causing them to be trapped. The net can be broken with brute force.." - item_cost = 4 + item_cost = 3 path = /obj/item/rig_module/fabricator/energy_net /datum/uplink_item/item/ninja_modules/stealth_field name = "Stealth Field" desc = "A module that allows the user to go invisible. Consumes power when active." - item_cost = 6 + item_cost = 5 path = /obj/item/rig_module/stealth_field /datum/uplink_item/item/ninja_modules/normal_grenade_lancher name = "Standard Grenade Launcher" desc = "A shoulder mounted grenade launcher with 3 EMP, Smoke, and flashbang grenades.It can be refilled with more grenades." - item_cost = 6 + item_cost = 5 path = /obj/item/rig_module/grenade_launcher /datum/uplink_item/item/ninja_modules/enery_blade name = "Energy Blade and dart launcher." desc = "A module that can produce a powerful energy blade in the users hand. It can also shoot stun-darts." - item_cost = 8 + item_cost = 4 path = /obj/item/rig_module/mounted/energy_blade /datum/uplink_item/item/ninja_modules/matter_fab name = "Matter Fabricator" desc = "A hardsuit matter fabricator that can produce sharp steel ninja stars used for throwing." - item_cost = 4 + item_cost = 3 path = /obj/item/rig_module/fabricator /datum/uplink_item/item/ninja_modules/emag_hand name = "EMAG Hand Module" desc = "A module that allows the user to apply an EMAG effect to the targeted item." - item_cost = 5 + item_cost = 1 path = /obj/item/rig_module/device/emag_hand /datum/uplink_item/item/ninja_modules/chem_injector name = "Chemical Injector" desc = "A chemical injector that allows the user to inject themsleves with medical chemicals." - item_cost = 3 + item_cost = 1 path = /obj/item/rig_module/chem_dispenser /datum/uplink_item/item/ninja_modules/EMP_Shield name = "Active EMP Shielding" desc = "A very complicated module for a hardsuit that protects it to some degree from EMPs." - item_cost = 4 + item_cost = 1 path = /obj/item/rig_module/emp_shielding /datum/uplink_item/item/ninja_modules/combat_injector name = "Combat Injector" desc = "A chemical injector that allows the user to inject themsleves with combat chemicals." - item_cost = 4 + item_cost = 2 path = /obj/item/rig_module/chem_dispenser/combat /datum/uplink_item/item/ninja_modules/self_destruct name = "Self-destruct Module" desc = "A Self-destruct Module that causes an explosion when the user dies or presses the switch." - item_cost = 8 + item_cost = 5 path = /obj/item/rig_module/self_destruct diff --git a/code/datums/uplink/revolution.dm b/code/datums/uplink/revolution.dm index 900a9eee948..f337a0d7469 100644 --- a/code/datums/uplink/revolution.dm +++ b/code/datums/uplink/revolution.dm @@ -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 = 40 + item_cost = 25 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 = 6 + item_cost = 2 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 = 12 + item_cost = 3 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 = 6 - path = /obj/structure/closet/crate/secure/gear_loadout/syndicate_softsuits \ No newline at end of file + item_cost = 3 + path = /obj/structure/closet/crate/secure/gear_loadout/syndicate_softsuits diff --git a/code/datums/uplink/stealth and camouflage items.dm b/code/datums/uplink/stealth and camouflage items.dm index b5cc17dae4e..f57768b3884 100644 --- a/code/datums/uplink/stealth and camouflage items.dm +++ b/code/datums/uplink/stealth and camouflage items.dm @@ -11,34 +11,34 @@ /datum/uplink_item/item/stealth_items/spy name = "Bug Kit" - item_cost = 2 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/spy /datum/uplink_item/item/stealth_items/id name = "Agent ID card" - item_cost = 4 + item_cost = 1 path = /obj/item/card/id/syndicate /datum/uplink_item/item/stealth_items/chameleon_kit name = "Chameleon Kit" - item_cost = 5 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/chameleon /datum/uplink_item/item/stealth_items/voice name = "Voice Changer" - item_cost = 5 + item_cost = 1 path = /obj/item/clothing/mask/gas/voice /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 = 7 + item_cost = 2 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 = 3 + item_cost = 1 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 = 3 - path = /obj/item/storage/box/closet_teleporter \ No newline at end of file + item_cost = 1 + path = /obj/item/storage/box/closet_teleporter diff --git a/code/datums/uplink/stealthy and inconspicuous weapons.dm b/code/datums/uplink/stealthy and inconspicuous weapons.dm index 0cae034bedb..f6dea20df5d 100644 --- a/code/datums/uplink/stealthy and inconspicuous weapons.dm +++ b/code/datums/uplink/stealthy and inconspicuous weapons.dm @@ -11,36 +11,36 @@ /datum/uplink_item/item/stealthy_weapons/cigarette_kit name = "Cigarette Kit" - item_cost = 2 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/cigarette /datum/uplink_item/item/stealthy_weapons/random_toxin name = "Random Toxin - Beaker" - item_cost = 2 + item_cost = 1 path = /obj/item/storage/box/syndie_kit/toxin /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 = 4 + item_cost = 2 path = /obj/item/storage/box/syndie_kit/special_pens /datum/uplink_item/item/stealthy_weapons/parapen name = "Paralysis pen" - item_cost = 6 + item_cost = 3 path = /obj/item/pen/reagent/paralysis /datum/uplink_item/item/stealthy_weapons/concealed_cane name = "Concealed Cane Sword" - item_cost = 4 + item_cost = 1 path = /obj/item/cane/concealed /datum/uplink_item/item/stealthy_weapons/sleepy_ring name = "Sleepy Ring" - item_cost = 5 + item_cost = 3 path = /obj/item/clothing/ring/reagent/sleepy /datum/uplink_item/item/stealthy_weapons/bear_trap name = "Sharpened Bear Trap" - item_cost = 5 - path = /obj/item/trap/sharpened \ No newline at end of file + item_cost = 2 + path = /obj/item/trap/sharpened diff --git a/html/changelogs/28feb21-thegreatTCrework.yml b/html/changelogs/28feb21-thegreatTCrework.yml new file mode 100644 index 00000000000..88b2b7c2aba --- /dev/null +++ b/html/changelogs/28feb21-thegreatTCrework.yml @@ -0,0 +1,43 @@ + +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Scheveningen + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - balance: "Reduced overall TC amount granted to all antag uplinks to 15. This was so that it still maintains the concept of having to ration between weapons and non-combat uplink equipment, displayed below." + - balance: "Greatly lowered costs of non-combat uplink equipment. Most weapons that can be acquired through the uplink have had their cost adjusted, rounded down. Relatively speaking, all weapons from the uplink should be very similar impact on the overall TC pool as before."