Antag Uplink Expansion (#6788)

* Adds Energy Daggerpens, Thieves gloves and Buzzer Ring. * Updoot * fixfix weakfire * Extra Touches * chlgongog * Fix antag injector cases.
2025-12-30 12:03:11 +00:00 · 2020-03-16 21:21:41 -07:00
parent a5e17e4d6d
commit c7ba2a8e4b
33 changed files with 717 additions and 28 deletions
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -13,7 +13,7 @@
 /datum/uplink_item/abstract/announcements/fake_centcom
 	name = "Command Update Announcement"
 	desc = "Causes a falsified Command Update. Triggers immediately after supplying additional data."
-	item_cost = 40
+	item_cost = 20

 /datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user)
 	var/title = sanitize(input("Enter your announcement title.", "Announcement Title") as null|text)
@@ -41,7 +41,7 @@
 /datum/uplink_item/abstract/announcements/fake_crew_arrival
 	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!"
-	item_cost = 30
+	item_cost = 15

 /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)
--- a/code/datums/uplink/armor.dm
+++ b/code/datums/uplink/armor.dm
@@ -13,3 +13,18 @@
 	name = "Heavy Armor Vest"
 	item_cost = 40
 	path = /obj/item/clothing/suit/storage/vest/heavy/merc
+
+/datum/uplink_item/item/armor/gorlexsuit
+	name = "Mercenary Voidsuit"
+	item_cost = 40
+	path = /obj/item/weapon/storage/box/syndie_kit/voidsuit
+
+/datum/uplink_item/item/armor/gorlexsuit_fire
+	name = "Mercenary Voidsuit (Fire)"
+	item_cost = 40
+	path = /obj/item/weapon/storage/box/syndie_kit/voidsuit/fire
+
+/datum/uplink_item/item/armor/combat
+	name = "Combat Platecarrier Set"
+	item_cost = 60
+	path = /obj/item/clothing/suit/armor/pcarrier/merc
--- a/code/datums/uplink/implants.dm
+++ b/code/datums/uplink/implants.dm
@@ -25,51 +25,51 @@
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink

 /datum/uplink_item/item/implants/imp_shades
-	name = "Integrated Thermal-Shades Implant (Organic)"
+	name = "Integrated Thermal-Shades Implant"
 	item_cost = 80
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug

 /datum/uplink_item/item/implants/imp_taser
-	name = "Integrated Taser Implant (Organic)"
+	name = "Integrated Taser Implant"
 	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/taser

 /datum/uplink_item/item/implants/imp_laser
-	name = "Integrated Laser Implant (Organic)"
+	name = "Integrated Laser Implant"
 	item_cost = 50
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/laser

 /datum/uplink_item/item/implants/imp_dart
-	name = "Integrated Dart Implant (Organic)"
+	name = "Integrated Dart Implant"
 	item_cost = 60
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/dart

 /datum/uplink_item/item/implants/imp_toolkit
-	name = "Integrated Toolkit Implant (Organic)"
+	name = "Integrated Toolkit Implant"
 	item_cost = 80
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/toolkit

 /datum/uplink_item/item/implants/imp_medkit
-	name = "Integrated Medkit Implant (Organic)"
+	name = "Integrated Medkit Implant"
 	item_cost = 60
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/medkit

 /datum/uplink_item/item/implants/imp_analyzer
-	name = "Integrated Research Scanner Implant (Organic)"
+	name = "Integrated Research Scanner Implant"
 	item_cost = 20
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/analyzer

 /datum/uplink_item/item/implants/imp_sword
-	name = "Integrated Sword Implant (Organic)"
+	name = "Integrated Sword Implant"
 	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/sword

 /datum/uplink_item/item/implants/imp_sprinter
-	name = "Integrated Sprinter Implant (Organic)"
+	name = "Integrated Sprinter Implant"
 	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/sprinter

 /datum/uplink_item/item/implants/imp_sprinter
-	name = "Integrated Surge Implant (Organic)"
+	name = "Integrated Surge Implant"
 	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/surge
--- a/code/datums/uplink/medical.dm
+++ b/code/datums/uplink/medical.dm
@@ -24,11 +24,23 @@
 	item_cost = 10
 	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting

+/datum/uplink_item/item/medical/clotting_case
+	name = "Clotting Medicine case"
+	item_cost = 20
+	desc = "A case of three myelamine injectors. Can rapidly remove and stow up to six injectors."
+	path = /obj/item/weapon/storage/quickdraw/syringe_case/clotting
+
 /datum/uplink_item/item/medical/bonemeds
 	name = "Bone Repair injector"
 	item_cost = 10
 	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed

+/datum/uplink_item/item/medical/bonemeds_case
+	name = "Bone Repair case"
+	item_cost = 20
+	desc = "A case of three osteodaxon injectors. Can rapidly remove and stow up to six injectors."
+	path = /obj/item/weapon/storage/quickdraw/syringe_case/bonemed
+
 /datum/uplink_item/item/medical/ambrosiadeusseeds
 	name = "Box of 7x ambrosia deus seed packets"
 	item_cost = 10
--- a/code/datums/uplink/resources.dm
+++ b/code/datums/uplink/resources.dm
@@ -0,0 +1,48 @@
+
+/datum/uplink_item/crated/resources
+	name = "Resource Crate"
+	desc = "A crate routed from an in-system trading post, containing various valuable materials."
+	item_cost = 60
+	category = /datum/uplink_category/services
+
+	paths = list(\
+	/obj/fiftyspawner/uranium,\
+	/obj/fiftyspawner/phoron,\
+	/obj/fiftyspawner/gold,\
+	/obj/fiftyspawner/silver,\
+	/obj/fiftyspawner/osmium,\
+	/obj/fiftyspawner/plasteel\
+	)
+
+/datum/uplink_item/crated/seeds
+	name = "Exotic Plantlife Crate"
+	desc = "A crate routed from an in-system trading post, containing various exotic plants."
+	item_cost = 20
+	category = /datum/uplink_category/services
+
+	paths = list(\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random,\
+	/obj/item/seeds/random\
+	)
+
+/datum/uplink_item/crated/spare_organs
+	name = "Spare Organ Crate"
+	desc = "A crate stolen from a medical relief ship, containing various bioprinted organs."
+	item_cost = 20
+	category = /datum/uplink_category/services
+	crate_path = /obj/structure/closet/crate/freezer
+
+	paths = list(\
+	/obj/item/organ/internal/eyes/replicant,\
+	/obj/item/organ/internal/heart/replicant,\
+	/obj/item/organ/internal/kidneys/replicant,\
+	/obj/item/organ/internal/liver/replicant,\
+	/obj/item/organ/internal/lungs/replicant,\
+	/obj/item/organ/internal/voicebox/replicant\
+	)
--- a/code/datums/uplink/stealth_items.dm
+++ b/code/datums/uplink/stealth_items.dm
@@ -37,4 +37,16 @@
 /datum/uplink_item/item/stealth_items/makeover
 	name = "Makeover Kit"
 	item_cost = 5
-	path = /obj/item/weapon/makeover
+	path = /obj/item/weapon/makeover
+
+/datum/uplink_item/item/stealth_items/thievesgloves
+	name = "Thieve's Gloves"
+	desc = "A pair of sterile gloves that allow the wearer to inspect the backpacks of other players, and swap pocket items."
+	item_cost = 30
+	path = /obj/item/clothing/gloves/sterile/thieves
+
+/datum/uplink_item/item/stealth_items/deadringer
+	name = "Stealth Watch"
+	desc = "A strange watch which can be used to create a fake corpse if you are injured when it is active, as it projects a cloaking field around your person."
+	item_cost = 50
+	path = /obj/item/weapon/deadringer
--- a/code/datums/uplink/stealthy_weapons.dm
+++ b/code/datums/uplink/stealthy_weapons.dm
@@ -33,3 +33,51 @@
 	name = "Random Toxin - Beaker"
 	item_cost = 10
 	path = /obj/item/weapon/storage/box/syndie_kit/toxin
+
+/datum/uplink_item/item/stealthy_weapons/penblade
+	name = "Energy Penblade, Black"
+	desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon."
+	item_cost = 20
+	path = /obj/item/weapon/pen/blade
+
+/datum/uplink_item/item/stealthy_weapons/penblade_red
+	name = "Energy Penblade, Red"
+	desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon."
+	item_cost = 20
+	path = /obj/item/weapon/pen/blade/red
+
+/datum/uplink_item/item/stealthy_weapons/penblade_blue
+	name = "Energy Penblade, Blue"
+	desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon."
+	item_cost = 20
+	path = /obj/item/weapon/pen/blade/blue
+
+/datum/uplink_item/item/stealthy_weapons/penblade_fancy
+	name = "Energy Penblade, Fountain"
+	desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon."
+	item_cost = 20
+	path = /obj/item/weapon/pen/blade/fountain
+
+/datum/uplink_item/item/stealthy_weapons/angrybuzzer
+	name = "Morphium Shock Ring"
+	desc = "An enigmatic ring used to create powerful electric shocks when punching. Can be used as a brute-force method of defibrillation."
+	item_cost = 40
+	path = /obj/item/clothing/gloves/ring/buzzer
+
+/datum/uplink_item/item/stealthy_weapons/huntingtrap
+	name = "Camonetted Beartraps"
+	desc = "A box of unique beartraps which will partially cloak when deployed, allowing for more effective hunting."
+	item_cost = 30
+	path = /obj/item/weapon/storage/box/syndie_kit/deadliest_game
+
+/datum/uplink_item/item/stealthy_weapons/virus
+	name = "Virus Cultures"
+	desc = "A box of three unique virus cultures. As dangerous to you as anyone else if handled improperly."
+	item_cost = 40
+	path = /obj/item/weapon/storage/box/syndie_kit/viral
+
+/datum/uplink_item/item/stealthy_weapons/syringe_case
+	name = "Quickdraw Syringe Case"
+	desc = "A small box capable of holding six syringes for rapid deployment. Fits in your pocket."
+	item_cost = 20
+	path = /obj/item/weapon/storage/quickdraw/syringe_case
--- a/code/datums/uplink/tools.dm
+++ b/code/datums/uplink/tools.dm
@@ -91,6 +91,12 @@
 	item_cost = 30
 	path = /obj/item/weapon/card/emag

