diff --git a/baystation12.dme b/baystation12.dme index 78450ab3c70..94c60e66f5f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -168,6 +168,7 @@ #define FILE_DIR "code/WorkInProgress/Apples" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" @@ -1168,7 +1169,6 @@ #include "code\WorkInProgress\animusstation\atm.dm" #include "code\WorkInProgress\Cael_Aislinn\energy_field.dm" #include "code\WorkInProgress\Cael_Aislinn\external_shield_gen.dm" -#include "code\WorkInProgress\Cael_Aislinn\power_monitor.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" diff --git a/code/WorkInProgress/Cael_Aislinn/power_monitor.dm b/code/WorkInProgress/Cael_Aislinn/power_monitor.dm deleted file mode 100644 index b044e174eb3..00000000000 --- a/code/WorkInProgress/Cael_Aislinn/power_monitor.dm +++ /dev/null @@ -1,226 +0,0 @@ -//links to a power monitor computer and transmits the amount of energy in the associated powercable network -//uses the navbeacon sprite and transmits data via magic for now - -/obj/machinery/powermonitor - - icon = 'objects.dmi' - icon_state = "navbeacon0-f" - name = "power monitor" - desc = "A monitoring device used to track power in a cable network." - level = 1 // underfloor - layer = 2.5 - anchored = 1 - - var/freq = 1427 // radio frequency - var/powernet_tag = "" //the text tag associated with this power monitor's network - var/open = 0 // true if cover is open - var/locked = 1 // true if controls are locked - var/list/codes // assoc. list of transponder codes - var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - - req_access = list(access_engine) - - New() - ..() - var/turf/T = loc - hide(T.intact) - - set_codes() - - spawn(5) // must wait for map loading to finish - if(radio_controller) - radio_controller.add_object(src, freq, RADIO_POWER) - - // set the transponder codes assoc list from codes_txt - proc/set_codes() - if(!codes_txt) - return - - codes = new() - - var/list/entries = dd_text2List(codes_txt, ";") // entries are separated by semicolons - - for(var/e in entries) - var/index = findtext(e, "=") // format is "key=value" - if(index) - var/key = copytext(e, 1, index) - var/val = copytext(e, index+1) - codes[key] = val - else - codes[e] = "1" - - // called when turf state changes - // hide the object if turf is intact - hide(var/intact) - invisibility = intact ? 101 : 0 - updateicon() - - // update the icon_state - proc/updateicon() - var/state="navbeacon[open]" - if(invisibility) - icon_state = "[state]-f" // if invisible, set icon to faded version - // in case revealed by T-scanner - else - icon_state = "[state]" - - // look for a signal of the form "getpowerlevel" - // where X is any - // or the location - // or one of the set transponder keys - // if found, return a signal - receive_signal(datum/signal/signal) - - var/request = signal.data["getpowermonitor"] - if(request && (request == "any" || request == powernet_tag) ) - spawn(1) - post_signal() - - // return a signal giving the power network energy level - proc/post_signal() - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) - - if(!frequency) return - - var/datum/signal/signal = new() - signal.source = src - signal.transmission_method = 1 - signal.data["powerlevel"] = 1 //TODO - - for(var/key in codes) - signal.data[key] = codes[key] - - frequency.post_signal(src, signal, filter = RADIO_POWER) - - attackby(var/obj/item/I, var/mob/user) - var/turf/T = loc - if(T.intact) - return // prevent intraction when T-scanner revealed - - if(istype(I, /obj/item/weapon/screwdriver)) - open = !open - - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") - - updateicon() - - else if (istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) - if(open) - if (src.allowed(user)) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" - else - user << "\red Access denied." - updateDialog() - else - user << "You must open the cover first!" - return - - attack_ai(var/mob/user) - interact(user, 1) - - attack_paw() - return - - attack_hand(var/mob/user) - interact(user, 0) - - proc/interact(var/mob/user, var/ai = 0) - var/turf/T = loc - if(T.intact) - return // prevent intraction when T-scanner revealed - - if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The monitor's control cover is closed." - return - - var/dat = "Navigation Beacon
" - if(locked && !ai) - dat += "(swipe card to unlock controls)
" - else if(!ai) - dat += "(swipe card to lock controls)
" - - dat += "Frequency: " - if(!locked) - dat += "-" - dat += "-" - dat += "[format_frequency(freq)]" - if(!locked) - dat += "+" - dat += "+" - dat += "
" - - dat += "Power network tag: [powernet_tag ? powernet_tag : "(none)"]
" - dat += "Transponder Codes: