mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Medsci remap strikes back (#18468)
* 1 * 2 * 3 * 4 * 5 * the great tag purge of 2022 * job spawners, viro window deletion * atmos pipe moment * fixes * removes maint can * feedback * converts spawners to the new system * OR shuffle, and other things * further edits * le thingy * miraviel review * merge master 2 * denth review * secondary thingies * master update * minor fixes * feedback * bmon review * more tweaks * area mistake * things * fixes departures * deconflict * unshocks your doors * fridge fridge fridge * OPTIMISE * oops * gnarg * another one * QC pass * oops * areas * Update code/modules/research/rdconsole.dm * more tweaks * space sign space sign * decals * oh my life * experimentor fixes part 2 * scope creep 2 scope creep 2 * de-gogglify * restore chapel confession booth, fixes viro fridge * more fixes * lovely windows * walls and pipes and pipes and walls * bmon review * bmon review * excess access * changes chapel maints, but not really
This commit is contained in:
+30120
-22323
File diff suppressed because it is too large
Load Diff
@@ -32,6 +32,8 @@
|
||||
var/list/item_reactions = list()
|
||||
var/list/valid_items = list() //valid items for special reactions like transforming
|
||||
var/list/critical_items = list() //items that can cause critical reactions
|
||||
/// Used for linking with rnd consoles
|
||||
var/range = 5
|
||||
|
||||
/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(list/source_list)
|
||||
var/list/temp_list = params2list(source_list)
|
||||
@@ -540,7 +542,7 @@
|
||||
usr << browse(null, "window=experimentor")
|
||||
return
|
||||
else if(scantype == "search")
|
||||
var/obj/machinery/computer/rdconsole/D = locate(/obj/machinery/computer/rdconsole) in oview(3,src)
|
||||
var/obj/machinery/computer/rdconsole/D = locate(/obj/machinery/computer/rdconsole) in orange(range, src)
|
||||
if(D)
|
||||
linked_console = D
|
||||
else if(scantype == "eject")
|
||||
|
||||
@@ -81,6 +81,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
|
||||
var/id = 0 //ID of the computer (for server restrictions).
|
||||
var/sync = TRUE //If sync if FALSE, it doesn't show up on Server Control Console
|
||||
///Range to search for rnd devices in proximity to console
|
||||
var/range = 3
|
||||
|
||||
req_access = list(ACCESS_TOX) //Data and setting manipulation requires scientist access.
|
||||
|
||||
@@ -129,7 +131,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
return initial(rt.name)
|
||||
|
||||
/obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).
|
||||
for(var/obj/machinery/r_n_d/D in range(3,src))
|
||||
for(var/obj/machinery/r_n_d/D in range(range, src))
|
||||
if(!isnull(D.linked_console) || D.panel_open)
|
||||
continue
|
||||
|
||||
@@ -946,6 +948,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
name = "\improper E.X.P.E.R.I-MENTOR R&D console"
|
||||
desc = "A console used to interface with R&D tools."
|
||||
id = 3
|
||||
range = 5
|
||||
circuit = /obj/item/circuitboard/rdconsole/experiment
|
||||
|
||||
/obj/machinery/computer/rdconsole/public
|
||||
|
||||
Reference in New Issue
Block a user