Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor uplink changes #12166

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Minor uplink changes #12166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions code/modules/uplink/uplink_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,15 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
surplus = 20
purchasable_from = UPLINK_NUKE_OPS

/datum/uplink_item/dangerous/syndicate_teleporter
name = "Experimental Syndicate Jaunter"
desc = "The Syndicate jaunter is a handheld device that jaunts the user 4-8 meters forward. \
Anyone caught in the wake of the jaunter will be knocked off their feet and receive minor damage. \
Due to the Syndicate's more limited research of teleportation technologies, it is incapable of phasing the user \
through solid matter nor is it capable of teleporting them across longer ranges."
item = /obj/item/teleporter
cost = 7

/datum/uplink_item/dangerous/flamethrower
name = "Flamethrower"
desc = "A flamethrower, fueled by a portion of highly flammable biotoxins stolen previously from Nanotrasen \
Expand Down Expand Up @@ -1764,14 +1773,6 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
surplus = 1
illegal_tech = FALSE

/datum/uplink_item/device_tools/syndicate_teleporter
name = "Experimental Syndicate Jaunter"
desc = "The Syndicate jaunter is a handheld device that jaunts the user 4-8 meters forward. \
Anyone caught in the wake of the jaunter will be knocked off their feet and receive minor damage. \
Due to the Syndicate's more limited research of teleportation technologies, it is incapable of phasing the user \
through solid matter nor is it capable of teleporting them across longer ranges."
item = /obj/item/teleporter
cost = 7

/datum/uplink_item/device_tools/frame
name = "F.R.A.M.E. PDA Disk"
Expand Down Expand Up @@ -1947,7 +1948,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
item = /obj/item/clothing/glasses/thermal/syndi
cost = 3
cost = 2

// Implants
/datum/uplink_item/implants
Expand Down
Loading