cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds hijack items back to the uplink (#26390)

Browse Source
This commit is contained in:
DGamerL
2024-08-04 16:53:59 +00:00
committed by GitHub
parent 4831c0624f
commit 319a3d0bf6
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_items/uplink_general.dm
+2 -6
View File
@@ -20,16 +20,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
continue
if(I.species && !(user.dna?.species.name in I.species)) //If your species does not match, no discount
continue
if(I.hijack_only && !(locate(/datum/objective/hijack) in user.mind.get_all_objectives())) //If you aren't a hijacker, no hijack only items
continue
if(!uplink_items[I.category])
uplink_items[I.category] = list()
uplink_items[I.category] += I
if(I.limited_stock < 0 && I.can_discount && I.item && I.cost > 5)
if(I.limited_stock < 0 && I.can_discount && I.item && I.cost > 5 && !I.hijack_only)
sales_items += I
if(isnull(user)) //Handles surplus
@@ -90,7 +87,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
var/can_discount = TRUE
/// Can you only buy so many? -1 allows for infinite purchases
var/limited_stock = -1
/// Can this item be purchased only during hijackings?
/// Can this item be purchased only during hijackings? Hijack-only items are by default unable to be on sale.
var/hijack_only = FALSE
/// Can you refund this in the uplink?
var/refundable = FALSE
@@ -734,7 +731,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 10
surplus = 0
hijack_only = TRUE //This is an item only useful for a hijack traitor, as such, it should only be available in those scenarios.
can_discount = FALSE
/datum/uplink_item/device_tools/advpinpointer
name = "Advanced Pinpointer"
code/datums/uplink_items/uplink_nuclear.dm
+1 -3
View File
@@ -664,7 +664,6 @@
cost = 55
excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT)
surplus = 0
can_discount = FALSE
hijack_only = FALSE
/datum/uplink_item/explosives/emp_bomb/nuke
@@ -676,11 +675,10 @@
/datum/uplink_item/explosives/atmosfiregrenades/nuke
reference = "NAPG"
hijack_only = FALSE
cost = 60
excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT)
surplus = 0
can_discount = FALSE
hijack_only = TRUE
/datum/uplink_item/stealthy_tools/chameleon/nuke
reference = "NCHAM"
code/datums/uplink_items/uplink_traitor.dm
+1 -4
View File
@@ -144,7 +144,6 @@
job = list("Chaplain")
surplus = 0 //No lucky chances from the crate; if you get this, this is ALL you're getting
hijack_only = TRUE //This is a murderbone weapon, as such, it should only be available in those scenarios.
can_discount = FALSE
//Janitor
@@ -691,7 +690,6 @@
cost = 40
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
surplus = 0
can_discount = FALSE
hijack_only = TRUE
/datum/uplink_item/explosives/emp_bomb
@@ -715,11 +713,10 @@
desc = "A box of two (2) grenades that cause large plasma fires. Can be used to deny access to a large area. Most useful if you have an atmospherics hardsuit."
reference = "APG"
item = /obj/item/storage/box/syndie_kit/atmosfiregrenades
hijack_only = TRUE
cost = 50
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
surplus = 0
can_discount = FALSE
hijack_only = TRUE
/datum/uplink_item/stealthy_tools/chameleon
name = "Chameleon Kit"