+/datum/uplink_item/item/tools/graviton
+	name = "Graviton Goggles"
+	desc = "An obvious, if useful pair of advanced imaging goggles that allow you to see objects and turfs through walls."
+	item_cost = 15
+	path = /obj/item/clothing/glasses/graviton
+
 /datum/uplink_item/item/tools/thermal
 	name = "Thermal Imaging Glasses"
 	item_cost = 30
@@ -111,6 +117,11 @@
 	item_cost = 60
 	path = /obj/item/weapon/storage/box/syndie_kit/demolitions_heavy

+/datum/uplink_item/item/tools/integratedcircuitprinter
+	name = "Integrated Circuit Printer (Upgraded)"
+	item_cost = 10
+	path = /obj/item/device/integrated_circuit_printer/upgraded
+
 /*
 /datum/uplink_item/item/tools/packagebomb/huge
 	name = "Package Bomb (Huge)
--- a/code/datums/uplink/uplink_categories.dm
+++ b/code/datums/uplink/uplink_categories.dm
@@ -52,4 +52,4 @@ datum/uplink_category/ammunition
 	name = "Telecrystals"

 /datum/uplink_category/backup
-	name = "Backup"
+	name = "Backup"
--- a/code/datums/uplink/uplink_items.dm
+++ b/code/datums/uplink/uplink_items.dm
@@ -162,6 +162,36 @@ datum/uplink_item/dd_SortValue()

 	return "\icon[default_abstract_uplink_icon]"

+/*
+ * Crated goods.
+ */
+
+/datum/uplink_item/crated
+	var/crate_path = /obj/structure/largecrate
+	var/list/paths = list()	// List of paths to be spawned into the crate.
+
+/datum/uplink_item/crated/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/obj/L = new crate_path(get_turf(loc))
+
+	L.adjust_scale(rand(9, 12) / 10, rand(9, 12) / 10)	// Some variation in the crate / locker size.
+
+	for(var/path in paths)
+		var/obj/O = new path(L)
+		O.forceMove(L)
+
+	return L
+
+/datum/uplink_item/crated/description()
+	if(!desc)
+		// Fallback description
+		var/obj/temp = crate_path
+		desc = initial(temp.desc)
+	return ..()
+
+/datum/uplink_item/crated/log_icon()
+	var/obj/I = crate_path
+	return "\icon[I]"
+
 /****************
 * Support procs *
 ****************/
--- a/code/datums/uplink/visible_weapons.dm
+++ b/code/datums/uplink/visible_weapons.dm
@@ -61,7 +61,7 @@

 /datum/uplink_item/item/visible_weapons/riggedlaser
 	name = "Exosuit Rigged Laser"
-	item_cost = 60
+	item_cost = 30
 	path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser

 /datum/uplink_item/item/visible_weapons/revolver
@@ -146,7 +146,7 @@

 /datum/uplink_item/item/visible_weapons/egun
 	name = "Energy Gun"
-	item_cost = 60
+	item_cost = 30
 	path = /obj/item/weapon/gun/energy/gun

 /datum/uplink_item/item/visible_weapons/lasercannon
@@ -171,5 +171,17 @@

 /datum/uplink_item/item/visible_weapons/xray
 	name = "Xray Gun"
-	item_cost = 85
+	item_cost = 60
 	path = /obj/item/weapon/gun/energy/xray
+
+/datum/uplink_item/item/visible_weapons/flamethrower
+	name = "Heavy Flamethrower"
+	desc = "A large flamethrower that runs on pressurized, gaseous phoron and electric charge."
+	item_cost = 60
+	path = /obj/item/weapon/storage/secure/briefcase/flamer
+
+/datum/uplink_item/item/visible_weapons/concussion_grenades
+	name = "Concussion Grenades (8)"
+	desc = "A box of eight concussion grenades."
+	item_cost = 30
+	path = /obj/item/weapon/storage/box/syndie_kit/concussion_grenade