[E]" + dat = "
[E]" if(E.holidayID) holiday += dat else if(E.wizardevent) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index ccfc041b21..eb4f2380a1 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -164,7 +164,7 @@ SUBSYSTEM_DEF(garbage) #endif var/type = D.type var/datum/qdel_item/I = items[type] - testing("GC: -- \ref[D] | [type] was unable to be GC'd --") + testing("GC: -- \ref[src] | [type] was unable to be GC'd --") I.failures++ if (GC_QUEUE_HARDDELETE) HardDelete(D) diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 07797d0677..0eafc9f099 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -109,23 +109,23 @@ SUBSYSTEM_DEF(pai) dat += "
Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!
" dat += "| Name: | [candidate.name] |
| \[Edit\] | What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. |
| \[Edit\] | What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. |
| Description: | [candidate.description] |
| \[Edit\] | What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. |
| \[Edit\] | What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. |
| Preferred Role: | [candidate.role] |
| \[Edit\] | Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. |
| \[Edit\] | Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. |
| OOC Comments: | [candidate.comments] |
| \[Edit\] | Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. |
| \[Edit\] | Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. |
" - dat += "
Submit Personality
" - dat += "Save Personality
" - dat += "Load Personality
" + dat += "
Submit Personality
" + dat += "Save Personality
" + dat += "Load Personality
" M << browse(dat, "window=paiRecruit") @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(pai) dat += "
" if(admin) - . += "(Cancel Vote) " + . += "(Cancel Vote) " else . += "
Start a vote:
- " //restart var/avr = CONFIG_GET(flag/allow_vote_restart) if(trialmin || avr) - . += "Restart" + . += "Restart" else . += "Restart (Disallowed)" if(trialmin) - . += "\t([avr ? "Allowed" : "Disallowed"])" + . += "\t([avr ? "Allowed" : "Disallowed"])" . += "
- " //gamemode var/avm = CONFIG_GET(flag/allow_vote_mode) if(trialmin || avm) - . += "GameMode" + . += "GameMode" else . += "GameMode (Disallowed)" if(trialmin) - . += "\t([avm ? "Allowed" : "Disallowed"])" + . += "\t([avm ? "Allowed" : "Disallowed"])" . += " " //custom if(trialmin) - . += "
- Custom " + . += "
- Custom " . += "
" - . += "Close" + . += "Close" return . diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 31e8daadb2..e8a1a17fe2 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -132,13 +132,13 @@ var/output = {"
- [Button1]"}
+ [Button1]"}
if (Button2)
- output += {"[Button2]"}
+ output += {"[Button2]"}
if (Button3)
- output += {"[Button3]"}
+ output += {"[Button3]"}
output += {"
"}
@@ -253,7 +253,7 @@
return
var/param = "null"
if(ref)
- param = "\ref[ref]"
+ param = "[REF(ref)]"
winset(user, windowid, "on-close=\".windowclose [param]\"")
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index cd589fd8c3..854aa40538 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -3,6 +3,7 @@
var/list/active_timers //for SStimer
var/list/datum_components //for /datum/components
var/ui_screen = "home" //for tgui
+ var/use_tag = FALSE
#ifdef TESTING
var/running_find_references
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index b653e5c6ae..2f13eec65b 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -25,10 +25,10 @@
/datum/proc/vv_get_dropdown()
. = list()
. += "---"
- .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]"
- .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]"
- .["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]"
- .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]"
+ .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=[REF(src)]"
+ .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=[REF(src)]"
+ .["Delete"] = "?_src_=vars;[HrefToken()];delete=[REF(src)]"
+ .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=[REF(src)]"
/datum/proc/on_reagent_change()
@@ -53,7 +53,7 @@
return
var/title = ""
- var/refid = "\ref[D]"
+ var/refid = "[REF(D)]"
var/icon/sprite
var/hash
@@ -71,7 +71,7 @@
hash = md5(hash + AT.icon_state)
src << browse_rsc(sprite, "vv[hash].png")
- title = "[D] (\ref[D]) = [type]"
+ title = "[D] ([REF(D)]) = [type]"
var/sprite_text
if(sprite)
@@ -394,9 +394,9 @@
name = DA[name] //name is really the index until this line
else
value = DA[name]
- header = "![](\"tmp\ref[value][rnd].png\")
"
+ src << browse_rsc(I.icon, "tmp[REF(value)][rnd].png")
+ html += "[name] = ![](\"tmp[REF(value)][rnd].png\")
"
#else
html += "[name] = /image ([value])"
#endif
@@ -434,14 +434,14 @@
//else if (istype(value, /client))
// var/client/C = value
- // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]"
+ // item = "[VV_HTML_ENCODE(name)] [REF(value)] = [C] [C.type]"
else if (istype(value, /datum))
var/datum/D = value
if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]"
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D] [D.type]"
else
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]"
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D.type]"
else if (islist(value))
var/list/L = value
@@ -459,9 +459,9 @@
items += debug_variable(key, val, level + 1, sanitize = sanitize)
- item = "[VV_HTML_ENCODE(name)] = /list ([L.len])- [items.Join()]
- [items.Join()]
" out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]
" - out += "Assigned role: [assigned_role]. Edit
" + out += "Assigned role: [assigned_role]. Edit
" out += "Faction and special role: [special_role]
" var/list/sections = list( @@ -412,11 +412,11 @@ text = uppertext(text) text = "[text]: " if (src in SSticker.mode.traitors) - text += "TRAITOR | loyal" + text += "TRAITOR | loyal" if (objectives.len==0) - text += "
Objectives are empty! Randomize!" + text += "
Objectives are empty! Randomize!" else - text += "traitor | LOYAL" + text += "traitor | LOYAL" if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -434,7 +434,7 @@ text = uppertext(text) text = "[text]: " if(src in SSticker.mode.brothers) - text += "Brother | no" + text += "Brother | no" if(current && current.client && (ROLE_BROTHER in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -449,19 +449,19 @@ text = uppertext(text) text = "[text]: " if ((src in SSticker.mode.changelings) && special_role) - text += "YES | no" + text += "YES | no" if (objectives.len==0) - text += "
Objectives are empty! Randomize!" + text += "
Objectives are empty! Randomize!" if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) ) - text += "
Transform to initial appearance." + text += "
Transform to initial appearance." else if(src in SSticker.mode.changelings) //Station Aligned Changeling - text += "YES (but not an antag) | no" + text += "YES (but not an antag) | no" if (objectives.len==0) - text += "
Objectives are empty! Randomize!" + text += "
Objectives are empty! Randomize!" if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) ) - text += "
Transform to initial appearance." + text += "
Transform to initial appearance." else - text += "yes | NO" + text += "yes | NO" if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -477,7 +477,7 @@ text = uppertext(text) text = "[text]: " if (ishuman(current)) - text += "healthy | infected | HUMAN | other" + text += "healthy | infected | HUMAN | other" else if(ismonkey(current)) var/found = FALSE for(var/datum/disease/transformation/jungle_fever/JF in current.viruses) @@ -485,9 +485,9 @@ break if(found) - text += "healthy | INFECTED | human | other" + text += "healthy | INFECTED | human | other" else - text += "HEALTHY | infected | human | other" + text += "HEALTHY | infected | human | other" else text += "healthy | infected | human | OTHER" @@ -507,17 +507,17 @@ text = uppertext(text) text = "[text]: " if (src in SSticker.mode.syndicates) - text += "OPERATIVE | nanotrasen" - text += "
To shuttle, undress, dress up." + text += "OPERATIVE | nanotrasen" + text += "
To shuttle, undress, dress up." var/code for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines) if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN") code = bombue.r_code break if (code) - text += " Code is [code]. tell the code." + text += " Code is [code]. tell the code." else - text += "operative | NANOTRASEN" + text += "operative | NANOTRASEN" if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -533,10 +533,10 @@ text = uppertext(text) text = "[text]: " if (has_antag_datum(/datum/antagonist/wizard)) - text += "YES | no" - text += "
To lair, undress" + text += "YES | no" + text += "
To lair, undress" else - text += "yes | NO" + text += "yes | NO" if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -563,28 +563,28 @@ if(M && (M.z in GLOB.station_z_levels) && !M.stat) last_healthy_headrev = FALSE break - text += "head | not mindshielded | employee | [last_healthy_headrev ? "LAST " : ""]HEADREV | rev" - text += "
Flash: give" + text += "head | not mindshielded | employee | [last_healthy_headrev ? "LAST " : ""]HEADREV | rev" + text += "
Flash: give" var/list/L = current.get_contents() var/obj/item/device/assembly/flash/flash = locate() in L if (flash) if(!flash.crit_fail) - text += " | take." + text += " | take." else - text += " | take | repair." + text += " | take | repair." else text += "." - text += " Reequip (gives traitor uplink)." + text += " Reequip (gives traitor uplink)." if (objectives.len==0) - text += "
Objectives are empty! Set to kill all heads." + text += "
Objectives are empty! Set to kill all heads." else if(current.isloyal()) - text += "head | MINDSHIELDED | employee | headrev | rev" + text += "head | MINDSHIELDED | employee | headrev | rev" else if (has_antag_datum(/datum/antagonist/rev)) - text += "head | not mindshielded | employee | headrev | REV" + text += "head | not mindshielded | employee | headrev | REV" else - text += "head | not mindshielded | EMPLOYEE | headrev | rev" + text += "head | not mindshielded | EMPLOYEE | headrev | rev" if(current && current.client && (ROLE_REV in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -599,8 +599,8 @@ text = uppertext(text) text = "[text]: " if(src in SSticker.mode.abductors) - text += "Abductor | human" - text += " | undress | equip" + text += "Abductor | human" + text += " | undress | equip" if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -618,13 +618,13 @@ var/datum/antagonist/devil/devilinfo = has_antag_datum(ANTAG_DATUM_DEVIL) if(devilinfo) if(!devilinfo.ascendable) - text += "DEVIL | ascendable devil | sintouched | human" + text += "DEVIL | ascendable devil | sintouched | human" else - text += "DEVIL | ASCENDABLE DEVIL | sintouched | human" + text += "DEVIL | ASCENDABLE DEVIL | sintouched | human" else if(src in SSticker.mode.sintouched) - text += "devil | ascendable devil | SINTOUCHED | human" + text += "devil | ascendable devil | SINTOUCHED | human" else - text += "devil | ascendable devil | sintouched | HUMAN" + text += "devil | ascendable devil | sintouched | HUMAN" if(current && current.client && (ROLE_DEVIL in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -641,11 +641,11 @@ var/datum/antagonist/ninja/ninjainfo = has_antag_datum(ANTAG_DATUM_NINJA) if(ninjainfo) if(ninjainfo.helping_station) - text += "employee | syndicate | NANOTRASEN | EQUIP" + text += "employee | syndicate | NANOTRASEN | EQUIP" else - text += "employee | SYNDICATE | nanotrasen | EQUIP" + text += "employee | SYNDICATE | nanotrasen | EQUIP" else - text += "EMPLOYEE | syndicate | nanotrasen | random allegiance" + text += "EMPLOYEE | syndicate | nanotrasen | random allegiance" if(current && current.client && (ROLE_NINJA in current.client.prefs.be_special)) text += " | Enabled in Prefs" else @@ -660,10 +660,10 @@ text = uppertext(text) text = "[text]: " if(iscultist(current)) - text += "not mindshielded | employee | CULTIST" - text += "
Give tome | amulet." + text += "not mindshielded | employee | CULTIST" + text += "
Give tome | amulet." else if(is_convertable_to_cult(current)) - text += "not mindshielded | EMPLOYEE | cultist" + text += "not mindshielded | EMPLOYEE | cultist" else text += "[!current.isloyal() ? "not mindshielded" : "MINDSHIELDED"] | EMPLOYEE | cannot serve Nar-Sie" @@ -682,10 +682,10 @@ text = uppertext(text) text = "[text]: " if(is_servant_of_ratvar(current)) - text += "not mindshielded | employee | SERVANT" - text += "
Equip" + text += "not mindshielded | employee | SERVANT" + text += "
Equip" else if(is_eligible_servant(current)) - text += "not mindshielded | EMPLOYEE | servant" + text += "not mindshielded | EMPLOYEE | servant" else text += "[!current.isloyal() ? "not mindshielded" : "MINDSHIELDED"] | EMPLOYEE | cannot serve Ratvar" @@ -702,14 +702,14 @@ text = "silicon" var/mob/living/silicon/robot/robot = current if (istype(robot) && robot.emagged) - text += "
Cyborg: Is emagged! Unemag!
0th law: [robot.laws.zeroth]" + text += "
Cyborg: Is emagged! Unemag!
0th law: [robot.laws.zeroth]" var/mob/living/silicon/ai/ai = current if (istype(ai) && ai.connected_robots.len) var/n_e_robots = 0 for (var/mob/living/silicon/robot/R in ai.connected_robots) if (R.emagged) n_e_robots++ - text += "
[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" + text += "
[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" if (SSticker.mode.config_tag == "traitorchan") if (sections["traitor"]) out += sections["traitor"]+"
" @@ -727,12 +727,12 @@ if(((src in SSticker.mode.traitors) || (src in SSticker.mode.syndicates)) && ishuman(current)) - text = "Uplink: give" + text = "Uplink: give" var/obj/item/device/uplink/U = find_syndicate_uplink() if(U) - text += " | take" + text += " | take" if (check_rights(R_FUN, 0)) - text += ", [U.telecrystals] TC" + text += ", [U.telecrystals] TC" else text += ", [U.telecrystals] TC" text += "." //hiel grammar @@ -742,18 +742,18 @@ out += "Memory:
" out += memory - out += "
Edit memory
" + out += "
Edit memory
" out += "Objectives:
" if (objectives.len == 0) out += "EMPTY
" else var/obj_count = 1 for(var/datum/objective/objective in objectives) - out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
" + out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
" obj_count++ - out += "Add objective
" + out += "Add objective
" - out += "Announce objectives
" + out += "Announce objectives
" var/datum/browser/popup = new(usr, "edit_memory", "", 600, 600) popup.set_content(out) diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index a9fd77d1e2..f23f0dfd07 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -21,7 +21,7 @@ this["desc"] = "" this["refs"] = list() for(var/spawner_obj in GLOB.mob_spawners[spawner]) - this["refs"] += "\ref[spawner_obj]" + this["refs"] += "[REF(spawner_obj)]" if(!this["desc"]) if(istype(spawner_obj, /obj/effect/mob_spawn)) var/obj/effect/mob_spawn/MS = spawner_obj diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f20b13e1a3..b6cace2111 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -335,7 +335,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/blood_splatter_index() - return "\ref[initial(icon)]-[initial(icon_state)]" + return "[REF(initial(icon))]-[initial(icon_state)]" //returns the mob's dna info as a list, to be inserted in an object's blood_DNA list /mob/living/proc/get_blood_dna_list() @@ -631,9 +631,9 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) var/turf/curturf = get_turf(src) if (curturf) .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=\ref[src]" - .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=\ref[src]" - .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=\ref[src]" + .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=[REF(src)]" + .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=[REF(src)]" + .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=[REF(src)]" /atom/proc/drop_location() var/atom/L = loc diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index b05a1d78f1..353b5726ce 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -523,7 +523,7 @@ /atom/movable/vv_get_dropdown() . = ..() . -= "Jump to" - .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[src]" + .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(src)]" /atom/movable/proc/ex_check(ex_id) if(!ex_id) diff --git a/code/game/communications.dm b/code/game/communications.dm index 19c3f87460..80c4728a36 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -147,6 +147,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "1357" = "Engineering", "1359" = "Security", "1337" = "CentCom", +<<<<<<< HEAD "1213" = "Syndicate", "1347" = "Supply", "1349" = "Service", @@ -292,6 +293,153 @@ GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") /datum/signal/proc/debug_print() if (source) +======= + "1213" = "Syndicate", + "1347" = "Supply", + "1349" = "Service", + "1447" = "AI Private", + "1215" = "Red Team", + "1217" = "Blue Team" +)) + +//depenging helpers +GLOBAL_VAR_CONST(SYND_FREQ, 1213) //nuke op frequency, coloured dark brown in chat window +GLOBAL_VAR_CONST(SUPP_FREQ, 1347) //supply, coloured light brown in chat window +GLOBAL_VAR_CONST(SERV_FREQ, 1349) //service, coloured green in chat window +GLOBAL_VAR_CONST(SCI_FREQ, 1351) //science, coloured plum in chat window +GLOBAL_VAR_CONST(COMM_FREQ, 1353) //command, colored gold in chat window +GLOBAL_VAR_CONST(MED_FREQ, 1355) //medical, coloured blue in chat window +GLOBAL_VAR_CONST(ENG_FREQ, 1357) //engineering, coloured orange in chat window +GLOBAL_VAR_CONST(SEC_FREQ, 1359) //security, coloured red in chat window +GLOBAL_VAR_CONST(CENTCOM_FREQ, 1337) //centcom frequency, coloured grey in chat window +GLOBAL_VAR_CONST(AIPRIV_FREQ, 1447) //AI private, colored magenta in chat window +GLOBAL_VAR_CONST(REDTEAM_FREQ, 1215) // red team (CTF) frequency, coloured red +GLOBAL_VAR_CONST(BLUETEAM_FREQ, 1217) // blue team (CTF) frequency, coloured blue + +#define TRANSMISSION_WIRE 0 +#define TRANSMISSION_RADIO 1 + +/* filters */ +GLOBAL_VAR_INIT(RADIO_TO_AIRALARM, "1") +GLOBAL_VAR_INIT(RADIO_FROM_AIRALARM, "2") +GLOBAL_VAR_INIT(RADIO_CHAT, "3") //deprecated +GLOBAL_VAR_INIT(RADIO_ATMOSIA, "4") +GLOBAL_VAR_INIT(RADIO_NAVBEACONS, "5") +GLOBAL_VAR_INIT(RADIO_AIRLOCK, "6") +GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") + +/datum/radio_frequency + + var/frequency as num + var/list/list/obj/devices = list() + +//If range > 0, only post to devices on the same z_level and within range +//Use range = -1, to restrain to the same z_level without limiting range +/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) + + //Apply filter to the signal. If none supply, broadcast to every devices + //_default channel is always checked + var/list/filter_list + + if(filter) + filter_list = list(filter,"_default") + else + filter_list = devices + + //If checking range, find the source turf + var/turf/start_point + if(range) + start_point = get_turf(source) + if(!start_point) + return 0 + + //Send the data + for(var/current_filter in filter_list) + for(var/obj/device in devices[current_filter]) + if(device == source) + continue + if(range) + var/turf/end_point = get_turf(device) + if(!end_point) + continue + if(start_point.z != end_point.z || (range > 0 && get_dist(start_point, end_point) > range)) + continue + device.receive_signal(signal, TRANSMISSION_RADIO, frequency) + +/datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) + if (!filter) + filter = "_default" + + var/list/devices_line = devices[filter] + if(!devices_line) + devices_line = list() + devices[filter] = devices_line + devices_line += device + + +/datum/radio_frequency/proc/remove_listener(obj/device) + for(var/devices_filter in devices) + var/list/devices_line = devices[devices_filter] + if(!devices_line) + devices -= devices_filter + devices_line -= device + if(!devices_line.len) + devices -= devices_filter + + + + + +/client/proc/print_pointers() + set name = "Debug Signals" + set category = "Debug" + + if(!holder) + return + + var/datum/signal/S + to_chat(src, "There are [S.pointers.len] pointers:") + for(var/p in S.pointers) + to_chat(src, p) + S = locate(p) + if(istype(S)) + to_chat(src, S.debug_print()) + +/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param) + return + +/datum/signal + var/obj/source + + var/transmission_method = 0 + //0 = wire + //1 = radio transmission + //2 = subspace transmission + + var/data = list() + var/encryption + + var/frequency = 0 + var/static/list/pointers = list() + +/datum/signal/New() + ..() + pointers += "[REF(src)]" + +/datum/signal/Destroy() + pointers -= "[REF(src)]" + return ..() + +/datum/signal/proc/copy_from(datum/signal/model) + source = model.source + transmission_method = model.transmission_method + data = model.data + encryption = model.encryption + frequency = model.frequency + +/datum/signal/proc/debug_print() + if (source) +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental . = "signal = {source = '[source]' [COORD(source)]\n" else . = "signal = {source = '[source]' ()\n" diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 8a0a622a63..2a1a196b0e 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -29,13 +29,13 @@ dat += "Using this contract, you may summon an apprentice to aid you on your mission.
" dat += "If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.
" dat += "Which school of magic is your apprentice studying?:
" - dat += "Destruction
" + dat += "Destruction
" dat += "Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.
" - dat += "Bluespace Manipulation
" + dat += "Bluespace Manipulation
" dat += "Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.
" - dat += "Healing
" + dat += "Healing
" dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
" - dat += "Robeless
" + dat += "Robeless
" dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
" user << browse(dat, "window=radio") onclose(user, "radio") diff --git a/code/game/gamemodes/cult/supply.dm b/code/game/gamemodes/cult/supply.dm index 47807fa93a..3720e496ea 100644 --- a/code/game/gamemodes/cult/supply.dm +++ b/code/game/gamemodes/cult/supply.dm @@ -22,7 +22,7 @@ dat += "
" for(var/s in possible_summons) var/datum/cult_supply/S = s - dat += "[initial(S.invocation)] - [initial(S.desc)]
" + dat += "[initial(S.invocation)] - [initial(S.desc)]
" var/datum/browser/popup = new(user, "talisman", "", 400, 400) popup.set_content(dat.Join("")) popup.open() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 26c3810b42..c8b98319f0 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -160,7 +160,7 @@ if(CONFIG_GET(flag/protect_assistant_from_antagonist)) replacementmode.restricted_jobs += "Assistant" - message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") + message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") . = 1 sleep(rand(600,1800)) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 92dca5d3c9..a2513d776f 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -133,9 +133,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( dat += "Install Module:
" dat += "The number afterwards is the amount of processing time it consumes.
" for(var/datum/AI_Module/large/module in possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
" + dat += "[module.module_name]\[?\] ([module.cost])
" for(var/datum/AI_Module/small/module in possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
" + dat += "[module.module_name]\[?\] ([module.cost])
" dat += "
" if(temp) dat += "[temp]" diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index d44ff57c96..f243f161c3 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -43,20 +43,20 @@ dat += "Collected Samples : [points]
" dat += "Gear Credits: [credits]
" dat += "Transfer data in exchange for supplies:
" - dat += "Advanced Baton
" - dat += "Agent Helmet
" - dat += "Agent Vest
" - dat += "Radio Silencer
" - dat += "Science Tool
" + dat += "Advanced Baton
" + dat += "Agent Helmet
" + dat += "Agent Vest
" + dat += "Radio Silencer
" + dat += "Science Tool
" else dat += "NO EXPERIMENT MACHINE DETECTED
" if(pad) dat += "Emergency Teleporter System." dat += "Consider using primary observation console first." - dat += "Activate Teleporter
" + dat += "Activate Teleporter
" if(gizmo && gizmo.marked) - dat += "Retrieve Mark
" + dat += "Retrieve Mark
" else dat += "Retrieve Mark
" else @@ -66,15 +66,15 @@ dat += "
Agent Vest Mode
" var/mode = vest.mode if(mode == VEST_STEALTH) - dat += "Combat" + dat += "Combat" dat += "Stealth" else dat += "Combat" - dat += "Stealth" + dat += "Stealth" dat+="
" - dat += "Select Agent Vest Disguise
" - dat += "[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest
" + dat += "Select Agent Vest Disguise
" + dat += "[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest
" else dat += "NO AGENT VEST DETECTED" var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 2b012e5f81..ae095c12e6 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -48,7 +48,7 @@ item_count++ var/g_color = gland_colors[i] var/amount = amounts[i] - dat += "[amount]" + dat += "[amount]" if(item_count == 4) // Four boxes per line dat +="" item_count = 0 diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 73a696fb3a..da445b94ce 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -104,9 +104,9 @@ dat += "
| "
dat += " | "
- dat += "Probe " - dat += "Dissect " - dat += "Analyze " + dat += "Probe " + dat += "Dissect " + dat += "Analyze " dat += " |
" dat += "[flash]" dat += "
" - dat += "Scan" - dat += "Close" : "open=1'>Open"]" + dat += "Scan" + dat += "Close" : "open=1'>Open"]" var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.set_content(dat) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 0251d17398..3ac0f7b29b 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -77,6 +77,7 @@ icon = 'icons/obj/machines/nuke_terminal.dmi' icon_state = "nuclearbomb_base" anchored = TRUE //stops it being moved + use_tag = TRUE /obj/machinery/nuclearbomb/syndicate //ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index aafbffa82e..6615180765 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /* This is for the sandbox for now, maybe useful later for an actual thing? @@ -137,3 +138,144 @@ return interact() +======= +/* + This is for the sandbox for now, + maybe useful later for an actual thing? + -Sayu +*/ + +/obj/structure/door_assembly + var/datum/airlock_maker/maker = null + +/obj/structure/door_assembly/attack_hand() + ..() + if(maker) + maker.interact() + +/datum/airlock_maker + var/obj/structure/door_assembly/linked = null + + var/list/access_used = null + var/require_all = 1 + + var/paintjob = "none" + var/glassdoor = 0 + + var/doorname = "airlock" + +/datum/airlock_maker/New(var/atom/target_loc) + linked = new(target_loc) + linked.maker = src + linked.anchored = FALSE + access_used = list() + + interact() + +/datum/airlock_maker/proc/linkpretty(href,desc,active) + if(!desc) + var/static/list/defaults = list("No","Yes") + desc = defaults[active+1] + if(active) + return "[desc]" + return "[desc]" + +/datum/airlock_maker/proc/interact() + var/list/leftcolumn = list() + var/list/rightcolumn = list() + leftcolumn += "Required Access" + for(var/access in get_all_accesses()) + leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used) + leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]" + + rightcolumn += "Paintjob" + for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity")) + rightcolumn += linkpretty("paint=[option]",option,option == paintjob) + rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "
" + var/length = max(leftcolumn.len,rightcolumn.len) + + var/dat = "You may move the model airlock around. A new airlock will be built in its space when you click done, below.
" + dat += "Door name: \"[doorname]\"" + dat += "
| " + if(i<=leftcolumn.len) + dat += leftcolumn[i] + dat += " | " + if(i<=rightcolumn.len) + dat += rightcolumn[i] + dat += " |
Finalize Airlock Construction | Cancel and Destroy Airlock" + usr << browse(dat,"window=airlockmaker") + +/datum/airlock_maker/Topic(var/href,var/list/href_list) + if(!usr) + return + if(!src || !linked || !linked.loc) + usr << browse(null,"window=airlockmaker") + return + + if("rename" in href_list) + var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname) + if(newname) + doorname = newname + if("access" in href_list) + var/value = text2num(href_list["access"]) + access_used ^= value + if("reqall" in href_list) + require_all = !require_all + if("paint" in href_list) + paintjob = href_list["paint"] + if("glass" in href_list) + glassdoor = !glassdoor + + if("cancel" in href_list) + usr << browse(null,"window=airlockmaker") + qdel(linked) + qdel(src) + return + + if("done" in href_list) + usr << browse(null,"window=airlockmaker") + var/turf/t_loc = linked.loc + qdel(linked) + if(!istype(t_loc)) + return + + var/target_type = "/obj/machinery/door/airlock" + if(glassdoor) + if(paintjob != "none") + if(paintjob in list("external","highsecurity","maintenance")) // no glass version + target_type += "/[paintjob]" + else + target_type += "/glass_[paintjob]" + else + target_type += "/glass" + else if(paintjob != "none") + target_type += "/[paintjob]" + var/final = target_type + target_type = text2path(final) + if(!target_type) + to_chat(usr, "Didn't work, contact Sayu with this: [final]") + usr << browse(null,"window=airlockmaker") + return + + var/obj/machinery/door/D = new target_type(t_loc) + + D.name = doorname + + if(access_used.len == 0) + D.req_access = null + D.req_one_access = null + else if(require_all) + D.req_access = access_used.Copy() + D.req_one_access = null + else + D.req_access = null + D.req_one_access = access_used.Copy() + + return + + interact() +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 15cd346b2d..cf2b867941 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -77,26 +77,26 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) hsbinfo = "
" if(admin) hsbinfo += "Administration
" - hsbinfo += "- Toggle Object Spawning
" - hsbinfo += "- Toggle Item Spawn Panel Auto-close
" + hsbinfo += "- Toggle Object Spawning
" + hsbinfo += "- Toggle Item Spawn Panel Auto-close
" hsbinfo += "Canister Spawning
" - hsbinfo += "- Spawn Plasma Canister
" - hsbinfo += "- Spawn CO2 Canister
" - hsbinfo += "- Spawn Nitrogen Canister
" - hsbinfo += "- Spawn N2O Canister
" + hsbinfo += "- Spawn Plasma Canister
" + hsbinfo += "- Spawn CO2 Canister
" + hsbinfo += "- Spawn Nitrogen Canister
" + hsbinfo += "- Spawn N2O Canister
" else hsbinfo += "Some item spawning may be disabled by the administrators.
" hsbinfo += "Only administrators may spawn dangerous canisters.
" for(var/T in hrefs) var/href = hrefs[T] if(href) - hsbinfo += "- [T]
" + hsbinfo += "- [T]
" else hsbinfo += "
[T]
" hsbinfo += "
" - hsbinfo += "- Spawn Clothing...
" - hsbinfo += "- Spawn Reagent Container...
" - hsbinfo += "- Spawn Other Item...
" + hsbinfo += "- Spawn Clothing...
" + hsbinfo += "- Spawn Reagent Container...
" + hsbinfo += "- Spawn Other Item...
" usr << browse(hsbinfo, "window=hsbpanel") @@ -235,12 +235,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!clothinfo) - clothinfo = "Clothing (Reagent Containers) (Other Items)
" + clothinfo = "Clothing (Reagent Containers) (Other Items)
" var/list/all_items = subtypesof(/obj/item/clothing) for(var/typekey in spawn_forbidden) all_items -= typesof(typekey) for(var/O in reverseRange(all_items)) - clothinfo += "[O]
" + clothinfo += "[O]
" usr << browse(clothinfo,"window=sandbox") @@ -249,12 +249,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!reaginfo) - reaginfo = "Reagent Containers (Clothing) (Other Items)
" + reaginfo = "Reagent Containers (Clothing) (Other Items)
" var/list/all_items = subtypesof(/obj/item/reagent_containers) for(var/typekey in spawn_forbidden) all_items -= typesof(typekey) for(var/O in reverseRange(all_items)) - reaginfo += "[O]
" + reaginfo += "[O]
" usr << browse(reaginfo,"window=sandbox") @@ -263,13 +263,13 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!objinfo) - objinfo = "Other Items (Clothing) (Reagent Containers)
" + objinfo = "Other Items (Clothing) (Reagent Containers)
" var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers) for(var/typekey in spawn_forbidden) all_items -= typesof(typekey) for(var/O in reverseRange(all_items)) - objinfo += "[O]
" + objinfo += "[O]
" usr << browse(objinfo,"window=sandbox") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 776b5d6981..484961b6f8 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -212,7 +212,7 @@ /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null) var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target))) if(stoner) - newstruct.faction |= "\ref[stoner]" + newstruct.faction |= "[REF(stoner)]" newstruct.master = stoner var/datum/action/innate/seek_master/SM = new() SM.Grant(newstruct) @@ -244,7 +244,7 @@ S.key = T.key S.language_holder = U.language_holder.copy(S) if(U) - S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation + S.faction |= "[REF(U)]" //Add the master as a faction, allowing inter-mob cooperation if(U && iscultist(U)) SSticker.mode.add_cultist(S.mind, 0) S.cancel_camera() diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 0838bfeed6..daa45caf72 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -652,7 +652,7 @@ var/list/cat_dat = list() for(var/category in categories) cat_dat[category] = "
" - dat += "
" + spell_info+= "[E.buy_word]
" else spell_info+= "Can't [E.buy_word]
" if(E.CanRefund(user,src)) - spell_info+= "Refund
" + spell_info+= "Refund
" spell_info += "
" if(cat_dat[E.category]) cat_dat[E.category] += spell_info diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 673591aef1..84a18e3352 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -107,8 +107,8 @@ GLOBAL_LIST_EMPTY(announcement_systems) return - var/contents = "Arrival Announcement: ([(arrivalToggle ? "On" : "Off")])
\n[arrival]
\n" - contents += "Departmental Head Announcement: ([(newheadToggle ? "On" : "Off")])
\n[newhead]
\n" + var/contents = "Arrival Announcement: ([(arrivalToggle ? "On" : "Off")])
\n[arrival]
\n" + contents += "Departmental Head Announcement: ([(newheadToggle ? "On" : "Off")])
\n[newhead]
\n" var/datum/browser/popup = new(user, "announcement_config", "Automated Announcement Configuration", 370, 220) popup.set_content(contents) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 44c6812d05..d783be292e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -240,8 +240,8 @@ var/dat = "
Autolathe Menu:
" dat += materials_printout() - dat += "
Browsing [selected_category]:
" dat += materials_printout() @@ -275,22 +275,22 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if (max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" else if(!disabled && can_build(D, 5)) - dat += " x5" + dat += " x5" if(!disabled && can_build(D, 10)) - dat += " x10" + dat += " x10" dat += "[get_design_cost(D)]
" @@ -298,7 +298,7 @@ return dat /obj/machinery/autolathe/proc/search_win(mob/user) - var/dat = "Return to main menu" + var/dat = "Return to main menu" dat += "
Search results:
" dat += materials_printout() @@ -307,17 +307,17 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if (max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" dat += "[get_design_cost(D)]
" diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 9d446aa77c..b8d20b0c59 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -62,11 +62,11 @@ var/dat = "[world.name] secure vault. Authorized personnel only.
" dat += "Current Balance: [SSshuttle.points] credits.
" if(!siphoning) - dat += "Siphon Credits
" + dat += "Siphon Credits
" else - dat += "Halt Credit Siphon
" + dat += "Halt Credit Siphon
" - dat += "Close" + dat += "Close" var/datum/browser/popup = new(user, "computer", "Bank Vault", 300, 200) popup.set_content("
Begin Reconstruction"} + dat += {"
Begin Reconstruction"} else dat += "
Reconstruction in process, please wait.
" - dat += {"
Close"} + dat += {"
Close"} var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index c93c96429c..aa644eb738 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -9,7 +9,7 @@ var/list/apcs //APCs the computer has access to var/mob/living/operator //Who's operating the computer right now var/obj/machinery/power/apc/active_apc //The APC we're using right now - var/list/filters //For sorting the results + var/list/result_filters //For sorting the results var/checking_logs = 0 var/list/logs var/authenticated = 0 @@ -18,7 +18,7 @@ /obj/machinery/computer/apc_control/Initialize() . = ..() apcs = list() //To avoid BYOND making the list run through a ton of procs - filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) + result_filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) /obj/machinery/computer/apc_control/process() apcs = list() //Clear the list every tick @@ -52,28 +52,28 @@ if(!checking_logs) dat += "Logged in as [auth_id].
" dat += "Filters
" - dat += "Name: [filters["Name"] ? filters["Name"] : "None set"]
" - dat += "Charge: \>[filters["Charge Above"] ? filters["Charge Above"] : "NaN"]% and \<[filters["Charge Below"] ? filters["Charge Below"] : "NaN"]%
" - dat += "Accessible: [filters["Responsive"] ? "Non-Responsive Only" : "All"]
" + dat += "Name: [result_filters["Name"] ? result_filters["Name"] : "None set"]
" + dat += "Charge: \>[result_filters["Charge Above"] ? result_filters["Charge Above"] : "NaN"]% and \<[result_filters["Charge Below"] ? result_filters["Charge Below"] : "NaN"]%
" + dat += "Accessible: [result_filters["Responsive"] ? "Non-Responsive Only" : "All"]
" for(var/A in apcs) var/obj/machinery/power/apc/APC = apcs[A] - if(filters["Name"] && !findtext(APC.name, filters["Name"]) && !findtext(APC.area.name, filters["Name"])) + if(result_filters["Name"] && !findtext(APC.name, result_filters["Name"]) && !findtext(APC.area.name, result_filters["Name"])) continue - if(filters["Charge Above"] && (APC.cell.charge / APC.cell.maxcharge) < filters["Charge Above"] / 100) + if(result_filters["Charge Above"] && (APC.cell.charge / APC.cell.maxcharge) < result_filters["Charge Above"] / 100) continue - if(filters["Charge Below"] && (APC.cell.charge / APC.cell.maxcharge) > filters["Charge Below"] / 100) + if(result_filters["Charge Below"] && (APC.cell.charge / APC.cell.maxcharge) > result_filters["Charge Below"] / 100) continue - if(filters["Responsive"] && !APC.aidisabled) + if(result_filters["Responsive"] && !APC.aidisabled) continue - dat += "[A]
\ + dat += "[A]
\ Charge: [DisplayPower(APC.cell.charge)] / [DisplayPower(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\ Area: [APC.area]
\ [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
" - dat += "Check Logs
" - dat += "Log Out
" + dat += "Check Logs
" + dat += "Log Out
" if(emagged) dat += "WARNING: Logging functionality partially disabled from outside source.
" - dat += "Restore logging functionality?
" + dat += "Restore logging functionality?
" else if(logs.len) for(var/entry in logs) @@ -81,11 +81,11 @@ else dat += "No activity has been recorded at this time.
" if(emagged) - dat += "@#%! CLEAR LOGS" - dat += "Return" + dat += "@#%! CLEAR LOGS" + dat += "Return" operator = user else - dat = "Please swipe a valid ID to log in..." + dat = "Please swipe a valid ID to log in..." var/datum/browser/popup = new(user, "apc_control", name, 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) @@ -153,7 +153,7 @@ return log_activity("changed name filter to \"[new_filter]\"") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Name"] = new_filter + result_filters["Name"] = new_filter if(href_list["above_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num @@ -163,7 +163,7 @@ if(new_filter) new_filter = Clamp(new_filter, 0, 100) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Charge Above"] = new_filter + result_filters["Charge Above"] = new_filter if(href_list["below_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num @@ -173,13 +173,13 @@ if(new_filter) new_filter = Clamp(new_filter, 0, 100) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Charge Below"] = new_filter + result_filters["Charge Below"] = new_filter if(href_list["access_filter"]) - if(isnull(filters["Responsive"])) - filters["Responsive"] = 1 + if(isnull(result_filters["Responsive"])) + result_filters["Responsive"] = 1 log_activity("sorted by non-responsive APCs only") else - filters["Responsive"] = !filters["Responsive"] + result_filters["Responsive"] = !result_filters["Responsive"] log_activity("sorted by all APCs") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) if(href_list["check_logs"]) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7748022da1..4203971522 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -134,18 +134,18 @@ if(..()) return user.set_machine(src) - var/dat = "Close" + var/dat = "Close" dat += "
[enemy_name]
[temp]
Food: [food] | Fuel: [fuel]" dat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" if(turns == 7) - dat += "" + dat += "" else - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" + dat += "" else dat = "
The Orion Trail
Experience the journey of your ancestors!
" - dat += "
[deadname] tried to fight back, but was killed." else eventdat += "
Fortunately, you fended them off without any trouble." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_FLUX) eventdat += "This region of space is highly turbulent.
If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies." eventdat += "
What will you do?" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_ILLNESS) eventdat += "A deadly illness has been contracted!" var/deadname = remove_crewmember() eventdat += "
[deadname] was killed by the disease." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_BREAKDOWN) eventdat += "Oh no! The engine has broken down!" eventdat += "
You can repair it with an engine part, or you can make repairs for 3 days." if(engine >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_MALFUNCTION) eventdat += "The ship's systems are malfunctioning!" eventdat += "
You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI." if(electronics >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_COLLISION) eventdat += "Something hit us! Looks like there's some hull damage." @@ -818,23 +818,23 @@ eventdat += "
[deadname] was killed by rapid depressurization." eventdat += "
You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together." if(hull >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_BLACKHOLE) eventdat += "You were swept away into the black hole." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" settlers = list() if(ORION_TRAIL_LING) eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." if(settlers.len <= 2) eventdat += "
Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(prob(10)) // "likely", I didn't say it was guaranteed! lings_aboard = min(++lings_aboard,2) else @@ -844,9 +844,9 @@ else if(prob(70)) lings_aboard = min(++lings_aboard,2) - eventdat += "" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_LING_ATTACK) @@ -892,8 +892,8 @@ else lings_aboard = max(0,--lings_aboard) - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 @@ -903,8 +903,8 @@ eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid." if(last_spaceport_action) eventdat += "
Last Spaceport Action: [last_spaceport_action]" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" else eventdat += "Your jump into the sector yields a spaceport - a lucky find!" eventdat += "
This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." @@ -943,13 +943,13 @@ //Buy crew if(food >= 10 && fuel >= 10) - eventdat += "
Hire a New Crewmember (-10FU, -10FO)
" + eventdat += "Hire a New Crewmember (-10FU, -10FO)
" else eventdat += "You cannot afford a new crewmember.
" //Sell crew if(settlers.len > 1) - eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
" + eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
" else eventdat += "You have no other crew to sell.
" @@ -958,37 +958,37 @@ //Engine parts if(fuel > 5) - eventdat += "" + eventdat += "" else eventdat += "You cannot afford engine parts." //Hull plates if(fuel > 5) - eventdat += "
" + eventdat += "" else eventdat += "You cannot afford hull plates." //Electronics if(fuel > 5) - eventdat += "
" + eventdat += "" else eventdat += "You cannot afford spare electronics." //Trade if(fuel > 5) - eventdat += "
Trade Fuel for Food (-5FU,+5FO)
" + eventdat += "Trade Fuel for Food (-5FU,+5FO)
" else eventdat += "You don't have 5FU to trade. 5) - eventdat += "
Trade Food for Fuel (+5FU,-5FO)
" + eventdat += "Trade Food for Fuel (+5FU,-5FO)
" else eventdat += "You don't have 5FO to trade."
- dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
+ dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
else if(mode == 2)
// JOB MANAGEMENT
- dat = "Return"
+ dat = "Return"
dat += " || Confirm Identity: "
var/S
if(scan)
S = html_encode(scan.name)
else
S = "--------"
- dat += "[S]"
+ dat += "[S]"
dat += "
| Job | Slots | Open job | Close job | Prioritize |
| Name | -ID | +Name | +ID | Fingerprints (F) | DNA (D) | -Blood Type | +Blood Type | Physical Status | Mental Status |
|---|---|---|---|---|---|---|---|---|
| [] | ", background, src, R.fields["id"], R.fields["name"]) + dat += text("||||||||
| [] | ", background, R.fields["id"], R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("F: [] D: [] | ", R.fields["fingerprint"], b_dna)
dat += text("[] | ", blood_type) @@ -102,11 +102,11 @@ dat += "
" // if(GLOB.data_core.general) // for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) -// dat += "[R.fields["id"]]: [R.fields["name"]]
" +// dat += "[R.fields["id"]]: [R.fields["name"]]
" // //Foreach goto(132) - dat += text("
Back", src) + dat += "
Back" if(3) - dat += text("Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack", src, src, src, src) + dat += "Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack" if(4) dat += "
| Medical Record | |||
| Name: | [active1.fields["name"]] | " - dat += "||
| ID: | [active1.fields["id"]] | ||
| Sex: | [active1.fields["sex"]] | ||
| Age: | [active1.fields["age"]] | ||
| Species: | [active1.fields["species"]] | ||
| Fingerprint: | [active1.fields["fingerprint"]] | ||
| Physical Status: | [active1.fields["p_stat"]] | ||
| Mental Status: | [active1.fields["m_stat"]] | ||
| Sex: | [active1.fields["sex"]] | ||
| Age: | [active1.fields["age"]] | ||
| Species: | [active1.fields["species"]] | ||
| Fingerprint: | [active1.fields["fingerprint"]] | ||
| Physical Status: | [active1.fields["p_stat"]] | ||
| Mental Status: | [active1.fields["m_stat"]] | ||
| General Record Lost! | |||
Medical Data | |||
| Blood Type: | [active2.fields["blood_type"]] | ||
| DNA: | [active2.fields["b_dna"]] | ||
Minor Disabilities: | [active2.fields["mi_dis"]] | ||
| Details: | [active2.fields["mi_dis_d"]] | ||
Major Disabilities: | [active2.fields["ma_dis"]] | ||
| Details: | [active2.fields["ma_dis_d"]] | ||
Allergies: | [active2.fields["alg"]] | ||
| Details: | [active2.fields["alg_d"]] | ||
Current Diseases: | [active2.fields["cdi"]] | ||
| Details: | [active2.fields["cdi_d"]] | ||
Important Notes: | [active2.fields["notes"]] | ||
| Blood Type: | [active2.fields["blood_type"]] | ||
| DNA: | [active2.fields["b_dna"]] | ||
Minor Disabilities: | [active2.fields["mi_dis"]] | ||
| Details: | [active2.fields["mi_dis_d"]] | ||
Major Disabilities: | [active2.fields["ma_dis"]] | ||
| Details: | [active2.fields["ma_dis_d"]] | ||
Allergies: | [active2.fields["alg"]] | ||
| Details: | [active2.fields["alg_d"]] | ||
Current Diseases: | [active2.fields["cdi"]] | ||
| Details: | [active2.fields["cdi_d"]] | ||
Important Notes: | [active2.fields["notes"]] | ||
Comments/Log | |||
| [active2.fields[text("com_[]", counter)]] | |||
| Delete Entry | |||
| [active2.fields[text("com_[]", counter)]] | |||
| Delete Entry | |||
| Add Entry | |||
| Add Entry | |||
Delete Record (Medical Only) | |||
Delete Record (Medical Only) | |||
| Medical Record Lost! | |||
New Record | |||
| Print Record | |||
| Back | |||
New Record | |||
| Print Record | |||
| Back |
[Dis.name]" - dat += "
Back" + dat += "
[Dis.name]" + dat += "
Back" if(6) dat += "
Medical Robots:" var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in GLOB.living_mob_list) @@ -191,7 +191,7 @@ else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "med_rec", "Medical Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -286,7 +286,7 @@
Severity: [Dis.severity]"} else if(href_list["del_all"]) - src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" else if(href_list["del_all2"]) investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", INVESTIGATE_RECORDS) @@ -377,13 +377,13 @@ src.active2.fields["notes"] = t1 if("p_stat") if(active1) - src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
", src, src, src, src) + src.temp = "Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
" if("m_stat") if(active1) - src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) + src.temp = "Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
" if("blood_type") if(active2) - src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) + src.temp = "Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
" if("b_dna") if(active2) var/t1 = stripped_input("Please input DNA hash:", "Med. records", src.active2.fields["b_dna"], null) @@ -452,7 +452,7 @@ else if(href_list["del_r"]) if(active2) - src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" else if(href_list["del_r2"]) investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 5ba20bc527..ffd2197133 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD // Allows you to monitor messages that passes the server. @@ -471,3 +472,478 @@ info_links = info add_overlay("paper_words") break +======= + +// Allows you to monitor messages that passes the server. + + + + +/obj/machinery/computer/message_monitor + name = "message monitor console" + desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." + icon_screen = "comm_logs" + circuit = /obj/item/circuitboard/computer/message_monitor + //Server linked to. + var/obj/machinery/message_server/linkedServer = null + //Sparks effect - For emag + var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread + //Messages - Saves me time if I want to change something. + var/noserver = "ALERT: No server detected." + var/incorrectkey = "ALERT: Incorrect decryption key!" + var/defaultmsg = "Welcome. Please select an option." + var/rebootmsg = "%$&(�: Critical %$$@ Error // !RestArting!
�%@%(*$%&(�&?*(%&�/{}" + var/time = 100 * length(src.linkedServer.decryptkey) + addtimer(CALLBACK(src, .proc/UnmagConsole), time) + message = rebootmsg + else + to_chat(user, "A no server error appears on the screen.") + +/obj/machinery/computer/message_monitor/Initialize() + . = ..() + //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. + if(!linkedServer) + if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] + +/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) + if(..()) + return + //If the computer is being hacked or is emagged, display the reboot message. + if(hacking || emagged) + message = rebootmsg + var/dat = "
\[Authenticated\] /"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+ else
+ dat += " \[Unauthenticated\] /"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+
+ if(hacking || emagged)
+ screen = 2
+ else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
+ if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ screen = 0
+
+ switch(screen)
+ //Main menu
+ if(0)
+ // = TAB
+ var/i = 0
+ dat += "" + + //Bottom message + if(!auth) + dat += "
" + dat += "
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message][pda.photo ? "(Photo)":""] |
It will take 20 seconds for every character that the password has." + dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." + else + //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. + dat += {"01000010011100100111010101110100011001010010110
+ 10110011001101111011100100110001101101001011011100110011
+ 10010000001100110011011110111001000100000011100110110010
+ 10111001001110110011001010111001000100000011010110110010
+ 10111100100101110001000000100100101110100001000000111011
+ 10110100101101100011011000010000001110100011000010110101
+ 10110010100100000001100100011000000100000011100110110010
+ 10110001101101111011011100110010001110011001000000110011
+ 00110111101110010001000000110010101110110011001010111001
+ 00111100100100000011000110110100001100001011100100110000
+ 10110001101110100011001010111001000100000011101000110100
+ 00110000101110100001000000111010001101000011001010010000
+ 00111000001100001011100110111001101110111011011110111001
+ 00110010000100000011010000110000101110011001011100010000
+ 00100100101101110001000000111010001101000011001010010000
+ 00110110101100101011000010110111001110100011010010110110
+ 10110010100101100001000000111010001101000011010010111001
+ 10010000001100011011011110110111001110011011011110110110
+ 00110010100100000011000110110000101101110001000000111001
+ 00110010101110110011001010110000101101100001000000111100
+ 10110111101110101011100100010000001110100011100100111010
+ 10110010100100000011010010110111001110100011001010110111
+ 00111010001101001011011110110111001110011001000000110100
+ 10110011000100000011110010110111101110101001000000110110
+ 00110010101110100001000000111001101101111011011010110010
+ 10110111101101110011001010010000001100001011000110110001
+ 10110010101110011011100110010000001101001011101000010111
+ 00010000001001101011000010110101101100101001000000111001
+ 10111010101110010011001010010000001101110011011110010000
+ 00110100001110101011011010110000101101110011100110010000
+ 00110010101101110011101000110010101110010001000000111010
+ 00110100001100101001000000111001001101111011011110110110
+ 10010000001100100011101010111001001101001011011100110011
+ 10010000001110100011010000110000101110100001000000111010
+ 001101001011011010110010100101110"} + + //Fake messages + if(3) + dat += "
" + + dat += {"
| Sender | +Sender's Job | +Recipient | +Message |
| [customsender] | +[customjob] | +[customrecepient ? customrecepient.owner : "NONE"] | +[custommessage] |
" + dat += {"
| X | Sending Dep. | Receiving Dep. | +Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | +[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
[custommessage]
" + if (!customrecepient.silent) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + if( customrecepient.loc && ishuman(customrecepient.loc) ) + var/mob/living/carbon/human/H = customrecepient.loc + to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + customrecepient.cut_overlays() + customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) + //Sender is faking as someone who exists + else + src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]") + customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" + if (!customrecepient.silent) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + if( customrecepient.loc && ishuman(customrecepient.loc) ) + var/mob/living/carbon/human/H = customrecepient.loc + to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + customrecepient.cut_overlays() + customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) + //Finally.. + ResetMessage() + + //Request Console Logs - KEY REQUIRED + if(href_list["viewr"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 4 + + if (href_list["back"]) + src.screen = 0 + + return src.attack_hand(usr) + + +/obj/item/paper/monitorkey + //..() + name = "monitor decryption key" + var/obj/machinery/message_server/server = null + +/obj/item/paper/monitorkey/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/item/paper/monitorkey/LateInitialize() + if(GLOB.message_servers) + for(var/obj/machinery/message_server/server in GLOB.message_servers) + if(!isnull(server)) + if(!isnull(server.decryptkey)) + info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info_links = info + add_overlay("paper_words") + break +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 61bf091af3..c13e80e48b 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -48,21 +48,21 @@ if(connected) var/d2 if(timing) //door controls do not need timers. - d2 = "Stop Time Launch" + d2 = "Stop Time Launch" else - d2 = "Initiate Time Launch" - dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" + d2 = "Initiate Time Launch" + dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) if(t == connected.power) temp += "[t] " else - temp += "[t] " - dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" + temp += "[t] " + dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" else - dat += "
\nToggle Outer Door
" - dat += "
Close" + dat += "
\nToggle Outer Door
" + dat += "
Close" add_fingerprint(usr) var/datum/browser/popup = new(user, "computer", title, 400, 500) popup.set_content(dat) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3e9d6df42a..d2005d0a55 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -21,16 +21,16 @@ user.set_machine(src) var/dat = "" if(screen == 0) - dat += "
Unlock Console" + dat += "
Unlock Console" else if(screen == 1) dat += "
Prisoner ID Management
" if(inserted_id) - dat += text("[inserted_id]") - dat += text("Collected Points: [inserted_id.points]. Reset.
") - dat += text("Card goal: [inserted_id.goal]. Set
") + dat += text("[inserted_id]
") + dat += text("Collected Points: [inserted_id.points]. Reset.
") + dat += text("Card goal: [inserted_id.goal]. Set
") dat += text("Space Law recommends quotas of 100 points per minute they would normally serve in the brig.
") else - dat += text("Insert Prisoner ID.
") + dat += text("Insert Prisoner ID.
") dat += "
Prisoner Implant Management
" dat += "Chemical Implants
" var/turf/Tr = null @@ -42,9 +42,9 @@ continue dat += "ID: [C.imp_in.name] | Remaining Units: [C.reagents.total_volume]
" dat += "| Inject: " - dat += "((1))" - dat += "((5))" - dat += "((10))
" + dat += "((1))" + dat += "((5))" + dat += "((10))
" dat += "********************************
" dat += "
Tracking Implants
" for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) @@ -61,9 +61,9 @@ loc_display = mob_loc.loc dat += "ID: [T.imp_in.name] | Location: [loc_display]
" - dat += "(Message Holder) |
" + dat += "(Message Holder) |
" dat += "********************************
" - dat += "
Lock Console" + dat += "
Lock Console" var/datum/browser/popup = new(user, "computer", "Prisoner Management Console", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 9960032d1d..41ead45327 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -7,6 +7,7 @@ icon_screen = "robot" icon_keyboard = "rd_key" req_access = list(ACCESS_ROBOTICS) +<<<<<<< HEAD circuit = /obj/item/circuitboard/computer/robotics var/temp = null @@ -158,6 +159,159 @@ else if (href_list["killdrone"]) if(src.allowed(usr)) +======= + circuit = /obj/item/circuitboard/computer/robotics + var/temp = null + + light_color = LIGHT_COLOR_PINK + +/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) + if(!istype(R)) + return 0 + if(isAI(user)) + if (R.connected_ai != user) + return 0 + if(iscyborg(user)) + if (R != user) + return 0 + if(R.scrambledcodes) + return 0 + return 1 + +/obj/machinery/computer/robotics/attack_hand(mob/user) + if(..()) + return + interact(user) + +/obj/machinery/computer/robotics/interact(mob/user) + if (src.z > 6) + to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") + return + user.set_machine(src) + var/dat + var/robots = 0 + for(var/mob/living/silicon/robot/R in GLOB.mob_list) + if(!can_control(user, R)) + continue + robots++ + dat += "[R.name] |" + if(R.stat) + dat += " Not Responding |" + else if (!R.canmove) + dat += " Locked Down |" + else + dat += " Operating Normally |" + if (!R.canmove) + else if(R.cell) + dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |" + else + dat += " No Cell Installed |" + if(R.module) + dat += " Module Installed ([R.module.name]) |" + else + dat += " No Module Installed |" + if(R.connected_ai) + dat += " Slaved to [R.connected_ai.name] |" + else + dat += " Independent from AI |" + if(issilicon(user) || IsAdminGhost(user)) + if(is_servant_of_ratvar(user) && user != R) + dat += "(Convert) " + else if(((issilicon(user) && is_special_character(user)) || IsAdminGhost(user)) && !R.emagged && (user != R || R.syndicate)) + dat += "(Hack) " + dat += "([R.canmove ? "Lockdown" : "Release"]) " + dat += "(Destroy)" + dat += "
" + + if(!robots) + dat += "No Cyborg Units detected within access parameters." + dat += "
" + + var/drones = 0 + for(var/mob/living/simple_animal/drone/D in GLOB.mob_list) + if(D.hacked) + continue + drones++ + dat += "[D.name] |" + if(D.stat) + dat += " Not Responding |" + dat += "(Destroy)" + dat += "
" + + if(!drones) + dat += "No Drone Units detected within access parameters." + + var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/robotics/Topic(href, href_list) + if(..()) + return + + if (href_list["temp"]) + src.temp = null + + else if (href_list["killbot"]) + if(src.allowed(usr)) + var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs + if(can_control(usr, R)) + var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort") + if(choice == "Confirm" && can_control(usr, R) && !..()) + if(R.syndicate && R.emagged) + to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") + if(R.connected_ai) + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") + R.ResetSecurityCodes() + else + var/turf/T = get_turf(R) + message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name(R, R.client)][ADMIN_JMP(T)]!") + log_game("\[key_name(usr)] detonated [key_name(R)]!") + if(R.connected_ai) + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") + R.self_destruct() + else + to_chat(usr, "Access Denied.") + + else if (href_list["stopbot"]) + if(src.allowed(usr)) + var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs + if(can_control(usr, R)) + var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") + if(choice == "Confirm" && can_control(usr, R) && !..()) + message_admins("[ADMIN_LOOKUPFLW(usr)] [R.canmove ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") + R.SetLockdown(!R.lockcharge) + to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") + if(R.connected_ai) + to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") + + else + to_chat(usr, "Access Denied.") + + else if (href_list["magbot"]) + if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr)) + var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs + if(istype(R) && !R.emagged && ((R.syndicate && R == usr) || R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R)) + log_game("[key_name(usr)] emagged [R.name] using robotic console!") + message_admins("[key_name_admin(usr)] emagged cyborg [key_name_admin(R)] using robotic console!") + R.SetEmagged(1) + if(is_special_character(R)) + R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes + + else if(href_list["convert"]) + if(issilicon(usr) && is_special_character(usr)) + var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs + if(istype(R) && !is_servant_of_ratvar(R) && is_servant_of_ratvar(usr) && R.connected_ai == usr) + log_game("[key_name(usr)] converted [R.name] using robotic console!") + message_admins("[key_name_admin(usr)] converted cyborg [key_name_admin(R)] using robotic console!") + add_servant_of_ratvar(R) + + else if (href_list["killdrone"]) + if(src.allowed(usr)) +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) in GLOB.mob_list if(D.hacked) to_chat(usr, "ERROR: [D] is not responding to external commands.") diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 81204a69f0..13f12c6d3f 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -63,9 +63,9 @@ var/dat if(temp) - dat = text("[]
Clear Screen", temp, src) + dat = text("[]
Clear Screen", temp) else - dat = text("Confirm Identity: []
", src, (scan ? text("[]", scan.name) : "----------")) + dat = text("Confirm Identity: []
", (scan ? text("[]", scan.name) : "----------")) if(authenticated) switch(screen) if(1) @@ -111,7 +111,7 @@ "} dat += {"
"}
- dat += text("New Record
", src)
+ dat += "New Record
"
//search bar
dat += {"
| Name | -ID | -Rank | -Fingerprints | +Name | +ID | +Rank | +Fingerprints | Criminal Status | |||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], src, R, R.fields["name"]) + dat += text("[] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("[] | ", R.fields["rank"]) dat += text("[] | ", R.fields["fingerprint"]) @@ -173,11 +173,11 @@ var complete_list = maintable.innerHTML;
|
-
|
|
General Record Lost!
" if((istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2))) dat += "Security Data" - dat += "
Criminal Status: [active2.fields["criminal"]]" - dat += "
Minor Crimes: Add New" + dat += "
Criminal Status: [active2.fields["criminal"]]" + dat += "
Minor Crimes: Add New" dat +={"
| [c.crimeDetails] | " dat += "[c.author] | " dat += "[c.time] | " - dat += "\[X\] | " + dat += "\[X\] | " dat += "" dat += "
Major Crimes: Add New" + dat += "
Major Crimes: Add New" dat +={"
| [c.crimeDetails] | " dat += "[c.author] | " dat += "[c.time] | " - dat += "\[X\] | " + dat += "\[X\] | " dat += "
\nImportant Notes:
\n\t [active2.fields["notes"]] " + dat += "
\nImportant Notes:
\n\t [active2.fields["notes"]] " dat += "
Comments/Log
" var/counter = 1 while(active2.fields[text("com_[]", counter)]) dat += (active2.fields[text("com_[]", counter)] + "
") if(active2.fields[text("com_[]", counter)] != "Deleted") - dat += text("Delete Entry
", src, counter) + dat += text("Delete Entry
", counter) counter++ - dat += text("Add Entry
", src) - dat += text("Delete Record (Security Only)
", src) + dat += "Add Entry
" + dat += "Delete Record (Security Only)
" else dat += "Security Record Lost!
" - dat += text("New Security Record
", src) - dat += text("Delete Record (ALL)
Print Record
Print Wanted Poster
Back
", src, src, src, src) + dat += "New Security Record
" + dat += "Delete Record (ALL)
Print Record
Print Wanted Poster
Back
" else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "secure_rec", "Security Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -451,8 +451,8 @@ What a mess.*/ if("Delete All Records") temp = "" temp += "Are you sure you wish to delete all Security records?
" - temp += "Yes
" - temp += "No" + temp += "Yes
" + temp += "No" if("Purge All Records") investigate_log("[usr.name] ([usr.key]) has purged all the security records.", INVESTIGATE_RECORDS) @@ -476,14 +476,14 @@ What a mess.*/ if("Delete Record (ALL)") if(active1) temp = "
Are you sure you wish to delete the record (ALL)?
" - temp += "Yes" - temp += "No" + temp += "Yes
" + temp += "No" if("Delete Record (Security)") if(active2) temp = "
Are you sure you wish to delete the record (Security Portion Only)?
" - temp += "Yes" - temp += "No" + temp += "Yes
" + temp += "No" if("Delete Entry") if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])])) @@ -657,11 +657,11 @@ What a mess.*/ if(istype(active2, /datum/data/record)) temp = "
Criminal Status:
" temp += "- "
- temp += "
- None " - temp += "
- *Arrest* " - temp += "
- Incarcerated " - temp += "
- Parolled " - temp += "
- Discharged " + temp += "
- None " + temp += "
- *Arrest* " + temp += "
- Incarcerated " + temp += "
- Parolled " + temp += "
- Discharged " temp += "
Rank:
" temp += "" else alert(usr, "You do not have the required rank to do this!") diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 4fefdb044e..c879bc175a 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -97,8 +97,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E if(uplinkholder) dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink." if(linkedboss) - dat += "Donate TC: 1 | 5 | All" - dat += "
Eject Uplink" + dat += "Donate TC: 1 | 5 | All" + dat += "
Eject Uplink" var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Receive Station", 700, 500) @@ -167,7 +167,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E var/dat = "" - dat += "Scan for TC stations.
" + dat += "Scan for TC stations.
" dat += "[storedcrystals] telecrystals are available for distribution.
" dat += "
" @@ -177,11 +177,11 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E if(A.uplinkholder) dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals." if(storedcrystals) - dat+= "
Add TC: 1 | 5 | 10 | All" + dat+= "
Add TC: 1 | 5 | 10 | All" dat += "
" if(TCstations.len && storedcrystals) - dat += "
Evenly distribute remaining TC.
" + dat += "
Evenly distribute remaining TC.
" for(var/entry in transferlog) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index ab4c72ab41..c62965f02d 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -70,16 +70,16 @@ data += "Calibration: Sub-Optimal" data += "
" - data += "Change regime
" - data += "Set target
" + data += "Change regime
" + data += "Set target
" if(locked) - data += "
Get target from memory
" - data += "Eject GPS device
" + data += "
Get target from memory
" + data += "Eject GPS device
" else data += "
Get target from memory
" data += "Eject GPS device
" - data += "
Calibrate Hub" + data += "
Calibrate Hub" var/datum/browser/popup = new(user, "teleporter", name, 400, 400) popup.set_content(data) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index de26806273..ec8779b7d2 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -92,21 +92,21 @@ user.set_machine(src) var/list/dat = list() dat +="
"
- dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" + dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" dat += "
" + dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" dat += "
" - dat += " Select Track
" + dat += " Select Track
" dat += "Track Selected: [selection.song_name]
" dat += "Track Length: [DisplayTimeText(selection.song_length)]
" dat += "
DJ's Soundboard:
" dat +="
"
- dat += "Air Horn "
- dat += "Station Alert "
- dat += "Warning Siren "
- dat += "Honk
" - dat += "Shotgun Pump" - dat += "Gunshot" - dat += "Esword" - dat += "Harm Alarm" + dat += "Air Horn " + dat += "Station Alert " + dat += "Warning Siren " + dat += "Honk
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) popup.set_content(dat.Join()) popup.open() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index aac80cc1a0..0e170d9b8b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -632,23 +632,23 @@ if(wires.is_cut(WIRE_IDSCAN)) t1 += text("IdScan wire is cut.
\n") else if(src.aiDisabledIdScanner) - t1 += text("IdScan disabled. Enable?
\n", src) + t1 += "IdScan disabled. Enable?
\n" else - t1 += text("IdScan enabled. Disable?
\n", src) + t1 += "IdScan enabled. Disable?
\n" if(src.emergency) - t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + t1 += "Emergency Access Override is enabled. Disable?
\n" else - t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + t1 += "Emergency Access Override is disabled. Enable?
\n" if(wires.is_cut(WIRE_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(wires.is_cut(WIRE_POWER2)) t1 += text("Main Power Output wire is cut.
\n") if(!secondsMainPowerLost) - t1 += text("Temporarily disrupt main power?.
\n", src) + t1 += "Temporarily disrupt main power?.
\n" if(!secondsBackupPowerLost) - t1 += text("Temporarily disrupt backup power?.
\n", src) + t1 += "Temporarily disrupt backup power?.
\n" if(wires.is_cut(WIRE_BACKUP1)) t1 += text("Backup Power Input wire is cut.
\n") @@ -658,53 +658,53 @@ if(wires.is_cut(WIRE_BOLTS)) t1 += text("Door bolt drop wire is cut.
\n") else if(!src.locked) - t1 += text("Door bolts are up. Drop them?
\n", src) + t1 += "Door bolts are up. Drop them?
\n" else t1 += text("Door bolts are down.") if(src.hasPower()) - t1 += text(" Raise?
\n", src) + t1 += " Raise?
\n" else t1 += text(" Cannot raise door bolts due to power failure.
\n") if(wires.is_cut(WIRE_LIGHT)) t1 += text("Door bolt lights wire is cut.
\n") else if(!src.lights) - t1 += text("Door bolt lights are off. Enable?
\n", src) + t1 += "Door bolt lights are off. Enable?
\n" else - t1 += text("Door bolt lights are on. Disable?
\n", src) + t1 += "Door bolt lights are on. Disable?
\n" if(wires.is_cut(WIRE_SHOCK)) t1 += text("Electrification wire is cut.
\n") if(secondsElectrified==ELECTRIFIED_PERMANENT) - t1 += text("Door is electrified indefinitely. Un-electrify it?
\n", src) + t1 += "Door is electrified indefinitely. Un-electrify it?
\n" else if(secondsElectrified>NOT_ELECTRIFIED) - t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified, src) + t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified) else - t1 += text("Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n", src, src) + t1 += "Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n" if(wires.is_cut(WIRE_SAFETY)) t1 += text("Door force sensors not responding.
\n") else if(src.safe) - t1 += text("Door safeties operating normally. Override?
\n",src) + t1 += "Door safeties operating normally. Override?
\n" else - t1 += text("Danger. Door safeties disabled. Restore?
\n",src) + t1 += "Danger. Door safeties disabled. Restore?
\n" if(wires.is_cut(WIRE_TIMING)) t1 += text("Door timing circuitry not responding.
\n") else if(src.normalspeed) - t1 += text("Door timing circuitry operating normally. Override?
\n",src) + t1 += "Door timing circuitry operating normally. Override?
\n" else - t1 += text("Warning. Door timing circuitry operating abnormally. Restore?
\n",src) + t1 += "Warning. Door timing circuitry operating abnormally. Restore?
\n" if(src.welded) t1 += text("Door appears to have been welded shut.
\n") else if(!src.locked) if(src.density) - t1 += text("Open door
\n", src) + t1 += "Open door
\n" else - t1 += text("Close door
\n", src) + t1 += "Close door
\n" - t1 += text("\n", src) + t1 += "\n" user << browse(t1, "window=airlock") onclose(user, "airlock") diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 5e0d018554..e243494f2b 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -277,29 +277,29 @@ if(!exteriorAirlock || !interiorAirlock) if(!exteriorAirlock) if(interiorAirlock.density) - output = "Open Interior Airlock
" + output = "Open Interior Airlock
" else - output = "Close Interior Airlock
" + output = "Close Interior Airlock
" else if(exteriorAirlock.density) - output = "Open Exterior Airlock
" + output = "Open Exterior Airlock
" else - output = "Close Exterior Airlock
" + output = "Close Exterior Airlock
" else if(exteriorAirlock.density) if(interiorAirlock.density) - output = {"Open Exterior Airlock
- Open Interior Airlock
"} + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} else - output = {"Cycle to Exterior Airlock
- Close Interior Airlock
"} + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} else if(interiorAirlock.density) - output = {"Close Exterior Airlock
- Cycle to Interior Airlock
"} + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} else - output = {"Close Exterior Airlock
- Close Interior Airlock
"} + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} output = {"Access Control Console
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 59d58bc9a5..6f10d11b2e 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //States for airlock_control #define AIRLOCK_STATE_INOPEN -2 #define AIRLOCK_STATE_PRESSURIZE -1 @@ -294,3 +295,301 @@ [state_options]"} return output +======= +//States for airlock_control +#define AIRLOCK_STATE_INOPEN -2 +#define AIRLOCK_STATE_PRESSURIZE -1 +#define AIRLOCK_STATE_CLOSED 0 +#define AIRLOCK_STATE_DEPRESSURIZE 1 +#define AIRLOCK_STATE_OUTOPEN 2 + +/datum/computer/file/embedded_program/airlock_controller + var/id_tag + var/exterior_door_tag + var/interior_door_tag + var/airpump_tag + var/sensor_tag + var/sanitize_external + + state = AIRLOCK_STATE_CLOSED + var/target_state = AIRLOCK_STATE_CLOSED + var/sensor_pressure = null + +/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) + var/receive_tag = signal.data["tag"] + if(!receive_tag) + return + + if(receive_tag==sensor_tag) + if(signal.data["pressure"]) + sensor_pressure = text2num(signal.data["pressure"]) + + else if(receive_tag==exterior_door_tag) + memory["exterior_status"] = signal.data["door_status"] + + else if(receive_tag==interior_door_tag) + memory["interior_status"] = signal.data["door_status"] + + else if(receive_tag==airpump_tag) + if(signal.data["power"]) + memory["pump_status"] = signal.data["direction"] + else + memory["pump_status"] = "off" + + else if(receive_tag==id_tag) + switch(signal.data["command"]) + if("cycle") + if(state < AIRLOCK_STATE_CLOSED) + target_state = AIRLOCK_STATE_OUTOPEN + else + target_state = AIRLOCK_STATE_INOPEN + +/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) + switch(command) + if("cycle_closed") + target_state = AIRLOCK_STATE_CLOSED + if("cycle_exterior") + target_state = AIRLOCK_STATE_OUTOPEN + if("cycle_interior") + target_state = AIRLOCK_STATE_INOPEN + if("abort") + target_state = AIRLOCK_STATE_CLOSED + +/datum/computer/file/embedded_program/airlock_controller/process() + var/process_again = 1 + while(process_again) + process_again = 0 + switch(state) + if(AIRLOCK_STATE_INOPEN) // state -2 + if(target_state > state) + if(memory["interior_status"] == "closed") + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + if(AIRLOCK_STATE_PRESSURIZE) + if(target_state < state) + if(sensor_pressure >= ONE_ATMOSPHERE*0.95) + if(memory["interior_status"] == "open") + state = AIRLOCK_STATE_INOPEN + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_open" + post_signal(signal) + else + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "sigtype"="command" + ) + if(memory["pump_status"] == "siphon") + signal.data["stabalize"] = 1 + else if(memory["pump_status"] != "release") + signal.data["power"] = 1 + post_signal(signal) + else if(target_state > state) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + + if(AIRLOCK_STATE_CLOSED) + if(target_state > state) + if(memory["interior_status"] == "closed") + state = AIRLOCK_STATE_DEPRESSURIZE + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else if(target_state < state) + if(memory["exterior_status"] == "closed") + state = AIRLOCK_STATE_PRESSURIZE + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + if(AIRLOCK_STATE_DEPRESSURIZE) + var/target_pressure = ONE_ATMOSPHERE*0.05 + if(sanitize_external) + target_pressure = ONE_ATMOSPHERE*0.01 + + if(sensor_pressure <= target_pressure) + if(target_state > state) + if(memory["exterior_status"] == "open") + state = AIRLOCK_STATE_OUTOPEN + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_open" + post_signal(signal) + else if(target_state < state) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else if((target_state < state) && !sanitize_external) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.data = list( + "tag" = airpump_tag, + "sigtype"="command" + ) + if(memory["pump_status"] == "release") + signal.data["purge"] = 1 + else if(memory["pump_status"] != "siphon") + signal.data["power"] = 1 + post_signal(signal) + + if(AIRLOCK_STATE_OUTOPEN) //state 2 + if(target_state < state) + if(memory["exterior_status"] == "closed") + if(sanitize_external) + state = AIRLOCK_STATE_DEPRESSURIZE + process_again = 1 + else + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + memory["sensor_pressure"] = sensor_pressure + memory["processing"] = state != target_state + //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0 + + return 1 + + +/obj/machinery/embedded_controller/radio/airlock_controller + icon = 'icons/obj/airlock_machines.dmi' + icon_state = "airlock_control_standby" + + name = "airlock console" + density = FALSE + + frequency = 1449 + power_channel = ENVIRON + + // Setup parameters only + var/id_tag + var/exterior_door_tag + var/interior_door_tag + var/airpump_tag + var/sensor_tag + var/sanitize_external + +/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) + . = ..() + if(!mapload) + return + + var/datum/computer/file/embedded_program/airlock_controller/new_prog = new + + new_prog.id_tag = id_tag + new_prog.exterior_door_tag = exterior_door_tag + new_prog.interior_door_tag = interior_door_tag + new_prog.airpump_tag = airpump_tag + new_prog.sensor_tag = sensor_tag + new_prog.sanitize_external = sanitize_external + + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() + if(on && program) + if(program.memory["processing"]) + icon_state = "airlock_control_process" + else + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/airlock_controller/return_text() + var/state_options = null + + var/state = 0 + var/sensor_pressure = "----" + var/exterior_status = "----" + var/interior_status = "----" + var/pump_status = "----" + var/current_status = "Inactive
" + if(program) + state = program.state + sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" + exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" + interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" + pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" + + switch(state) + if(AIRLOCK_STATE_INOPEN) + state_options = {"Close Interior Airlock
+Cycle to Exterior Airlock
"} + current_status = "Interior Airlock Open
Chamber Pressurized" + if(AIRLOCK_STATE_PRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Interior Airlock
Chamber Pressurizing" + if(AIRLOCK_STATE_CLOSED) + state_options = {"Open Interior Airlock
+Open Exterior Airlock
"} + if(AIRLOCK_STATE_DEPRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" + if(AIRLOCK_STATE_OUTOPEN) + state_options = {"Cycle to Interior Airlock
+Close Exterior Airlock
"} + current_status = "Exterior Airlock Open
Chamber Depressurized" + + var/output = {"
"} return output +======= + if(!mapload) + return + var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new + + new_prog.airpump_tag = airpump_tag + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon() + if(on && program) + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text() + var/state_options = null + state_options = {"Deactivate Vent
+Activate Vent / Pump
+Activate Vent / Clear
"} + var/output = {"Vent Control Console
+[state_options]
"} + + return output +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 3b4503c3c8..7de077c016 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -67,7 +67,7 @@ var/mob/thismob = i var/list/mob_info = list() mob_info["name"] = thismob.real_name - mob_info["mob"] = "\ref[thismob]" + mob_info["mob"] = "[REF(thismob)]" mobs += list(mob_info) data["mobs"] = mobs diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index f7a4138348..afc463a60e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -120,8 +120,8 @@ Possible to do for anyone motivated enough: if(temp) dat = temp else - dat = "Request an AI's presence.
" - dat += "Call another holopad.
" + dat = "Request an AI's presence.
" + dat += "Call another holopad.
" if(LAZYLEN(holo_calls)) dat += "=====================================================
" @@ -131,7 +131,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad != src) - dat += "Answer call from [get_area(HC.calling_holopad)].
" + dat += "Answer call from [get_area(HC.calling_holopad)].
" one_unanswered_call = TRUE else one_answered_call = TRUE @@ -142,7 +142,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src) - dat += "Disconnect call from [HC.user].
" + dat += "Disconnect call from [HC.user].
" var/datum/browser/popup = new(user, "holopad", name, 300, 130) @@ -166,22 +166,22 @@ Possible to do for anyone motivated enough: if(last_request + 200 < world.time) last_request = world.time temp = "You requested an AI's presence.
" - temp += "Main Menu" + temp += "Main Menu" var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, "Your presence is requested at \the [area].") else temp = "A request for AI presence was already sent recently.
" - temp += "Main Menu" + temp += "Main Menu" else if(href_list["Holocall"]) if(outgoing_call) return temp = "You must stand on the holopad to make a call!
" - temp += "Main Menu" + temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() for(var/I in holopads) @@ -196,7 +196,7 @@ Possible to do for anyone motivated enough: if(usr.loc == loc) temp = "Dialing...
" - temp += "Main Menu" + temp += "Main Menu" new /datum/holocall(usr, src, callnames[result]) else if(href_list["connectcall"]) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index b37be1c4c2..f31a2d2436 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -160,7 +160,7 @@ /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "
" - dat += "Chemical Storage" + dat += "Chemical Storage" dat += materials_printout() dat += "
"
- dat += "
<< Back
" + dat += "
<< Back
" if(2) //req. supplies dat += "Which department do you need supplies from?
" @@ -160,13 +160,13 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += ""
dat += "[dpt] "
- dat += "Normal High"
+ dat += " Normal High"
if(hackState)
- dat += "EXTREME"
+ dat += "EXTREME"
dat += " "
dat += " "
dat += "
" - dat += "Shotgun Pump" - dat += "Gunshot" - dat += "Esword" - dat += "Harm Alarm" + dat += "Air Horn " + dat += "Station Alert " + dat += "Warning Siren " + dat += "Honk
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) popup.set_content(dat.Join()) popup.open() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index aac80cc1a0..0e170d9b8b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -632,23 +632,23 @@ if(wires.is_cut(WIRE_IDSCAN)) t1 += text("IdScan wire is cut.
\n") else if(src.aiDisabledIdScanner) - t1 += text("IdScan disabled. Enable?
\n", src) + t1 += "IdScan disabled. Enable?
\n" else - t1 += text("IdScan enabled. Disable?
\n", src) + t1 += "IdScan enabled. Disable?
\n" if(src.emergency) - t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + t1 += "Emergency Access Override is enabled. Disable?
\n" else - t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + t1 += "Emergency Access Override is disabled. Enable?
\n" if(wires.is_cut(WIRE_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(wires.is_cut(WIRE_POWER2)) t1 += text("Main Power Output wire is cut.
\n") if(!secondsMainPowerLost) - t1 += text("Temporarily disrupt main power?.
\n", src) + t1 += "Temporarily disrupt main power?.
\n" if(!secondsBackupPowerLost) - t1 += text("Temporarily disrupt backup power?.
\n", src) + t1 += "Temporarily disrupt backup power?.
\n" if(wires.is_cut(WIRE_BACKUP1)) t1 += text("Backup Power Input wire is cut.
\n") @@ -658,53 +658,53 @@ if(wires.is_cut(WIRE_BOLTS)) t1 += text("Door bolt drop wire is cut.
\n") else if(!src.locked) - t1 += text("Door bolts are up. Drop them?
\n", src) + t1 += "Door bolts are up. Drop them?
\n" else t1 += text("Door bolts are down.") if(src.hasPower()) - t1 += text(" Raise?
\n", src) + t1 += " Raise?
\n" else t1 += text(" Cannot raise door bolts due to power failure.
\n") if(wires.is_cut(WIRE_LIGHT)) t1 += text("Door bolt lights wire is cut.
\n") else if(!src.lights) - t1 += text("Door bolt lights are off. Enable?
\n", src) + t1 += "Door bolt lights are off. Enable?
\n" else - t1 += text("Door bolt lights are on. Disable?
\n", src) + t1 += "Door bolt lights are on. Disable?
\n" if(wires.is_cut(WIRE_SHOCK)) t1 += text("Electrification wire is cut.
\n") if(secondsElectrified==ELECTRIFIED_PERMANENT) - t1 += text("Door is electrified indefinitely. Un-electrify it?
\n", src) + t1 += "Door is electrified indefinitely. Un-electrify it?
\n" else if(secondsElectrified>NOT_ELECTRIFIED) - t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified, src) + t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified) else - t1 += text("Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n", src, src) + t1 += "Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n" if(wires.is_cut(WIRE_SAFETY)) t1 += text("Door force sensors not responding.
\n") else if(src.safe) - t1 += text("Door safeties operating normally. Override?
\n",src) + t1 += "Door safeties operating normally. Override?
\n" else - t1 += text("Danger. Door safeties disabled. Restore?
\n",src) + t1 += "Danger. Door safeties disabled. Restore?
\n" if(wires.is_cut(WIRE_TIMING)) t1 += text("Door timing circuitry not responding.
\n") else if(src.normalspeed) - t1 += text("Door timing circuitry operating normally. Override?
\n",src) + t1 += "Door timing circuitry operating normally. Override?
\n" else - t1 += text("Warning. Door timing circuitry operating abnormally. Restore?
\n",src) + t1 += "Warning. Door timing circuitry operating abnormally. Restore?
\n" if(src.welded) t1 += text("Door appears to have been welded shut.
\n") else if(!src.locked) if(src.density) - t1 += text("Open door
\n", src) + t1 += "Open door
\n" else - t1 += text("Close door
\n", src) + t1 += "Close door
\n" - t1 += text("\n", src) + t1 += "\n" user << browse(t1, "window=airlock") onclose(user, "airlock") diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 5e0d018554..e243494f2b 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -277,29 +277,29 @@ if(!exteriorAirlock || !interiorAirlock) if(!exteriorAirlock) if(interiorAirlock.density) - output = "Open Interior Airlock
" + output = "Open Interior Airlock
" else - output = "Close Interior Airlock
" + output = "Close Interior Airlock
" else if(exteriorAirlock.density) - output = "Open Exterior Airlock
" + output = "Open Exterior Airlock
" else - output = "Close Exterior Airlock
" + output = "Close Exterior Airlock
" else if(exteriorAirlock.density) if(interiorAirlock.density) - output = {"Open Exterior Airlock
- Open Interior Airlock
"} + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} else - output = {"Cycle to Exterior Airlock
- Close Interior Airlock
"} + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} else if(interiorAirlock.density) - output = {"Close Exterior Airlock
- Cycle to Interior Airlock
"} + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} else - output = {"Close Exterior Airlock
- Close Interior Airlock
"} + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} output = {"Access Control Console
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 59d58bc9a5..6f10d11b2e 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //States for airlock_control #define AIRLOCK_STATE_INOPEN -2 #define AIRLOCK_STATE_PRESSURIZE -1 @@ -294,3 +295,301 @@ [state_options]"} return output +======= +//States for airlock_control +#define AIRLOCK_STATE_INOPEN -2 +#define AIRLOCK_STATE_PRESSURIZE -1 +#define AIRLOCK_STATE_CLOSED 0 +#define AIRLOCK_STATE_DEPRESSURIZE 1 +#define AIRLOCK_STATE_OUTOPEN 2 + +/datum/computer/file/embedded_program/airlock_controller + var/id_tag + var/exterior_door_tag + var/interior_door_tag + var/airpump_tag + var/sensor_tag + var/sanitize_external + + state = AIRLOCK_STATE_CLOSED + var/target_state = AIRLOCK_STATE_CLOSED + var/sensor_pressure = null + +/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) + var/receive_tag = signal.data["tag"] + if(!receive_tag) + return + + if(receive_tag==sensor_tag) + if(signal.data["pressure"]) + sensor_pressure = text2num(signal.data["pressure"]) + + else if(receive_tag==exterior_door_tag) + memory["exterior_status"] = signal.data["door_status"] + + else if(receive_tag==interior_door_tag) + memory["interior_status"] = signal.data["door_status"] + + else if(receive_tag==airpump_tag) + if(signal.data["power"]) + memory["pump_status"] = signal.data["direction"] + else + memory["pump_status"] = "off" + + else if(receive_tag==id_tag) + switch(signal.data["command"]) + if("cycle") + if(state < AIRLOCK_STATE_CLOSED) + target_state = AIRLOCK_STATE_OUTOPEN + else + target_state = AIRLOCK_STATE_INOPEN + +/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) + switch(command) + if("cycle_closed") + target_state = AIRLOCK_STATE_CLOSED + if("cycle_exterior") + target_state = AIRLOCK_STATE_OUTOPEN + if("cycle_interior") + target_state = AIRLOCK_STATE_INOPEN + if("abort") + target_state = AIRLOCK_STATE_CLOSED + +/datum/computer/file/embedded_program/airlock_controller/process() + var/process_again = 1 + while(process_again) + process_again = 0 + switch(state) + if(AIRLOCK_STATE_INOPEN) // state -2 + if(target_state > state) + if(memory["interior_status"] == "closed") + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + if(AIRLOCK_STATE_PRESSURIZE) + if(target_state < state) + if(sensor_pressure >= ONE_ATMOSPHERE*0.95) + if(memory["interior_status"] == "open") + state = AIRLOCK_STATE_INOPEN + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_open" + post_signal(signal) + else + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "sigtype"="command" + ) + if(memory["pump_status"] == "siphon") + signal.data["stabalize"] = 1 + else if(memory["pump_status"] != "release") + signal.data["power"] = 1 + post_signal(signal) + else if(target_state > state) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + + if(AIRLOCK_STATE_CLOSED) + if(target_state > state) + if(memory["interior_status"] == "closed") + state = AIRLOCK_STATE_DEPRESSURIZE + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = interior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else if(target_state < state) + if(memory["exterior_status"] == "closed") + state = AIRLOCK_STATE_PRESSURIZE + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + if(AIRLOCK_STATE_DEPRESSURIZE) + var/target_pressure = ONE_ATMOSPHERE*0.05 + if(sanitize_external) + target_pressure = ONE_ATMOSPHERE*0.01 + + if(sensor_pressure <= target_pressure) + if(target_state > state) + if(memory["exterior_status"] == "open") + state = AIRLOCK_STATE_OUTOPEN + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_open" + post_signal(signal) + else if(target_state < state) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else if((target_state < state) && !sanitize_external) + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.data = list( + "tag" = airpump_tag, + "sigtype"="command" + ) + if(memory["pump_status"] == "release") + signal.data["purge"] = 1 + else if(memory["pump_status"] != "siphon") + signal.data["power"] = 1 + post_signal(signal) + + if(AIRLOCK_STATE_OUTOPEN) //state 2 + if(target_state < state) + if(memory["exterior_status"] == "closed") + if(sanitize_external) + state = AIRLOCK_STATE_DEPRESSURIZE + process_again = 1 + else + state = AIRLOCK_STATE_CLOSED + process_again = 1 + else + var/datum/signal/signal = new + signal.data["tag"] = exterior_door_tag + signal.data["command"] = "secure_close" + post_signal(signal) + else + if(memory["pump_status"] != "off") + var/datum/signal/signal = new + signal.data = list( + "tag" = airpump_tag, + "power" = 0, + "sigtype"="command" + ) + post_signal(signal) + + memory["sensor_pressure"] = sensor_pressure + memory["processing"] = state != target_state + //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0 + + return 1 + + +/obj/machinery/embedded_controller/radio/airlock_controller + icon = 'icons/obj/airlock_machines.dmi' + icon_state = "airlock_control_standby" + + name = "airlock console" + density = FALSE + + frequency = 1449 + power_channel = ENVIRON + + // Setup parameters only + var/id_tag + var/exterior_door_tag + var/interior_door_tag + var/airpump_tag + var/sensor_tag + var/sanitize_external + +/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) + . = ..() + if(!mapload) + return + + var/datum/computer/file/embedded_program/airlock_controller/new_prog = new + + new_prog.id_tag = id_tag + new_prog.exterior_door_tag = exterior_door_tag + new_prog.interior_door_tag = interior_door_tag + new_prog.airpump_tag = airpump_tag + new_prog.sensor_tag = sensor_tag + new_prog.sanitize_external = sanitize_external + + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() + if(on && program) + if(program.memory["processing"]) + icon_state = "airlock_control_process" + else + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/airlock_controller/return_text() + var/state_options = null + + var/state = 0 + var/sensor_pressure = "----" + var/exterior_status = "----" + var/interior_status = "----" + var/pump_status = "----" + var/current_status = "Inactive
" + if(program) + state = program.state + sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" + exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" + interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" + pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" + + switch(state) + if(AIRLOCK_STATE_INOPEN) + state_options = {"Close Interior Airlock
+Cycle to Exterior Airlock
"} + current_status = "Interior Airlock Open
Chamber Pressurized" + if(AIRLOCK_STATE_PRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Interior Airlock
Chamber Pressurizing" + if(AIRLOCK_STATE_CLOSED) + state_options = {"Open Interior Airlock
+Open Exterior Airlock
"} + if(AIRLOCK_STATE_DEPRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" + if(AIRLOCK_STATE_OUTOPEN) + state_options = {"Cycle to Interior Airlock
+Close Exterior Airlock
"} + current_status = "Exterior Airlock Open
Chamber Depressurized" + + var/output = {"
Airlock Status
+
+
+
+
+
+
+
+
+[state_options]"}
+
+ return output
+>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
diff --git a/code/game/machinery/embedded_controller/simple_vent_controller.dm b/code/game/machinery/embedded_controller/simple_vent_controller.dm
index 063e81354c..f078ad94eb 100644
--- a/code/game/machinery/embedded_controller/simple_vent_controller.dm
+++ b/code/game/machinery/embedded_controller/simple_vent_controller.dm
@@ -53,6 +53,7 @@
/obj/machinery/embedded_controller/radio/simple_vent_controller/Initialize(mapload)
. = ..()
+<<<<<<< HEAD
if(!mapload)
return
var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new
@@ -77,3 +78,29 @@
[state_options]Current Status:
[current_status]
\> Chamber Pressure:
[sensor_pressure] kPa
\> Control Pump:
[pump_status]
\> Interior Door:
[interior_status]
\> Exterior Door:
[exterior_status]
"} return output +======= + if(!mapload) + return + var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new + + new_prog.airpump_tag = airpump_tag + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon() + if(on && program) + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text() + var/state_options = null + state_options = {"Deactivate Vent
+Activate Vent / Pump
+Activate Vent / Clear
"} + var/output = {"Vent Control Console
+[state_options]
"} + + return output +>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 3b4503c3c8..7de077c016 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -67,7 +67,7 @@ var/mob/thismob = i var/list/mob_info = list() mob_info["name"] = thismob.real_name - mob_info["mob"] = "\ref[thismob]" + mob_info["mob"] = "[REF(thismob)]" mobs += list(mob_info) data["mobs"] = mobs diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index f7a4138348..afc463a60e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -120,8 +120,8 @@ Possible to do for anyone motivated enough: if(temp) dat = temp else - dat = "Request an AI's presence.
" - dat += "Call another holopad.
" + dat = "Request an AI's presence.
" + dat += "Call another holopad.
" if(LAZYLEN(holo_calls)) dat += "=====================================================
" @@ -131,7 +131,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad != src) - dat += "Answer call from [get_area(HC.calling_holopad)].
" + dat += "Answer call from [get_area(HC.calling_holopad)].
" one_unanswered_call = TRUE else one_answered_call = TRUE @@ -142,7 +142,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src) - dat += "Disconnect call from [HC.user].
" + dat += "Disconnect call from [HC.user].
" var/datum/browser/popup = new(user, "holopad", name, 300, 130) @@ -166,22 +166,22 @@ Possible to do for anyone motivated enough: if(last_request + 200 < world.time) last_request = world.time temp = "You requested an AI's presence.
" - temp += "Main Menu" + temp += "Main Menu" var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, "Your presence is requested at \the [area].") else temp = "A request for AI presence was already sent recently.
" - temp += "Main Menu" + temp += "Main Menu" else if(href_list["Holocall"]) if(outgoing_call) return temp = "You must stand on the holopad to make a call!
" - temp += "Main Menu" + temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() for(var/I in holopads) @@ -196,7 +196,7 @@ Possible to do for anyone motivated enough: if(usr.loc == loc) temp = "Dialing...
" - temp += "Main Menu" + temp += "Main Menu" new /datum/holocall(usr, src, callnames[result]) else if(href_list["connectcall"]) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index b37be1c4c2..f31a2d2436 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -160,7 +160,7 @@ /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "
Limb Grower Menu:
" - dat += "Chemical Storage" + dat += "Chemical Storage" dat += materials_printout() dat += "
| [C] | " + dat += "[C] | " dat += "|
| [dpt] | " - dat += "Normal High" + dat += " | Normal High" if(hackState) - dat += "EXTREME" + dat += "EXTREME" dat += " | " dat += "
<< Back
" + dat += "
<< Back
" if(2) //req. supplies dat += "Which department do you need supplies from?
" @@ -160,13 +160,13 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += "
<< Back
" + dat += "
<< Back
" if(3) //relay information dat += "Which department would you like to send information to?
" @@ -175,21 +175,21 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += "
<< Back
" + dat += "
<< Back
" if(6) //sent successfully dat += "Message sent.
" - dat += "Continue
" + dat += "Continue
" if(7) //unsuccessful; not sent dat += "An error occurred.
" - dat += "Continue
" + dat += "Continue
" if(8) //view messages for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) @@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(allConsoles) for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. messageComposite = "
[msg]
" + messageComposite
dat += messageComposite
- dat += "<< Back to Main Menu
" + dat += "
<< Back to Main Menu
" if(9) //authentication before sending dat += "Message Authentication
" @@ -211,8 +211,8 @@ GLOBAL_LIST_EMPTY(allConsoles) dat += "
You may authenticate your message now by scanning your ID or your stamp
" dat += "Validated by: [msgVerified ? msgVerified : "Not Validated"]
" dat += "Stamped by: [msgStamped ? msgStamped : "Not Stamped"]
" - dat += "Send Message
" - dat += "
<< Discard Message
" + dat += "Send Message
" + dat += "
<< Discard Message
" if(10) //send announcement dat += "
Station-wide Announcement
" @@ -221,12 +221,12 @@ GLOBAL_LIST_EMPTY(allConsoles) else dat += "Swipe your card to authenticate yourself
" dat += "Message: [message ? message : "No Message"]
" - dat += "[message ? "Edit" : "Write"] Message
" + dat += "[message ? "Edit" : "Write"] Message
" if ((announceAuth || IsAdminGhost(user)) && message) - dat += "Announce Message
" + dat += "Announce Message
" else dat += "Announce Message
" - dat += "
<< Back
" + dat += "
<< Back
" else //main menu screen = 0 @@ -237,25 +237,25 @@ GLOBAL_LIST_EMPTY(allConsoles) dat += "
There are new PRIORITY messages
" if (newmessagepriority == 3) dat += "
There are new EXTREME PRIORITY messages
" - dat += "View Messages
" + dat += "View Messages
" - dat += "Request Assistance
" - dat += "Request Supplies
" - dat += "Relay Anonymous Information
" + dat += "Request Assistance
" + dat += "Request Supplies
" + dat += "Relay Anonymous Information
" if(!emergency) - dat += "Emergency: Security
" - dat += "Emergency: Engineering
" - dat += "Emergency: Medical
" + dat += "Emergency: Security
" + dat += "Emergency: Engineering
" + dat += "Emergency: Medical
" else dat += "[emergency] has been dispatched to this location.
" if(announcementConsole) - dat += "Send Station-wide Announcement
" + dat += "Send Station-wide Announcement
" if (silent) - dat += "Speaker OFF" + dat += "Speaker OFF" else - dat += "Speaker ON" + dat += "Speaker ON" var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -454,7 +454,7 @@ GLOBAL_LIST_EMPTY(allConsoles) var/linkedsender if(istype(source, /obj/machinery/requests_console)) var/obj/machinery/requests_console/sender = source - linkedsender = "[sender.department]" + linkedsender = "[sender.department]" else capitalize(source) linkedsender = source diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 20fd729304..606f64c7f3 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -58,13 +58,13 @@ Please wait until completion...
dat = {" Metal Amount: [min(150000, src.metal_amount)] cm3 (MAX: 150,000)
-Left Arm (25,000 cc metal.)
-Right Arm (25,000 cc metal.)
-Left Leg (25,000 cc metal.)
-Right Leg (25,000 cc metal).
-Chest (50,000 cc metal).
-Head (50,000 cc metal).
-Robot Frame (75,000 cc metal).
+Left Arm (25,000 cc metal.)
+Right Arm (25,000 cc metal.)
+Left Leg (25,000 cc metal.)
+Right Leg (25,000 cc metal).
+Chest (50,000 cc metal).
+Head (50,000 cc metal).
+Robot Frame (75,000 cc metal).
"} user << browse("
[plays] players have tried their luck today, and [jackpots] have won a jackpot!
- Play!
+ Play!
[reeltext]
- Refund balance
"} + Refund balance
"} var/datum/browser/popup = new(user, "slotmachine", "Slot Machine") popup.set_content(dat) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 590c8d03a5..93f9d2b03a 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -30,23 +30,23 @@ if(0) dat += "
[temp]
" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(servers.len) dat += "
Detected Telecommunication Servers:
- "
for(var/obj/machinery/telecomms/T in servers)
- dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- [REF(T)] [T.name] ([T.id]) " dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "
No servers detected. Scan for servers: \[Scan\]" + dat += "
No servers detected. Scan for servers: \[Scan\]" // --- Viewing Server --- if(1) dat += "
[temp]
" - dat += "
Current Network: [network]" dat += "
Selected Server: [SelectedServer.id]" @@ -65,7 +65,7 @@ // If the log is a speech file if(C.input_type == "Speech File") - dat += "
" + dat += "
" // -- Determine race of orator -- @@ -128,7 +128,7 @@ else if(C.input_type == "Execution Error") - dat += "
" + dat += "
" dat += "Output: \"[C.parameters["message"]]\"
" dat += "
" diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index cb3ae78e72..c5c53888fc 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -32,28 +32,28 @@ if(0) dat += "
[temp]
" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(machinelist.len) dat += "
Detected Network Entities:
- "
for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- [REF(T)] [T.name] ([T.id]) " dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "\[Probe Network\]" + dat += "\[Probe Network\]" // --- Viewing Machine --- if(1) dat += "
[temp]
" - dat += "
Current Network: [network]
" dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" dat += "Linked Entities:
- "
for(var/obj/machinery/telecomms/T in SelectedMachine.links)
if(!T.hide)
- dat += "
- \ref[T.id] [T.name] ([T.id]) " + dat += "
- [REF(T.id)] [T.name] ([T.id]) " dat += "
[name] Access
[temp]
" - dat += "
Power Status: [toggled ? "On" : "Off"]" + dat += "
Power Status: [toggled ? "On" : "Off"]" if(on && toggled) if(id != "" && id) - dat += "
Identification String: [id]" + dat += "
Identification String: [id]" else - dat += "
Identification String: NULL" - dat += "
Network: [network]" + dat += "
Identification String: NULL" + dat += "
Network: [network]" dat += "
Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]" if(hide) dat += "
Shadow Link: ACTIVE" @@ -73,7 +73,7 @@ i++ if(T.hide && !hide) continue - dat += "
Filtering Frequencies: " @@ -83,21 +83,21 @@ for(var/x in freq_listening) i++ if(i < length(freq_listening)) - dat += "[format_frequency(x)] GHz\[X\]; " + dat += "[format_frequency(x)] GHz\[X\]; " else - dat += "[format_frequency(x)] GHz\[X\]" + dat += "[format_frequency(x)] GHz\[X\]" else dat += "NONE" - dat += "
\[Add Filter\]" + dat += "
\[Add Filter\]" dat += "
" if(P) var/obj/machinery/telecomms/T = P.buffer if(istype(T)) - dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" + dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else - dat += "
MULTITOOL BUFFER: \[Add Machine\]" + dat += "
MULTITOOL BUFFER: \[Add Machine\]" dat += "" temp = "" @@ -151,8 +151,8 @@ /obj/machinery/telecomms/relay/Options_Menu() var/dat = "" - dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" - dat += "
Receiving: [receiving ? "YES" : "NO"]" + dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" + dat += "
Receiving: [receiving ? "YES" : "NO"]" return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -167,7 +167,7 @@ // BUS /obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" + var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) @@ -254,7 +254,7 @@ if(text2num(href_list["unlink"]) <= length(links)) var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])] if(T) - temp = "-% Removed \ref[T] [T.name] from linked entities. %-" + temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" // Remove link entries from both T and src. @@ -276,7 +276,7 @@ if(!(T in links)) links += T - temp = "-% Successfully linked with \ref[T] [T.name] %-" + temp = "-% Successfully linked with [REF(T)] [T.name] %-" else temp = "-% Unable to acquire buffer %-" @@ -284,7 +284,7 @@ if(href_list["buffer"]) P.buffer = src - temp = "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-" + temp = "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" if(href_list["flush"]) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2510c19c05..514de9b841 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -373,7 +373,7 @@ for (var/datum/data/vending_product/R in display_records) dat += "
" dat += "
":null] + [internal_damage&MECHA_INT_TEMP_CONTROL?"CLOWN SUPPORT SYSTEM MALFUNCTION
":null] + [internal_damage&MECHA_INT_TANK_BREACH?"GAS TANK HONK
":null] + [internal_damage&MECHA_INT_CONTROL_LOST?"HONK-A-DOODLE - Recalibrate
":null] + IntegriHONK: [integrity]%
+ PowerHONK charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
+ Air source: [use_internal_tank?"Internal Airtank":"Environment"]
+ AirHONK pressure: [tank_pressure]kPa
+ AirHONK temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
+ HONK pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
+ HONK temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
+ Lights: [lights?"on":"off"]
+ [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":null] + "} + return output + +/obj/mecha/combat/honker/get_stats_html() + var/output = {" +
+ [src.get_stats_part()]
+
+
+ [src.get_equipment_list()]
+
+ +
+ [src.get_commands()]
+
+
+
+ "}
+ return output
+
+/obj/mecha/combat/honker/get_commands()
+ var/output = {"
+
+ "}
+ output += ..()
+ return output
+
+
+/obj/mecha/combat/honker/get_equipment_list()
+ if(!equipment.len)
+ return
+ var/output = "Honk-ON-Systems:Sounds of HONK:
+
+ Sad Trombone
+
+ "
+ for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
+ output += "
"
+ return output
+
+
+
+/obj/mecha/combat/honker/mechstep(direction)
+ var/result = step(src,direction)
+ if(result)
+ if(!squeak)
+ playsound(src, "clownstep", 70, 1)
+ squeak = 1
+ else
+ squeak = 0
+ return result
+
+/obj/mecha/combat/honker/Topic(href, href_list)
+ ..()
+ if (href_list["play_sound"])
+ switch(href_list["play_sound"])
+ if("sadtrombone")
+ playsound(src, 'sound/misc/sadtrombone.ogg', 50)
+ return
+
+/proc/rand_hex_color()
+ var/list/colors = list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")
+ var/color=""
+ for (var/i=0;i<6;i++)
+ color = color+pick(colors)
+ return color
+
+
+>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 48d98aa70f..627858bea6 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -25,7 +25,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/update_equip_info()
if(chassis)
- send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+ send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",get_equip_info())
return 1
return
@@ -52,7 +52,7 @@
if(chassis.selected == src)
txt += "[src.name]"
else if(selectable)
- txt += "[src.name]"
+ txt += "[src.name]"
else
txt += "[src.name]"
@@ -132,7 +132,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/set_ready_state(state)
equip_ready = state
if(chassis)
- send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+ send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
return
/obj/item/mecha_parts/mecha_equipment/proc/occupant_message(message)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 0b99d811b3..cc0f935628 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -104,21 +104,21 @@
if(output)
var/temp = ""
if(patient)
- temp = "[MT.get_equip_info()]
"
+ output += "\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" + temp = "
\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" return "[output] [temp]" return /obj/item/mecha_parts/mecha_equipment/medical/sleeper/Topic(href,href_list) ..() - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) - if(filter.get("eject")) + var/datum/topic_input/afilter = new /datum/topic_input(href,href_list) + if(afilter.get("eject")) go_out() - if(filter.get("view_stats")) + if(afilter.get("view_stats")) chassis.occupant << browse(get_patient_stats(),"window=msleeper") onclose(chassis.occupant, "msleeper") return - if(filter.get("inject")) - inject_reagent(filter.getType("inject", /datum/reagent),filter.getObj("source")) + if(afilter.get("inject")) + inject_reagent(afilter.getType("inject", /datum/reagent),afilter.getObj("source")) return /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_stats() @@ -184,7 +184,7 @@ if(SG && SG.reagents && islist(SG.reagents.reagent_list)) for(var/datum/reagent/R in SG.reagents.reagent_list) if(R.volume > 0) - output += "Inject [R.name]
" + output += "Inject [R.name]
" return output @@ -287,7 +287,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/get_equip_info() var/output = ..() if(output) - return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" + return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" return /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(atom/movable/target) @@ -358,19 +358,19 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Topic(href,href_list) ..() - var/datum/topic_input/filter = new (href,href_list) - if(filter.get("toggle_mode")) + var/datum/topic_input/afilter = new (href,href_list) + if(afilter.get("toggle_mode")) mode = !mode update_equip_info() return - if(filter.get("select_reagents")) + if(afilter.get("select_reagents")) processed_reagents.len = 0 var/m = 0 var/message for(var/i=1 to known_reagents.len) if(m>=synth_speed) break - var/reagent = filter.get("reagent_[i]") + var/reagent = afilter.get("reagent_[i]") if(reagent && (reagent in known_reagents)) message = "[m ? ", " : null][known_reagents[reagent]]" processed_reagents += reagent @@ -382,14 +382,14 @@ occupant_message("Reagent processing started.") log_message("Reagent processing started.") return - if(filter.get("show_reagents")) + if(afilter.get("show_reagents")) chassis.occupant << browse(get_reagents_page(),"window=msyringegun") - if(filter.get("purge_reagent")) - var/reagent = filter.get("purge_reagent") + if(afilter.get("purge_reagent")) + var/reagent = afilter.get("purge_reagent") if(reagent) reagents.del_reagent(reagent) return - if(filter.get("purge_all")) + if(afilter.get("purge_all")) reagents.clear_reagents() return return @@ -426,7 +426,7 @@ var/r_list = get_reagents_list() var/inputs if(r_list) - inputs += "" + inputs += "" inputs += "" inputs += "" var/output = {"
" return output @@ -206,7 +206,7 @@ if(!check_resources(D)) say("Not enough resources. Queue processing stopped.") temp = {"Not enough resources to build next part.
- Try again | Return"} + Try again | Return"} return 0 remove_from_queue(1) build_part(D) @@ -225,12 +225,12 @@ var/obj/part = D.build_path output += "
" //check if the tech coefficients have changed - temp += "Return" + temp += "Return" updateUsrDialog() say("Successfully synchronized with R&D server.") return - temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" + temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" updateUsrDialog() return @@ -289,12 +289,12 @@ switch(screen) if("main") left_part = output_available_resources()+"
" - left_part += "Sync with R&D servers
" + left_part += "Sync with R&D servers
" for(var/part_set in part_sets) - left_part += "[part_set] - \[Add all parts to queue\]
" + left_part += "[part_set] - \[Add all parts to queue\]
" if("parts") left_part += output_parts_list(part_set) - left_part += "
Return" + left_part += "
Return" dat = {"
[initial(part.name)] description:
[initial(part.desc)]- Return + Return "} break diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ad0e428f14..2f98b2cc4c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -647,7 +647,7 @@ to_chat(user, "[B.get_mecha_info()]") break //Nothing like a big, red link to make the player feel powerful! - to_chat(user, "ASSUME DIRECT CONTROL?
") + to_chat(user, "ASSUME DIRECT CONTROL?
") else examine(user) if(occupant) @@ -661,7 +661,7 @@ if(!can_control_mech) to_chat(user, "You cannot control exosuits without AI control beacons installed.") return - to_chat(user, "Take control of exosuit?
") + to_chat(user, "Take control of exosuit?
") /obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 431768500e..63dd798a34 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -23,15 +23,15 @@ var/answer = TR.get_mecha_info() if(answer) dat += {"
[answer]
- Send message
- Show exosuit log | (EMP pulse)
"} + Send message
+ Show exosuit log | (EMP pulse)
"} if(screen==1) dat += "
Log contents
" - dat += "Return" + dat += "Return
" dat += "[stored_data]" - dat += "(Refresh)
" + dat += "(Refresh)
" dat += "" user << browse(dat, "window=computer;size=400x500") @@ -41,19 +41,19 @@ /obj/machinery/computer/mecha/Topic(href, href_list) if(..()) return - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) + var/datum/topic_input/afilter = new /datum/topic_input(href,href_list) if(href_list["send_message"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("send_message") var/message = stripped_input(usr,"Input message","Transmit message") var/obj/mecha/M = MT.in_mecha() if(trim(message) && M) M.occupant_message(message) return if(href_list["shock"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("shock") MT.shock() if(href_list["get_log"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("get_log") stored_data = MT.get_mecha_log() screen = 1 if(href_list["return"]) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 27256d8b0b..54b44f89f9 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -22,7 +22,7 @@ [js_dropdowns] function SSticker() { setInterval(function(){ - window.location='byond://?src=\ref[src]&update_content=1'; + window.location='byond://?src=[REF(src)]&update_content=1'; }, 1000); } @@ -55,7 +55,7 @@ "[MECHA_INT_FIRE]" = "INTERNAL FIRE", "[MECHA_INT_TEMP_CONTROL]" = "LIFE SUPPORT SYSTEM MALFUNCTION", "[MECHA_INT_TANK_BREACH]" = "GAS TANK BREACH", - "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", + "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT" ) for(var/tflag in dam_reports) @@ -84,7 +84,7 @@ Airtank temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
- [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
+ [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""] [defense_action.owner ? "Defence Mode: [defence_mode ? "Enabled" : "Disabled"]
" : ""] [overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""] @@ -100,25 +100,25 @@
Electronics
Radio settings:
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
+ Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
+ Speaker: [radio.listening?"Engaged":"Disengaged"]
Frequency: - - - - + - + - [format_frequency(radio.frequency)] - + - +
+ + + +
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
+ Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
+ Speaker: [radio.listening?"Engaged":"Disengaged"]
Frequency: - - - - + - + - [format_frequency(radio.frequency)] - + - +
+ + + +
Permissions & Logging
- [add_req_access?"L":"Unl"]ock ID upload panel
- [maint_access?"Forbid":"Permit"] maintenance protocols
- [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
- DNA-lock
- View internal log
- Change exosuit name
+ [add_req_access?"L":"Unl"]ock ID upload panel
+ [maint_access?"Forbid":"Permit"] maintenance protocols
+ [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
+ DNA-lock
+ View internal log
+ Change exosuit name
- [maint_access?"Forbid":"Permit"] maintenance protocols
- [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
- DNA-lock
- View internal log
- Change exosuit name
+ [add_req_access?"L":"Unl"]ock ID upload panel
+ [maint_access?"Forbid":"Permit"] maintenance protocols
+ [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
+ DNA-lock
+ View internal log
+ Change exosuit name
"}
for(var/X in equipment)
var/obj/item/mecha_parts/mecha_equipment/W = X
- . += "[W.name] Detach
" + . += "[W.name] Detach
" . += "Available equipment slots: [max_equip-equipment.len]" . += "
"
@@ -143,7 +143,7 @@
return
. = "Equipment:" + . += "[W.name] Detach
" . += "Available equipment slots: [max_equip-equipment.len]" . += "
"
for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
- . += "
"
@@ -171,7 +171,7 @@
[MT.get_equip_info()]
"
+ . += "[MT.get_equip_info()]
"
. += "Following keycodes are present in this system:
"} for(var/a in operation_req_access) - . += "[get_access_desc(a)] - Delete" + . += "[get_access_desc(a)] - Delete
" . += "
Following keycodes were detected on portable device:
" for(var/a in id_card.access) if(a in operation_req_access) @@ -179,8 +179,8 @@ var/a_name = get_access_desc(a) if(!a_name) continue //there's some strange access without a name - . += "[a_name] - Add" - . += "
Finish " + . += "[a_name] - Add
" + . += "
Finish " . += "(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)" . += "