cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

uplink updates (#18800)

Browse Source 
* uplink updates

* gives admin radio uplink 500 TC

* removing implicit var/

* fixing multiple uplink reference

* Update code/datums/uplink_item.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/datums/uplink_item.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* allowing admin uplink to buy hijack items without hijack objective

* i hate this file being in repo

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
HMBGERDO
2022-08-17 10:54:47 +01:00
committed by GitHub
co-authored by Sirryan2002
parent c2cf6e89b2
commit 5c110b9745
5 changed files with 131 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/uplinks.dm
+15 -5
View File
@@ -22,17 +22,21 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/job = null
var/temp_category
var/uplink_type = "traitor"
var/uplink_type = UPLINK_TYPE_TRAITOR
/// Whether the uplink is jammed and cannot be used to order items.
var/is_jammed = FALSE
/obj/item/uplink/ui_host()
return loc
/obj/item/uplink/proc/update_uplink_type(new_uplink_type)
uplink_type = new_uplink_type
uplink_items = get_uplink_items(src)
/obj/item/uplink/New()
..()
uses = SSticker.mode.uplink_uses
uplink_items = get_uplink_items()
uplink_items = get_uplink_items(src)
GLOB.world_uplinks += src
@@ -58,7 +62,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
cats[++cats.len] = list("cat" = category, "items" = list())
for(var/datum/uplink_item/I in uplink_items[category])
if(I.job && I.job.len)
if(!(I.job.Find(job)))
if(!(I.job.Find(job)) && uplink_type != UPLINK_TYPE_ADMIN)
continue
cats[cats.len]["items"] += list(list("name" = sanitize(I.name), "desc" = sanitize(I.description()),"cost" = I.cost, "hijack_only" = I.hijack_only, "obj_path" = I.reference, "refundable" = I.refundable))
uplink_items[I.reference] = I
@@ -253,7 +257,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
/obj/item/radio/uplink/nuclear/New()
..()
if(hidden_uplink)
hidden_uplink.uplink_type = "nuclear"
hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
GLOB.nuclear_uplink_list += src
/obj/item/radio/uplink/nuclear/Destroy()
@@ -263,7 +267,13 @@ GLOBAL_LIST_EMPTY(world_uplinks)
/obj/item/radio/uplink/sst/New()
..()
if(hidden_uplink)
hidden_uplink.uplink_type = "sst"
hidden_uplink.update_uplink_type(UPLINK_TYPE_SST)
/obj/item/radio/uplink/admin/New()
..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
hidden_uplink.uses = 500
/obj/item/multitool/uplink/New()
..()
code/game/objects/items/weapons/implants/implantuplink.dm
+14 -2
View File
@@ -10,15 +10,20 @@
hidden_uplink.uses = 10
..()
/obj/item/implant/uplink/nuclear/New()
..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
/obj/item/implant/uplink/sit/New()
..()
if(hidden_uplink)
hidden_uplink.uplink_type = "sit"
hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
/obj/item/implant/uplink/admin/New()
..()
if(hidden_uplink)
hidden_uplink.uplink_type = "admin"
hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
/obj/item/implant/uplink/implant(mob/source)
var/obj/item/implant/imp_e = locate(src.type) in source
@@ -43,3 +48,10 @@
/obj/item/implanter/uplink/New()
imp = new /obj/item/implant/uplink(src)
..()
/obj/item/implanter/nuclear_uplink
name = "implanter (nuclear uplink)"
/obj/item/implanter/nuclear_uplink/New()
imp = new /obj/item/implant/uplink/nuclear(src)
..()