" - - - //url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. - //Do the double-encoding here to save nanoseconds - var/twiceEncoded = url_encode(url_encode(message)) - - if(islist(target)) - for(var/I in target) - var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible - - if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. - continue - - if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue - C.chatOutput.messageQueue += message - continue - - payload[C] += twiceEncoded - - else - var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible - - if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. - return - - if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue - C.chatOutput.messageQueue += message - return - - payload[C] += twiceEncoded diff --git a/code/controllers/subsystem/cleanup.dm b/code/controllers/subsystem/cleanup.dm new file mode 100644 index 00000000000..f5962c45547 --- /dev/null +++ b/code/controllers/subsystem/cleanup.dm @@ -0,0 +1,44 @@ +/** + * # Cleanup Subsystem + * + * For now, all it does is periodically clean the supplied global lists of any null values they may contain. + * + * Why is this important? + * + * Sometimes, these lists can gain nulls due to errors. + * For example, when a dead player trasitions from the `dead_mob_list` to the `alive_mob_list`, a null value may get stuck in the dead mob list. + * This can cause issues when other code tries to do things with the values in the list, but are instead met with null values. + * These problems are incredibly hard to track down and fix, so this subsystem is a solution to that. + */ +SUBSYSTEM_DEF(cleanup) + name = "Null cleanup" + wait = 30 SECONDS + flags = SS_POST_FIRE_TIMING + priority = FIRE_PRIORITY_CLEANUP + init_order = INIT_ORDER_CLEANUP + runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "Certain global lists will no longer be cleared of nulls, which may result in runtimes. No immediate action is needed." + /// A list of global lists we want the subsystem to clean. + var/list/lists_to_clean + +/datum/controller/subsystem/cleanup/Initialize(start_timeofday) + // If you want this subsystem to clean out nulls from a specific list, add it here. + lists_to_clean = list( + GLOB.clients = "clients", + GLOB.player_list = "player_list", + GLOB.mob_list = "mob_list", + GLOB.alive_mob_list = "alive_mob_list", + GLOB.dead_mob_list = "dead_mob_list", + GLOB.human_list = "human_list", + GLOB.carbon_list = "carbon_list" + ) + return ..() + +/datum/controller/subsystem/cleanup/fire(resumed) + for(var/L in lists_to_clean) + var/list/_list = L + var/prev_length = length(_list) + listclearnulls(_list) + + if(length(_list) < prev_length) + stack_trace("Found a null value in GLOB.[lists_to_clean[_list]]!") diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 3adfdf3972f..729c4dbe67b 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -620,20 +620,32 @@ SUBSYSTEM_DEF(jobs) var/mob/M = tgtcard.getPlayer() for(var/datum/job/job in occupations) if(tgtcard.assignment && tgtcard.assignment == job.title) - jobs_to_formats[job.title] = "disabled" // the job they already have is pre-selected + jobs_to_formats[job.title] = "green" // the job they already have is pre-selected + else if(tgtcard.assignment == "Demoted" || tgtcard.assignment == "Terminated") + jobs_to_formats[job.title] = "grey" else if(!job.would_accept_job_transfer_from_player(M)) - jobs_to_formats[job.title] = "linkDiscourage" // jobs which are karma-locked and not unlocked for this player are discouraged + jobs_to_formats[job.title] = "grey" // jobs which are karma-locked and not unlocked for this player are discouraged else if((job.title in GLOB.command_positions) && istype(M) && M.client && job.available_in_playtime(M.client)) - jobs_to_formats[job.title] = "linkDiscourage" // command jobs which are playtime-locked and not unlocked for this player are discouraged + jobs_to_formats[job.title] = "grey" // command jobs which are playtime-locked and not unlocked for this player are discouraged else if(job.total_positions && !job.current_positions && job.title != "Civilian") - jobs_to_formats[job.title] = "linkEncourage" // jobs with nobody doing them at all are encouraged + jobs_to_formats[job.title] = "teal" // jobs with nobody doing them at all are encouraged else if(job.total_positions >= 0 && job.current_positions >= job.total_positions) - jobs_to_formats[job.title] = "linkDiscourage" // jobs that are full (no free positions) are discouraged + jobs_to_formats[job.title] = "grey" // jobs that are full (no free positions) are discouraged + if(tgtcard.assignment == "Demoted" || tgtcard.assignment == "Terminated") + jobs_to_formats["Custom"] = "grey" return jobs_to_formats -/datum/controller/subsystem/jobs/proc/log_job_transfer(transferee, oldvalue, newvalue, whodidit) - id_change_records["[id_change_counter]"] = list("transferee" = transferee, "oldvalue" = oldvalue, "newvalue" = newvalue, "whodidit" = whodidit, "timestamp" = station_time_timestamp()) + +/datum/controller/subsystem/jobs/proc/log_job_transfer(transferee, oldvalue, newvalue, whodidit, reason) + id_change_records["[id_change_counter]"] = list( + "transferee" = transferee, + "oldvalue" = oldvalue, + "newvalue" = newvalue, + "whodidit" = whodidit, + "timestamp" = station_time_timestamp(), + "reason" = reason + ) id_change_counter++ /datum/controller/subsystem/jobs/proc/slot_job_transfer(oldtitle, newtitle) @@ -663,45 +675,35 @@ SUBSYSTEM_DEF(jobs) return var/datum/data/pda/app/messenger/PM = target_pda.find_program(/datum/data/pda/app/messenger) if(PM && PM.can_receive()) - PM.notify("Automated Notification: \"[antext]\" (Unable to Reply)") + PM.notify("Automated Notification: \"[antext]\" (Unable to Reply)", 0) // the 0 means don't make the PDA flash +/datum/controller/subsystem/jobs/proc/notify_by_name(target_name, antext) + // Used to notify a specific crew member based on their real_name + if(!target_name || !antext) + return + var/obj/item/pda/target_pda + for(var/obj/item/pda/check_pda in GLOB.PDAs) + if(check_pda.owner == target_name) + target_pda = check_pda + break + if(!target_pda) + return + var/datum/data/pda/app/messenger/PM = target_pda.find_program(/datum/data/pda/app/messenger) + if(PM && PM.can_receive()) + PM.notify("Automated Notification: \"[antext]\" (Unable to Reply)", 0) // the 0 means don't make the PDA flash -/datum/controller/subsystem/jobs/proc/fetch_transfer_record_html(var/centcom) - var/record_html = "
| [thisheader] | " - record_html += "|
| [thisrecord[lkey]] | " - else - continue - else - record_html += "[thisrecord[lkey]] | " - record_html += "
Remember to stamp and send back the supply manifests.
" + return ..() /datum/controller/subsystem/shuttle/stat_entry(msg) @@ -93,6 +95,11 @@ SUBSYSTEM_DEF(shuttle) return S WARNING("couldn't find dock with id: [id]") +/datum/controller/subsystem/shuttle/proc/secondsToRefuel() + var/elapsed = world.time - SSticker.round_start_time + var/remaining = round((config.shuttle_refuel_delay - elapsed) / 10) + return remaining > 0 ? remaining : 0 + /datum/controller/subsystem/shuttle/proc/requestEvac(mob/user, call_reason) if(!emergency) WARNING("requestEvac(): There is no emergency shuttle, but the shuttle was called. Using the backup shuttle instead.") @@ -107,7 +114,7 @@ SUBSYSTEM_DEF(shuttle) return emergency = backup_shuttle - if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay) + if(secondsToRefuel()) to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.") return @@ -131,7 +138,7 @@ SUBSYSTEM_DEF(shuttle) call_reason = trim(html_encode(call_reason)) if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) - to_chat(user, "You must provide a reason.") + to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.") return var/area/signal_origin = get_area(user) @@ -192,7 +199,7 @@ SUBSYSTEM_DEF(shuttle) var/obj/machinery/computer/communications/C = thing if(C.stat & BROKEN) continue - else if(istype(thing, /datum/computer_file/program/comm) || istype(thing, /obj/item/circuitboard/communications)) + else if(istype(thing, /obj/item/circuitboard/communications)) continue var/turf/T = get_turf(thing) @@ -247,7 +254,7 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment, _crates) if(!packId) return - var/datum/supply_packs/P = supply_packs["[packId]"] + var/datum/supply_packs/P = locateUID(packId) if(!P) return diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm new file mode 100644 index 00000000000..33d97fcfe04 --- /dev/null +++ b/code/controllers/subsystem/sounds.dm @@ -0,0 +1,165 @@ +#define DATUMLESS "NO_DATUM" + +SUBSYSTEM_DEF(sounds) + name = "Sounds" + init_order = INIT_ORDER_SOUNDS + flags = SS_NO_FIRE + offline_implications = "Sounds may not play correctly. Shuttle call recommended." + + var/using_channels_max = CHANNEL_HIGHEST_AVAILABLE // BYOND max channels + /// Amount of channels to reserve for random usage rather than reservations being allowed to reserve all channels. Also a nice safeguard for when someone screws up. + var/random_channels_min = 50 + // Hey uh these two needs to be initialized fast because the whole "things get deleted before init" thing. + /// Assoc list, "[channel]" = either the datum using it or TRUE for an unsafe-reserved (datumless reservation) channel + var/list/using_channels + /// Assoc list datum = list(channel1, channel2, ...) for what channels something reserved. + var/list/using_channels_by_datum + // Special datastructure for fast channel management + /// List of all channels as numbers + var/list/channel_list + /// Associative list of all reserved channels associated to their position. "[channel_number]" = index as number + var/list/reserved_channels + /// lower iteration position - Incremented and looped to get "random" sound channels for normal sounds. The channel at this index is returned when asking for a random channel. + var/channel_random_low + /// higher reserve position - decremented and incremented to reserve sound channels, anything above this is reserved. The channel at this index is the highest unreserved channel. + var/channel_reserve_high + +/datum/controller/subsystem/sounds/Initialize() + setup_available_channels() + return ..() + +/** + * Sets up all available sound channels + */ +/datum/controller/subsystem/sounds/proc/setup_available_channels() + channel_list = list() + reserved_channels = list() + using_channels = list() + using_channels_by_datum = list() + for(var/i in 1 to using_channels_max) + channel_list += i + channel_random_low = 1 + channel_reserve_high = length(channel_list) + +/** + * Removes a channel from using list + * + * Arguments: + * * channel - The channel number + */ +/datum/controller/subsystem/sounds/proc/free_sound_channel(channel) + var/text_channel = num2text(channel) + var/using = using_channels[text_channel] + using_channels -= text_channel + if(!using) // datum channel + using_channels_by_datum[using] -= channel + if(!length(using_channels_by_datum[using])) + using_channels_by_datum -= using + free_channel(channel) + +/** + * Frees all the channels a datum is using + * + * Arguments: + * * D - The datum + */ +/datum/controller/subsystem/sounds/proc/free_datum_channels(datum/D) + var/list/L = using_channels_by_datum[D] + if(!L) + return + for(var/channel in L) + using_channels -= num2text(channel) + free_channel(channel) + using_channels_by_datum -= D + +/** + * Frees all datumless channels + */ +/datum/controller/subsystem/sounds/proc/free_datumless_channels() + free_datum_channels(DATUMLESS) + +/** + * NO AUTOMATIC CLEANUP - If you use this, you better manually free it later! + * + * Returns an integer for channel + */ +/datum/controller/subsystem/sounds/proc/reserve_sound_channel_datumless() + . = reserve_channel() + if(!.) // oh no.. + return FALSE + var/text_channel = num2text(.) + using_channels[text_channel] = DATUMLESS + LAZYADD(using_channels_by_datum[DATUMLESS], .) + +/** + * Reserves a channel for a datum. Automatic cleanup only when the datum is deleted. + * + * Returns an integer for channel + * Arguments: + * * D - The datum + */ +/datum/controller/subsystem/sounds/proc/reserve_sound_channel(datum/D) + if(!D) // i don't like typechecks but someone will fuck it up + CRASH("Attempted to reserve sound channel without datum using the managed proc.") + . = reserve_channel() + if(!.) + return FALSE + var/text_channel = num2text(.) + using_channels[text_channel] = D + LAZYADD(using_channels_by_datum[D], .) + +/** + * Reserves a channel and updates the datastructure. Private proc. + */ +/datum/controller/subsystem/sounds/proc/reserve_channel() + PRIVATE_PROC(TRUE) + if(channel_reserve_high <= random_channels_min) // out of channels + return + var/channel = channel_list[channel_reserve_high] + reserved_channels[num2text(channel)] = channel_reserve_high-- + return channel + +/** + * Frees a channel and updates the datastructure. Private proc. + */ +/datum/controller/subsystem/sounds/proc/free_channel(number) + PRIVATE_PROC(TRUE) + var/text_channel = num2text(number) + var/index = reserved_channels[text_channel] + if(!index) + CRASH("Attempted to (internally) free a channel that wasn't reserved.") + reserved_channels -= text_channel + // push reserve index up, which makes it now on a channel that is reserved + channel_reserve_high++ + // swap the reserved channel with the unreserved channel so the reserve index is now on an unoccupied channel and the freed channel is next to be used. + channel_list.Swap(channel_reserve_high, index) + // now, an existing reserved channel will likely (exception: unreserving last reserved channel) be at index + // get it, and update position. + var/text_reserved = num2text(channel_list[index]) + if(!reserved_channels[text_reserved]) // if it isn't already reserved make sure we don't accidently mistakenly put it on reserved list! + return + reserved_channels[text_reserved] = index + +/** + * Random available channel, returns text + */ +/datum/controller/subsystem/sounds/proc/random_available_channel_text() + if(channel_random_low > channel_reserve_high) + channel_random_low = 1 + . = "[channel_list[channel_random_low++]]" + +/** + * Random available channel, returns number + */ +/datum/controller/subsystem/sounds/proc/random_available_channel() + if(channel_random_low > channel_reserve_high) + channel_random_low = 1 + . = channel_list[channel_random_low++] + +/** + * How many channels we have left + */ +/datum/controller/subsystem/sounds/proc/available_channels_left() + return length(channel_list) - random_channels_min + +#undef DATUMLESS diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm index af4ea2e914d..97f84263a45 100644 --- a/code/controllers/subsystem/tickets/mentor_tickets.dm +++ b/code/controllers/subsystem/tickets/mentor_tickets.dm @@ -25,4 +25,4 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets message_mentorTicket(msg) /datum/controller/subsystem/tickets/mentor_tickets/create_other_system_ticket(datum/ticket/T) - SStickets.newTicket(T.clientName, T.content, T.title) + SStickets.newTicket(get_client_by_ckey(T.client_ckey), T.content, T.title) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 64f91e96b6c..60f3a5fa8dd 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -93,7 +93,7 @@ SUBSYSTEM_DEF(tickets) var/datum/ticket/T = new(title, passedContent, getTicketCounterAndInc()) allTickets += T - T.clientName = C + T.client_ckey = C.ckey T.locationSent = C.mob.loc.name T.mobControlled = C.mob @@ -139,14 +139,16 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/convert_ticket(datum/ticket/T) T.ticketState = TICKET_CLOSED var/client/C = usr.client - to_chat_safe(T.clientName, list("[key_name_hidden(C)] has converted your ticket to a [other_ticket_name] ticket.",\ + var/client/owner = get_client_by_ckey(T.client_ckey) + to_chat_safe(owner, list("[key_name_hidden(C)] has converted your ticket to a [other_ticket_name] ticket.",\ "Be sure to use the correct type of help next time!")) message_staff("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.") log_game("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.") create_other_system_ticket(T) /datum/controller/subsystem/tickets/proc/create_other_system_ticket(datum/ticket/T) - SSmentor_tickets.newTicket(T.clientName, T.content, T.title) + var/client/C = get_client_by_ckey(T.client_ckey) + SSmentor_tickets.newTicket(C, T.content, T.title) /datum/controller/subsystem/tickets/proc/autoRespond(N) if(!check_rights(rights_needed)) @@ -177,7 +179,7 @@ SUBSYSTEM_DEF(tickets) sorted_responses += key var/message_key = input("Select an autoresponse. This will mark the ticket as resolved.", "Autoresponse") as null|anything in sortTim(sorted_responses, /proc/cmp_text_asc) //use sortTim and cmp_text_asc to sort alphabetically - + var/client/ticket_owner = get_client_by_ckey(T.client_ckey) switch(message_key) if(null) //they cancelled T.staffAssigned = initial(T.staffAssigned) //if they cancel we dont need to hold this ticket anymore @@ -189,18 +191,18 @@ SUBSYSTEM_DEF(tickets) C.man_up(returnClient(N)) T.lastStaffResponse = "Autoresponse: [message_key]" resolveTicket(N) - message_staff("[C] has auto responded to [T.clientName]\'s adminhelp with: [message_key] ") - log_game("[C] has auto responded to [T.clientName]\'s adminhelp with: [response_phrases[message_key]]") + message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ") + log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]") if("Mentorhelp") convert_ticket(T) else var/msg_sound = sound('sound/effects/adminhelp.ogg') SEND_SOUND(returnClient(N), msg_sound) to_chat_safe(returnClient(N), "[key_name_hidden(C)] is autoresponding with: [response_phrases[message_key]]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key] - message_staff("[C] has auto responded to [T.clientName]\'s adminhelp with: [message_key] ") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key + message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key T.lastStaffResponse = "Autoresponse: [message_key]" resolveTicket(N) - log_game("[C] has auto responded to [T.clientName]\'s adminhelp with: [response_phrases[message_key]]") + log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]") //Set ticket state with key N to closed /datum/controller/subsystem/tickets/proc/closeTicket(N) @@ -214,7 +216,7 @@ SUBSYSTEM_DEF(tickets) //Check if the user already has a ticket open and within the cooldown period. /datum/controller/subsystem/tickets/proc/checkForOpenTicket(client/C) for(var/datum/ticket/T in allTickets) - if(T.clientName == C && T.ticketState == TICKET_OPEN && (T.ticketCooldown > world.time)) + if(T.client_ckey == C.ckey && T.ticketState == TICKET_OPEN && (T.ticketCooldown > world.time)) return T return FALSE @@ -222,7 +224,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/checkForTicket(client/C) var/list/tickets = list() for(var/datum/ticket/T in allTickets) - if(T.clientName == C && (T.ticketState == TICKET_OPEN || T.ticketState == TICKET_STALE)) + if(T.client_ckey == C.ckey && (T.ticketState == TICKET_OPEN || T.ticketState == TICKET_STALE)) tickets += T if(tickets.len) return tickets @@ -231,7 +233,7 @@ SUBSYSTEM_DEF(tickets) //return the client of a ticket number /datum/controller/subsystem/tickets/proc/returnClient(N) var/datum/ticket/T = allTickets[N] - return T.clientName + return get_client_by_ckey(T.client_ckey) /datum/controller/subsystem/tickets/proc/assignStaffToTicket(client/C, N) var/datum/ticket/T = allTickets[N] @@ -244,7 +246,8 @@ SUBSYSTEM_DEF(tickets) /datum/ticket var/ticketNum // Ticket number - var/clientName // Client which opened the ticket + /// ckey of the client who opened the ticket + var/client_ckey var/timeOpened // Time the ticket was opened var/title //The initial message with links var/list/content // content of the staff help @@ -379,7 +382,7 @@ UI STUFF dat += "
Ticket #[T.ticketNum]
" - dat += "[T.clientName] / [T.mobControlled] opened this [ticket_name] at [T.timeOpened] at location [T.locationSent]
" + dat += "[T.client_ckey] / [T.mobControlled] opened this [ticket_name] at [T.timeOpened] at location [T.locationSent]
" dat += "Ticket Status: [status]" dat += "
| [T.title] |
| [entry] | [functions] | [M_name] - [M_rname] - [M_key] ([M_job]) @@ -342,7 +342,7 @@ dname = M return {" |
| [dname][caption][logout_status][istype(A, /area/security/permabrig) ? " (PERMA) " : ""][M.stat == 2 ? " (DEAD)" : ""] | -PM [ADMIN_FLW(M, "FLW")] | [close ? "PM [ADMIN_FLW(M, "FLW")] | [close ? "" : ""]"} /datum/admins/proc/check_antagonists() if(!check_rights(R_ADMIN)) @@ -418,7 +418,7 @@ var/mob/M = blob.current if(M) dat += "
| [ADMIN_PP(M,"[M.real_name]")][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " - dat += "PM | " + dat += "PM | " else dat += "
| Blob not found! |
\ Fingerprint: [fingerprint]
\ Blood DNA: [dna]") - return + else + to_chat(user, "No match found in station records.") - to_chat(user, "No match found in station records.") - -/obj/item/detective_scanner/ui_action_click() - print_scanner_report() +/obj/item/detective_scanner/ui_action_click(mob/user, actiontype) + if(actiontype == /datum/action/item_action/print_forensic_report) + print_scanner_report() + else + clear_scanner() /obj/item/detective_scanner/proc/print_scanner_report() - if(log.len && !scanning) - scanning = 1 + if(length(log) && !scanning) + scanning = TRUE to_chat(usr, "Printing report, please wait...") playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) - spawn(100) - // Create our paper - var/obj/item/paper/P = new(get_turf(src)) - P.name = "paper- 'Scanner Report'" - P.info = "
" - P.info += jointext(log, "
") - P.info += "
Notes:
" - P.info_links = P.info - - if(ismob(loc)) - var/mob/M = loc - M.put_in_hands(P) - to_chat(M, "Report printed. Log cleared.") - - // Clear the logs - log = list() - scanning = 0 + addtimer(CALLBACK(src, .proc/make_paper, log), 10 SECONDS) // Create our paper + log = list() // Clear the logs + scanning = FALSE else - to_chat(usr, "The scanner has no logs or is in use.") + to_chat(usr, "The scanner has no logs or is in use.") + +/obj/item/detective_scanner/proc/make_paper(log) // Moved to a proc because 'spawn()' is evil + var/obj/item/paper/P = new(get_turf(src)) + P.name = "paper- 'Scanner Report'" + P.info = "
" + P.info += jointext(log, "
") + P.info += "
Notes:
" + P.info_links = P.info + + if(ismob(loc)) + var/mob/M = loc + M.put_in_hands(P) + to_chat(M, "Report printed. Log cleared.") -/obj/item/detective_scanner/attack(mob/living/M as mob, mob/user as mob) +/obj/item/detective_scanner/proc/clear_scanner() + if(length(log) && !scanning) + log = list() + playsound(loc, 'sound/machines/ding.ogg', 40) + addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, usr, "Scanner logs cleared."), 1.5 SECONDS) //Timer so that it clears on the 'ding' + else + to_chat(usr, "The scanner has no logs or is in use.") + + +/obj/item/detective_scanner/attack() return - -/obj/item/detective_scanner/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/detective_scanner/afterattack(atom/A, mob/user) scan(A, user) -/obj/item/detective_scanner/proc/scan(var/atom/A, var/mob/user) +/obj/item/detective_scanner/proc/scan(atom/A, mob/user) if(!scanning) // Can remotely scan objects and mobs. - if(!in_range(A, user) && !(A in view(world.view, user))) + if(!(A in view(world.view, user))) return if(loc != user) return - scanning = 1 + scanning = TRUE - user.visible_message("\The [user] points the [src.name] at \the [A] and performs a forensic scan.") - to_chat(user, "You scan \the [A]. The scanner is now analysing the results...") + user.visible_message("[user] points [src] at [A] and performs a forensic scan.", + "You scan [A]. The scanner is now analysing the results...") // GATHER INFORMATION @@ -123,10 +133,10 @@ // Start gathering - if(A.blood_DNA && A.blood_DNA.len) + if(length(A.blood_DNA)) blood = A.blood_DNA.Copy() - if(A.suit_fibers && A.suit_fibers.len) + if(length(A.suit_fibers)) fibers = A.suit_fibers.Copy() if(ishuman(A)) @@ -137,11 +147,11 @@ else if(!ismob(A)) - if(A.fingerprints && A.fingerprints.len) + if(length(A.fingerprints)) fingerprints = A.fingerprints.Copy() // Only get reagents from non-mobs. - if(A.reagents && A.reagents.reagent_list.len) + if(A.reagents && length(A.reagents.reagent_list)) for(var/datum/reagent/R in A.reagents.reagent_list) reagents[R.name] = R.volume @@ -154,63 +164,60 @@ var/blood_type = R.data["blood_type"] blood[blood_DNA] = blood_type - // We gathered everything. Create a fork and slowly display the results to the holder of the scanner. - spawn(0) + // We gathered everything. Slowly display the results to the holder of the scanner. + var/found_something = FALSE + add_log("[station_time_timestamp()][get_timestamp()] - [target_name]", FALSE) - var/found_something = 0 - add_log("[station_time_timestamp()][get_timestamp()] - [target_name]", 0) + // Fingerprints + if(length(fingerprints)) + sleep(30) + add_log("Prints:") + for(var/finger in fingerprints) + add_log("[finger]") + found_something = TRUE - // Fingerprints - if(fingerprints && fingerprints.len) - sleep(30) - add_log("Prints:") - for(var/finger in fingerprints) - add_log("[finger]") - found_something = 1 + // Blood + if(length(blood)) + sleep(30) + add_log("Blood:") + found_something = TRUE + for(var/B in blood) + add_log("Type: [blood[B]] DNA: [B]") - // Blood - if(blood && blood.len) - sleep(30) - add_log("Blood:") - found_something = 1 - for(var/B in blood) - add_log("Type: [blood[B]] DNA: [B]") + //Fibers + if(length(fibers)) + sleep(30) + add_log("Fibers:") + for(var/fiber in fibers) + add_log("[fiber]") + found_something = TRUE - //Fibers - if(fibers && fibers.len) - sleep(30) - add_log("Fibers:") - for(var/fiber in fibers) - add_log("[fiber]") - found_something = 1 + //Reagents + if(length(reagents)) + sleep(30) + add_log("Reagents:") + for(var/R in reagents) + add_log("Reagent: [R] Volume: [reagents[R]]") + found_something = TRUE - //Reagents - if(reagents && reagents.len) - sleep(30) - add_log("Reagents:") - for(var/R in reagents) - add_log("Reagent: [R] Volume: [reagents[R]]") - found_something = 1 + // Get a new user + var/mob/holder = null + if(ismob(loc)) + holder = loc - // Get a new user - var/mob/holder = null - if(ismob(src.loc)) - holder = src.loc + if(!found_something) + add_log("# No forensic traces found #", FALSE) // Don't display this to the holder user + if(holder) + to_chat(holder, "Unable to locate any fingerprints, materials, fibers, or blood on [A]!") + else + if(holder) + to_chat(holder, "You finish scanning [A].") - if(!found_something) - add_log("# No forensic traces found #", 0) // Don't display this to the holder user - if(holder) - to_chat(holder, "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!") - else - if(holder) - to_chat(holder, "You finish scanning \the [target_name].") + add_log("---------------------------------------------------------", FALSE) + scanning = FALSE - add_log("---------------------------------------------------------", 0) - scanning = 0 - return - -/obj/item/detective_scanner/proc/add_log(var/msg, var/broadcast = 1) +/obj/item/detective_scanner/proc/add_log(msg, broadcast = TRUE) if(scanning) if(broadcast && ismob(loc)) var/mob/M = loc diff --git a/code/modules/events/apc_overload.dm b/code/modules/events/apc_overload.dm index 13cabe81b3c..2ca2cdbfa70 100644 --- a/code/modules/events/apc_overload.dm +++ b/code/modules/events/apc_overload.dm @@ -21,7 +21,7 @@ SEND_SOUND(M, S) /datum/event/apc_overload/announce() - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/apc_overload.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/attention.ogg') /datum/event/apc_overload/end() return TRUE @@ -32,7 +32,7 @@ /area/turret_protected/ai) if(announce) - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/apc_overload.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/attention.ogg') // break APC_BREAK_PROBABILITY% of all of the APCs on the station var/affected_apc_count = 0 diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm index c19b6cbe8b7..bb82ceb15c4 100644 --- a/code/modules/events/apc_short.dm +++ b/code/modules/events/apc_short.dm @@ -21,7 +21,7 @@ SEND_SOUND(M, S) /datum/event/apc_short/announce() - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/apc_short.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') /datum/event/apc_short/end() return TRUE @@ -32,7 +32,7 @@ /area/turret_protected/ai) if(announce) - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/apc_short.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') // break APC_BREAK_PROBABILITY% of all of the APCs on the station var/affected_apc_count = 0 @@ -46,10 +46,10 @@ if(prob(APC_BREAK_PROBABILITY)) // if it has internal wires, cut the power wires if(C.wires) - if(!C.wires.IsIndexCut(APC_WIRE_MAIN_POWER1)) - C.wires.CutWireIndex(APC_WIRE_MAIN_POWER1) - if(!C.wires.IsIndexCut(APC_WIRE_MAIN_POWER2)) - C.wires.CutWireIndex(APC_WIRE_MAIN_POWER2) + if(!C.wires.is_cut(WIRE_MAIN_POWER1)) + C.wires.cut(WIRE_MAIN_POWER1) + if(!C.wires.is_cut(WIRE_MAIN_POWER2)) + C.wires.cut(WIRE_MAIN_POWER2) // if it was operating, toggle off the breaker if(C.operating) C.toggle_breaker() diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 8d91635c458..35cc199c3ff 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -32,7 +32,7 @@ log_debug("Original brand intelligence machine: [originMachine] ([ADMIN_VV(originMachine,"VV")]) [ADMIN_JMP(originMachine)]") /datum/event/brand_intelligence/tick() - if(!originMachine || QDELETED(originMachine) || originMachine.shut_up || originMachine.wires.IsAllCut()) //if the original vending machine is missing or has it's voice switch flipped + if(!originMachine || QDELETED(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped for(var/obj/machinery/vending/saved in infectedMachines) saved.shoot_inventory = 0 if(originMachine) diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 7304469f408..17c697faf11 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -25,5 +25,5 @@ for(var/thing in epicentreList) var/obj/effect/landmark/epicentre = thing for(var/obj/machinery/power/apc/apc in range(epicentre, lightsoutRange)) - apc.overload_lighting() + INVOKE_ASYNC(apc, /obj/machinery/power/apc.proc/overload_lighting) diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 02fa69b7c3e..f3ea93c80c4 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -4,24 +4,16 @@ var/list/drones_list = list() /datum/event/rogue_drone/start() - //spawn them at the same place as carp var/list/possible_spawns = list() for(var/thing in GLOB.landmarks_list) var/obj/effect/landmark/C = thing - if(C.name == "carpspawn") + if(C.name == "carpspawn") //spawn them at the same place as carp possible_spawns.Add(C) - //25% chance for this to be a false alarm - var/num - if(prob(25)) - num = 0 - else - num = rand(2,6) - for(var/i=0, i
"
- if(istype(inserted_id))
- dat += "You have [inserted_id.mining_points] mining points collected. Eject ID.
" + // ID + if(inserted_id) + data["has_id"] = TRUE + data["id"] = list( + "name" = inserted_id.registered_name, + "points" = inserted_id.mining_points, + ) else - dat += "No ID inserted. Insert ID.
" - dat += "
"
- dat += "" + // ID + if(inserted_id) + data["has_id"] = TRUE + data["id"] = list( + "name" = inserted_id.registered_name, + "points" = inserted_id.mining_points, + ) else - dat += "No ID inserted. Insert ID.
" - dat += "
Equipment point cost list:
| [prize.equipment_name] | [prize.cost] | Purchase |
" + var/list/list/temp_alarm_list = SSalarm.alarms.Copy() + for(var/cat in temp_alarm_list) + if(!(cat in alarms_listend_for)) + continue + dat += text("[]
\n", cat) + var/list/list/L = temp_alarm_list[cat].Copy() + for(var/alarm in L) + var/list/list/alm = L[alarm].Copy() + var/area_name = alm[1] + var/C = alm[2] + var/list/list/sources = alm[3].Copy() + for(var/thing in sources) + var/atom/A = locateUID(thing) + if(A && A.z != z) + L -= alarm + continue + dat += "
\n" + if(!L.len) + dat += "-- All Systems Nominal
\n" + dat += "
\n" + + viewalerts = TRUE + var/dat_text = dat.Join("") + src << browse(dat_text, "window=aialerts&can_close=0") + /mob/living/silicon/ai/proc/show_borg_info() stat(null, text("Connected cyborgs: [connected_robots.len]")) for(var/thing in connected_robots) @@ -612,7 +652,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(href_list["switchcamera"]) switchCamera(locate(href_list["switchcamera"])) in GLOB.cameranet.cameras if(href_list["showalerts"]) - subsystem_alarm_monitor() + ai_alerts() if(href_list["show_paper"]) if(last_paper_seen) src << browse(last_paper_seen, "window=show_paper") @@ -787,12 +827,49 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( Bot.call_bot(src, waypoint) +/mob/living/silicon/ai/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) + if(!(class in alarms_listend_for)) + return + if(alarmsource.z != z) + return + if(stat == DEAD) + return TRUE + if(O) + var/obj/machinery/camera/C = locateUID(O[1]) + if(O.len == 1 && !QDELETED(C) && C.can_use()) + queueAlarm("--- [class] alarm detected in [A.name]! ([C.c_tag])", class) + else if(O && O.len) + var/foo = 0 + var/dat2 = "" + for(var/thing in O) + var/obj/machinery/camera/I = locateUID(thing) + if(!QDELETED(I)) + dat2 += text("[][]", (!foo) ? "" : " | ", I.c_tag) //I'm not fixing this shit... + foo = 1 + queueAlarm(text ("--- [] alarm detected in []! ([])", class, A.name, dat2), class) + else + queueAlarm(text("--- [] alarm detected in []! (No Camera)", class, A.name), class) + else + queueAlarm(text("--- [] alarm detected in []! (No Camera)", class, A.name), class) + if(viewalerts) + ai_alerts() + +/mob/living/silicon/ai/alarm_cancelled(src, class, area/A, obj/origin, cleared) + if(cleared) + if(!(class in alarms_listend_for)) + return + if(origin.z != z) + return + queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0) + if(viewalerts) + ai_alerts() + /mob/living/silicon/ai/proc/switchCamera(obj/machinery/camera/C) if(!tracking) cameraFollow = null - if(!C || stat == DEAD) //C.can_use()) + if(QDELETED(C) || stat == DEAD) //C.can_use()) return FALSE if(!eyeobj) @@ -1255,8 +1332,10 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(istype(A)) switch(alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", "Yes", "No")) if("Yes") - A.AIShiftClick() - to_chat(src, "You open \the [A] for [target].") + if(!A.density) + to_chat(src, "[A] was already opened.") + else if(A.open_close(src)) + to_chat(src, "You open \the [A] for [target].") else to_chat(src, "You deny the request.") else diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 61151e35c92..106eaf86d37 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -132,8 +132,6 @@ sleep(50) theAPC = null - process_queued_alarms() - /mob/living/silicon/ai/updatehealth(reason = "none given") if(status_flags & GODMODE) health = 100 diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 2a1662b064d..6cb0cc53bd0 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -243,7 +243,7 @@ add_fingerprint(user) -proc/robot_healthscan(mob/user, mob/living/M) +/proc/robot_healthscan(mob/user, mob/living/M) var/scan_type if(istype(M, /mob/living/silicon/robot)) scan_type = "robot" @@ -312,8 +312,3 @@ proc/robot_healthscan(mob/user, mob/living/M) to_chat(user, "[capitalize(O.name)]: [O.damage]") if(!organ_found) to_chat(user, "No prosthetics located.") - - if(ismachineperson(H)) - to_chat(user, "Internal Fluid Level:[H.blood_volume]/[H.max_blood]") - if(H.bleed_rate) - to_chat(user, "Warning:External component leak detected!") diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 72d9b210712..65847c3a9b1 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -53,7 +53,7 @@ emote("deathgasp", force = TRUE) if(module) - module.handle_death(gibbed) + module.handle_death(src, gibbed) // Only execute the below if we successfully died . = ..(gibbed) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5cc6e50fd06..a8485853be1 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -35,7 +35,6 @@ var/mail_destination = 0 var/reboot_cooldown = 60 // one minute var/last_reboot - var/emagged_time var/list/pullable_drone_items = list( /obj/item/pipe, /obj/structure/disposalconstruct, @@ -59,7 +58,7 @@ // Disable the microphone wire on Drones if(radio) - radio.wires.CutWireIndex(RADIO_WIRE_TRANSMIT) + radio.wires.cut(WIRE_RADIO_TRANSMIT) if(camera && ("Robots" in camera.network)) camera.network.Add("Engineering") @@ -127,6 +126,11 @@ /mob/living/silicon/robot/drone/pick_module() return +/mob/living/silicon/robot/drone/can_be_revived() + . = ..() + if(emagged) + return FALSE + //Drones cannot be upgraded with borg modules so we need to catch some items before they get used in ..(). /mob/living/silicon/robot/drone/attackby(obj/item/W as obj, mob/user as mob, params) @@ -208,8 +212,8 @@ log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") GLOB.lawchanges.Add("[time] : [H.name]([H.key]) emagged [name]([key])") + addtimer(CALLBACK(src, .proc/shut_down, TRUE), EMAG_TIMER) - emagged_time = world.time emagged = 1 density = 1 pass_flags = 0 @@ -361,12 +365,7 @@ /mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0) . = ..() - if(emagged) - density = 1 - if(world.time - emagged_time > EMAG_TIMER) - shut_down(TRUE) - return - density = 0 //this is reset every canmove update otherwise + density = emagged //this is reset every canmove update otherwise /mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) if(affect_silicon) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 07080e694bf..a183a8fc455 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -13,7 +13,6 @@ handle_robot_cell() process_locks() update_items() - process_queued_alarms() /mob/living/silicon/robot/proc/handle_robot_cell() @@ -46,7 +45,7 @@ /mob/living/silicon/robot/proc/handle_equipment() if(camera && !scrambledcodes) - if(stat == DEAD || wires.IsCameraCut()) + if(stat == DEAD || wires.is_cut(WIRE_BORG_CAMERA)) camera.status = 0 else camera.status = 1 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7f1a18ac22d..8f34314f717 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -59,7 +59,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/ear_protection = 0 var/damage_protection = 0 var/emp_protection = FALSE - var/xeno_disarm_chance = 85 var/list/force_modules = list() var/allow_rename = TRUE @@ -72,11 +71,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/list/req_access var/ident = 0 //var/list/laws = list() - var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list()) var/viewalerts = 0 var/modtype = "Default" var/lower_mod = 0 - var/datum/effect_system/spark_spread/spark_system//So they can initialize sparks whenever/N + var/datum/effect_system/spark_spread/spark_system //So they can initialize sparks whenever/N var/jeton = 0 var/low_power_mode = 0 //whether the robot has no charge left. var/weapon_lock = 0 @@ -85,6 +83,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/lockcharge //Used when locking down a borg to preserve cell charge var/speed = 0 //Cause sec borgs gotta go fast //No they dont! var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console. Setting to one hides them. + var/can_lock_cover = FALSE //Used to set if a borg can re-lock its cover. var/has_camera = TRUE var/pdahide = 0 //Used to hide the borg from the messenger list var/tracking_entities = 0 //The number of known entities currently accessing the internal camera @@ -112,7 +111,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/get_cell() return cell -/mob/living/silicon/robot/New(loc, syndie = FALSE, unfinished = FALSE, alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) +/mob/living/silicon/robot/New(loc, syndie = FALSE, unfinished = FALSE, alien = FALSE, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null) spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, src) spark_system.attach(src) @@ -134,13 +133,13 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( radio = new /obj/item/radio/borg(src) common_radio = radio - init(ai_to_sync_to = ai_to_sync_to) + init(alien, connect_to_AI, ai_to_sync_to) if(has_camera && !camera) camera = new /obj/machinery/camera(src) camera.c_tag = real_name camera.network = list("SS13","Robots") - if(wires.IsCameraCut()) // 5 = BORG CAMERA + if(wires.is_cut(WIRE_BORG_CAMERA)) // 5 = BORG CAMERA camera.status = 0 if(mmi == null) @@ -172,18 +171,20 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( scanner = new(src) scanner.Grant(src) -/mob/living/silicon/robot/proc/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) +/mob/living/silicon/robot/proc/init(alien, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null) aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) make_laws() additional_law_channels["Binary"] = ":b " + if(!connect_to_AI) + return var/found_ai = ai_to_sync_to if(!found_ai) found_ai = select_active_ai_with_fewest_borgs() if(found_ai) - lawupdate = 1 + lawupdate = TRUE connect_to_ai(found_ai) else - lawupdate = 0 + lawupdate = FALSE playsound(loc, 'sound/voice/liveagain.ogg', 75, 1) @@ -270,6 +271,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO //Improved /N /mob/living/silicon/robot/Destroy() + SStgui.close_uis(wires) if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside. var/turf/T = get_turf(loc)//To hopefully prevent run time errors. if(T) mmi.loc = T @@ -543,6 +545,43 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( src.verbs -= GLOB.robot_verbs_default src.verbs -= silicon_subsystems +/mob/living/silicon/robot/verb/cmd_robot_alerts() + set category = "Robot Commands" + set name = "Show Alerts" + if(usr.stat == DEAD) + to_chat(src, "Alert: You are dead.") + return //won't work if dead + robot_alerts() + +/mob/living/silicon/robot/proc/robot_alerts() + var/list/dat = list() + var/list/list/temp_alarm_list = SSalarm.alarms.Copy() + for(var/cat in temp_alarm_list) + if(!(cat in alarms_listend_for)) + continue + dat += text("[cat]
\n") + var/list/list/L = temp_alarm_list[cat].Copy() + for(var/alarm in L) + var/list/list/alm = L[alarm].Copy() + var/list/list/sources = alm[3].Copy() + var/area_name = alm[1] + for(var/thing in sources) + var/atom/A = locateUID(thing) + if(A && A.z != z) + L -= alarm + continue + dat += "
\n" + if(!L.len) + dat += "-- All Systems Nominal
\n" + dat += "
\n" + + var/datum/browser/alerts = new(usr, "robotalerts", "Current Station Alerts", 400, 410) + var/dat_text = dat.Join("") + alerts.set_content(dat_text) + alerts.open() + /mob/living/silicon/robot/proc/ionpulse() if(!ionpulse_on) return @@ -604,6 +643,23 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/InCritical() return low_power_mode +/mob/living/silicon/robot/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) + if(!(class in alarms_listend_for)) + return + if(alarmsource.z != z) + return + if(stat == DEAD) + return + queueAlarm(text("--- [class] alarm detected in [A.name]!"), class) + +/mob/living/silicon/robot/alarm_cancelled(src, class, area/A, obj/origin, cleared) + if(cleared) + if(!(class in alarms_listend_for)) + return + if(origin.z != z) + return + queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0) + /mob/living/silicon/robot/ex_act(severity) switch(severity) if(1.0) @@ -697,6 +753,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( if(allowed(W)) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] [src]'s interface.") + to_chat(src, "[user] [ locked ? "locked" : "unlocked"] your interface.") update_icons() else to_chat(user, "Access denied.") @@ -713,7 +770,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( if(!user.drop_item()) return if(U.action(src)) - to_chat(user, "You apply the upgrade to [src].") + user.visible_message("[user] applied [U] to [src].", "You apply [U] to [src].") U.forceMove(src) else to_chat(user, "Upgrade error.") @@ -795,7 +852,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( opened = FALSE update_icons() return - else if(wiresexposed && wires.IsAllCut()) + else if(wiresexposed && wires.is_all_cut()) //Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob. if(!mmi) to_chat(user, "[src] has no brain to remove.") @@ -909,16 +966,24 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( update_icons() return -/mob/living/silicon/robot/verb/unlock_own_cover() +/mob/living/silicon/robot/verb/toggle_own_cover() set category = "Robot Commands" - set name = "Unlock Cover" - set desc = "Unlocks your own cover if it is locked. You can not lock it again. A human will have to lock it for you." - if(locked) - switch(alert("You can not lock your cover again, are you sure?\n (You can still ask for a human to lock it)", "Unlock Own Cover", "Yes", "No")) - if("Yes") - locked = 0 - update_icons() - to_chat(usr, "You unlock your cover.") + set name = "Toggle Cover" + set desc = "Toggles the lock on your cover." + + if(can_lock_cover) + if(alert("Are you sure?", locked ? "Unlock Cover" : "Lock Cover", "Yes", "No") == "Yes") + locked = !locked + update_icons() + to_chat(usr, "You [locked ? "lock" : "unlock"] your cover.") + return + if(!locked) + to_chat(usr, "You cannot lock your cover yourself. Find a robotocist.") + return + if(alert("You cannnot lock your own cover again. Are you sure?\n You will need a robotocist to re-lock you.", "Unlock Own Cover", "Yes", "No") == "Yes") + locked = !locked + update_icons() + to_chat(usr, "You unlock your cover.") /mob/living/silicon/robot/attack_ghost(mob/user) if(wiresexposed) @@ -1023,10 +1088,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( src << browse(null, t1) return 1 - if(href_list["showalerts"]) - subsystem_alarm_monitor() - return 1 - if(href_list["mod"]) var/obj/item/O = locate(href_list["mod"]) if(istype(O) && (O.loc == src)) @@ -1041,6 +1102,11 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( activate_module(O) installed_modules() + //Show alerts window if user clicked on "Show alerts" in chat + if(href_list["showalerts"]) + robot_alerts() + return TRUE + if(href_list["deact"]) var/obj/item/O = locate(href_list["deact"]) if(activated(O)) @@ -1063,7 +1129,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return 1 /mob/living/silicon/robot/proc/radio_menu() - radio.interact(src)//Just use the radio's Topic() instead of bullshit special-snowflake code + radio.interact(src) /mob/living/silicon/robot/proc/control_headlamp() if(stat || lamp_recharging || low_power_mode) @@ -1233,7 +1299,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/proc/SetLockdown(var/state = 1) // They stay locked down if their wire is cut. - if(wires.LockedCut()) + if(wires.is_cut(WIRE_BORG_LOCKED)) state = 1 if(state) throw_alert("locked", /obj/screen/alert/locked) @@ -1343,14 +1409,14 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( eye_protection = 2 // Immunity to flashes and the visual part of flashbangs ear_protection = 1 // Immunity to the audio part of flashbangs damage_protection = 10 // Reduce all incoming damage by this number - xeno_disarm_chance = 20 allow_rename = FALSE modtype = "Commando" faction = list("nanotrasen") is_emaggable = FALSE + can_lock_cover = TRUE default_cell_type = /obj/item/stock_parts/cell/bluespace -/mob/living/silicon/robot/deathsquad/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) +/mob/living/silicon/robot/deathsquad/init(alien = FALSE, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null) laws = new /datum/ai_laws/deathsquad module = new /obj/item/robot_module/deathsquad(src) aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) @@ -1376,11 +1442,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( static_radio_channels = 1 allow_rename = FALSE weapons_unlock = TRUE + can_lock_cover = TRUE default_cell_type = /obj/item/stock_parts/cell/super var/eprefix = "Amber" -/mob/living/silicon/robot/ert/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) +/mob/living/silicon/robot/ert/init(alien = FALSE, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null) laws = new /datum/ai_laws/ert_override radio = new /obj/item/radio/borg/ert(src) radio.recalculateChannels() @@ -1413,7 +1480,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( damage_protection = 5 // Reduce all incoming damage by this number eprefix = "Gamma" magpulse = 1 - xeno_disarm_chance = 40 /mob/living/silicon/robot/destroyer @@ -1433,10 +1499,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( ear_protection = 1 // Immunity to the audio part of flashbangs emp_protection = TRUE // Immunity to EMP, due to heavy shielding damage_protection = 20 // Reduce all incoming damage by this number. Very high in the case of /destroyer borgs, since it is an admin-only borg. - xeno_disarm_chance = 10 + can_lock_cover = TRUE default_cell_type = /obj/item/stock_parts/cell/bluespace -/mob/living/silicon/robot/destroyer/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) +/mob/living/silicon/robot/destroyer/init(alien = FALSE, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null) aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) additional_law_channels["Binary"] = ":b " laws = new /datum/ai_laws/deathsquad diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 8445a399582..84eb782833b 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -2,19 +2,17 @@ if(M.a_intent == INTENT_DISARM) if(!lying) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) - if(prob(xeno_disarm_chance)) - Stun(7) - step(src, get_dir(M,src)) - spawn(5) - step(src, get_dir(M,src)) - add_attack_logs(M, src, "Alien pushed over") - playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1) - visible_message("[M] has forced back [src]!",\ - "[M] has forced back [src]!") + var/obj/item/I = get_active_hand() + if(I) + uneq_active() + visible_message("[M] disarmed [src]!", "[M] has disabled [src]'s active module!") + add_attack_logs(M, src, "alien disarmed") else - playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M] took a swipe at [src]!",\ - "[M] took a swipe at [src]!") + Stun(2) + step(src, get_dir(M,src)) + add_attack_logs(M, src, "Alien pushed over") + visible_message("[M] forces back [src]!", "[M] forces back [src]!") + playsound(loc, 'sound/weapons/pierce.ogg', 50, TRUE, -1) else ..() return diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 8e8c67693c5..ff967354131 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -114,7 +114,7 @@ /obj/item/robot_module/proc/handle_custom_removal(component_id, mob/living/user, obj/item/W) return FALSE -/obj/item/robot_module/proc/handle_death(gibbed) +/obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed) return /obj/item/robot_module/standard @@ -255,7 +255,7 @@ fix_modules() -/obj/item/robot_module/engineering/handle_death() +/obj/item/robot_module/engineering/handle_death(mob/living/silicon/robot/R, gibbed) var/obj/item/gripper/G = locate(/obj/item/gripper) in modules if(G) G.drop_gripped_item(silent = TRUE) @@ -368,6 +368,11 @@ R.add_language("Clownish",1) R.add_language("Neo-Russkiya", 1) +/obj/item/robot_module/butler/handle_death(mob/living/silicon/robot/R, gibbed) + var/obj/item/storage/bag/tray/cyborg/T = locate(/obj/item/storage/bag/tray/cyborg) in modules + if(istype(T)) + T.drop_inventory(R) + /obj/item/robot_module/miner name = "miner robot module" @@ -623,7 +628,7 @@ ..() -/obj/item/robot_module/drone/handle_death() +/obj/item/robot_module/drone/handle_death(mob/living/silicon/robot/R, gibbed) var/obj/item/gripper/G = locate(/obj/item/gripper) in modules if(G) G.drop_gripped_item(silent = TRUE) diff --git a/code/modules/mob/living/silicon/robot/syndicate.dm b/code/modules/mob/living/silicon/robot/syndicate.dm index f5b58696059..cfc6e1bd59d 100644 --- a/code/modules/mob/living/silicon/robot/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/syndicate.dm @@ -11,6 +11,7 @@ modtype = "Syndicate" req_access = list(ACCESS_SYNDICATE) ionpulse = 1 + can_lock_cover = TRUE lawchannel = "State" var/playstyle_string = "You are a Syndicate assault cyborg!
\ You are armed with powerful offensive tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \ diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index c923e0912b7..7f9c0849d9c 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -11,9 +11,11 @@ var/list/stating_laws = list()// Channels laws are currently being stated on var/list/alarms_to_show = list() var/list/alarms_to_clear = list() + var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0) + var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0) + var/list/alarms_listend_for = list("Motion", "Fire", "Atmosphere", "Power", "Camera") //var/list/hud_list[10] var/list/speech_synthesizer_langs = list() //which languages can be vocalized by the speech synthesizer - var/list/alarm_handlers = list() // List of alarm handlers this silicon is registered to var/designation = "" var/obj/item/camera/siliconcam/aiCamera = null //photography //Used in say.dm, allows for pAIs to have different say flavor text, as well as silicons, although the latter is not implemented. @@ -25,9 +27,6 @@ //var/sensor_mode = 0 //Determines the current HUD. - var/next_alarm_notice - var/list/datum/alarm/queued_alarms = new() - hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD) @@ -46,6 +45,8 @@ diag_hud_set_health() add_language("Galactic Common") init_subsystems() + RegisterSignal(SSalarm, COMSIG_TRIGGERED_ALARM, .proc/alarm_triggered) + RegisterSignal(SSalarm, COMSIG_CANCELLED_ALARM, .proc/alarm_cancelled) /mob/living/silicon/med_hud_set_health() return //we use a different hud @@ -55,10 +56,93 @@ /mob/living/silicon/Destroy() GLOB.silicon_mob_list -= src - for(var/datum/alarm_handler/AH in alarm_handlers) - AH.unregister(src) return ..() +/mob/living/silicon/proc/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) + return + +/mob/living/silicon/proc/alarm_cancelled(src, class, area/A, obj/origin, cleared) + return + +/mob/living/silicon/proc/queueAlarm(message, type, incoming = TRUE) + var/in_cooldown = (alarms_to_show.len > 0 || alarms_to_clear.len > 0) + if(incoming) + alarms_to_show += message + alarm_types_show[type] += 1 + else + alarms_to_clear += message + alarm_types_clear[type] += 1 + + if(in_cooldown) + return + + addtimer(CALLBACK(src, .proc/show_alarms), 3 SECONDS) + +/mob/living/silicon/proc/show_alarms() + if(alarms_to_show.len < 5) + for(var/msg in alarms_to_show) + to_chat(src, msg) + else if(length(alarms_to_show)) + + var/list/msg = list("--- ") + + if(alarm_types_show["Burglar"]) + msg += "BURGLAR: [alarm_types_show["Burglar"]] alarms detected. - " + + if(alarm_types_show["Motion"]) + msg += "MOTION: [alarm_types_show["Motion"]] alarms detected. - " + + if(alarm_types_show["Fire"]) + msg += "FIRE: [alarm_types_show["Fire"]] alarms detected. - " + + if(alarm_types_show["Atmosphere"]) + msg += "ATMOSPHERE: [alarm_types_show["Atmosphere"]] alarms detected. - " + + if(alarm_types_show["Power"]) + msg += "POWER: [alarm_types_show["Power"]] alarms detected. - " + + if(alarm_types_show["Camera"]) + msg += "CAMERA: [alarm_types_show["Camera"]] alarms detected. - " + + msg += "\[Show Alerts\]" + var/msg_text = msg.Join("") + to_chat(src, msg_text) + + if(alarms_to_clear.len < 3) + for(var/msg in alarms_to_clear) + to_chat(src, msg) + + else if(alarms_to_clear.len) + var/list/msg = list("--- ") + + if(alarm_types_clear["Motion"]) + msg += "MOTION: [alarm_types_clear["Motion"]] alarms cleared. - " + + if(alarm_types_clear["Fire"]) + msg += "FIRE: [alarm_types_clear["Fire"]] alarms cleared. - " + + if(alarm_types_clear["Atmosphere"]) + msg += "ATMOSPHERE: [alarm_types_clear["Atmosphere"]] alarms cleared. - " + + if(alarm_types_clear["Power"]) + msg += "POWER: [alarm_types_clear["Power"]] alarms cleared. - " + + if(alarm_types_show["Camera"]) + msg += "CAMERA: [alarm_types_clear["Camera"]] alarms cleared. - " + + msg += "\[Show Alerts\]" + + var/msg_text = msg.Join("") + to_chat(src, msg_text) + + + alarms_to_show.Cut() + alarms_to_clear.Cut() + for(var/key in alarm_types_show) + alarm_types_show[key] = 0 + for(var/key in alarm_types_clear) + alarm_types_clear[key] = 0 + /mob/living/silicon/rename_character(oldname, newname) // we actually don't want it changing minds and stuff if(!newname) @@ -283,63 +367,6 @@ if("Disable") to_chat(src, "Sensor augmentations disabled.") -/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised) - if(!next_alarm_notice) - next_alarm_notice = world.time + 10 SECONDS - - var/list/alarms = queued_alarms[alarm_handler] - if(was_raised) - // Raised alarms are always set - alarms[alarm] = 1 - else - // Alarms that were raised but then cleared before the next notice are instead removed - if(alarm in alarms) - alarms -= alarm - // And alarms that have only been cleared thus far are set as such - else - alarms[alarm] = -1 - -/mob/living/silicon/proc/process_queued_alarms() - if(next_alarm_notice && (world.time > next_alarm_notice)) - next_alarm_notice = 0 - - var/alarm_raised = 0 - for(var/datum/alarm_handler/AH in queued_alarms) - var/list/alarms = queued_alarms[AH] - var/reported = 0 - for(var/datum/alarm/A in alarms) - if(alarms[A] == 1) - if(!reported) - reported = 1 - to_chat(src, "--- [AH.category] Detected ---") - raised_alarm(A) - - for(var/datum/alarm_handler/AH in queued_alarms) - var/list/alarms = queued_alarms[AH] - var/reported = 0 - for(var/datum/alarm/A in alarms) - if(alarms[A] == -1) - if(!reported) - reported = 1 - to_chat(src, "--- [AH.category] Cleared ---") - to_chat(src, "\The [A.alarm_name()].") - - if(alarm_raised) - to_chat(src, "\[Show Alerts\]") - - for(var/datum/alarm_handler/AH in queued_alarms) - var/list/alarms = queued_alarms[AH] - alarms.Cut() - -/mob/living/silicon/proc/raised_alarm(var/datum/alarm/A) - to_chat(src, "[A.alarm_name()]!") - -/mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) - var/cameratext = "" - for(var/obj/machinery/camera/C in A.cameras()) - cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" - to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])") - /mob/living/silicon/adjustToxLoss(var/amount) return STATUS_UPDATE_NONE diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index cbb0287b76a..6ac5f8cded2 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -3,11 +3,10 @@ /mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent - var/damage = rand(10, 20) + var/damage = 20 if(prob(90)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") + visible_message("[M] has slashed at [src]!", "[M] has slashed at [src]!") if(prob(8)) flash_eyes(affect_silicon = 1) add_attack_logs(M, src, "Alien attacked") diff --git a/code/modules/mob/living/silicon/subsystems.dm b/code/modules/mob/living/silicon/subsystems.dm index d18d41a40cf..65a92d07008 100644 --- a/code/modules/mob/living/silicon/subsystems.dm +++ b/code/modules/mob/living/silicon/subsystems.dm @@ -8,13 +8,11 @@ /mob/living/silicon var/list/silicon_subsystems = list( - /mob/living/silicon/proc/subsystem_alarm_monitor, /mob/living/silicon/proc/subsystem_law_manager ) /mob/living/silicon/ai silicon_subsystems = list( - /mob/living/silicon/proc/subsystem_alarm_monitor, /mob/living/silicon/proc/subsystem_atmos_control, /mob/living/silicon/proc/subsystem_crew_monitor, /mob/living/silicon/proc/subsystem_law_manager, @@ -23,7 +21,6 @@ /mob/living/silicon/robot/drone silicon_subsystems = list( - /mob/living/silicon/proc/subsystem_alarm_monitor, /mob/living/silicon/proc/subsystem_law_manager, /mob/living/silicon/proc/subsystem_power_monitor ) @@ -32,30 +29,11 @@ register_alarms = 0 /mob/living/silicon/proc/init_subsystems() - alarm_monitor = new(src) atmos_control = new(src) crew_monitor = new(src) law_manager = new(src) power_monitor = new(src) - if(!register_alarms) - return - - var/list/register_to = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm) - for(var/datum/alarm_handler/AH in register_to) - AH.register(src, /mob/living/silicon/proc/receive_alarm) - queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order - alarm_handlers |= AH - -/******************** -* Alarm Monitor * -********************/ -/mob/living/silicon/proc/subsystem_alarm_monitor() - set name = "Alarm Monitor" - set category = "Subsystems" - - alarm_monitor.ui_interact(usr, state = GLOB.self_state) - /******************** * Atmos Control * ********************/ diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index b42f3275997..28fff50a124 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -42,13 +42,18 @@ /mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. - var/damage = rand(15, 30) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") - playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - add_attack_logs(M, src, "Alien attacked") - attack_threshold_check(damage) - return + if(M.a_intent == INTENT_DISARM) + playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1) + visible_message("[M] [response_disarm] [name]!", "[M] [response_disarm] you!") + add_attack_logs(M, src, "Alien disarmed") + else + var/damage = rand(15, 30) + visible_message("[M] has slashed at [src]!", \ + "[M] has slashed at [src]!") + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) + add_attack_logs(M, src, "Alien attacked") + attack_threshold_check(damage) + return TRUE /mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index e51dc527832..97fc3ac469c 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -94,7 +94,6 @@ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST)//Diagnostic HUD views /obj/item/radio/headset/bot - subspace_transmission = 1 requires_tcomms = FALSE canhear_range = 0 diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index f1278918898..dbd8ae6033a 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -66,6 +66,7 @@ RegisterSignal(src, COMSIG_CROSSED_MOVABLE, .proc/human_squish_check) /mob/living/simple_animal/bot/mulebot/Destroy() + SStgui.close_uis(wires) unload(0) QDEL_NULL(wires) QDEL_NULL(cell) @@ -142,7 +143,7 @@ if(open) icon_state="mulebot-hatch" else - icon_state = "mulebot[!wires.MobAvoid()]" + icon_state = "mulebot[wires.is_cut(WIRE_MOB_AVOIDANCE)]" overlays.Cut() if(load && !ismob(load))//buckling handles the mob offsets load.pixel_y = initial(load.pixel_y) + 9 @@ -158,9 +159,9 @@ qdel(src) if(2) for(var/i = 1; i < 3; i++) - wires.RandomCut() + wires.cut_random() if(3) - wires.RandomCut() + wires.cut_random() return /mob/living/simple_animal/bot/mulebot/bullet_act(obj/item/projectile/Proj) @@ -169,7 +170,7 @@ unload(0) if(prob(25)) visible_message("Something shorts out inside [src]!") - wires.RandomCut() + wires.cut_random() /mob/living/simple_animal/bot/mulebot/Topic(href, list/href_list) if(..()) @@ -318,7 +319,7 @@ // returns true if the bot has power /mob/living/simple_animal/bot/mulebot/proc/has_power() - return !open && cell && cell.charge > 0 && wires.HasPower() + return !open && cell && cell.charge > 0 && !wires.is_cut(WIRE_MAIN_POWER1) && !wires.is_cut(WIRE_MAIN_POWER2) /mob/living/simple_animal/bot/mulebot/proc/buzz(type) switch(type) @@ -362,7 +363,7 @@ if(istype(AM,/obj/structure/closet/crate)) CRATE = AM else - if(wires.LoadCheck()) + if(!wires.is_cut(WIRE_LOADCHECK)) buzz(SIGH) return // if not hacked, only allow crates to be loaded @@ -459,8 +460,7 @@ on = 0 return if(on) - var/speed = (wires.Motor1() ? 1 : 0) + (wires.Motor2() ? 2 : 0) -// to_chat(world, "speed: [speed]") + var/speed = (wires.is_cut(WIRE_MOTOR1) ? 1 : 0) + (wires.is_cut(WIRE_MOTOR2) ? 2 : 0) var/num_steps = 0 switch(speed) if(0) @@ -624,7 +624,7 @@ // not loaded if(auto_pickup) // find a crate var/atom/movable/AM - if(wires.LoadCheck()) // if hacked, load first unanchored thing we find + if(wires.is_cut(WIRE_LOADCHECK)) // if hacked, load first unanchored thing we find for(var/atom/movable/A in get_step(loc, loaddir)) if(!A.anchored) AM = A @@ -672,7 +672,7 @@ // called when bot bumps into anything /mob/living/simple_animal/bot/mulebot/Bump(atom/obs) - if(!wires.MobAvoid()) // usually just bumps, but if avoidance disabled knock over mobs + if(wires.is_cut(WIRE_MOB_AVOIDANCE)) // usually just bumps, but if avoidance disabled knock over mobs var/mob/M = obs if(ismob(M)) if(istype(M,/mob/living/silicon/robot)) @@ -736,8 +736,8 @@ ..() /mob/living/simple_animal/bot/mulebot/receive_signal(datum/signal/signal) - if(!wires.RemoteRX() || ..()) - return 1 + if(wires.is_cut(WIRE_REMOTE_RX) || ..()) + return TRUE var/recv = signal.data["command"] @@ -772,7 +772,7 @@ // send a radio signal with multiple data key/values /mob/living/simple_animal/bot/mulebot/post_signal_multiple(var/freq, var/list/keyval) - if(!wires.RemoteTX()) + if(wires.is_cut(WIRE_REMOTE_TX)) return ..() @@ -803,7 +803,7 @@ //Update navigation data. Called when commanded to deliver, return home, or a route update is needed... /mob/living/simple_animal/bot/mulebot/proc/get_nav() - if(!on || !wires.BeaconRX()) + if(!on || wires.is_cut(WIRE_BEACON_RX)) return for(var/obj/machinery/navbeacon/NB in GLOB.deliverybeacons) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 07a21af8a0b..915bf9ae2aa 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -9,7 +9,7 @@ response_disarm = "bops" response_harm = "kicks" speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") - speak_emote = list("barks", "woofs") + speak_emote = list("barks.", "woofs.") emote_hear = list("barks!", "woofs!", "yaps.","pants.") emote_see = list("shakes its head.", "chases its tail.","shivers.") faction = list("neutral") diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index c6f3ac845e3..2b9358214b1 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -71,9 +71,6 @@ var/spawn_delay = 600 var/turn_on = 0 var/auto_spawn = 1 - proc - warpbots() - /mob/living/simple_animal/hostile/hivebot/tele/New() ..() @@ -83,7 +80,7 @@ visible_message("The [src] warps in!") playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1) -/mob/living/simple_animal/hostile/hivebot/tele/warpbots() +/mob/living/simple_animal/hostile/hivebot/tele/proc/warpbots() icon_state = "def_radar" visible_message("The [src] turns on!") while(bot_amt > 0) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 2f97001d3ae..dd0316f4177 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -122,8 +122,8 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/megafauna/colossus/proc/enrage(mob/living/L) if(ishuman(L)) var/mob/living/carbon/human/H = L - if(H.martial_art && prob(H.martial_art.deflection_chance)) - . = TRUE + if(H.mind && H.mind.martial_art && prob(H.mind.martial_art.deflection_chance)) + return TRUE /mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots() ranged_cooldown = world.time + 40 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 50531f976e9..14d2e933605 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -524,7 +524,7 @@ Difficulty: Medium else animate(src, pixel_x = -16, pixel_z = 0, time = 5) -obj/effect/temp_visual/fireball +/obj/effect/temp_visual/fireball icon = 'icons/obj/wizard.dmi' icon_state = "fireball" name = "fireball" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index bd3314d1453..b6189d56eac 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -1,6 +1,6 @@ //malfunctioning combat drones -/mob/living/simple_animal/hostile/retaliate/malf_drone +/mob/living/simple_animal/hostile/malf_drone name = "combat drone" desc = "An automated combat drone armed with state of the art weaponry and shielding." icon_state = "drone3" @@ -8,254 +8,175 @@ icon_dead = "drone_dead" ranged = 1 rapid = 3 + retreat_distance = 3 + minimum_distance = 3 speak_chance = 5 turns_per_move = 3 response_help = "pokes the" response_disarm = "gently pushes aside the" response_harm = "hits the" - speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.") - emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity") + speak = list("ALERT.", "Hostile-ile-ile entities dee-twhoooo-wected.", "Threat parameterszzzz- szzet.", "Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.") + emote_see = list("beeps menacingly.", "whirrs threateningly.", "scans for targets.") a_intent = INTENT_HARM - stop_automated_movement_when_pulled = 0 - health = 300 - maxHealth = 300 + stop_automated_movement_when_pulled = FALSE + health = 200 + maxHealth = 200 speed = 8 - projectiletype = /obj/item/projectile/beam/drone + projectiletype = /obj/item/projectile/beam/immolator/weak projectilesound = 'sound/weapons/laser3.ogg' - var/datum/effect_system/trail_follow/ion/ion_trail - - //the drone randomly switches between these states because it's malfunctioning - var/hostile_drone = 0 - //0 - retaliate, only attack enemies that attack it - //1 - hostile, attack everything that comes near - - var/turf/patrol_target - var/explode_chance = 1 - var/disabled = 0 - var/exploding = 0 - - //Drones aren't affected by atmos. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 - - var/has_loot = 1 faction = list("malf_drone") deathmessage = "suddenly breaks apart." del_on_death = 1 + var/datum/effect_system/trail_follow/ion/ion_trail + var/passive_mode = TRUE // if true, don't target anything. -/mob/living/simple_animal/hostile/retaliate/malf_drone/New() - ..() - if(prob(5)) - projectiletype = /obj/item/projectile/beam/pulse/drone - projectilesound = 'sound/weapons/pulse2.ogg' +/mob/living/simple_animal/hostile/malf_drone/Initialize(mapload) + . = ..() ion_trail = new ion_trail.set_up(src) ion_trail.start() + update_icons() -/mob/living/simple_animal/hostile/retaliate/malf_drone/Process_Spacemove(var/check_drift = 0) +/mob/living/simple_animal/hostile/malf_drone/Process_Spacemove(check_drift = 0) return 1 -/mob/living/simple_animal/hostile/retaliate/malf_drone/ListTargets() - if(hostile_drone) - return view(src, 10) - else - return ..() - -//self repair systems have a chance to bring the drone back to life -/mob/living/simple_animal/hostile/retaliate/malf_drone/Life(seconds, times_fired) - - //emps and lots of damage can temporarily shut us down - if(disabled > 0) - stat = UNCONSCIOUS - icon_state = "drone_dead" - disabled-- - wander = 0 - speak_chance = 0 - if(disabled <= 0) - stat = CONSCIOUS - icon_state = "drone0" - wander = 1 - speak_chance = 5 - - //repair a bit of damage - if(prob(1)) - src.visible_message("[bicon(src)] [src] shudders and shakes as some of it's damaged systems come back online.") - do_sparks(3, 1, src) - health += rand(25,100) - - //spark for no reason - if(prob(5)) - do_sparks(3, 1, src) - - //sometimes our targetting sensors malfunction, and we attack anyone nearby - if(prob(disabled ? 0 : 1)) - if(hostile_drone) - src.visible_message("[bicon(src)] [src] retracts several targetting vanes, and dulls it's running lights.") - hostile_drone = 0 - else - src.visible_message("[bicon(src)] [src] suddenly lights up, and additional targetting vanes slide into place.") - hostile_drone = 1 - - if(health / maxHealth > 0.9) - icon_state = "drone3" - explode_chance = 0 - else if(health / maxHealth > 0.7) - icon_state = "drone2" - explode_chance = 0 - else if(health / maxHealth > 0.5) - icon_state = "drone1" - explode_chance = 0.5 - else if(health / maxHealth > 0.3) - icon_state = "drone0" - explode_chance = 5 - else if(health > 0) - //if health gets too low, shut down - icon_state = "drone_dead" - exploding = 0 - if(!disabled) - if(prob(50)) - src.visible_message("[bicon(src)] [src] suddenly shuts down!") - else - src.visible_message("[bicon(src)] [src] suddenly lies still and quiet.") - disabled = rand(150, 600) - walk(src,0) - - if(exploding && prob(20)) - if(prob(50)) - src.visible_message("[bicon(src)] [src] begins to spark and shake violenty!") - else - src.visible_message("[bicon(src)] [src] sparks and shakes like it's about to explode!") - do_sparks(3, 1, src) - - if(!exploding && !disabled && prob(explode_chance)) - exploding = 1 - stat = UNCONSCIOUS - wander = 1 - walk(src,0) - spawn(rand(50,150)) - if(!disabled && exploding) - explosion(get_turf(src), 0, 1, 4, 7) - //proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1) - ..() - -//ion rifle! -/mob/living/simple_animal/hostile/retaliate/malf_drone/emp_act(severity) - health -= rand(3,15) * (severity + 1) - disabled = rand(150, 600) - hostile_drone = 0 - walk(src,0) - -/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy() //Seriously, what the actual hell. - //some random debris left behind - if(has_loot) - do_sparks(3, 1, src) - var/obj/O - - //shards - O = new /obj/item/shard(loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/shard(loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/shard(loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/shard(loc) - step_to(O, get_turf(pick(view(7, src)))) - - //rods - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - - //plasteel - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - - //also drop dummy circuit boards deconstructable for research (loot) - var/obj/item/circuitboard/C - - //spawn 1-4 boards of a random type - var/spawnees = 0 - var/num_boards = rand(1,4) - var/list/options = list(1,2,4,8,16,32,64,128,256, 512) - for(var/i=0, i
") + . += "[p_they(TRUE)] has blood dribbling from [p_their()] mouth." /mob/living/simple_animal/hostile/poison/terror_spider/New() ..() @@ -254,9 +254,10 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) if(web_type) web_action = new() web_action.Grant(src) - wrap_action = new() - wrap_action.Grant(src) - + if(regen_points_per_tick < regen_points_per_hp) + // Only grant the Wrap action button to spiders who need to use it to regenerate their health + wrap_action = new() + wrap_action.Grant(src) name += " ([rand(1, 1000)])" real_name = name msg_terrorspiders("[src] has grown in [get_area(src)].") @@ -278,6 +279,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) addtimer(CALLBACK(src, .proc/announcetoghosts), 30) var/datum/atom_hud/U = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] U.add_hud_to(src) + spider_creation_time = world.time /mob/living/simple_animal/hostile/poison/terror_spider/proc/announcetoghosts() if(spider_awaymission) @@ -285,8 +287,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) if(stat == DEAD) return if(ckey) - var/image/alert_overlay = image('icons/mob/terrorspider.dmi', icon_state) - notify_ghosts("[src] has appeared in [get_area(src)]. (already player-controlled)", source = src, alert_overlay = alert_overlay) + notify_ghosts("[src] (player controlled) has appeared in [get_area(src)].") else if(ai_playercontrol_allowtype) var/image/alert_overlay = image('icons/mob/terrorspider.dmi', icon_state) notify_ghosts("[src] has appeared in [get_area(src)].", enter_link = "(Click to control)", source = src, alert_overlay = alert_overlay, action = NOTIFY_ATTACK) @@ -298,7 +299,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) /mob/living/simple_animal/hostile/poison/terror_spider/Life(seconds, times_fired) . = ..() - if(!.) // if mob is dead + if(stat == DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(prob(2)) // 2% chance every cycle to decompose visible_message("\The dead body of the [src] decomposes!") @@ -342,7 +343,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) /mob/living/simple_animal/hostile/poison/terror_spider/ObjBump(obj/O) if(istype(O, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/L = O - if(L.density) + if(L.density) // must check density here, to avoid rapid bumping of an airlock that is in the process of opening, instantly forcing it closed return try_open_airlock(L) if(istype(O, /obj/machinery/door/firedoor)) var/obj/machinery/door/firedoor/F = O @@ -352,7 +353,8 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) . = ..() /mob/living/simple_animal/hostile/poison/terror_spider/proc/msg_terrorspiders(msgtext) - for(var/mob/living/simple_animal/hostile/poison/terror_spider/T in GLOB.ts_spiderlist) + for(var/thing in GLOB.ts_spiderlist) + var/mob/living/simple_animal/hostile/poison/terror_spider/T = thing if(T.stat != DEAD) to_chat(T, "TerrorSense: [msgtext]") @@ -365,21 +367,54 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) /mob/living/simple_animal/hostile/poison/terror_spider/proc/try_open_airlock(obj/machinery/door/airlock/D) if(D.operating) return - if(!D.density) - to_chat(src, "Closing doors does not help us.") - else if(D.welded) - to_chat(src, "The door is welded shut.") + if(D.welded) + to_chat(src, "The door is welded.") else if(D.locked) - to_chat(src, "The door is bolted shut.") + to_chat(src, "The door is bolted.") else if(D.allowed(src)) - D.open(1) - return 1 + if(D.density) + D.open(TRUE) + else + D.close(TRUE) + return TRUE else if(D.arePowerSystemsOn() && (spider_opens_doors != 2)) to_chat(src, "The door's motors resist your efforts to force it.") else if(!spider_opens_doors) to_chat(src, "Your type of spider is not strong enough to force open doors.") else - visible_message("[src] pries open the door!") + visible_message("[src] forces the door!") playsound(src.loc, "sparks", 100, 1) - D.open(1) - return 1 + if(D.density) + D.open(TRUE) + else + D.close(TRUE) + return TRUE + + +/mob/living/simple_animal/hostile/poison/terror_spider/Stat() + ..() + // Determines what shows in the "Status" tab for player-controlled spiders. Used to help players understand spider health regeneration mechanics. + // Uses because the status panel does NOT accept . + if(statpanel("Status") && ckey && stat == CONSCIOUS) + if(degenerate) + stat(null, "Hivemind Connection Severed! Dying...") // color=red + return + if(health != maxHealth) + var/hp_points_per_second = 0 + var/ltext = "FAST" + var/lcolor = "#fcba03" // orange + var/secs_per_tick = (SSmobs.wait / 10) // This uses SSmobs.wait because it must use the same frequency as mobs are processed + if(regen_points < (regen_points_per_hp * 2)) + // Slow regen speed: using regen_points as we get them. Figure out regen_points/sec, then convert that to hp/sec. + var/regen_points_per_second = (regen_points_per_tick / secs_per_tick) + hp_points_per_second = (regen_points_per_second / regen_points_per_hp) + ltext = "SLOW (HUNGRY!)" + lcolor = "#eb4034" // red + else + // Fast regen speed: healing at full 1 hp / tick rate. Just divide 1hp/tick by seconds/tick to get healing/sec. + hp_points_per_second = 1 / secs_per_tick + if(hp_points_per_second > 0) + var/pc_of_max_per_second = round(((hp_points_per_second / maxHealth) * 100), 0.1) + stat(null, "Regeneration: [ltext]: [num2text(pc_of_max_per_second)]% of health per second") + + diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d4f8e7c4c3d..4bff2c100bf 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -319,10 +319,9 @@ return verb /mob/living/simple_animal/movement_delay() - . = ..() - . = speed - + if(forced_look) + . += 3 . += config.animal_delay /mob/living/simple_animal/Stat() diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index c222f76eadb..639f3da7aaf 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -20,10 +20,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].") else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") /mob/Login() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 848606be3ec..4e4bd99e54d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -478,6 +478,41 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ return 0 //Unsupported slot //END HUMAN +/mob/proc/get_visible_mobs() + var/list/seen_mobs = list() + for(var/mob/M in view(src)) + seen_mobs += M + + return seen_mobs + +/** + * Returns an assoc list which contains the mobs in range and their "visible" name. + * Mobs out of view but in range will be listed as unknown. Else they will have their visible name +*/ +/mob/proc/get_telepathic_targets() + var/list/validtargets = new /list() + var/turf/T = get_turf(src) + var/list/mobs_in_view = get_visible_mobs() + + for(var/mob/living/M in range(14, T)) + if(M && M.mind) + if(M == src) + continue + var/mob_name + if(M in mobs_in_view) + mob_name = M.name + else + mob_name = "Unknown entity" + var/i = 0 + var/result_name + do + result_name = mob_name + if(i++) + result_name += " ([i])" // Avoid dupes + while(validtargets[result_name]) + validtargets[result_name] = M + return validtargets + // If you're looking for `reset_perspective`, that's a synonym for this proc. /mob/proc/reset_perspective(atom/A) if(client) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ff01fbe5cc9..6acfb92a515 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -288,7 +288,7 @@ S.message = Gibberish(S.message, p) -proc/muffledspeech(phrase) +/proc/muffledspeech(phrase) phrase = html_decode(phrase) var/leng=length(phrase) var/counter=length(phrase) @@ -675,4 +675,3 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well return TRUE -#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider)) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 8e7adea666b..212bb41720d 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -38,32 +38,42 @@ O.rename_self("AI",1) - spawn() - qdel(src) + INVOKE_ASYNC(GLOBAL_PROC, .proc/qdel, src) // To prevent the proc from returning null. return O -//human -> robot -/mob/living/carbon/human/proc/Robotize() +/** + For transforming humans into robots (cyborgs). + + Arguments: + * cell_type: A type path of the cell the new borg should receive. + * connect_to_default_AI: TRUE if you want /robot/New() to handle connecting the borg to the AI with the least borgs. + * AI: A reference to the AI we want to connect to. +*/ +/mob/living/carbon/human/proc/Robotize(cell_type = null, connect_to_default_AI = TRUE, mob/living/silicon/ai/AI = null) if(notransform) return for(var/obj/item/W in src) unEquip(W) - regenerate_icons() + notransform = 1 canmove = 0 icon = null invisibility = 101 - for(var/t in bodyparts) - qdel(t) - for(var/i in internal_organs) - qdel(i) - var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc ) + // Creating a new borg here will connect them to a default AI and notify that AI, if `connect_to_default_AI` is TRUE. + var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(loc, connect_to_AI = connect_to_default_AI) - // cyborgs produced by Robotize get an automatic power cell - O.cell = new /obj/item/stock_parts/cell/high(O) + // If `AI` is passed in, we want to connect to that AI specifically. + if(AI) + O.lawupdate = TRUE + O.connect_to_ai(AI) + + if(!cell_type) + O.cell = new /obj/item/stock_parts/cell/high(O) + else + O.cell = new cell_type(O) O.gender = gender O.invisibility = 0 @@ -77,9 +87,8 @@ else O.key = key - O.loc = loc + O.forceMove(loc) O.job = "Cyborg" - O.notify_ai(1) if(O.mind && O.mind.assigned_role == "Cyborg") if(O.mind.role_alt_title == "Robot") @@ -92,8 +101,7 @@ O.Namepick() - spawn(0)//To prevent the proc from returning null. - qdel(src) + INVOKE_ASYNC(GLOBAL_PROC, .proc/qdel, src) // To prevent the proc from returning null. return O //human -> alien @@ -125,9 +133,7 @@ to_chat(new_xeno, "You are now an alien.") new_xeno.update_pipe_vision() - spawn(0)//To prevent the proc from returning null. - qdel(src) - return + qdel(src) /mob/living/carbon/human/proc/slimeize(reproduce as num) if(notransform) @@ -180,9 +186,7 @@ to_chat(new_corgi, "You are now a Corgi. Yap Yap!") new_corgi.update_pipe_vision() - spawn(0)//To prevent the proc from returning null. - qdel(src) - return + qdel(src) /mob/living/carbon/human/Animalize() @@ -211,9 +215,7 @@ to_chat(new_mob, "You suddenly feel more... animalistic.") new_mob.update_pipe_vision() - spawn() - qdel(src) - return + qdel(src) /mob/proc/Animalize() @@ -254,9 +256,7 @@ to_chat(pai, "You have become a pAI! Your name is [pai.name].") pai.update_pipe_vision() - spawn(0)//To prevent the proc from returning null. - qdel(src) - return + qdel(src) /mob/proc/safe_respawn(var/MP) if(!MP) diff --git a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm deleted file mode 100644 index 948824fa32e..00000000000 --- a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm +++ /dev/null @@ -1,70 +0,0 @@ -GLOBAL_VAR_INIT(ntnrc_uid, 0) - -/datum/ntnet_conversation - var/id = null - var/title = "Untitled Conversation" - var/datum/computer_file/program/chatclient/operator // "Administrator" of this channel. Creator starts as channel's operator, - var/list/messages = list() - var/list/clients = list() - var/password - -/datum/ntnet_conversation/New() - id = GLOB.ntnrc_uid - GLOB.ntnrc_uid++ - if(GLOB.ntnet_global) - GLOB.ntnet_global.chat_channels.Add(src) - ..() - -/datum/ntnet_conversation/Destroy() - if(GLOB.ntnet_global) - GLOB.ntnet_global.chat_channels.Remove(src) - return ..() - -/datum/ntnet_conversation/proc/add_message(message, username) - message = "[station_time_timestamp()] [username]: [message]" - messages.Add(message) - trim_message_list() - -/datum/ntnet_conversation/proc/add_status_message(message) - messages.Add("[station_time_timestamp()] -!- [message]") - trim_message_list() - -/datum/ntnet_conversation/proc/trim_message_list() - if(messages.len <= 50) - return - messages = messages.Copy(messages.len-50 ,0) - -/datum/ntnet_conversation/proc/add_client(datum/computer_file/program/chatclient/C) - if(!istype(C)) - return - clients.Add(C) - add_status_message("[C.username] has joined the channel.") - // No operator, so we assume the channel was empty. Assign this user as operator. - if(!operator) - changeop(C) - -/datum/ntnet_conversation/proc/remove_client(datum/computer_file/program/chatclient/C) - if(!istype(C) || !(C in clients)) - return - clients.Remove(C) - add_status_message("[C.username] has left the channel.") - - // Channel operator left, pick new operator - if(C == operator) - operator = null - if(clients.len) - var/datum/computer_file/program/chatclient/newop = pick(clients) - changeop(newop) - - -/datum/ntnet_conversation/proc/changeop(datum/computer_file/program/chatclient/newop) - if(istype(newop)) - operator = newop - add_status_message("Channel operator status transferred to [newop.username].") - -/datum/ntnet_conversation/proc/change_title(newtitle, datum/computer_file/program/chatclient/client) - if(operator != client) - return 0 // Not Authorised - - add_status_message("[client.username] has changed channel title from [title] to [newtitle]") - title = newtitle diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm deleted file mode 100644 index 2f9aa3f2e7d..00000000000 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ /dev/null @@ -1,145 +0,0 @@ -GLOBAL_DATUM_INIT(ntnet_global, /datum/ntnet, new()) - - -// This is the NTNet datum. There can be only one NTNet datum in game at once. Modular computers read data from this. -/datum/ntnet - var/list/relays = list() - var/list/logs = list() - var/list/available_station_software = list() - var/list/available_antag_software = list() - var/list/chat_channels = list() - var/list/fileservers = list() - // Amount of logs the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly. - // High values make displaying logs much laggier. - var/setting_maxlogcount = 100 - - // These only affect wireless. LAN (consoles) are unaffected since it would be possible to create scenario where someone turns off NTNet, and is unable to turn it back on since it refuses connections - var/setting_softwaredownload = 1 - var/setting_peertopeer = 1 - var/setting_communication = 1 - var/setting_systemcontrol = 1 - var/setting_disabled = 0 // Setting to 1 will disable all wireless, independently on relays status. - - var/intrusion_detection_enabled = 1 // Whether the IDS warning system is enabled - var/intrusion_detection_alarm = 0 // Set when there is an IDS warning due to malicious (antag) software. - - -// If new NTNet datum is spawned, it replaces the old one. -/datum/ntnet/New() - if(GLOB.ntnet_global && (GLOB.ntnet_global != src)) - GLOB.ntnet_global = src // There can be only one. - for(var/obj/machinery/ntnet_relay/R in GLOB.machines) - relays.Add(R) - R.NTNet = src - build_software_lists() - add_log("NTNet logging system activated.") - -// Simplified logging: Adds a log. log_string is mandatory parameter, source is optional. -/datum/ntnet/proc/add_log(log_string, obj/item/computer_hardware/network_card/source = null) - var/log_text = "[station_time_timestamp()] - " - if(source) - log_text += "[source.get_network_tag()] - " - else - log_text += "*SYSTEM* - " - log_text += log_string - logs.Add(log_text) - - - // We have too many logs, remove the oldest entries until we get into the limit - if(logs.len > setting_maxlogcount) - logs = logs.Copy(logs.len-setting_maxlogcount,0) - - -// Checks whether NTNet operates. If parameter is passed checks whether specific function is enabled. -/datum/ntnet/proc/check_function(specific_action = 0) - if(!relays || !relays.len) // No relays found. NTNet is down - return 0 - - var/operating = 0 - - // Check all relays. If we have at least one working relay, network is up. - for(var/M in relays) - var/obj/machinery/ntnet_relay/R = M - if(R.operable()) - operating = 1 - break - - if(setting_disabled) - return 0 - - switch(specific_action) - if(NTNET_SOFTWAREDOWNLOAD) - return (operating && setting_softwaredownload) - if(NTNET_PEERTOPEER) - return (operating && setting_peertopeer) - if(NTNET_COMMUNICATION) - return (operating && setting_communication) - if(NTNET_SYSTEMCONTROL) - return (operating && setting_systemcontrol) - return operating - -// Builds lists that contain downloadable software. -/datum/ntnet/proc/build_software_lists() - available_station_software = list() - available_antag_software = list() - for(var/F in typesof(/datum/computer_file/program)) - var/datum/computer_file/program/prog = new F - // Invalid type (shouldn't be possible but just in case), invalid filetype (not executable program) or invalid filename (unset program) - if(!prog || prog.filename == "UnknownProgram" || prog.filetype != "PRG") - continue - // Check whether the program should be available for station/antag download, if yes, add it to lists. - if(prog.available_on_ntnet) - available_station_software.Add(prog) - if(prog.available_on_syndinet) - available_antag_software.Add(prog) - -// Attempts to find a downloadable file according to filename var -/datum/ntnet/proc/find_ntnet_file_by_name(filename) - for(var/N in available_station_software) - var/datum/computer_file/program/P = N - if(filename == P.filename) - return P - for(var/N in available_antag_software) - var/datum/computer_file/program/P = N - if(filename == P.filename) - return P - -// Resets the IDS alarm -/datum/ntnet/proc/resetIDS() - intrusion_detection_alarm = 0 - -/datum/ntnet/proc/toggleIDS() - resetIDS() - intrusion_detection_enabled = !intrusion_detection_enabled - -// Removes all logs -/datum/ntnet/proc/purge_logs() - logs = list() - add_log("-!- LOGS DELETED BY SYSTEM OPERATOR -!-") - -// Updates maximal amount of stored logs. Use this instead of setting the number, it performs required checks. -/datum/ntnet/proc/update_max_log_count(lognumber) - if(!lognumber) - return 0 - // Trim the value if necessary - lognumber = max(MIN_NTNET_LOGS, min(lognumber, MAX_NTNET_LOGS)) - setting_maxlogcount = lognumber - add_log("Configuration Updated. Now keeping [setting_maxlogcount] logs in system memory.") - -/datum/ntnet/proc/toggle_function(function) - if(!function) - return - function = text2num(function) - switch(function) - if(NTNET_SOFTWAREDOWNLOAD) - setting_softwaredownload = !setting_softwaredownload - add_log("Configuration Updated. Wireless network firewall now [setting_softwaredownload ? "allows" : "disallows"] connection to software repositories.") - if(NTNET_PEERTOPEER) - setting_peertopeer = !setting_peertopeer - add_log("Configuration Updated. Wireless network firewall now [setting_peertopeer ? "allows" : "disallows"] peer to peer network traffic.") - if(NTNET_COMMUNICATION) - setting_communication = !setting_communication - add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.") - if(NTNET_SYSTEMCONTROL) - setting_systemcontrol = !setting_systemcontrol - add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.") diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm deleted file mode 100644 index 97ddcfb69c0..00000000000 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ /dev/null @@ -1,125 +0,0 @@ -// Relays don't handle any actual communication. Global NTNet datum does that, relays only tell the datum if it should or shouldn't work. -/obj/machinery/ntnet_relay - name = "NTNet Quantum Relay" - desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile." - use_power = ACTIVE_POWER_USE - active_power_usage = 100 // 100 watts. Yes I know this is a high power machine but this fucking obliterates an unpowered smes (AI sat) - idle_power_usage = 100 - icon = 'icons/obj/stationobjs.dmi' - icon_state = "bus" - anchored = 1 - density = 1 - var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame. - var/enabled = 1 // Set to 0 if the relay was turned off - var/dos_failure = 0 // Set to 1 if the relay failed due to (D)DoS attack - var/list/dos_sources = list() // Backwards reference for qdel() stuff - - // Denial of Service attack variables - var/dos_overload = 0 // Amount of DoS "packets" in this relay's buffer - var/dos_capacity = 500 // Amount of DoS "packets" in buffer required to crash the relay - var/dos_dissipate = 1 // Amount of DoS "packets" dissipated over time. - - -// TODO: Implement more logic here. For now it's only a placeholder. -/obj/machinery/ntnet_relay/inoperable(additional_flags = 0) - if(stat & (BROKEN | NOPOWER | EMPED | additional_flags)) - return 1 - if(dos_failure) - return 1 - if(!enabled) - return 1 - return 0 - -/obj/machinery/ntnet_relay/update_icon() - if(operable()) - icon_state = "bus" - else - icon_state = "bus_off" - -/obj/machinery/ntnet_relay/process() - if(operable()) - use_power = ACTIVE_POWER_USE - else - use_power = IDLE_POWER_USE - - update_icon() - - if(dos_overload) - dos_overload = max(0, dos_overload - dos_dissipate) - - // If DoS traffic exceeded capacity, crash. - if((dos_overload > dos_capacity) && !dos_failure) - dos_failure = 1 - update_icon() - GLOB.ntnet_global.add_log("Quantum relay switched from normal operation mode to overload recovery mode.") - // If the DoS buffer reaches 0 again, restart. - if((dos_overload == 0) && dos_failure) - dos_failure = 0 - update_icon() - GLOB.ntnet_global.add_log("Quantum relay switched from overload recovery mode to normal operation mode.") - ..() - -/obj/machinery/ntnet_relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "ntnet_relay.tmpl", "NTNet Quantum Relay", 500, 300) - ui.open() - -/obj/machinery/ntnet_relay/ui_data(mob/user) - var/list/data = list() - data["enabled"] = enabled - data["dos_capacity"] = dos_capacity - data["dos_overload"] = dos_overload - data["dos_crashed"] = dos_failure - return data - - -/obj/machinery/ntnet_relay/Topic(href, list/href_list) - if(..()) - return - switch(href_list["action"]) - if("restart") - dos_overload = 0 - dos_failure = 0 - update_icon() - GLOB.ntnet_global.add_log("Quantum relay manually restarted from overload recovery mode to normal operation mode.") - if("toggle") - enabled = !enabled - GLOB.ntnet_global.add_log("Quantum relay manually [enabled ? "enabled" : "disabled"].") - update_icon() - return 1 - - -/obj/machinery/ntnet_relay/attack_hand(mob/living/user) - ui_interact(user) - -/obj/machinery/ntnet_relay/New() - uid = gl_uid - gl_uid++ - component_parts = list() - component_parts += new /obj/item/circuitboard/machine/ntnet_relay(null) - component_parts += new /obj/item/stack/cable_coil(null, 2) - - if(GLOB.ntnet_global) - GLOB.ntnet_global.relays.Add(src) - NTNet = GLOB.ntnet_global - GLOB.ntnet_global.add_log("New quantum relay activated. Current amount of linked relays: [NTNet.relays.len]") - ..() - -/obj/machinery/ntnet_relay/Destroy() - if(GLOB.ntnet_global) - GLOB.ntnet_global.relays.Remove(src) - GLOB.ntnet_global.add_log("Quantum relay connection severed. Current amount of linked relays: [NTNet.relays.len]") - NTNet = null - - for(var/datum/computer_file/program/ntnet_dos/D in dos_sources) - D.target = null - D.error = "Connection to quantum relay severed" - - return ..() - -/obj/item/circuitboard/machine/ntnet_relay - name = "NTNet Relay (Machine Board)" - build_path = /obj/machinery/ntnet_relay - origin_tech = "programming=3;bluespace=3;magnets=2" - req_components = list(/obj/item/stack/cable_coil = 2) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm deleted file mode 100644 index 1dd45a33603..00000000000 --- a/code/modules/modular_computers/computers/item/computer.dm +++ /dev/null @@ -1,369 +0,0 @@ -// This is the base type that does all the hardware stuff. -// Other types expand it - tablets use a direct subtypes, and -// consoles and laptops use "procssor" item that is held inside machinery piece -/obj/item/modular_computer - name = "modular microcomputer" - desc = "A small portable microcomputer." - - var/enabled = 0 // Whether the computer is turned on. - var/screen_on = 1 // Whether the computer is active/opened/it's screen is on. - var/datum/computer_file/program/active_program = null // A currently active program running on the computer. - var/hardware_flag = 0 // A flag that describes this device type - var/last_power_usage = 0 - var/last_battery_percent = 0 // Used for deciding if battery percentage has chandged - var/last_world_time = "00:00" - var/list/last_header_icons - var/emagged = 0 // Whether the computer is emagged. - - var/base_active_power_usage = 50 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. - var/base_idle_power_usage = 5 // Power usage when the computer is idle and screen is off (currently only applies to laptops) - - // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..) - // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently - // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example. - - icon = 'icons/obj/computer.dmi' - icon_state = "laptop-open" - var/icon_state_unpowered = null // Icon state when the computer is turned off. - var/icon_state_powered = null // Icon state when the computer is turned on. - var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. - var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4. - var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer. - - integrity_failure = 50 - max_integrity = 100 - armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) - - // Important hardware (must be installed for computer to work) - - // Optional hardware (improves functionality, but is not critical for computer to work) - - var/list/all_components // List of "connection ports" in this computer and the components with which they are plugged - - var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with. - var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks. - - - -/obj/item/modular_computer/New() - update_icon() - if(!physical) - physical = src - ..() - START_PROCESSING(SSobj, src) - all_components = list() - idle_threads = list() - -/obj/item/modular_computer/Destroy() - kill_program(forced = TRUE) - for(var/H in all_components) - var/obj/item/computer_hardware/CH = all_components[H] - if(CH.holder == src) - CH.on_remove(src) - CH.holder = null - all_components.Remove(CH.device_type) - qdel(CH) - physical = null - STOP_PROCESSING(SSobj, src) - return ..() - - -/obj/item/modular_computer/proc/add_verb(var/path) - switch(path) - if(MC_CARD) - verbs += /obj/item/modular_computer/proc/eject_id - if(MC_SDD) - verbs += /obj/item/modular_computer/proc/eject_disk - if(MC_AI) - verbs += /obj/item/modular_computer/proc/eject_card - -/obj/item/modular_computer/proc/remove_verb(path) - switch(path) - if(MC_CARD) - verbs -= /obj/item/modular_computer/proc/eject_id - if(MC_SDD) - verbs -= /obj/item/modular_computer/proc/eject_disk - if(MC_AI) - verbs -= /obj/item/modular_computer/proc/eject_card - -// Eject ID card from computer, if it has ID slot with card inside. -/obj/item/modular_computer/proc/eject_id() - set name = "Eject ID" - set category = "Object" - set src in view(1) - - if(issilicon(usr)) - return - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - if(!usr.incapacitated()) - card_slot.try_eject(null, usr) - -// Eject ID card from computer, if it has ID slot with card inside. -/obj/item/modular_computer/proc/eject_card() - set name = "Eject Intellicard" - set category = "Object" - set src in view(1) - - if(issilicon(usr)) - return - var/obj/item/computer_hardware/ai_slot/ai_slot = all_components[MC_AI] - if(!usr.incapacitated()) - ai_slot.try_eject(null, usr, 1) - - -// Eject ID card from computer, if it has ID slot with card inside. -/obj/item/modular_computer/proc/eject_disk() - set name = "Eject Data Disk" - set category = "Object" - set src in view(1) - - if(issilicon(usr)) - return - - if(!usr.incapacitated()) - var/obj/item/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD] - if(uninstall_component(portable_drive, usr)) - portable_drive.verb_pickup() - -/obj/item/modular_computer/AltClick(mob/user) - ..() - if(issilicon(user)) - return - - if(!user.incapacitated() && Adjacent(user)) - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - var/obj/item/computer_hardware/ai_slot/ai_slot = all_components[MC_AI] - var/obj/item/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD] - if(portable_drive) - if(uninstall_component(portable_drive, user)) - portable_drive.verb_pickup() - else - if(card_slot && card_slot.try_eject(null, user)) - return - if(ai_slot) - ai_slot.try_eject(null, user) - - -// Gets IDs/access levels from card slot. Would be useful when/if PDAs would become modular PCs. -/obj/item/modular_computer/GetAccess() - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - if(card_slot) - return card_slot.GetAccess() - return ..() - -/obj/item/modular_computer/GetID() - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - if(card_slot) - return card_slot.GetID() - return ..() - -/obj/item/modular_computer/attack_ai(mob/user) - return attack_self(user) - -/obj/item/modular_computer/attack_ghost(mob/dead/observer/user) - if(enabled) - ui_interact(user) - else if(user.can_admin_interact()) - var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No") - if(response == "Yes") - turn_on(user) - -/obj/item/modular_computer/emag_act(mob/user) - if(emagged) - to_chat(user, "\The [src] was already emagged.") - return 0 - else - emagged = 1 - to_chat(user, "You emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.") - return 1 - -/obj/item/modular_computer/examine(mob/user) - . = ..() - if(obj_integrity <= integrity_failure) - . += "It is heavily damaged!" - else if(obj_integrity < max_integrity) - . += "It is damaged." - -/obj/item/modular_computer/update_icon() - overlays.Cut() - if(!enabled) - icon_state = icon_state_unpowered - else - icon_state = icon_state_powered - if(active_program && active_program.program_state != PROGRAM_STATE_KILLED) - overlays += active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu - else - overlays += icon_state_menu - - if(obj_integrity <= integrity_failure) - overlays += "bsod" - overlays += "broken" - - -// On-click handling. Turns on the computer if it's off and opens the GUI. -/obj/item/modular_computer/attack_self(mob/user) - if(enabled) - ui_interact(user) - else - turn_on(user) - -/obj/item/modular_computer/proc/turn_on(mob/user) - var/issynth = issilicon(user) // Robots and AIs get different activation messages. - if(obj_integrity <= integrity_failure) - if(issynth) - to_chat(user, "You send an activation signal to \the [src], but it responds with an error code. It must be damaged.") - else - to_chat(user, "You press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again.") - return - - // If we have a recharger, enable it automatically. Lets computer without a battery work. - var/obj/item/computer_hardware/recharger/recharger = all_components[MC_CHARGE] - if(recharger) - recharger.enabled = 1 - - if(all_components[MC_CPU] && use_power()) // use_power() checks if the PC is powered - if(issynth) - to_chat(user, "You send an activation signal to \the [src], turning it on.") - else - to_chat(user, "You press the power button and start up \the [src].") - enabled = 1 - update_icon() - ui_interact(user) - else // Unpowered - if(issynth) - to_chat(user, "You send an activation signal to \the [src] but it does not respond.") - else - to_chat(user, "You press the power button but \the [src] does not respond.") - -// Process currently calls handle_power(), may be expanded in future if more things are added. -/obj/item/modular_computer/process() - if(!enabled) // The computer is turned off - last_power_usage = 0 - return 0 - - if(obj_integrity <= integrity_failure) - shutdown_computer() - return 0 - - if(active_program && active_program.requires_ntnet && !get_ntnet_status(active_program.requires_ntnet_feature)) - active_program.event_networkfailure(0) // Active program requires NTNet to run but we've just lost connection. Crash. - - if(active_program) - if(active_program.program_state != PROGRAM_STATE_KILLED) - active_program.process_tick() - active_program.ntnet_status = get_ntnet_status() - else - active_program = null - - for(var/I in idle_threads) - var/datum/computer_file/program/P = I - if(P.program_state != PROGRAM_STATE_KILLED) - if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) - P.event_networkfailure(1) - P.process_tick() - P.ntnet_status = get_ntnet_status() - else - idle_threads.Remove(P) - - handle_power() // Handles all computer power interaction - -// Relays kill program request to currently active program. Use this to quit current program. -/obj/item/modular_computer/proc/kill_program(forced = FALSE) - if(active_program && active_program.program_state != PROGRAM_STATE_KILLED) - active_program.kill_program(forced) - active_program = null - var/mob/user = usr - if(user && istype(user)) - ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. - update_icon() - -// Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on) -/obj/item/modular_computer/proc/get_ntnet_status(specific_action = 0) - var/obj/item/computer_hardware/network_card/network_card = all_components[MC_NET] - if(network_card) - return network_card.get_signal(specific_action) - else - return 0 - -/obj/item/modular_computer/proc/add_log(text) - if(!get_ntnet_status()) - return FALSE - var/obj/item/computer_hardware/network_card/network_card = all_components[MC_NET] - return GLOB.ntnet_global.add_log(text, network_card) - -/obj/item/modular_computer/proc/shutdown_computer(loud = 1) - if(enabled) - kill_program(forced = TRUE) - for(var/datum/computer_file/program/P in idle_threads) - P.kill_program(forced = TRUE) - idle_threads.Remove(P) - if(loud) - physical.visible_message("\The [src] shuts down.") - enabled = 0 - update_icon() - - -/obj/item/modular_computer/attackby(obj/item/W, mob/user) - // Insert items into the components - for(var/h in all_components) - var/obj/item/computer_hardware/H = all_components[h] - if(H.try_insert(W, user)) - return - - // Insert new hardware - if(istype(W, /obj/item/computer_hardware)) - if(install_component(W, user)) - return - - if(istype(W, /obj/item/wrench)) - if(all_components.len) - to_chat(user, "Remove all components from \the [src] before disassembling it.") - return - new /obj/item/stack/sheet/metal(get_turf(loc), steel_sheet_cost) - physical.visible_message("\The [src] has been disassembled by [user].") - relay_qdel() - qdel(src) - return - - if(istype(W, /obj/item/screwdriver)) - if(!all_components.len) - to_chat(user, "This device doesn't have any components installed.") - return - var/list/component_names = list() - for(var/h in all_components) - var/obj/item/computer_hardware/H = all_components[h] - component_names.Add(H.name) - - var/choice = input(user, "Which component do you want to uninstall?", "Computer maintenance", null) as null|anything in component_names - - if(!choice) - return - - if(!Adjacent(user)) - return - - var/obj/item/computer_hardware/H = find_hardware_by_name(choice) - - if(!H) - return - - uninstall_component(H, user) - return - - ..() - -/obj/item/modular_computer/welder_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - default_welder_repair(user, I) - -// Used by processor to relay qdel() to machinery type. -/obj/item/modular_computer/proc/relay_qdel() - return - -// Perform adjacency checks on our physical counterpart, if any. -/obj/item/modular_computer/Adjacent(atom/neighbor) - if(physical && physical != src) - return physical.Adjacent(neighbor) - return ..() diff --git a/code/modules/modular_computers/computers/item/computer_components.dm b/code/modules/modular_computers/computers/item/computer_components.dm deleted file mode 100644 index fb6d41d989f..00000000000 --- a/code/modules/modular_computers/computers/item/computer_components.dm +++ /dev/null @@ -1,58 +0,0 @@ -/obj/item/modular_computer/proc/can_install_component(obj/item/computer_hardware/H, mob/living/user = null) - if(!H.can_install(src, user)) - return FALSE - - if(H.w_class > max_hardware_size) - if(user) - to_chat(user, "This component is too large for \the [src]!") - return FALSE - - if(all_components[H.device_type]) - if(user) - to_chat(user, "This computer's hardware slot is already occupied by \the [all_components[H.device_type]].") - return FALSE - return TRUE - - -// Installs component. -/obj/item/modular_computer/proc/install_component(obj/item/computer_hardware/H, mob/living/user = null) - if(!can_install_component(H, user)) - return FALSE - - if(user && !user.unEquip(H)) - return FALSE - H.forceMove(src) - - all_components[H.device_type] = H - - if(user) - to_chat(user, "You install \the [H] into \the [src].") - H.holder = src - H.on_install(src, user) - - -// Uninstalls component. -/obj/item/modular_computer/proc/uninstall_component(obj/item/computer_hardware/H, mob/living/user = null) - if(H.holder != src) // Not our component at all. - return FALSE - - all_components.Remove(H.device_type) - - if(user) - to_chat(user, "You remove \the [H] from \the [src].") - - H.forceMove(get_turf(src)) - H.holder = null - H.on_remove(src, user) - if(enabled && !use_power()) - shutdown_computer() - update_icon() - - -// Checks all hardware pieces to determine if name matches, if yes, returns the hardware piece, otherwise returns null -/obj/item/modular_computer/proc/find_hardware_by_name(name) - for(var/i in all_components) - var/obj/O = all_components[i] - if(O.name == name) - return O - return null diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm deleted file mode 100644 index 08a8ca6aaf4..00000000000 --- a/code/modules/modular_computers/computers/item/computer_damage.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/item/modular_computer/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) - . = ..() - var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity)) - switch(damage_flag) - if("bullet") - component_probability = damage_amount * 0.5 - if("laser") - component_probability = damage_amount * 0.66 - if(component_probability) - for(var/I in all_components) - var/obj/item/computer_hardware/H = all_components[I] - if(prob(component_probability)) - H.take_damage(round(damage_amount*0.5), damage_type, damage_flag, 0) - -/obj/item/modular_computer/deconstruct(disassembled = TRUE) - break_apart() - -/obj/item/modular_computer/proc/break_apart() - if(!(flags & NODECONSTRUCT)) - physical.visible_message("\The [src] breaks apart!") - var/turf/newloc = get_turf(src) - new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2)) - for(var/C in all_components) - var/obj/item/computer_hardware/H = all_components[C] - uninstall_component(H) - H.forceMove(newloc) - if(prob(25)) - H.take_damage(rand(10,30), BRUTE, 0, 0) - relay_qdel() - qdel(src) diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm deleted file mode 100644 index 27c81d48190..00000000000 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ /dev/null @@ -1,77 +0,0 @@ -// Tries to draw power from charger or, if no operational charger is present, from power cell. -/obj/item/modular_computer/proc/use_power(amount = 0) - if(check_power_override()) - return TRUE - - var/obj/item/computer_hardware/recharger/recharger = all_components[MC_CHARGE] - - if(recharger && recharger.check_functionality()) - if(recharger.use_power(amount)) - return TRUE - - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - - if(battery_module && battery_module.battery && battery_module.battery.charge) - var/obj/item/stock_parts/cell/cell = battery_module.battery - if(cell.use(amount * GLOB.CELLRATE)) - return TRUE - else // Discharge the cell anyway. - cell.use(min(amount*GLOB.CELLRATE, cell.charge)) - return FALSE - return FALSE - -/obj/item/modular_computer/proc/give_power(amount) - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - if(battery_module && battery_module.battery) - return battery_module.battery.give(amount) - return 0 - -/obj/item/modular_computer/get_cell() - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - if(battery_module && battery_module.battery) - return battery_module.battery - -// Used in following function to reduce copypaste -/obj/item/modular_computer/proc/power_failure() - if(enabled) // Shut down the computer - if(active_program) - active_program.event_powerfailure(0) - for(var/I in idle_threads) - var/datum/computer_file/program/PRG = I - PRG.event_powerfailure(1) - shutdown_computer(0) - -// Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged -/obj/item/modular_computer/proc/handle_power() - var/obj/item/computer_hardware/recharger/recharger = all_components[MC_CHARGE] - if(recharger) - recharger.process() - - var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage - - for(var/obj/item/computer_hardware/H in all_components) - if(H.enabled) - power_usage += H.power_usage - - if(use_power(power_usage)) - last_power_usage = power_usage - return TRUE - else - power_failure() - return FALSE - -/obj/item/modular_computer/proc/get_power_eta() - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - if(battery_module && battery_module.battery) - var/hours = 0 - var/minutes = (battery_module.battery.charge) / (last_power_usage / 20) // 20 = obj processing interval - if(minutes > 60) - hours = minutes/60 - minutes = (hours - round(hours)) * 60 - var/seconds = (minutes - round(minutes)) * 60 - return list("hours" = hours, "minutes" = minutes, "seconds" = seconds) - return list() - -// Used by child types if they have other power source than battery or recharger -/obj/item/modular_computer/proc/check_power_override() - return FALSE diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm deleted file mode 100644 index 36df0243f54..00000000000 --- a/code/modules/modular_computers/computers/item/computer_ui.dm +++ /dev/null @@ -1,194 +0,0 @@ -// Operates NanoUI -/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(!enabled) - if(ui) - ui.close() - return 0 - if(!use_power()) - if(ui) - ui.close() - return 0 - - // Robots don't really need to see the screen, their wireless connection works as long as computer is on. - if(!screen_on && !issilicon(user)) - if(ui) - ui.close() - return 0 - - // If we have an active program switch to it now. - if(active_program) - if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now. - ui.close() - active_program.ui_interact(user) - return - - // We are still here, that means there is no program loaded. Load the BIOS/ROM/OS/whatever you want to call it. - // This screen simply lists available programs and user may select them. - var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] - if(!hard_drive || !hard_drive.stored_files || !hard_drive.stored_files.len) - to_chat(user, "\The [src] beeps three times, it's screen displaying a \"DISK ERROR\" warning.") - return // No HDD, No HDD files list or no stored files. Something is very broken. - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "computer_main.tmpl", "NTOS Main menu", 400, 500) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - - -/obj/item/modular_computer/ui_data(mob/user) - var/list/data = get_header_data() - data["programs"] = list() - var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] - for(var/datum/computer_file/program/P in hard_drive.stored_files) - var/running = 0 - if(P in idle_threads) - running = 1 - - data["programs"] += list(list("name" = P.filename, "desc" = P.filedesc, "running" = running)) - - return data - -// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_" -/obj/item/modular_computer/proc/get_header_data() - var/list/data = list() - - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - var/obj/item/computer_hardware/recharger/recharger = all_components[MC_CHARGE] - - if(battery_module && battery_module.battery) - switch(battery_module.battery.percent()) - if(80 to 200) // 100 should be maximal but just in case.. - data["PC_batteryicon"] = "batt_100.gif" - if(60 to 80) - data["PC_batteryicon"] = "batt_80.gif" - if(40 to 60) - data["PC_batteryicon"] = "batt_60.gif" - if(20 to 40) - data["PC_batteryicon"] = "batt_40.gif" - if(5 to 20) - data["PC_batteryicon"] = "batt_20.gif" - else - data["PC_batteryicon"] = "batt_5.gif" - data["PC_batterypercent"] = "[round(battery_module.battery.percent())] %" - data["PC_showbatteryicon"] = 1 - else - data["PC_batteryicon"] = "batt_5.gif" - data["PC_batterypercent"] = "N/C" - data["PC_showbatteryicon"] = battery_module ? 1 : 0 - - if(recharger && recharger.enabled && recharger.check_functionality() && recharger.use_power(0)) - data["PC_apclinkicon"] = "charging.gif" - - switch(get_ntnet_status()) - if(0) - data["PC_ntneticon"] = "sig_none.gif" - if(1) - data["PC_ntneticon"] = "sig_low.gif" - if(2) - data["PC_ntneticon"] = "sig_high.gif" - if(3) - data["PC_ntneticon"] = "sig_lan.gif" - - if(idle_threads.len) - var/list/program_headers = list() - for(var/I in idle_threads) - var/datum/computer_file/program/P = I - if(!P.ui_header) - continue - program_headers.Add(list(list( - "icon" = P.ui_header - ))) - - data["PC_programheaders"] = program_headers - - data["PC_stationtime"] = station_time_timestamp() - data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen - return data - - -// Handles user's GUI input -/obj/item/modular_computer/Topic(href, list/href_list) - if(..()) - return - var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] - switch(href_list["action"]) - if("PC_exit") - kill_program() - return 1 - if("PC_shutdown") - shutdown_computer() - return 1 - if("PC_minimize") - var/mob/user = usr - if(!active_program || !all_components[MC_CPU]) - return 1 - - idle_threads.Add(active_program) - active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs - - active_program = null - update_icon() - if(user && istype(user)) - ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. - - if("PC_killprogram") - var/prog = href_list["name"] - var/datum/computer_file/program/P = null - var/mob/user = usr - if(hard_drive) - P = hard_drive.find_file_by_name(prog) - - if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED) - return 1 - - P.kill_program(forced = TRUE) - to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.") - - if("PC_runprogram") - var/prog = href_list["name"] - var/datum/computer_file/program/P = null - var/mob/user = usr - if(hard_drive) - P = hard_drive.find_file_by_name(prog) - - if(!P || !istype(P)) // Program not found or it's not executable program. - to_chat(user, "\The [src]'s screen shows \"I/O ERROR - Unable to run program\" warning.") - return 1 - - P.computer = src - - if(!P.is_supported_by_hardware(hardware_flag, 1, user)) - return 1 - - // The program is already running. Resume it. - if(P in idle_threads) - P.program_state = PROGRAM_STATE_ACTIVE - active_program = P - idle_threads.Remove(P) - update_icon() - return - - var/obj/item/computer_hardware/processor_unit/PU = all_components[MC_CPU] - - if(idle_threads.len > PU.max_idle_programs) - to_chat(user, "\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error.") - return 1 - - if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet. - to_chat(user, "\The [src]'s screen shows \"Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.") - return 1 - if(P.run_program(user)) - active_program = P - update_icon() - return 1 - else - return - -/obj/item/modular_computer/nano_host() - if(physical) - return physical - return src diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm deleted file mode 100644 index 223627bd69e..00000000000 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ /dev/null @@ -1,109 +0,0 @@ -/obj/item/modular_computer/laptop - name = "laptop" - desc = "A portable laptop computer." - - icon = 'icons/obj/modular_laptop.dmi' - icon_state = "laptop-closed" - icon_state_powered = "laptop" - icon_state_unpowered = "laptop-off" - icon_state_menu = "menu" - - hardware_flag = PROGRAM_LAPTOP - max_hardware_size = 2 - w_class = WEIGHT_CLASS_NORMAL - - flags = HANDSLOW // No running around with open laptops in hands. - - screen_on = 0 // Starts closed - var/start_open = 1 // unless this var is set to 1 - var/icon_state_closed = "laptop-closed" - var/w_class_open = WEIGHT_CLASS_BULKY - var/slowdown_open = 1 - -/obj/item/modular_computer/laptop/New() - ..() - if(start_open && !screen_on) - toggle_open() - -/obj/item/modular_computer/laptop/update_icon() - if(screen_on) - ..() - else - overlays.Cut() - icon_state = icon_state_closed - -/obj/item/modular_computer/laptop/attack_self(mob/user) - if(!screen_on) - try_toggle_open(user) - else - return ..() - -/obj/item/modular_computer/laptop/verb/open_computer() - set name = "Toggle Open" - set category = "Object" - set src in view(1) - - try_toggle_open(usr) - -/obj/item/modular_computer/laptop/MouseDrop(obj/over_object, src_location, over_location) - if(over_object == usr || over_object == src) - try_toggle_open(usr) - if(ishuman(usr)) - if(!isturf(loc) || !Adjacent(usr)) - return - if(over_object && !usr.incapacitated()) - if(!usr.canUnEquip(src)) - to_chat(usr, "[src] appears stuck on you!") - return - switch(over_object.name) - if("r_hand") - usr.unEquip(src) - usr.put_in_r_hand(src) - if("l_hand") - usr.unEquip(src) - usr.put_in_l_hand(src) - -/obj/item/modular_computer/laptop/attack_hand(mob/user) - if(screen_on && isturf(loc)) - return attack_self(user) - - return ..() - - -/obj/item/modular_computer/laptop/proc/try_toggle_open(mob/living/user) - if(issilicon(user)) - return - if(!isturf(loc) && !ismob(loc)) // No opening it in backpack. - return - if(user.incapacitated() || !Adjacent(user)) - return - - toggle_open(user) - - -/obj/item/modular_computer/laptop/AltClick(mob/user) - if(screen_on) // Close it. - try_toggle_open(user) - else - return ..() - -/obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null) - if(screen_on) - if(user) - to_chat(user, "You close \the [src].") - slowdown = initial(slowdown) - w_class = initial(w_class) - else - if(user) - to_chat(user, "You open \the [src].") - slowdown = slowdown_open - w_class = w_class_open - - screen_on = !screen_on - update_icon() - - - -// Laptop frame, starts empty and closed. -/obj/item/modular_computer/laptop/buildable - start_open = 0 diff --git a/code/modules/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm deleted file mode 100644 index 43720dfa2fc..00000000000 --- a/code/modules/modular_computers/computers/item/laptop_presets.dm +++ /dev/null @@ -1,21 +0,0 @@ -/obj/item/modular_computer/laptop/preset/New() - . = ..() - install_component(new /obj/item/computer_hardware/processor_unit/small) - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) - install_component(new /obj/item/computer_hardware/hard_drive) - install_component(new /obj/item/computer_hardware/network_card) - install_programs() - - -/obj/item/modular_computer/laptop/preset/proc/install_programs() - return - - -/obj/item/modular_computer/laptop/preset/civillian - desc = "A low-end laptop often used for personal recreation." - - -/obj/item/modular_computer/laptop/preset/civillian/install_programs() - var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] - hard_drive.store_file(new/datum/computer_file/program/chatclient()) - hard_drive.store_file(new/datum/computer_file/program/nttransfer()) diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm deleted file mode 100644 index 3095e0af876..00000000000 --- a/code/modules/modular_computers/computers/item/processor.dm +++ /dev/null @@ -1,73 +0,0 @@ -// Held by /obj/machinery/modular_computer to reduce amount of copy-pasted code. -/obj/item/modular_computer/processor - name = "processing unit" - desc = "You shouldn't see this. If you do, report it." - icon = null - icon_state = null - icon_state_unpowered = null - icon_state_menu = null - hardware_flag = 0 - - var/obj/machinery/modular_computer/machinery_computer = null - -/obj/item/modular_computer/processor/Destroy() - . = ..() - if(machinery_computer && (machinery_computer.cpu == src)) - machinery_computer.cpu = null - machinery_computer = null - -/obj/item/modular_computer/processor/New(comp) - if(!comp || !istype(comp, /obj/machinery/modular_computer)) - CRASH("Inapropriate type passed to obj/item/modular_computer/processor/New()! Aborting.") - // Obtain reference to machinery computer - all_components = list() - idle_threads = list() - machinery_computer = comp - machinery_computer.cpu = src - hardware_flag = machinery_computer.hardware_flag - max_hardware_size = machinery_computer.max_hardware_size - steel_sheet_cost = machinery_computer.steel_sheet_cost - obj_integrity = machinery_computer.obj_integrity - max_integrity = machinery_computer.max_integrity - integrity_failure = machinery_computer.integrity_failure - base_active_power_usage = machinery_computer.base_active_power_usage - base_idle_power_usage = machinery_computer.base_idle_power_usage - -/obj/item/modular_computer/processor/relay_qdel() - qdel(machinery_computer) - -/obj/item/modular_computer/processor/update_icon() - if(machinery_computer) - return machinery_computer.update_icon() - -// This thing is not meant to be used on it's own, get topic data from our machinery owner. -//obj/item/modular_computer/processor/canUseTopic(user, state) -// if(!machinery_computer) -// return 0 - -// return machinery_computer.canUseTopic(user, state) - -/obj/item/modular_computer/processor/shutdown_computer() - if(!machinery_computer) - return - ..() - machinery_computer.update_icon() - return - -/obj/item/modular_computer/processor/add_verb(path) - switch(path) - if(MC_CARD) - machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_id - if(MC_SDD) - machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_disk - if(MC_AI) - machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_card - -/obj/item/modular_computer/processor/remove_verb(path) - switch(path) - if(MC_CARD) - machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_id - if(MC_SDD) - machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_disk - if(MC_AI) - machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_card diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm deleted file mode 100644 index f0a044b1d36..00000000000 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ /dev/null @@ -1,12 +0,0 @@ -/obj/item/modular_computer/tablet //Its called tablet for theme of 90ies but actually its a "big smartphone" sized - name = "tablet computer" - icon = 'icons/obj/modular_tablet.dmi' - icon_state = "tablet" - icon_state_unpowered = "tablet" - icon_state_powered = "tablet" - icon_state_menu = "menu" - hardware_flag = PROGRAM_TABLET - max_hardware_size = 1 - w_class = WEIGHT_CLASS_SMALL - steel_sheet_cost = 1 - slot_flags = SLOT_ID | SLOT_BELT diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm deleted file mode 100644 index 3ac32e30ca9..00000000000 --- a/code/modules/modular_computers/computers/item/tablet_presets.dm +++ /dev/null @@ -1,29 +0,0 @@ - -// This is literally the worst possible cheap tablet -/obj/item/modular_computer/tablet/preset/cheap - desc = "A low-end tablet often seen among low ranked station personnel." - -/obj/item/modular_computer/tablet/preset/cheap/New() - . = ..() - install_component(new /obj/item/computer_hardware/processor_unit/small) - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer/micro)) - install_component(new /obj/item/computer_hardware/hard_drive/small) - install_component(new /obj/item/computer_hardware/network_card) - -// Alternative version, an average one, for higher ranked positions mostly -/obj/item/modular_computer/tablet/preset/advanced/New() - . = ..() - install_component(new /obj/item/computer_hardware/processor_unit/small) - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) - install_component(new /obj/item/computer_hardware/hard_drive/small) - install_component(new /obj/item/computer_hardware/network_card) - install_component(new /obj/item/computer_hardware/card_slot) - install_component(new /obj/item/computer_hardware/printer/mini) - -/obj/item/modular_computer/tablet/preset/cargo/New() - . = ..() - install_component(new /obj/item/computer_hardware/processor_unit/small) - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) - install_component(new /obj/item/computer_hardware/hard_drive/small) - install_component(new /obj/item/computer_hardware/network_card) - install_component(new /obj/item/computer_hardware/printer/mini) diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm deleted file mode 100644 index 4f1bd269337..00000000000 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ /dev/null @@ -1,76 +0,0 @@ -/obj/machinery/modular_computer/console/preset - // Can be changed to give devices specific hardware - var/_has_id_slot = 0 - var/_has_printer = 0 - var/_has_battery = 0 - var/_has_ai = 0 - -/obj/machinery/modular_computer/console/preset/New() - . = ..() - if(!cpu) - return - cpu.install_component(new /obj/item/computer_hardware/processor_unit) - - if(_has_id_slot) - cpu.install_component(new /obj/item/computer_hardware/card_slot) - if(_has_printer) - cpu.install_component(new /obj/item/computer_hardware/printer) - if(_has_battery) - cpu.install_component(new /obj/item/computer_hardware/battery(cpu, /obj/item/stock_parts/cell/computer/super)) - if(_has_ai) - cpu.install_component(new /obj/item/computer_hardware/ai_slot) - install_programs() - -// Override in child types to install preset-specific programs. -/obj/machinery/modular_computer/console/preset/proc/install_programs() - return - - - -// ===== ENGINEERING CONSOLE ===== -/obj/machinery/modular_computer/console/preset/engineering - console_department = "Engineering" - desc = "A stationary computer. This one comes preloaded with engineering programs." - -/obj/machinery/modular_computer/console/preset/engineering/install_programs() - var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] - hard_drive.store_file(new/datum/computer_file/program/power_monitor()) - hard_drive.store_file(new/datum/computer_file/program/alarm_monitor()) - hard_drive.store_file(new/datum/computer_file/program/supermatter_monitor()) - -// ===== RESEARCH CONSOLE ===== -/obj/machinery/modular_computer/console/preset/research - console_department = "Research" - desc = "A stationary computer. This one comes preloaded with research programs." - _has_ai = 1 - -/obj/machinery/modular_computer/console/preset/research/install_programs() - var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] - hard_drive.store_file(new/datum/computer_file/program/ntnetmonitor()) - hard_drive.store_file(new/datum/computer_file/program/nttransfer()) - hard_drive.store_file(new/datum/computer_file/program/chatclient()) - hard_drive.store_file(new/datum/computer_file/program/aidiag()) - - -// ===== COMMAND CONSOLE ===== -/obj/machinery/modular_computer/console/preset/command - console_department = "Command" - desc = "A stationary computer. This one comes preloaded with command programs." - _has_id_slot = 1 - _has_printer = 1 - -/obj/machinery/modular_computer/console/preset/command/install_programs() - var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] - hard_drive.store_file(new/datum/computer_file/program/chatclient()) - hard_drive.store_file(new/datum/computer_file/program/card_mod()) - hard_drive.store_file(new/datum/computer_file/program/comm()) - -// ===== CIVILIAN CONSOLE ===== -/obj/machinery/modular_computer/console/preset/civilian - console_department = "Civilian" - desc = "A stationary computer. This one comes preloaded with generic programs." - -/obj/machinery/modular_computer/console/preset/civilian/install_programs() - var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] - hard_drive.store_file(new/datum/computer_file/program/chatclient()) - hard_drive.store_file(new/datum/computer_file/program/nttransfer()) diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm deleted file mode 100644 index 391396a7d75..00000000000 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ /dev/null @@ -1,154 +0,0 @@ -// Global var to track modular computers -GLOBAL_LIST_EMPTY(global_modular_computers) - -// Modular Computer - device that runs various programs and operates with hardware -// DO NOT SPAWN THIS TYPE. Use /laptop/ or /console/ instead. -/obj/machinery/modular_computer - name = "modular computer" - desc = "An advanced computer." - - use_power = IDLE_POWER_USE - idle_power_usage = 5 - var/hardware_flag = 0 // A flag that describes this device type - var/last_power_usage = 0 // Power usage during last tick - - // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..) - // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently - // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example. - - icon = null - icon_state = null - var/icon_state_unpowered = null // Icon state when the computer is turned off. - var/icon_state_powered = null // Icon state when the computer is turned on. - var/screen_icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. - var/screen_icon_screensaver = "standby" // Icon state overlay when the computer is powered, but not 'switched on'. - var/max_hardware_size = 0 // Maximal hardware size. Currently, tablets have 1, laptops 2 and consoles 3. Limits what hardware types can be installed. - var/steel_sheet_cost = 10 // Amount of steel sheets refunded when disassembling an empty frame of this computer. - var/light_strength = 0 // Light luminosity when turned on - var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. - var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops) - - var/obj/item/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things. - -/obj/machinery/modular_computer/New() - ..() - cpu = new(src) - cpu.physical = src - GLOB.global_modular_computers.Add(src) - -/obj/machinery/modular_computer/Destroy() - QDEL_NULL(cpu) - return ..() - -/obj/machinery/modular_computer/attack_ghost(mob/dead/observer/user) - if(cpu) - cpu.attack_ghost(user) - -/obj/machinery/modular_computer/emag_act(mob/user) - return cpu ? cpu.emag_act(user) : 1 - -/obj/machinery/modular_computer/update_icon() - overlays.Cut() - icon_state = icon_state_powered - - if(!cpu || !cpu.enabled) - if (!(stat & NOPOWER) && (cpu && cpu.use_power())) - overlays += screen_icon_screensaver - else - icon_state = icon_state_unpowered - set_light(0) - else - set_light(light_strength) - if(cpu.active_program) - overlays += cpu.active_program.program_icon_state ? cpu.active_program.program_icon_state : screen_icon_state_menu - else - overlays += screen_icon_state_menu - - if(cpu && cpu.obj_integrity <= cpu.integrity_failure) - overlays += "bsod" - overlays += "broken" - -// Eject ID card from computer, if it has ID slot with card inside. -/obj/machinery/modular_computer/proc/eject_id() - set name = "Eject ID" - set category = "Object" - - if(cpu) - cpu.eject_id() - -// Eject ID card from computer, if it has ID slot with card inside. -/obj/machinery/modular_computer/proc/eject_disk() - set name = "Eject Data Disk" - set category = "Object" - - if(cpu) - cpu.eject_disk() - -/obj/machinery/modular_computer/proc/eject_card() - set name = "Eject Intellicard" - set category = "Object" - set src in view(1) - - if(cpu) - cpu.eject_card() - -/obj/machinery/modular_computer/AltClick(mob/user) - if(cpu) - cpu.AltClick(user) - -// On-click handling. Turns on the computer if it's off and opens the GUI. -/obj/machinery/modular_computer/attack_hand(mob/user) - if(cpu) - cpu.attack_self(user) // CPU is an item, that's why we route attack_hand to attack_self - -// Process currently calls handle_power(), may be expanded in future if more things are added. -/obj/machinery/modular_computer/process() - if(cpu) - // Keep names in sync. - cpu.name = src.name - cpu.process() - -// Used in following function to reduce copypaste -/obj/machinery/modular_computer/proc/power_failure(malfunction = 0) - var/obj/item/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL] - if(cpu && cpu.enabled) // Shut down the computer - visible_message("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.") - if(cpu) - cpu.shutdown_computer(0) - stat |= NOPOWER - update_icon() - - -// Modular computers can have battery in them, we handle power in previous proc, so prevent this from messing it up for us. -/obj/machinery/modular_computer/power_change() - if(cpu && cpu.use_power()) // If MC_CPU still has a power source, PC wouldn't go offline. - stat &= ~NOPOWER - update_icon() - return - ..() - update_icon() - -/obj/machinery/modular_computer/attackby(obj/item/W, mob/user) - if(cpu) - return cpu.attackby(W, user) - return ..() - - -// Stronger explosions cause serious damage to internal components -// Minor explosions are mostly mitigitated by casing. -/obj/machinery/modular_computer/ex_act(severity) - if(cpu) - cpu.ex_act(severity) - ..() - -// EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components -/obj/machinery/modular_computer/emp_act(severity) - if(cpu) - cpu.emp_act(severity) - -// "Stun" weapons can cause minor damage to components (short-circuits?) -// "Burn" damage is equally strong against internal components and exterior casing -// "Brute" damage mostly damages the casing. -/obj/machinery/modular_computer/bullet_act(obj/item/projectile/Proj) - if(cpu) - cpu.bullet_act(Proj) diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm deleted file mode 100644 index e16ce82702c..00000000000 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ /dev/null @@ -1,53 +0,0 @@ -/obj/machinery/modular_computer/console - name = "console" - desc = "A stationary computer." - - icon = 'icons/obj/modular_console.dmi' - icon_state = "console" - icon_state_powered = "console" - icon_state_unpowered = "console-off" - screen_icon_state_menu = "menu" - hardware_flag = PROGRAM_CONSOLE - anchored = 1 - density = 1 - base_idle_power_usage = 100 - base_active_power_usage = 500 - max_hardware_size = 4 - steel_sheet_cost = 10 - light_strength = 2 - max_integrity = 300 - integrity_failure = 150 - - var/console_department = "" // Used in New() to set network tag according to our area. - var/components = TRUE // Install basic components? - -/obj/machinery/modular_computer/console/buildable - components = FALSE - -/obj/machinery/modular_computer/console/New() - ..() - var/obj/item/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL] - if(battery_module) - qdel(battery_module) - - if(components) - var/obj/item/computer_hardware/network_card/wired/network_card = new() - - cpu.install_component(network_card) - cpu.install_component(new /obj/item/computer_hardware/recharger/APC) - cpu.install_component(new /obj/item/computer_hardware/hard_drive/super) // Consoles generally have better HDDs due to lower space limitations - - var/area/A = get_area(src) - // Attempts to set this console's tag according to our area. Since some areas have stuff like "XX - YY" in their names we try to remove that too. - if(A && console_department) - network_card.identification_string = replacetext(replacetext(replacetext("[A.name] [console_department] Console", " ", "_"), "-", ""), "__", "_") // Replace spaces with "_" - else if(A) - network_card.identification_string = replacetext(replacetext(replacetext("[A.name] Console", " ", "_"), "-", ""), "__", "_") - else if(console_department) - network_card.identification_string = replacetext(replacetext(replacetext("[console_department] Console", " ", "_"), "-", ""), "__", "_") - else - network_card.identification_string = "Unknown Console" - - if(cpu) - cpu.screen_on = 1 - update_icon() diff --git a/code/modules/modular_computers/documentation.md b/code/modules/modular_computers/documentation.md deleted file mode 100644 index 9caae69aade..00000000000 --- a/code/modules/modular_computers/documentation.md +++ /dev/null @@ -1,45 +0,0 @@ - - -#Modular computer programs -Ok. so a quick rundown on how to make a program. This is kind of a shitty documentation, but oh well I was asked to. - - -## Base setup -This is how the base program is setup. the rest is mostly tgui stuff. I'll use the ntnetmonitor as a base - - -```DM -/datum/computer_file/program/ntnetmonitor - filename = "ntmonitor" //This is obviously the name of the file itself. not much to be said - filedesc = "NTNet Diagnostics and Monitoring" // This is sort of the official name. it's what shows up on the main menu - program_icon_state = "comm_monitor" // This is what the screen will look like when the program is active - extended_desc = "This program is a dummy. // This is a sort of a description, visible when looking on the ntnet - size = 12 // size of the program. Big programs need more hard drive space. Don't make it too big though. - requires_ntnet = 1 // If this is set, the program will not run without an ntnet connection, and will close if the connection is lost. Mainly for primarily online programs. - required_access = ACCESS_NETWORK //This is access required to run the program itself. ONLY SET THIS FOR SUPER SECURE SHIT. This also acts as transfer_access as well. - transfer_access = ACCESS_CHANGE_IDS // This is the access needed to download from ntnet or host on the ptp program. This is what you want to use most of the time. - available_on_ntnet = 1 //If it's available to download on ntnet. pretty self explanatory. - available_on_syndinet = 0 // ditto but on emagged syndie net. Use this for antag programs - usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL - //^^- The comment above sorta explains it. Use this to limit what kind of machines can run the program. For example, comms program should be limited to consoles and laptops. - var/ui_header = "downloader_finished.gif" //This one is kinda cool. If you have the program minimized, this will show up in the header of the computer screen. - //you can even have the program change what the header is based on the situation! see alarm.dm for an example. -``` - -##Preinstalls -Now. for pre-installing stuff. - -Primarily done for consoles, there's an install_programs() proc in the console presets file in the machines folder. - -for example, the command console one. - -```DM -/obj/machinery/modular_computer/console/preset/command/install_programs() - cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient()) - cpu.hard_drive.store_file(new/datum/computer_file/program/card_mod()) -``` -Basically, you want to do cpu.hard_drive.store_file(new/*program path here*()) and put it in the subtype's install_programs(). -Probably pretty self explanatory, but just in case. - -Will probably be expanded when new features come around or I get asked to mention something. - diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm deleted file mode 100644 index b3f8064b72a..00000000000 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ /dev/null @@ -1,50 +0,0 @@ -GLOBAL_VAR_INIT(file_uid, 0) - -/datum/computer_file - var/filename = "NewFile" // Placeholder. No spacebars - var/filetype = "XXX" // File full names are [filename].[filetype] so like NewFile.XXX in this case - var/size = 1 // File size in GQ. Integers only! - var/obj/item/computer_hardware/hard_drive/holder // Holder that contains this file. - var/unsendable = 0 // Whether the file may be sent to someone via NTNet transfer or other means. - var/undeletable = 0 // Whether the file may be deleted. Setting to 1 prevents deletion/renaming/etc. - var/uid // UID of this file - var/password = "" // Placeholder for password. - -/datum/computer_file/New() - ..() - uid = GLOB.file_uid - GLOB.file_uid++ - -/datum/computer_file/Destroy() - if(!holder) - return ..() - - holder.remove_file(src) - // holder.holder is the computer that has drive installed. If we are Destroy()ing program that's currently running kill it. - if(holder.holder && holder.holder.active_program == src) - holder.holder.kill_program(forced = TRUE) - holder = null - return ..() - -// Returns independent copy of this file. -/datum/computer_file/proc/clone(rename = 0) - var/datum/computer_file/temp = new type - temp.unsendable = unsendable - temp.undeletable = undeletable - temp.size = size - if(rename) - temp.filename = filename + "(Copy)" - else - temp.filename = filename - temp.filetype = filetype - temp.password = password - return temp - -/datum/computer_file/proc/can_access_file(mob/user, input_password = "") - if(!password) - return TRUE - if(!input_password) - input_password = sanitize(input(user, "Please enter a password to access file '[filename]':")) - if(input_password == password) - return TRUE - return FALSE diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm deleted file mode 100644 index 32ef6f53dd1..00000000000 --- a/code/modules/modular_computers/file_system/data.dm +++ /dev/null @@ -1,20 +0,0 @@ -// /data/ files store data in string format. -// They don't contain other logic for now. -/datum/computer_file/data - var/stored_data = "" // Stored data in string format. - filetype = "DAT" - var/block_size = 250 - var/do_not_edit = 0 // Whether the user will be reminded that the file probably shouldn't be edited. - -/datum/computer_file/data/clone() - var/datum/computer_file/data/temp = ..() - temp.stored_data = stored_data - return temp - -// Calculates file size from amount of characters in saved string -/datum/computer_file/data/proc/calculate_size() - size = max(1, round(length(stored_data) / block_size)) - -/datum/computer_file/data/logfile - filetype = "LOG" - diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm deleted file mode 100644 index 6f779312c15..00000000000 --- a/code/modules/modular_computers/file_system/program.dm +++ /dev/null @@ -1,200 +0,0 @@ -// /program/ files are executable programs that do things. -/datum/computer_file/program - filetype = "PRG" - filename = "UnknownProgram" // File name. FILE NAME MUST BE UNIQUE IF YOU WANT THE PROGRAM TO BE DOWNLOADABLE FROM NTNET! - var/required_access = null // List of required accesses to *run* the program. - var/transfer_access = null // List of required access to download or file host the program - var/program_state = PROGRAM_STATE_KILLED// PROGRAM_STATE_KILLED or PROGRAM_STATE_BACKGROUND or PROGRAM_STATE_ACTIVE - specifies whether this program is running. - var/obj/item/modular_computer/computer // Device that runs this program. - var/filedesc = "Unknown Program" // User-friendly name of this program. - var/extended_desc = "N/A" // Short description of this program's function. - var/program_icon_state = null // Program-specific screen icon state - var/requires_ntnet = 0 // Set to 1 for program to require nonstop NTNet connection to run. If NTNet connection is lost program crashes. - var/requires_ntnet_feature = 0 // Optional, if above is set to 1 checks for specific function of NTNet (currently NTNET_SOFTWAREDOWNLOAD, NTNET_PEERTOPEER, NTNET_SYSTEMCONTROL and NTNET_COMMUNICATION) - var/ntnet_status = 1 // NTNet status, updated every tick by computer running this program. Don't use this for checks if NTNet works, computers do that. Use this for calculations, etc. - var/usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL - var/network_destination = null // Optional string that describes what NTNet server/system this program connects to. Used in default logging. - var/available_on_ntnet = 1 // Whether the program can be downloaded from NTNet. Set to 0 to disable. - var/available_on_syndinet = 0 // Whether the program can be downloaded from SyndiNet (accessible via emagging the computer). Set to 1 to enable. - var/ui_header = null // Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /icons/program_icons. Be careful not to use too large images! - -/datum/computer_file/program/New(obj/item/modular_computer/comp = null) - ..() - if(comp && istype(comp)) - computer = comp - -/datum/computer_file/program/Destroy() - computer = null - . = ..() - -/datum/computer_file/program/clone() - var/datum/computer_file/program/temp = ..() - temp.required_access = required_access - temp.filedesc = filedesc - temp.program_icon_state = program_icon_state - temp.requires_ntnet = requires_ntnet - temp.requires_ntnet_feature = requires_ntnet_feature - temp.usage_flags = usage_flags - return temp - -// Relays icon update to the computer. -/datum/computer_file/program/proc/update_computer_icon() - if(computer) - computer.update_icon() - -// Attempts to create a log in global ntnet datum. Returns 1 on success, 0 on fail. -/datum/computer_file/program/proc/generate_network_log(text) - if(computer) - return computer.add_log(text) - return 0 - -/datum/computer_file/program/proc/is_supported_by_hardware(hardware_flag = 0, loud = 0, mob/user = null) - if(!(hardware_flag & usage_flags)) - if(loud && computer && user) - to_chat(user, "\The [computer] flashes an \"Hardware Error - Incompatible software\" warning.") - return 0 - return 1 - -/datum/computer_file/program/proc/get_signal(specific_action = 0) - if(computer) - return computer.get_ntnet_status(specific_action) - return 0 - -// Called by Process() on device that runs us, once every tick. -/datum/computer_file/program/proc/process_tick() - return 1 - -// Check if the user can run program. Only humans can operate computer. Automatically called in run_program() -// User has to wear their ID for ID Scan to work. -// Can also be called manually, with optional parameter being access_to_check to scan the user's ID -/datum/computer_file/program/proc/can_run(mob/user, loud = 0, access_to_check, transfer = 0) - // Defaults to required_access - if(!access_to_check) - if(transfer && transfer_access) - access_to_check = transfer_access - else - access_to_check = required_access - if(!access_to_check) // No required_access, allow it. - return 1 - - if(!transfer && computer && computer.emagged) //emags can bypass the execution locks but not the download ones. - return 1 - - if(user.can_admin_interact()) - return 1 - - if(issilicon(user)) - return 1 - - if(ishuman(user)) - var/obj/item/card/id/D - var/obj/item/computer_hardware/card_slot/card_slot - if(computer && card_slot) - card_slot = computer.all_components[MC_CARD] - D = card_slot.GetID() - var/mob/living/carbon/human/h = user - var/obj/item/card/id/I = h.get_idcard() - var/obj/item/card/id/C = h.get_active_hand() - if(C) - C = C.GetID() - if(!(C && istype(C))) - C = null - - if(!I && !C && !D) - if(loud) - to_chat(user, "\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.") - return 0 - - if(I) - if(access_to_check in I.GetAccess()) - return 1 - else if(C) - if(access_to_check in C.GetAccess()) - return 1 - else if(D) - if(access_to_check in D.GetAccess()) - return 1 - if(loud) - to_chat(user, "\The [computer] flashes an \"Access Denied\" warning.") - return 0 - -// This attempts to retrieve header data for UIs. If implementing completely new device of different type than existing ones -// always include the device here in this proc. This proc basically relays the request to whatever is running the program. -/datum/computer_file/program/proc/get_header_data() - if(computer) - return computer.get_header_data() - return list() - -// This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure. -// When implementing new program based device, use this to run the program. -/datum/computer_file/program/proc/run_program(mob/living/user) - if(can_run(user, 1)) - if(requires_ntnet && network_destination) - generate_network_log("Connection opened to [network_destination].") - program_state = PROGRAM_STATE_ACTIVE - return 1 - return 0 - -// Use this proc to kill the program. Designed to be implemented by each program if it requires on-quit logic, such as the NTNRC client. -/datum/computer_file/program/proc/kill_program(forced = FALSE) - program_state = PROGRAM_STATE_KILLED - computer.update_icon() - if(network_destination) - generate_network_log("Connection to [network_destination] closed.") - return 1 - -// This is called every tick when the program is enabled. Ensure you do parent call if you override it. If parent returns 1 continue with UI initialisation. - -/datum/computer_file/program/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists. - return computer.ui_interact(user) - return 1 - - -// CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC: -// Topic calls are automagically forwarded from NanoModule this program contains. -// Calls beginning with "PRG_" are reserved for programs handling. -// Calls beginning with "PC_" are reserved for computer handling (by whatever runs the program) -// ALWAYS INCLUDE PARENT CALL ..() OR DIE IN FIRE. -/datum/computer_file/program/Topic(href, list/href_list) - if(..()) - return 1 - - var/datum/nanoui/ui = SSnanoui.get_open_ui(usr, src, "main") - - if(computer) - switch(href_list["action"]) - if("PC_exit") - computer.kill_program() - ui.close() - return 1 - if("PC_shutdown") - computer.shutdown_computer() - ui.close() - return 1 - if("PC_minimize") - var/mob/user = usr - if(!computer.active_program || !computer.all_components[MC_CPU]) - return - - computer.idle_threads.Add(computer.active_program) - program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs - - computer.active_program = null - computer.update_icon() - ui.close() - - if(user && istype(user)) - computer.ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. - - -/datum/computer_file/program/nano_host() - if(computer.physical) - return computer.physical - else - return computer - -/datum/computer_file/program/CanUseTopic(mob/user) - if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists. - return STATUS_CLOSE - return ..() diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm deleted file mode 100644 index 279d646cfd7..00000000000 --- a/code/modules/modular_computers/file_system/program_events.dm +++ /dev/null @@ -1,18 +0,0 @@ -// Events are sent to the program by the computer. -// Always include a parent call when overriding an event. - -// Called when the ID card is removed from computer. ID is removed AFTER this proc. -/datum/computer_file/program/proc/event_idremoved(background, slot) - return - -// Called when the computer fails due to power loss. Override when program wants to specifically react to power loss. -/datum/computer_file/program/proc/event_powerfailure(background) - kill_program(forced = TRUE) - -// Called when the network connectivity fails. Computer does necessary checks and only calls this when requires_ntnet_feature and similar variables are not met. -/datum/computer_file/program/proc/event_networkfailure(background) - kill_program(forced = TRUE) - if(background) - computer.visible_message("\The [computer]'s screen displays an \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error") - else - computer.visible_message("\The [computer]'s screen briefly freezes and then shows \"NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.\" error.") diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm deleted file mode 100644 index f6bc293db7d..00000000000 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ /dev/null @@ -1,103 +0,0 @@ -/datum/computer_file/program/ntnet_dos - filename = "ntn_dos" - filedesc = "DoS Traffic Generator" - program_icon_state = "hostile" - extended_desc = "This advanced script can perform denial of service attacks against NTNet quantum relays. The system administrator will probably notice this. Multiple devices can run this program together against same relay for increased effect" - size = 20 - requires_ntnet = 1 - available_on_ntnet = 0 - available_on_syndinet = 1 - var/obj/machinery/ntnet_relay/target = null - var/dos_speed = 0 - var/error = "" - var/executed = 0 - -/datum/computer_file/program/ntnet_dos/process_tick() - dos_speed = 0 - switch(ntnet_status) - if(1) - dos_speed = NTNETSPEED_LOWSIGNAL * 10 - if(2) - dos_speed = NTNETSPEED_HIGHSIGNAL * 10 - if(3) - dos_speed = NTNETSPEED_ETHERNET * 10 - if(target && executed) - target.dos_overload += dos_speed - if(target.inoperable()) - target.dos_sources.Remove(src) - target = null - error = "Connection to destination relay lost." - -/datum/computer_file/program/ntnet_dos/kill_program(forced = FALSE) - if(target) - target.dos_sources.Remove(src) - target = null - executed = 0 - ..() - -/datum/computer_file/program/ntnet_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ntnet_dos.tmpl", "DoS Traffic Generator", 575, 250) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - - -/datum/computer_file/program/ntnet_dos/Topic(href, list/href_list) - if(..()) - return 1 - switch(href_list["action"]) - if("PRG_target_relay") - for(var/obj/machinery/ntnet_relay/R in GLOB.ntnet_global.relays) - if("[R.uid]" == href_list["targid"]) - target = R - return 1 - if("PRG_reset") - if(target) - target.dos_sources.Remove(src) - target = null - executed = 0 - error = "" - return 1 - if("PRG_execute") - if(target) - executed = 1 - target.dos_sources.Add(src) - if(GLOB.ntnet_global.intrusion_detection_enabled) - var/obj/item/computer_hardware/network_card/network_card = computer.all_components[MC_NET] - GLOB.ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [network_card.get_network_tag()]") - GLOB.ntnet_global.intrusion_detection_alarm = 1 - return 1 - -/datum/computer_file/program/ntnet_dos/ui_data(mob/user) - if(!GLOB.ntnet_global) - return - - var/list/data = get_header_data() - - if(error) - data["error"] = error - else if(target && executed) - data["target"] = 1 - data["speed"] = dos_speed - - // This is mostly visual, generate some strings of 1s and 0s - // Probability of 1 is equal of completion percentage of DoS attack on this relay. - // Combined with UI updates this adds quite nice effect to the UI - var/percentage = target.dos_overload * 100 / target.dos_capacity - data["dos_strings"] = list() - for(var/j, j<10, j++) - var/string = "" - for(var/i, i<20, i++) - string = "[string][prob(percentage)]" - data["dos_strings"] += list(list("nums" = string)) - else - data["relays"] = list() - for(var/obj/machinery/ntnet_relay/R in GLOB.ntnet_global.relays) - data["relays"] += list(list("id" = R.uid)) - data["focus"] = target ? target.uid : null - - return data diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm deleted file mode 100644 index 42f722af799..00000000000 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ /dev/null @@ -1,74 +0,0 @@ -/datum/computer_file/program/revelation - filename = "revelation" - filedesc = "Revelation" - program_icon_state = "hostile" - extended_desc = "This virus can destroy hard drive of system it is executed on. It may be obfuscated to look like another non-malicious program. Once armed, it will destroy the system upon next execution." - size = 13 - requires_ntnet = 0 - available_on_ntnet = 0 - available_on_syndinet = 1 - var/armed = 0 - -/datum/computer_file/program/revelation/run_program(var/mob/living/user) - . = ..(user) - if(armed) - activate() - -/datum/computer_file/program/revelation/proc/activate() - if(computer) - computer.visible_message("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.") - computer.enabled = 0 - computer.update_icon() - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - var/obj/item/computer_hardware/battery/battery_module = computer.all_components[MC_CELL] - var/obj/item/computer_hardware/recharger/recharger = computer.all_components[MC_CHARGE] - qdel(hard_drive) - computer.take_damage(25, BRUTE, 0, 0) - if(battery_module && prob(25)) - qdel(battery_module) - computer.visible_message("\The [computer]'s battery explodes in rain of sparks.") - do_sparks(5, 0, computer.loc) - - if(recharger && prob(50)) - qdel(recharger) - computer.visible_message("\The [computer]'s recharger explodes in rain of sparks.") - do_sparks(5, 0, computer.loc) - - -/datum/computer_file/program/revelation/Topic(href, list/href_list) - if(..()) - return 1 - switch(href_list["action"]) - if("PRG_arm") - armed = !armed - if("PRG_activate") - activate() - if("PRG_obfuscate") - var/mob/living/user = usr - var/newname = sanitize(input(user, "Enter new program name: ")) - if(!newname) - return - filedesc = newname - - -/datum/computer_file/program/revelation/clone() - var/datum/computer_file/program/revelation/temp = ..() - temp.armed = armed - return temp - -/datum/computer_file/program/revelation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "revelation.tmpl", "Revelation Virus", 575, 250) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - -/datum/computer_file/program/revelation/ui_data(mob/user) - var/list/data = get_header_data() - - data["armed"] = armed - - return data diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm deleted file mode 100644 index cae4b5ed2e2..00000000000 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ /dev/null @@ -1,493 +0,0 @@ -/datum/computer_file/program/card_mod - filename = "cardmod" - filedesc = "ID card modification program" - program_icon_state = "id" - extended_desc = "Program for programming employee ID cards to access parts of the station." - transfer_access = ACCESS_CHANGE_IDS - requires_ntnet = 0 - size = 8 - var/is_centcom = 0 - var/mode = 0 - var/printing = 0 - - //Cooldown for closing positions in seconds - //if set to -1: No cooldown... probably a bad idea - //if set to 0: Not able to close "original" positions. You can only close positions that you have opened before - var/change_position_cooldown = 60 - //Jobs you cannot open new positions for - var/list/blacklisted = list( - /datum/job/ai, - /datum/job/cyborg, - /datum/job/captain, - /datum/job/hop, - /datum/job/hos, - /datum/job/chief_engineer, - /datum/job/rd, - /datum/job/cmo, - /datum/job/judge, - /datum/job/blueshield, - /datum/job/nanotrasenrep, - /datum/job/pilot, - /datum/job/brigdoc, - /datum/job/mechanic, - /datum/job/barber, - /datum/job/chaplain, - /datum/job/ntnavyofficer, - /datum/job/ntspecops, - /datum/job/civilian, - /datum/job/syndicateofficer, - /datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work - ) - - //The scaling factor of max total positions in relation to the total amount of people on board the station in % - var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players - - //This is used to keep track of opened positions for jobs to allow instant closing - //Assoc array: "JobName" = (int)
Crew Manifest
[GLOB.data_core ? GLOB.data_core.get_manifest(0) : ""]" - else if(modify && !mode) - title = "access report" - content = {"
Access Report
- Prepared By: [scan && scan.registered_name ? scan.registered_name : "Unknown"]- For: [modify.registered_name ? modify.registered_name : "Unregistered"]
-
- Assignment: [modify.assignment]
- Account Number: #[modify.associated_account_number]
- Blood Type: [modify.blood_type]
- Access:
"}
-
- var/first = 1
- for(var/A in modify.access)
- content += "[first ? "" : ", "][get_access_desc(A)]"
- first = 0
- content += "
"
-
- if(content)
- if(!printer.print_text(content, title))
- to_chat(user, "Hardware error: Printer was unable to print the file. It may be out of paper.")
- return 1
- else
- computer.visible_message("\The [computer] prints out paper.")
-
- if("PRG_terminate")
- if(is_authenticated(usr))
- var/jobnamedata = modify.getRankAndAssignment()
- var/reason = sanitize(copytext(input("Enter legal reason for termination. Enter nothing to cancel.", "Employment Termination"), 1, MAX_MESSAGE_LEN))
- if(!reason || !is_authenticated(usr) || !modify)
- return
- log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\" for: \"[reason]\".")
- message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\" for: \"[reason]\".")
- usr.create_log(MISC_LOG, "terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\"")
- SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Terminated", scan.registered_name)
- SSjobs.notify_dept_head(modify.rank, "[scan.registered_name] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\" for \"[reason]\".")
- modify.assignment = "Terminated"
- modify.access = list()
-
- if("PRG_make_job_available")
- // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
- if(is_authenticated(usr))
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjobs.GetJob(edit_job_target)
- if(!j)
- return 1
- if(can_open_job(j) != 1)
- return 1
- if(opened_positions[edit_job_target] >= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions++
- opened_positions[edit_job_target]++
- log_game("[key_name(usr)] has opened a job slot for job \"[j]\".")
-
- if("PRG_make_job_unavailable")
- // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
- if(is_authenticated(usr))
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjobs.GetJob(edit_job_target)
- if(!j)
- return 1
- if(can_close_job(j) != 1)
- return 1
- //Allow instant closing without cooldown if a position has been opened before
- if(opened_positions[edit_job_target] <= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions--
- opened_positions[edit_job_target]--
- log_game("[key_name(usr)] has closed a job slot for job \"[j]\".")
-
-
- if("PRG_prioritize_job")
- // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
- if(is_authenticated(usr))
- var/priority_target = href_list["job"]
- var/datum/job/j = SSjobs.GetJob(priority_target)
- if(!j)
- return 0
- // Unlike the proper ID computer, this does not check job_in_department
- var/priority = TRUE
- if(j in SSjobs.prioritized_jobs)
- SSjobs.prioritized_jobs -= j
- priority = FALSE
- else if(SSjobs.prioritized_jobs.len < 3)
- SSjobs.prioritized_jobs += j
- else
- return 0
- log_game("[key_name(usr)] [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".")
- playsound(computer.loc, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
- if(modify)
- modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
-
- SSnanoui.update_uis(src)
- return 1
-
-/datum/computer_file/program/card_mod/ui_data(mob/user)
- var/list/data = get_header_data()
-
- var/obj/item/card/id/modify = null
- var/obj/item/card/id/scan = null
-
- var/obj/item/computer_hardware/card_slot/card_slot
- var/obj/item/computer_hardware/printer/printer
- if(computer)
- card_slot = computer.all_components[MC_CARD]
- printer = computer.all_components[MC_PRINT]
- if(card_slot)
- modify = card_slot.stored_card
- scan = card_slot.stored_card2
-
- data["src"] = UID()
- data["station_name"] = station_name()
- data["mode"] = mode
- data["printing"] = printing
- data["printer"] = printer ? TRUE : FALSE
- data["manifest"] = GLOB.data_core ? GLOB.data_core.get_manifest(0) : null
- data["target_name"] = modify ? modify.name : "-----"
- data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----"
- data["target_rank"] = get_target_rank()
- data["scan_name"] = scan ? scan.name : "-----"
- data["scan_owner"] = scan && scan.registered_name ? scan.registered_name : null
- data["authenticated"] = is_authenticated(user)
- data["has_modify"] = !!modify
- data["account_number"] = modify ? modify.associated_account_number : null
- data["centcom_access"] = is_centcom
- data["all_centcom_access"] = null
- data["regions"] = null
-
- var/list/job_formats = SSjobs.format_jobs_for_id_computer(modify)
-
- data["top_jobs"] = format_jobs(list("Captain", "Custom"), data["target_rank"], job_formats)
- data["engineering_jobs"] = format_jobs(GLOB.engineering_positions, data["target_rank"], job_formats)
- data["medical_jobs"] = format_jobs(GLOB.medical_positions, data["target_rank"], job_formats)
- data["science_jobs"] = format_jobs(GLOB.science_positions, data["target_rank"], job_formats)
- data["security_jobs"] = format_jobs(GLOB.security_positions, data["target_rank"], job_formats)
- data["support_jobs"] = format_jobs(GLOB.support_positions, data["target_rank"], job_formats)
- data["civilian_jobs"] = format_jobs(GLOB.civilian_positions, data["target_rank"], job_formats)
- data["special_jobs"] = format_jobs(GLOB.whitelisted_positions, data["target_rank"], job_formats)
- data["centcom_jobs"] = format_jobs(get_all_centcom_jobs(), data["target_rank"], job_formats)
- data["card_skins"] = format_card_skins(get_station_card_skins())
-
- data["job_slots"] = format_job_slots()
-
- var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
- var/mins = round(time_to_wait / 60)
- var/seconds = time_to_wait - (60*mins)
- data["cooldown_mins"] = mins
- data["cooldown_secs"] = (seconds < 10) ? "0[seconds]" : seconds
-
- if(mode == 3 && is_authenticated(user))
- data["id_change_html"] = SSjobs.fetch_transfer_record_html(is_centcom)
-
- if(modify)
- data["current_skin"] = modify.icon_state
-
- if(modify && is_centcom)
- var/list/all_centcom_access = list()
- for(var/access in get_all_centcom_access())
- all_centcom_access.Add(list(list(
- "desc" = replacetext(get_centcom_access_desc(access), " ", " "),
- "ref" = access,
- "allowed" = (access in modify.access) ? 1 : 0)))
-
- data["all_centcom_access"] = all_centcom_access
- data["all_centcom_skins"] = format_card_skins(get_centcom_card_skins())
-
- else if(modify)
- var/list/regions = list()
- for(var/i = 1; i <= 7; i++)
- var/list/accesses = list()
- for(var/access in get_region_accesses(i))
- if(get_access_desc(access))
- accesses.Add(list(list(
- "desc" = replacetext(get_access_desc(access), " ", " "),
- "ref" = access,
- "allowed" = (access in modify.access) ? 1 : 0)))
-
- regions.Add(list(list(
- "name" = get_region_accesses_name(i),
- "accesses" = accesses)))
-
- data["regions"] = regions
-
- return data
diff --git a/code/modules/modular_computers/file_system/programs/command/comms.dm b/code/modules/modular_computers/file_system/programs/command/comms.dm
deleted file mode 100644
index c23f0c9e3c7..00000000000
--- a/code/modules/modular_computers/file_system/programs/command/comms.dm
+++ /dev/null
@@ -1,385 +0,0 @@
-/datum/computer_file/program/comm
- filename = "comm"
- filedesc = "Command and communications"
- program_icon_state = "comm"
- extended_desc = "Used to command and control the station. Can relay long-range communications. This program can not be run on tablet computers."
- required_access = ACCESS_HEADS
- requires_ntnet = 1
- size = 12
- usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
- network_destination = "station long-range communication array"
-
- var/authenticated = COMM_AUTHENTICATION_NONE
- var/list/messagetitle = list()
- var/list/messagetext = list()
- var/currmsg = 0
- var/aicurrmsg = 0
- var/menu_state = COMM_SCREEN_MAIN
- var/ai_menu_state = COMM_SCREEN_MAIN
- var/message_cooldown = 0
- var/centcomm_message_cooldown = 0
- var/tmp_alertlevel = 0
-
- var/stat_msg1
- var/stat_msg2
- var/display_type="blank"
-
- var/datum/announcement/priority/crew_announcement = new
-
-/datum/computer_file/program/comm/New()
- GLOB.shuttle_caller_list += src
- ..()
- crew_announcement.newscast = 0
-
-/datum/computer_file/program/comm/Destroy()
- GLOB.shuttle_caller_list -= src
- SSshuttle.autoEvac()
- return ..()
-
-/datum/computer_file/program/comm/proc/is_authenticated(mob/user, loud = 1)
- if(authenticated == COMM_AUTHENTICATION_MAX)
- return COMM_AUTHENTICATION_MAX
- else if(user.can_admin_interact())
- return COMM_AUTHENTICATION_MAX
- else if(authenticated)
- return COMM_AUTHENTICATION_MIN
- else
- if(loud)
- to_chat(user, "Access denied.")
- return COMM_AUTHENTICATION_NONE
-
-/datum/computer_file/program/comm/proc/change_security_level(mob/user, new_level)
- tmp_alertlevel = new_level
- var/old_level = GLOB.security_level
- if(!tmp_alertlevel)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel < SEC_LEVEL_GREEN)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel > SEC_LEVEL_BLUE)
- tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
- set_security_level(tmp_alertlevel)
- if(GLOB.security_level != old_level)
- log_game("[key_name(user)] has changed the security level to [get_security_level()].")
- message_admins("[key_name_admin(user)] has changed the security level to [get_security_level()].")
- switch(GLOB.security_level)
- if(SEC_LEVEL_GREEN)
- feedback_inc("alert_comms_green", 1)
- if(SEC_LEVEL_BLUE)
- feedback_inc("alert_comms_blue", 1)
- tmp_alertlevel = 0
-
-/datum/computer_file/program/comm/proc/setCurrentMessage(mob/user, value)
- if(isAI(user) || isrobot(user))
- aicurrmsg = value
- else
- currmsg = value
-
-/datum/computer_file/program/comm/proc/getCurrentMessage(mob/user)
- if(isAI(user) || isrobot(user))
- return aicurrmsg
- else
- return currmsg
-
-/datum/computer_file/program/comm/proc/setMenuState(mob/user, value)
- if(isAI(user) || isrobot(user))
- ai_menu_state=value
- else
- menu_state=value
-
-/datum/computer_file/program/comm/proc/getMenuState(mob/user)
- if(isAI(user) || isrobot(user))
- return ai_menu_state
- else
- return menu_state
-
-/datum/computer_file/program/comm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "comm_program.tmpl", "Command and communications program", 575, 500)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/comm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
- var/list/data = get_header_data()
- data["is_ai"] = isAI(user) || isrobot(user)
- data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state
- data["emagged"] = computer ? computer.emagged : null
- data["authenticated"] = is_authenticated(user, 0)
- data["screen"] = getMenuState(usr)
-
- data["stat_display"] = list(
- "type" = display_type,
- "line_1" = (stat_msg1 ? stat_msg1 : "-----"),
- "line_2" = (stat_msg2 ? stat_msg2 : "-----"),
-
- "presets" = list(
- list("name" = "blank", "label" = "Clear", "desc" = "Blank slate"),
- list("name" = "shuttle", "label" = "Shuttle ETA", "desc" = "Display how much time is left."),
- list("name" = "message", "label" = "Message", "desc" = "A custom message.")
- ),
-
- "alerts"=list(
- list("alert" = "default", "label" = "Nanotrasen", "desc" = "Oh god."),
- list("alert" = "redalert", "label" = "Red Alert", "desc" = "Nothing to do with communists."),
- list("alert" = "lockdown", "label" = "Lockdown", "desc" = "Let everyone know they're on lockdown."),
- list("alert" = "biohazard", "label" = "Biohazard", "desc" = "Great for virus outbreaks and parties."),
- )
- )
-
- data["security_level"] = GLOB.security_level
- data["str_security_level"] = capitalize(get_security_level())
- data["levels"] = list(
- list("id" = SEC_LEVEL_GREEN, "name" = "Green"),
- list("id" = SEC_LEVEL_BLUE, "name" = "Blue"),
- )
-
- var/list/msg_data = list()
- for(var/i = 1; i <= messagetext.len; i++)
- msg_data.Add(list(list("title" = messagetitle[i], "body" = messagetext[i], "id" = i)))
-
- data["messages"] = msg_data
- if((data["is_ai"] && aicurrmsg) || (!data["is_ai"] && currmsg))
- data["current_message"] = data["is_ai"] ? messagetext[aicurrmsg] : messagetext[currmsg]
- data["current_message_title"] = data["is_ai"] ? messagetitle[aicurrmsg] : messagetitle[currmsg]
-
- data["lastCallLoc"] = SSshuttle.emergencyLastCallLoc ? format_text(SSshuttle.emergencyLastCallLoc.name) : null
-
- var/shuttle[0]
- switch(SSshuttle.emergency.mode)
- if(SHUTTLE_IDLE, SHUTTLE_RECALL)
- shuttle["callStatus"] = 2 //#define
- else
- shuttle["callStatus"] = 1
- if(SSshuttle.emergency.mode == SHUTTLE_CALL)
- var/timeleft = SSshuttle.emergency.timeLeft()
- shuttle["eta"] = "[timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]"
-
- data["shuttle"] = shuttle
-
- return data
-
-/datum/computer_file/program/comm/Topic(href, href_list)
- if(..())
- return 1
-
- var/turf/T = get_turf(computer)
- if(!is_secure_level(T.z))
- to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
- return 1
-
- if(href_list["PRG_login"])
- if(!ishuman(usr))
- to_chat(usr, "Access denied.")
- return
-
- var/list/access = usr.get_access()
- if(ACCESS_HEADS in access)
- authenticated = COMM_AUTHENTICATION_MIN
-
- if(ACCESS_CAPTAIN in access)
- authenticated = COMM_AUTHENTICATION_MAX
- var/mob/living/carbon/human/H = usr
- var/obj/item/card/id = H.get_idcard(TRUE)
- if(istype(id))
- crew_announcement.announcer = GetNameAndAssignmentFromId(id)
-
- SSnanoui.update_uis(src)
- return 1
-
- if(href_list["PRG_logout"])
- authenticated = COMM_AUTHENTICATION_NONE
- crew_announcement.announcer = ""
- setMenuState(usr, COMM_SCREEN_MAIN)
- SSnanoui.update_uis(src)
- return 1
-
- if(is_authenticated(usr))
- switch(href_list["PRG_operation"])
- if("main")
- setMenuState(usr, COMM_SCREEN_MAIN)
-
- if("changeseclevel")
- setMenuState(usr,COMM_SCREEN_SECLEVEL)
-
- if("newalertlevel")
- if(isAI(usr) || isrobot(usr))
- to_chat(usr, "Firewalls prevent you from changing the alert level.")
- return 1
- else if(usr.can_admin_interact())
- change_security_level(usr, text2num(href_list["level"]))
- return 1
- else if(!ishuman(usr))
- to_chat(usr, "Security measures prevent you from changing the alert level.")
- return 1
-
- var/mob/living/carbon/human/L = usr
- var/obj/item/card = L.get_active_hand()
- var/obj/item/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda
- if(istype(I, /obj/item/pda))
- var/obj/item/pda/pda = I
- I = pda.id
- if(I && istype(I))
- if(ACCESS_CAPTAIN in I.access)
- change_security_level(usr, text2num(href_list["level"]))
- else
- to_chat(usr, "You are not authorized to do this.")
- setMenuState(usr, COMM_SCREEN_MAIN)
- else
- to_chat(usr, "You need to swipe your ID.")
-
- if("announce")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
- if(message_cooldown)
- to_chat(usr, "Please allow at least one minute to pass between announcements.")
- SSnanoui.update_uis(src)
- return 1
- var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
- if(!input || message_cooldown || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
- SSnanoui.update_uis(src)
- return 1
- crew_announcement.Announce(input)
- message_cooldown = 1
- spawn(600)//One minute cooldown
- message_cooldown = 0
-
- if("callshuttle")
- var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","")
- if(!input || ..() || !is_authenticated(usr))
- SSnanoui.update_uis(src)
- return 1
-
- call_shuttle_proc(usr, input)
- if(SSshuttle.emergency.timer)
- post_status("shuttle")
- setMenuState(usr, COMM_SCREEN_MAIN)
-
- if("cancelshuttle")
- if(isAI(usr) || isrobot(usr))
- to_chat(usr, "Firewalls prevent you from recalling the shuttle.")
- SSnanoui.update_uis(src)
- return 1
- var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No")
- if(response == "Yes")
- cancel_call_proc(usr)
- if(SSshuttle.emergency.timer)
- post_status("shuttle")
- setMenuState(usr, COMM_SCREEN_MAIN)
-
- if("messagelist")
- currmsg = 0
- if(href_list["msgid"])
- setCurrentMessage(usr, text2num(href_list["msgid"]))
- setMenuState(usr,COMM_SCREEN_MESSAGES)
-
- if("delmessage")
- if(href_list["msgid"])
- currmsg = text2num(href_list["msgid"])
- var/response = alert("Are you sure you wish to delete this message?", "Confirm", "Yes", "No")
- if(response == "Yes")
- if(currmsg)
- var/id = getCurrentMessage()
- var/title = messagetitle[id]
- var/text = messagetext[id]
- messagetitle.Remove(title)
- messagetext.Remove(text)
- if(currmsg == id)
- currmsg = 0
- if(aicurrmsg == id)
- aicurrmsg = 0
- setMenuState(usr,COMM_SCREEN_MESSAGES)
-
- if("status")
- setMenuState(usr,COMM_SCREEN_STAT)
-
- // Status display stuff
- if("setstat")
- display_type=href_list["statdisp"]
- switch(display_type)
- if("message")
- post_status("message", stat_msg1, stat_msg2, usr)
- if("alert")
- post_status("alert", href_list["alert"], user = usr)
- else
- post_status(href_list["statdisp"], user = usr)
- setMenuState(usr, COMM_SCREEN_STAT)
-
- if("setmsg1")
- stat_msg1 = clean_input("Line 1", "Enter Message Text", stat_msg1)
- setMenuState(usr, COMM_SCREEN_STAT)
-
- if("setmsg2")
- stat_msg2 = clean_input("Line 2", "Enter Message Text", stat_msg2)
- setMenuState(usr, COMM_SCREEN_STAT)
-
- if("nukerequest")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
- if(centcomm_message_cooldown)
- to_chat(usr, "Arrays recycling. Please stand by.")
- SSnanoui.update_uis(src)
- return 1
- var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
- SSnanoui.update_uis(src)
- return 1
- Nuke_request(input, usr)
- to_chat(usr, "Request sent.")
- log_game("[key_name(usr)] has requested the nuclear codes from Centcomm")
- GLOB.priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg')
- centcomm_message_cooldown = 1
- spawn(6000)//10 minute cooldown
- centcomm_message_cooldown = 0
- setMenuState(usr,COMM_SCREEN_MAIN)
-
- if("MessageCentcomm")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
- if(centcomm_message_cooldown)
- to_chat(usr, "Arrays recycling. Please stand by.")
- SSnanoui.update_uis(src)
- return 1
- var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
- SSnanoui.update_uis(src)
- return 1
- Centcomm_announce(input, usr)
- to_chat(usr, "Message transmitted.")
- log_game("[key_name(usr)] has made a Centcomm announcement: [input]")
- centcomm_message_cooldown = 1
- spawn(6000)//10 minute cooldown
- centcomm_message_cooldown = 0
- setMenuState(usr,COMM_SCREEN_MAIN)
-
- // OMG SYNDICATE ...LETTERHEAD
- if("MessageSyndicate")
- if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (computer && computer.emagged))
- if(centcomm_message_cooldown)
- to_chat(usr, "Arrays recycling. Please stand by.")
- SSnanoui.update_uis(src)
- return 1
- var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
- SSnanoui.update_uis(src)
- return 1
- Syndicate_announce(input, usr)
- to_chat(usr, "Message transmitted.")
- log_game("[key_name(usr)] has made a Syndicate announcement: [input]")
- centcomm_message_cooldown = 1
- spawn(6000)//10 minute cooldown
- centcomm_message_cooldown = 0
- setMenuState(usr,COMM_SCREEN_MAIN)
-
- if("RestartNanoMob")
- if(SSmob_hunt)
- if(SSmob_hunt.manual_reboot())
- var/loading_msg = pick("Respawning spawns", "Reticulating splines", "Flipping hat",
- "Capturing all of them", "Fixing minor text issues", "Being the very best",
- "Nerfing this", "Not communicating with playerbase", "Coding a ripoff in a 2D spaceman game")
- to_chat(usr, "Restarting Nano-Mob Hunter GO! game server. [loading_msg]...")
- else
- to_chat(usr, "Nano-Mob Hunter GO! game server reboot failed due to recent restart. Please wait before re-attempting.")
- else
- to_chat(usr, "Nano-Mob Hunter GO! game server is offline for extended maintenance. Contact your Central Command administrators for more info if desired.")
-
- SSnanoui.update_uis(src)
- return 1
diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
deleted file mode 100644
index 8cb47337a6d..00000000000
--- a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
+++ /dev/null
@@ -1,71 +0,0 @@
-/datum/computer_file/program/alarm_monitor
- filename = "alarmmonitor"
- filedesc = "Alarm Monitoring"
- ui_header = "alarm_green.gif"
- program_icon_state = "alert-green"
- extended_desc = "This program provides visual interface for station's alarm system."
- requires_ntnet = 1
- network_destination = "alarm monitoring network"
- size = 5
- var/list/datum/alarm_handler/alarm_handlers
-
-/datum/computer_file/program/alarm_monitor/New()
- ..()
- alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.fire_alarm, SSalarms.power_alarm)
- for(var/datum/alarm_handler/AH in alarm_handlers)
- AH.register(src, /datum/computer_file/program/alarm_monitor/proc/update_icon)
-
-/datum/computer_file/program/alarm_monitor/Destroy()
- for(var/datum/alarm_handler/AH in alarm_handlers)
- AH.unregister(src)
- QDEL_NULL(alarm_handlers)
- return ..()
-
-/datum/computer_file/program/alarm_monitor/proc/update_icon()
- for(var/datum/alarm_handler/AH in alarm_handlers)
- if(AH.has_major_alarms())
- program_icon_state = "alert-red"
- ui_header = "alarm_red.gif"
- update_computer_icon()
- return 1
- program_icon_state = "alert-green"
- ui_header = "alarm_green.gif"
- update_computer_icon()
- return 0
-
-/datum/computer_file/program/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring", 575, 700)
- ui.set_auto_update(1)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/alarm_monitor/ui_data(mob/user)
- var/list/data = get_header_data()
-
- var/categories[0]
- for(var/datum/alarm_handler/AH in alarm_handlers)
- categories[++categories.len] = list("category" = AH.category, "alarms" = list())
- for(var/datum/alarm/A in AH.major_alarms())
- var/cameras[0]
- var/lost_sources[0]
-
- if(isAI(user))
- for(var/obj/machinery/camera/C in A.cameras())
- cameras[++cameras.len] = C.nano_structure()
- for(var/datum/alarm_source/AS in A.sources)
- if(!AS.source)
- lost_sources[++lost_sources.len] = AS.source_name
-
- categories[categories.len]["alarms"] += list(list(
- "name" = sanitize(A.alarm_name()),
- "origin_lost" = A.origin == null,
- "has_cameras" = cameras.len,
- "cameras" = cameras,
- "lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : ""))
- data["categories"] = categories
-
- return data
diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
deleted file mode 100644
index 0763d527345..00000000000
--- a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/datum/computer_file/program/power_monitor
- filename = "powermonitor"
- filedesc = "Power Monitoring"
- program_icon_state = "power_monitor"
- extended_desc = "This program connects to sensors around the station to provide information about electrical systems"
- ui_header = "power_norm.gif"
- transfer_access = ACCESS_ENGINE
- usage_flags = PROGRAM_CONSOLE
- requires_ntnet = 0
- network_destination = "power monitoring system"
- size = 9
- var/obj/structure/cable/attached
-
-/datum/computer_file/program/power_monitor/run_program(mob/living/user)
- . = ..(user)
- search()
-
-/datum/computer_file/program/power_monitor/process_tick()
- if(!attached)
- search()
-
-/datum/computer_file/program/power_monitor/proc/search()
- var/turf/T = get_turf(computer)
- attached = locate() in T
-
-/datum/computer_file/program/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "power_monitor.tmpl", "Alarm Monitoring", 800, 700)
- ui.set_auto_update(1)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/power_monitor/ui_data()
- var/list/data = get_header_data()
-
- data["powermonitor"] = attached ? TRUE : FALSE
-
- if(attached)
- var/datum/powernet/powernet = attached.powernet
- data["poweravail"] = powernet.avail
- data["powerload"] = powernet.viewload
- data["powerdemand"] = powernet.load
- data["apcs"] = GLOB.apc_repository.apc_data(powernet)
-
- return data
diff --git a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm
deleted file mode 100644
index 0045b36f30e..00000000000
--- a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm
+++ /dev/null
@@ -1,137 +0,0 @@
-/datum/computer_file/program/supermatter_monitor
- filename = "smmonitor"
- filedesc = "Supermatter Monitoring"
- ui_header = "smmon_0.gif"
- program_icon_state = "smmon_0"
- extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines."
- requires_ntnet = TRUE
- transfer_access = ACCESS_CONSTRUCTION
- network_destination = "supermatter monitoring system"
- size = 5
- var/last_status = SUPERMATTER_INACTIVE
- var/list/supermatters
- var/obj/machinery/power/supermatter_shard/active // Currently selected supermatter crystal.
-
-
-/datum/computer_file/program/supermatter_monitor/process_tick()
- ..()
- var/new_status = get_status()
- if(last_status != new_status)
- last_status = new_status
- if(last_status == SUPERMATTER_ERROR)
- last_status = SUPERMATTER_INACTIVE
- ui_header = "smmon_[last_status].gif"
- program_icon_state = "smmon_[last_status]"
- if(istype(computer))
- computer.update_icon()
-
-/datum/computer_file/program/supermatter_monitor/run_program(mob/living/user)
- . = ..(user)
- refresh()
-
-/datum/computer_file/program/supermatter_monitor/kill_program(forced = FALSE)
- active = null
- supermatters = null
- ..()
-
-// Refreshes list of active supermatter crystals
-/datum/computer_file/program/supermatter_monitor/proc/refresh()
- supermatters = list()
- var/turf/T = get_turf(nano_host())
- if(!T)
- return
- for(var/obj/machinery/power/supermatter_shard/S in SSair.atmos_machinery)
- // Delaminating, not within coverage, not on a tile.
- if(!(is_station_level(S.z) || is_mining_level(S.z) || atoms_share_level(S, T) || !istype(S.loc, /turf/simulated/)))
- continue
- supermatters.Add(S)
-
- if(!(active in supermatters))
- active = null
-
-/datum/computer_file/program/supermatter_monitor/proc/get_status()
- . = SUPERMATTER_INACTIVE
- for(var/obj/machinery/power/supermatter_shard/S in supermatters)
- . = max(., S.get_status())
-
-/datum/computer_file/program/supermatter_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "supermatter_monitor.tmpl", "Supermatter Monitoring", 600, 400)
- ui.set_auto_update(TRUE)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/supermatter_monitor/ui_data()
- var/list/data = get_header_data()
-
- if(istype(active))
- var/turf/T = get_turf(active)
- if(!T)
- active = null
- refresh()
- return
- var/datum/gas_mixture/air = T.return_air()
- if(!air)
- active = null
- return
-
- data["active"] = TRUE
- data["SM_integrity"] = active.get_integrity()
- data["SM_power"] = active.power
- data["SM_ambienttemp"] = air.temperature
- data["SM_ambientpressure"] = air.return_pressure()
- //data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
- var/other_moles = air.total_trace_moles()
- var/TM = air.total_moles()
- if(TM)
- data["SM_gas_O2"] = round(100*air.oxygen/TM,0.01)
- data["SM_gas_CO2"] = round(100*air.carbon_dioxide/TM,0.01)
- data["SM_gas_N2"] = round(100*air.nitrogen/TM,0.01)
- data["SM_gas_PL"] = round(100*air.toxins/TM,0.01)
- if(other_moles)
- data["SM_gas_OTHER"] = round(100 * other_moles / TM, 0.01)
- else
- data["SM_gas_OTHER"] = 0
- else
- data["SM_gas_O2"] = 0
- data["SM_gas_CO2"] = 0
- data["SM_gas_N2"] = 0
- data["SM_gas_PH"] = 0
- data["SM_gas_OTHER"] = 0
- else
- var/list/SMS = list()
- for(var/obj/machinery/power/supermatter_shard/S in supermatters)
- var/area/A = get_area(S)
- if(!A)
- continue
-
- SMS.Add(list(list(
- "area_name" = A.name,
- "integrity" = S.get_integrity(),
- "uid" = S.uid
- )))
-
- data["active"] = FALSE
- data["supermatters"] = SMS
-
- return data
-
-
-/datum/computer_file/program/supermatter_monitor/Topic(href, href_list)
- if(..())
- return TRUE
- if(href_list["clear"])
- active = null
- return TRUE
- if(href_list["refresh"])
- refresh()
- return TRUE
- if(href_list["set"])
- var/newuid = text2num(href_list["set"])
- for(var/obj/machinery/power/supermatter_shard/S in supermatters)
- if(S.uid == newuid)
- active = S
- return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm
deleted file mode 100644
index 70ce4656b9c..00000000000
--- a/code/modules/modular_computers/file_system/programs/generic/configurator.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-// This is special hardware configuration program.
-// It is to be used only with modular computers.
-// It allows you to toggle components of your device.
-
-/datum/computer_file/program/computerconfig
- filename = "compconfig"
- filedesc = "Computer Configuration Tool"
- extended_desc = "This program allows configuration of computer's hardware"
- program_icon_state = "generic"
- unsendable = 1
- undeletable = 1
- size = 4
- available_on_ntnet = 0
- requires_ntnet = 0
-
-
-/datum/computer_file/program/computerconfig/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700)
- ui.set_auto_update(1)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/computerconfig/ui_data(mob/user)
- var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
- var/obj/item/computer_hardware/battery/battery_module = computer.all_components[MC_CELL]
-
- var/list/data = get_header_data()
-
- data["disk_size"] = hard_drive.max_capacity
- data["disk_used"] = hard_drive.used_capacity
- data["power_usage"] = computer.last_power_usage
- data["battery_exists"] = battery_module ? 1 : 0
- if(battery_module && battery_module.battery)
- data["battery_rating"] = battery_module.battery.maxcharge
- data["battery_percent"] = round(battery_module.battery.percent())
- data["eta"] = computer.get_power_eta()
-
- if(battery_module && battery_module.battery)
- data["battery"] = list("max" = battery_module.battery.maxcharge, "charge" = round(battery_module.battery.charge))
-
- var/list/all_entries[0]
- for(var/I in computer.all_components)
- var/obj/item/computer_hardware/H = computer.all_components[I]
- all_entries.Add(list(list(
- "name" = H.name,
- "desc" = H.desc,
- "enabled" = H.enabled,
- "critical" = H.critical,
- "powerusage" = H.power_usage
- )))
-
- data["hardware"] = all_entries
- return data
-
-
-/datum/computer_file/program/computerconfig/Topic(href, list/href_list)
- if(..())
- return
- switch(href_list["action"])
- if("PC_toggle_component")
- var/obj/item/computer_hardware/H = computer.find_hardware_by_name(href_list["name"])
- if(H && istype(H))
- H.enabled = !H.enabled
- . = TRUE
diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
deleted file mode 100644
index e7edc437639..00000000000
--- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+++ /dev/null
@@ -1,228 +0,0 @@
-/datum/computer_file/program/filemanager
- filename = "filemanager"
- filedesc = "NTOS File Manager"
- extended_desc = "This program allows management of files."
- program_icon_state = "generic"
- size = 8
- requires_ntnet = 0
- available_on_ntnet = 0
- undeletable = 1
- var/open_file
- var/error
-
-/datum/computer_file/program/filemanager/proc/prepare_printjob(t, font = PRINTER_FONT) // Additional stuff to parse if we want to print it and make a happy Head of Personnel. Forms FTW.
- t = replacetext(t, "\[field\]", "")
- t = replacetext(t, "\[sign\]", "")
- t = pencode_to_html(t, sign = 0, fields = 0, deffont = font)
- return t
-
-/datum/computer_file/program/filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
- assets.send(user)
- ui = new(user, src, ui_key, "file_manager.tmpl", "NTOS File Manager", 575, 700)
- ui.set_auto_update(1)
- ui.set_layout_key("program")
- ui.open()
-
-/datum/computer_file/program/filemanager/ui_data(mob/user)
- var/list/data = get_header_data()
-
- var/obj/item/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
- var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.all_components[MC_SDD]
- if(error)
- data["error"] = error
- if(open_file)
- var/datum/computer_file/data/file
-
- if(!computer || !HDD)
- data["error"] = "I/O ERROR: Unable to access hard drive."
- else
- file = HDD.find_file_by_name(open_file)
- if(!istype(file))
- data["error"] = "I/O ERROR: Unable to open file."
- else
- data["filedata"] = pencode_to_html(file.stored_data, format = 1, sign = 0, fields = 0)
- data["filename"] = "[file.filename].[file.filetype]"
- else
- if(!computer || !HDD)
- data["error"] = "I/O ERROR: Unable to access hard drive."
- else
- var/list/files[0]
- for(var/datum/computer_file/F in HDD.stored_files)
- files.Add(list(list(
- "name" = F.filename,
- "type" = F.filetype,
- "size" = F.size,
- "undeletable" = F.undeletable,
- "encrypted" = !!F.password
- )))
- data["files"] = files
- if(RHDD)
- data["usbconnected"] = 1
- var/list/usbfiles[0]
- for(var/datum/computer_file/F in RHDD.stored_files)
- usbfiles.Add(list(list(
- "name" = F.filename,
- "type" = F.filetype,
- "size" = F.size,
- "undeletable" = F.undeletable,
- "encrypted" = !!F.password
- )))
- data["usbfiles"] = usbfiles
-
- return data
-
-/datum/computer_file/program/filemanager/Topic(href, list/href_list)
- if(..())
- return 1
-
- var/obj/item/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
- var/obj/item/computer_hardware/hard_drive/RHDD = computer.all_components[MC_SDD]
- var/obj/item/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
-
- switch(href_list["action"])
- if("PRG_openfile")
- . = 1
- var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"])
- if(!F.can_access_file(usr))
- return
- open_file = href_list["name"]
- if("PRG_newtextfile")
- . = 1
- var/newname = stripped_input(usr, "Enter file name or leave blank to cancel:", "File rename", max_length=50)
- if(!newname)
- return 1
- if(!HDD)
- return 1
- var/datum/computer_file/data/F = new/datum/computer_file/data()
- F.filename = newname
- F.filetype = "TXT"
- HDD.store_file(F)
- if("PRG_deletefile")
- . = 1
- if(!HDD)
- return 1
- var/datum/computer_file/file = HDD.find_file_by_name(href_list["name"])
- if(!file || file.undeletable)
- return 1
- HDD.remove_file(file)
- if("PRG_usbdeletefile")
- . = 1
- if(!RHDD)
- return 1
- var/datum/computer_file/file = RHDD.find_file_by_name(href_list["name"])
- if(!file || file.undeletable)
- return 1
- RHDD.remove_file(file)
- if("PRG_closefile")
- . = 1
- open_file = null
- error = null
- if("PRG_clone")
- . = 1
- if(!HDD)
- return 1
- var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"])
- if(!F || !istype(F))
- return 1
- var/newname = stripped_input(usr, "Enter clone file name:", "File clone", "Copy of " + F.filename, max_length=50)
- if(F && newname)
- var/datum/computer_file/C = F.clone(1)
- C.filename = newname
- if(!HDD.store_file(C))
- error = "I/O error: Unable to clone file. Hard drive is probably full."
- if("PRG_rename")
- . = 1
- if(!HDD)
- return 1
- var/datum/computer_file/file = HDD.find_file_by_name(href_list["name"])
- if(!file || !istype(file))
- return 1
- var/newname = stripped_input(usr, "Enter new file name:", "File rename", file.filename, max_length=50)
- if(file && newname)
- file.filename = newname
- if("PRG_edit")
- . = 1
- if(!open_file)
- return 1
- if(!HDD)
- return 1
- var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
- if(!F || !istype(F))
- return 1
- if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No"))
- return 1
- // 16384 is the limit for file length in characters. Currently, papers have value of 2048 so this is 8 times as long, since we can't edit parts of the file independently.
- var/newtext = stripped_multiline_input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", html_decode(F.stored_data), 16384, TRUE)
- if(!newtext)
- return
- if(F)
- var/datum/computer_file/data/backup = F.clone()
- HDD.remove_file(F)
- F = backup.clone() //When the file gets removed from the HDD, it gets queued for garbage collection. Hacky fix is to make a copy.
- F.stored_data = newtext
- F.calculate_size()
- // We can't store the updated file, it's probably too large. Print an error and restore backed up version.
- // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space.
- // They will be able to copy-paste the text from error screen and store it in notepad or something.
- if(!HDD.store_file(F))
- error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:[F.stored_data]
" - HDD.store_file(backup) - if("PRG_printfile") - . = 1 - if(!open_file) - return 1 - if(!HDD) - return 1 - var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) - if(!F || !istype(F)) - return 1 - if(!printer) - error = "Missing Hardware: Your computer does not have required hardware to complete this operation." - return 1 - if(!printer.print_text(prepare_printjob(F.stored_data, computer.emagged ? CRAYON_FONT : PRINTER_FONT), open_file)) - error = "Hardware error: Printer was unable to print the file. It may be out of paper." - return 1 - if("PRG_copytousb") - . = 1 - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - RHDD.store_file(C) - if("PRG_copyfromusb") - . = 1 - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = RHDD.find_file_by_name(href_list["name"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - HDD.store_file(C) - if("PRG_encrypt") - . = 1 - if(!HDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"]) - if(!F || F.undeletable) - return 1 - if(F.password) - return - var/new_password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File")) - if(!new_password) - to_chat(usr, "File not encrypted.") - return - F.password=new_password - if("PRG_decrypt") - . = 1 - if(!HDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"]) - if(!F || F.undeletable) - return 1 - if(F.can_access_file(usr)) - F.password = "" diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm deleted file mode 100644 index b4e5ab4674c..00000000000 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ /dev/null @@ -1,178 +0,0 @@ -/datum/computer_file/program/ntnetdownload - filename = "ntndownloader" - filedesc = "NTNet Software Download Tool" - program_icon_state = "generic" - extended_desc = "This program allows downloads of software from official NT repositories" - unsendable = 1 - undeletable = 1 - size = 4 - requires_ntnet = 1 - requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD - available_on_ntnet = 0 - ui_header = "downloader_finished.gif" - var/datum/computer_file/program/downloaded_file = null - var/hacked_download = 0 - var/download_completion = 0 //GQ of downloaded data. - var/download_netspeed = 0 - var/downloaderror = "" - var/obj/item/modular_computer/my_computer = null - -/datum/computer_file/program/ntnetdownload/proc/begin_file_download(filename) - if(downloaded_file) - return 0 - - var/datum/computer_file/program/PRG = GLOB.ntnet_global.find_ntnet_file_by_name(filename) - - if(!PRG || !istype(PRG)) - return 0 - - // Attempting to download antag only program, but without having emagged computer. No. - if(PRG.available_on_syndinet && !computer.emagged) - return 0 - - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - - if(!computer || !hard_drive || !hard_drive.can_store_file(PRG)) - return 0 - - ui_header = "downloader_running.gif" - - if(PRG in GLOB.ntnet_global.available_station_software) - generate_network_log("Began downloading file [PRG.filename].[PRG.filetype] from NTNet Software Repository.") - hacked_download = 0 - else if(PRG in GLOB.ntnet_global.available_antag_software) - generate_network_log("Began downloading file **ENCRYPTED**.[PRG.filetype] from unspecified server.") - hacked_download = 1 - else - generate_network_log("Began downloading file [PRG.filename].[PRG.filetype] from unspecified server.") - hacked_download = 0 - - downloaded_file = PRG.clone() - -/datum/computer_file/program/ntnetdownload/proc/abort_file_download() - if(!downloaded_file) - return - generate_network_log("Aborted download of file [hacked_download ? "**ENCRYPTED**" : "[downloaded_file.filename].[downloaded_file.filetype]"].") - downloaded_file = null - download_completion = 0 - ui_header = "downloader_finished.gif" - -/datum/computer_file/program/ntnetdownload/proc/complete_file_download() - if(!downloaded_file) - return - generate_network_log("Completed download of file [hacked_download ? "**ENCRYPTED**" : "[downloaded_file.filename].[downloaded_file.filetype]"].") - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file)) - // The download failed - downloaderror = "I/O ERROR - Unable to save file. Check whether you have enough free space on your hard drive and whether your hard drive is properly connected. If the issue persists contact your system administrator for assistance." - downloaded_file = null - download_completion = 0 - ui_header = "downloader_finished.gif" - -/datum/computer_file/program/ntnetdownload/process_tick() - if(!downloaded_file) - return - if(download_completion >= downloaded_file.size) - complete_file_download() - // Download speed according to connectivity state. NTNet server is assumed to be on unlimited speed so we're limited by our local connectivity - download_netspeed = 0 - // Speed defines are found in misc.dm - switch(ntnet_status) - if(1) - download_netspeed = NTNETSPEED_LOWSIGNAL - if(2) - download_netspeed = NTNETSPEED_HIGHSIGNAL - if(3) - download_netspeed = NTNETSPEED_ETHERNET - download_completion += download_netspeed - -/datum/computer_file/program/ntnetdownload/Topic(href, list/href_list) - if(..()) - return 1 - switch(href_list["action"]) - if("PRG_downloadfile") - if(!downloaded_file) - begin_file_download(href_list["filename"]) - return 1 - if("PRG_reseterror") - if(downloaderror) - download_completion = 0 - download_netspeed = 0 - downloaded_file = null - downloaderror = "" - return 1 - return 0 - -/datum/computer_file/program/ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ntnet_downloader.tmpl", "NTNet Download Program", 575, 700) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - -/datum/computer_file/program/ntnetdownload/ui_data(mob/user) - my_computer = computer - - if(!istype(my_computer)) - return - - var/list/data = get_header_data() - - // This IF cuts on data transferred to client, so i guess it's worth it. - if(downloaderror) // Download errored. Wait until user resets the program. - data["error"] = downloaderror - else if(downloaded_file) // Download running. Wait please.. - data["downloadname"] = downloaded_file.filename - data["downloaddesc"] = downloaded_file.filedesc - data["downloadsize"] = downloaded_file.size - data["downloadspeed"] = download_netspeed - data["downloadcompletion"] = round(min(download_completion, downloaded_file.size), 0.1) - else // No download running, pick file. - var/obj/item/computer_hardware/hard_drive/hard_drive = my_computer.all_components[MC_HDD] - data["disk_size"] = hard_drive.max_capacity - data["disk_used"] = hard_drive.used_capacity - var/list/all_entries[0] - for(var/A in GLOB.ntnet_global.available_station_software) - var/datum/computer_file/program/P = A - // Only those programs our user can run will show in the list - if(!P.can_run(user,transfer = 1)) - continue - all_entries.Add(list(list( - "filename" = P.filename, - "filedesc" = P.filedesc, - "fileinfo" = P.extended_desc, - "compatibility" = check_compatibility(P), - "size" = P.size, - "status" = !hard_drive || !hard_drive.can_store_file(P) ? "disabled" : null - ))) - data["hackedavailable"] = 0 - if(computer.emagged) // If we are running on emagged computer we have access to some "bonus" software - var/list/hacked_programs[0] - for(var/S in GLOB.ntnet_global.available_antag_software) - var/datum/computer_file/program/P = S - data["hackedavailable"] = 1 - hacked_programs.Add(list(list( - "filename" = P.filename, - "filedesc" = P.filedesc, - "fileinfo" = P.extended_desc, - "size" = P.size - ))) - data["hacked_programs"] = hacked_programs - - data["downloadable_programs"] = all_entries - - return data - -/datum/computer_file/program/ntnetdownload/proc/check_compatibility(datum/computer_file/program/P) - var/hardflag = computer.hardware_flag - - if(P && P.is_supported_by_hardware(hardflag,0)) - return "Compatible" - return "Incompatible!" - -/datum/computer_file/program/ntnetdownload/kill_program(forced) - abort_file_download() - return ..(forced) diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm deleted file mode 100644 index ca208c22b02..00000000000 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ /dev/null @@ -1,229 +0,0 @@ -/datum/computer_file/program/chatclient - filename = "ntnrc_client" - filedesc = "NTNet Relay Chat Client" - program_icon_state = "command" - extended_desc = "This program allows communication over NTNRC network" - size = 8 - requires_ntnet = 1 - requires_ntnet_feature = NTNET_COMMUNICATION - network_destination = "NTNRC server" - ui_header = "ntnrc_idle.gif" - available_on_ntnet = 1 - var/last_message = null // Used to generate the toolbar icon - var/username - var/datum/ntnet_conversation/channel = null - var/operator_mode = 0 // Channel operator mode - var/netadmin_mode = 0 // Administrator mode (invisible to other users + bypasses passwords) - -/datum/computer_file/program/chatclient/New() - ..() - username = "DefaultUser[rand(100, 999)]" - -/datum/computer_file/program/chatclient/process_tick() - ..() - if(program_state != PROGRAM_STATE_KILLED) - ui_header = "ntnrc_idle.gif" - if(channel) - // Remember the last message. If there is no message in the channel remember null. - last_message = channel.messages.len ? channel.messages[channel.messages.len - 1] : null - else - last_message = null - return 1 - if(channel && channel.messages && channel.messages.len) - ui_header = last_message == channel.messages[channel.messages.len - 1] ? "ntnrc_idle.gif" : "ntnrc_new.gif" - else - ui_header = "ntnrc_idle.gif" - -/datum/computer_file/program/chatclient/kill_program(forced = FALSE) - if(channel) - channel.remove_client(src) - channel = null - ..() - -/datum/computer_file/program/chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ntnet_chat.tmpl", "NTNet Relay Chat Client", 575, 700) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - - -/datum/computer_file/program/chatclient/ui_data(mob/user) - if(!GLOB.ntnet_global || !GLOB.ntnet_global.chat_channels) - return - - var/list/data = get_header_data() - - data["adminmode"] = netadmin_mode - if(channel) - data["title"] = channel.title - var/list/messages[0] - for(var/M in channel.messages) - messages.Add(list(list( - "msg" = M - ))) - data["messages"] = messages - var/list/clients[0] - for(var/C in channel.clients) - var/datum/computer_file/program/chatclient/cl = C - clients.Add(list(list( - "name" = cl.username - ))) - data["clients"] = clients - operator_mode = (channel.operator == src) ? 1 : 0 - data["is_operator"] = operator_mode || netadmin_mode - - else // Channel selection screen - var/list/all_channels[0] - for(var/C in GLOB.ntnet_global.chat_channels) - var/datum/ntnet_conversation/conv = C - if(conv && conv.title) - all_channels.Add(list(list( - "chan" = conv.title, - "id" = conv.id - ))) - data["all_channels"] = all_channels - - return data - -/datum/computer_file/program/chatclient/Topic(href, list/href_list) - if(..()) - return 1 - - switch(href_list["action"]) - if("PRG_speak") - . = 1 - if(!channel) - return 1 - var/mob/living/user = usr - var/message = reject_bad_text(input(user, "Enter message or leave blank to cancel: ")) - if(!message || !channel) - return - channel.add_message(message, username) - log_chat("[username] sent to [channel.title]: [message]", user) - - if("PRG_joinchannel") - . = 1 - var/datum/ntnet_conversation/C - for(var/datum/ntnet_conversation/chan in GLOB.ntnet_global.chat_channels) - if(chan.id == text2num(href_list["id"])) - C = chan - break - - if(!C) - return 1 - - if(netadmin_mode) - channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. - return 1 - - if(C.password) - var/mob/living/user = usr - var/password = reject_bad_text(input(user,"Access Denied. Enter password:")) - if(C && (password == C.password)) - C.add_client(src) - channel = C - return 1 - C.add_client(src) - channel = C - if("PRG_leavechannel") - . = 1 - if(channel) - channel.remove_client(src) - channel = null - if("PRG_newchannel") - . = 1 - var/mob/living/user = usr - var/channel_title = reject_bad_text(input(user,"Enter channel name or leave blank to cancel:")) - if(!channel_title) - return 1 - var/datum/ntnet_conversation/C = new/datum/ntnet_conversation() - C.add_client(src) - C.operator = src - channel = C - C.title = channel_title - if("PRG_toggleadmin") - . = 1 - if(netadmin_mode) - netadmin_mode = 0 - if(channel) - channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... - channel = null - return 1 - var/mob/living/user = usr - if(can_run(user, 1, ACCESS_NETWORK)) - if(channel) - var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No") - if(response == "Yes") - if(channel) - channel.remove_client(src) - channel = null - else - return 1 - netadmin_mode = 1 - if("PRG_changename") - . = 1 - var/mob/living/user = usr - var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:")) - if(!newname) - return 1 - if(channel) - channel.add_status_message("[username] is now known as [newname].") - username = newname - - if("PRG_savelog") - . = 1 - if(!channel) - return 1 - var/mob/living/user = usr - var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:") - if(!logname || !channel) - return 1 - var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile() - // Now we will generate HTML-compliant file that can actually be viewed/printed. - logfile.filename = logname - logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" - for(var/logstring in channel.messages) - logfile.stored_data += "[logstring]\[BR\]" - logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]" - logfile.calculate_size() - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - if(!computer || !hard_drive || !hard_drive.store_file(logfile)) - if(!computer) - // This program shouldn't even be runnable without computer. - CRASH("Var computer is null!") - if(!hard_drive) - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") - else // In 99.9% cases this will mean our HDD is full - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") - if("PRG_renamechannel") - . = 1 - if(!operator_mode || !channel) - return 1 - var/mob/living/user = usr - var/newname = reject_bad_text(input(user, "Enter new channel name or leave blank to cancel:")) - if(!newname || !channel) - return 1 - channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") - channel.title = newname - if("PRG_deletechannel") - . = 1 - if(channel && ((channel.operator == src) || netadmin_mode)) - QDEL_NULL(channel) - if("PRG_setpassword") - . = 1 - if(!channel || ((channel.operator != src) && !netadmin_mode)) - return 1 - - var/mob/living/user = usr - var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:")) - if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode)) - return 1 - - if(newpassword == "nopassword") - channel.password = "" - else - channel.password = newpassword diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm deleted file mode 100644 index 1ccefa9311a..00000000000 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ /dev/null @@ -1,195 +0,0 @@ -GLOBAL_VAR_INIT(nttransfer_uid, 0) - -/datum/computer_file/program/nttransfer - filename = "nttransfer" - filedesc = "NTNet P2P Transfer Client" - extended_desc = "This program allows for simple file transfer via direct peer to peer connection." - program_icon_state = "comm_logs" - size = 7 - requires_ntnet = 1 - requires_ntnet_feature = NTNET_PEERTOPEER - network_destination = "other device via P2P tunnel" - available_on_ntnet = 1 - - var/error = "" // Error screen - var/server_password = "" // Optional password to download the file. - var/datum/computer_file/provided_file = null // File which is provided to clients. - var/datum/computer_file/downloaded_file = null // File which is being downloaded - var/list/connected_clients = list() // List of connected clients. - var/datum/computer_file/program/nttransfer/remote // Client var, specifies who are we downloading from. - var/download_completion = 0 // Download progress in GQ - var/download_netspeed = 0 // Our connectivity speed in GQ/s - var/actual_netspeed = 0 // Displayed in the UI, this is the actual transfer speed. - var/unique_token // UID of this program - var/upload_menu = 0 // Whether we show the program list and upload menu - -/datum/computer_file/program/nttransfer/New() - unique_token = GLOB.nttransfer_uid - GLOB.nttransfer_uid++ - ..() - -/datum/computer_file/program/nttransfer/process_tick() - // Server mode - update_netspeed() - if(provided_file) - for(var/datum/computer_file/program/nttransfer/C in connected_clients) - // Transfer speed is limited by device which uses slower connectivity. - // We can have multiple clients downloading at same time, but let's assume we use some sort of multicast transfer - // so they can all run on same speed. - C.actual_netspeed = min(C.download_netspeed, download_netspeed) - C.download_completion += C.actual_netspeed - if(C.download_completion >= provided_file.size) - C.finish_download() - else if(downloaded_file) // Client mode - if(!remote) - crash_download("Connection to remote server lost") - -/datum/computer_file/program/nttransfer/kill_program(forced = FALSE) - if(downloaded_file) // Client mode, clean up variables for next use - finalize_download() - - if(provided_file) // Server mode, disconnect all clients - for(var/datum/computer_file/program/nttransfer/P in connected_clients) - P.crash_download("Connection terminated by remote server") - downloaded_file = null - ..(forced) - -/datum/computer_file/program/nttransfer/proc/update_netspeed() - download_netspeed = 0 - switch(ntnet_status) - if(1) - download_netspeed = NTNETSPEED_LOWSIGNAL - if(2) - download_netspeed = NTNETSPEED_HIGHSIGNAL - if(3) - download_netspeed = NTNETSPEED_ETHERNET - -// Finishes download and attempts to store the file on HDD -/datum/computer_file/program/nttransfer/proc/finish_download() - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file)) - error = "I/O Error: Unable to save file. Check your hard drive and try again." - finalize_download() - -// Crashes the download and displays specific error message -/datum/computer_file/program/nttransfer/proc/crash_download(var/message) - error = message ? message : "An unknown error has occurred during download" - finalize_download() - -// Cleans up variables for next use -/datum/computer_file/program/nttransfer/proc/finalize_download() - if(remote) - remote.connected_clients.Remove(src) - downloaded_file = null - remote = null - download_completion = 0 - - -/datum/computer_file/program/nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ntnet_transfer.tmpl", "NTNet P2P Transfer Client", 575, 700) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - -/datum/computer_file/program/nttransfer/Topic(href, list/href_list) - if(..()) - return 1 - switch(href_list["action"]) - if("PRG_downloadfile") - for(var/datum/computer_file/program/nttransfer/P in GLOB.ntnet_global.fileservers) - if("[P.unique_token]" == href_list["id"]) - remote = P - break - if(!remote || !remote.provided_file) - return - if(remote.server_password) - var/pass = reject_bad_text(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) - if(pass != remote.server_password) - error = "Incorrect Password" - return 1 - downloaded_file = remote.provided_file.clone() - remote.connected_clients.Add(src) - return 1 - if("PRG_reset") - error = "" - upload_menu = 0 - finalize_download() - if(src in GLOB.ntnet_global.fileservers) - GLOB.ntnet_global.fileservers.Remove(src) - for(var/datum/computer_file/program/nttransfer/T in connected_clients) - T.crash_download("Remote server has forcibly closed the connection") - provided_file = null - return 1 - if("PRG_setpassword") - var/pass = reject_bad_text(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) - if(!pass) - return - if(pass == "none") - server_password = "" - return - server_password = pass - return 1 - if("PRG_uploadfile") - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - for(var/datum/computer_file/F in hard_drive.stored_files) - if("[F.uid]" == href_list["id"]) - if(F.unsendable) - error = "I/O Error: File locked." - return - if(istype(F, /datum/computer_file/program)) - var/datum/computer_file/program/P = F - if(!P.can_run(usr,transfer = 1)) - error = "Access Error: Insufficient rights to upload file." - provided_file = F - GLOB.ntnet_global.fileservers.Add(src) - return - error = "I/O Error: Unable to locate file on hard drive." - return 1 - if("PRG_uploadmenu") - upload_menu = 1 - - -/datum/computer_file/program/nttransfer/ui_data(mob/user) - - var/list/data = get_header_data() - - if(error) - data["error"] = error - else if(downloaded_file) - data["downloading"] = 1 - data["download_size"] = downloaded_file.size - data["download_progress"] = download_completion - data["download_netspeed"] = actual_netspeed - data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]" - else if (provided_file) - data["uploading"] = 1 - data["upload_uid"] = unique_token - data["upload_clients"] = connected_clients.len - data["upload_haspassword"] = server_password ? 1 : 0 - data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]" - else if (upload_menu) - var/list/all_files[0] - var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] - for(var/datum/computer_file/F in hard_drive.stored_files) - all_files.Add(list(list( - "uid" = F.uid, - "filename" = "[F.filename].[F.filetype]", - "size" = F.size - ))) - data["upload_filelist"] = all_files - else - var/list/all_servers[0] - for(var/datum/computer_file/program/nttransfer/P in GLOB.ntnet_global.fileservers) - all_servers.Add(list(list( - "uid" = P.unique_token, - "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", - "size" = P.provided_file.size, - "haspassword" = P.server_password ? 1 : 0 - ))) - data["servers"] = all_servers - - return data diff --git a/code/modules/modular_computers/file_system/programs/research/airestorer.dm b/code/modules/modular_computers/file_system/programs/research/airestorer.dm deleted file mode 100644 index a87a2cd87b4..00000000000 --- a/code/modules/modular_computers/file_system/programs/research/airestorer.dm +++ /dev/null @@ -1,137 +0,0 @@ -/datum/computer_file/program/aidiag - filename = "aidiag" - filedesc = "AI Maintenance Utility" - program_icon_state = "generic" - extended_desc = "This program is capable of reconstructing damaged AI systems. Requires direct AI connection via intellicard slot." - size = 12 - requires_ntnet = 0 - usage_flags = PROGRAM_CONSOLE - transfer_access = ACCESS_HEADS - available_on_ntnet = 1 - var/restoring = FALSE - -/datum/computer_file/program/aidiag/proc/get_ai(cardcheck) - - var/obj/item/computer_hardware/ai_slot/ai_slot - - if(computer) - ai_slot = computer.all_components[MC_AI] - - if(computer && ai_slot && ai_slot.check_functionality()) - if(cardcheck == 1) - return ai_slot - if(ai_slot.enabled && ai_slot.stored_card) - if(cardcheck == 2) - return ai_slot.stored_card - if(locate(/mob/living/silicon/ai) in ai_slot.stored_card) - return locate(/mob/living/silicon/ai) in ai_slot.stored_card - - return null - -/datum/computer_file/program/aidiag/Topic(href, list/href_list) - if(..()) - return TRUE - - var/mob/living/silicon/ai/A = get_ai() - if(!A) - restoring = FALSE - - switch(href_list["action"]) - if("PRG_beginReconstruction") - if(A && A.health < 100) - restoring = TRUE - return TRUE - if("PRG_eject") - if(computer.all_components[MC_AI]) - var/obj/item/computer_hardware/ai_slot/ai_slot = computer.all_components[MC_AI] - if(ai_slot && ai_slot.stored_card) - ai_slot.try_eject(0,usr) - return TRUE - -/datum/computer_file/program/aidiag/process_tick() - ..() - if(!restoring) //Put the check here so we don't check for an ai all the time - return - var/obj/item/aicard/cardhold = get_ai(2) - - var/obj/item/computer_hardware/ai_slot/ai_slot = get_ai(1) - - - var/mob/living/silicon/ai/A = get_ai() - if(!A || !cardhold) - restoring = FALSE // If the AI was removed, stop the restoration sequence. - if(ai_slot) - ai_slot.locked = FALSE - return - - if(cardhold.flush) - ai_slot.locked = FALSE - restoring = FALSE - return - ai_slot.locked = TRUE - A.adjustOxyLoss(-1) - A.adjustFireLoss(-1) - A.adjustToxLoss(-1) - A.adjustBruteLoss(-1) - A.updatehealth() - if(A.health >= 0 && A.stat == DEAD) - A.stat = CONSCIOUS - A.lying = 0 - GLOB.dead_mob_list -= A - GLOB.alive_mob_list += A - // Finished restoring - if(A.health >= 100) - ai_slot.locked = FALSE - restoring = FALSE - - return TRUE - - -/datum/computer_file/program/aidiag/ui_data(mob/user) - var/list/data = get_header_data() - var/mob/living/silicon/ai/AI - // A shortcut for getting the AI stored inside the computer. The program already does necessary checks. - AI = get_ai() - - var/obj/item/aicard/aicard = get_ai(2) - - if(!aicard) - data["nocard"] = TRUE - data["error"] = "Please insert an intelliCard." - else - if(!AI) - data["error"] = "No AI located" - else - var/obj/item/aicard/cardhold = AI.loc - if(cardhold.flush) - data["error"] = "Flush in progress" - else - data["name"] = AI.name - data["restoring"] = restoring - data["health"] = (AI.health + 100) / 2 - data["isDead"] = AI.stat == DEAD - - var/list/all_laws[0] - for(var/datum/ai_law/L in AI.laws.all_laws()) - all_laws.Add(list(list( - "index" = L.index, - "text" = L.law - ))) - - data["ai_laws"] = all_laws - - return data - -/datum/computer_file/program/aidiag/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ai_restorer.tmpl", "Integrity Restorer", 600, 400) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - -/datum/computer_file/program/aidiag/kill_program(forced) - restoring = FALSE - return ..(forced) diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm deleted file mode 100644 index 0a839a6d13f..00000000000 --- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm +++ /dev/null @@ -1,90 +0,0 @@ -/datum/computer_file/program/ntnetmonitor - filename = "ntmonitor" - filedesc = "NTNet Diagnostics and Monitoring" - program_icon_state = "comm_monitor" - extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes" - size = 12 - requires_ntnet = 1 - required_access = ACCESS_NETWORK //Network control is a more secure program. - available_on_ntnet = 1 - -/datum/computer_file/program/ntnetmonitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) - assets.send(user) - ui = new(user, src, ui_key, "ntnet_monitor.tmpl", "NTNet Diagnostics and Monitoring Tool", 575, 700) - ui.set_auto_update(1) - ui.set_layout_key("program") - ui.open() - -/datum/computer_file/program/ntnetmonitor/Topic(href, list/href_list) - if(..()) - return 1 - switch(href_list["action"]) - if("resetIDS") - . = 1 - if(GLOB.ntnet_global) - GLOB.ntnet_global.resetIDS() - return 1 - if("toggleIDS") - . = 1 - if(GLOB.ntnet_global) - GLOB.ntnet_global.toggleIDS() - return 1 - if("toggleWireless") - . = 1 - if(!GLOB.ntnet_global) - return 1 - - // NTNet is disabled. Enabling can be done without user prompt - if(GLOB.ntnet_global.setting_disabled) - GLOB.ntnet_global.setting_disabled = 0 - return 1 - - // NTNet is enabled and user is about to shut it down. Let's ask them if they really want to do it, as wirelessly connected computers won't connect without NTNet being enabled (which may prevent people from turning it back on) - var/mob/user = usr - if(!user) - return 1 - var/response = alert(user, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No") - if(response == "Yes") - GLOB.ntnet_global.setting_disabled = 1 - return 1 - if("purgelogs") - . = 1 - if(GLOB.ntnet_global) - GLOB.ntnet_global.purge_logs() - if("updatemaxlogs") - . = 1 - var/mob/user = usr - var/logcount = text2num(input(user,"Enter amount of logs to keep in memory ([MIN_NTNET_LOGS]-[MAX_NTNET_LOGS]):")) - if(GLOB.ntnet_global) - GLOB.ntnet_global.update_max_log_count(logcount) - if("toggle_function") - . = 1 - if(!GLOB.ntnet_global) - return 1 - GLOB.ntnet_global.toggle_function(text2num(href_list["id"])) - -/datum/computer_file/program/ntnetmonitor/ui_data(mob/user) - if(!GLOB.ntnet_global) - return - var/list/data = get_header_data() - - data["ntnetstatus"] = GLOB.ntnet_global.check_function() - data["ntnetrelays"] = GLOB.ntnet_global.relays.len - data["idsstatus"] = GLOB.ntnet_global.intrusion_detection_enabled - data["idsalarm"] = GLOB.ntnet_global.intrusion_detection_alarm - - data["config_softwaredownload"] = GLOB.ntnet_global.setting_softwaredownload - data["config_peertopeer"] = GLOB.ntnet_global.setting_peertopeer - data["config_communication"] = GLOB.ntnet_global.setting_communication - data["config_systemcontrol"] = GLOB.ntnet_global.setting_systemcontrol - - data["ntnetlogs"] = list() - - for(var/i in GLOB.ntnet_global.logs) - data["ntnetlogs"] += list(list("entry" = i)) - data["ntnetmaxlogs"] = GLOB.ntnet_global.setting_maxlogcount - - return data diff --git a/code/modules/modular_computers/hardware/CPU.dm b/code/modules/modular_computers/hardware/CPU.dm deleted file mode 100644 index 02e7d41d512..00000000000 --- a/code/modules/modular_computers/hardware/CPU.dm +++ /dev/null @@ -1,44 +0,0 @@ -// CPU that allows the computer to run programs. -// Better CPUs are obtainable via research and can run more programs on background. - -/obj/item/computer_hardware/processor_unit - name = "processor board" - desc = "A standard CPU board used in most computers. It can run up to three programs simultaneously." - icon_state = "cpuboard" - w_class = WEIGHT_CLASS_SMALL - power_usage = 50 - critical = 1 - malfunction_probability = 1 - origin_tech = "programming=3;engineering=2" - var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description. - device_type = MC_CPU - -/obj/item/computer_hardware/processor_unit/on_remove(obj/item/modular_computer/MC, mob/user) - MC.shutdown_computer() - -/obj/item/computer_hardware/processor_unit/small - name = "microprocessor" - desc = "A miniaturised CPU used in portable devices. It can run up to two programs simultaneously." - icon_state = "cpu" - w_class = WEIGHT_CLASS_TINY - power_usage = 25 - max_idle_programs = 1 - origin_tech = "programming=2;engineering=2" - -/obj/item/computer_hardware/processor_unit/photonic - name = "photonic processor board" - desc = "An advanced experimental CPU board that uses photonic core instead of regular circuitry. It can run up to five programs simultaneously, but uses a lot of power." - icon_state = "cpuboard_super" - w_class = WEIGHT_CLASS_SMALL - power_usage = 250 - max_idle_programs = 4 - origin_tech = "programming=5;engineering=4" - -/obj/item/computer_hardware/processor_unit/photonic/small - name = "photonic microprocessor" - desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It can run up to three programs simultaneously." - icon_state = "cpu_super" - w_class = WEIGHT_CLASS_TINY - power_usage = 75 - max_idle_programs = 2 - origin_tech = "programming=4;engineering=3" diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm deleted file mode 100644 index 3e82455c53b..00000000000 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ /dev/null @@ -1,105 +0,0 @@ -/obj/item/computer_hardware - name = "hardware" - desc = "Unknown Hardware." - icon = 'icons/obj/module.dmi' - icon_state = "std_mod" - - w_class = WEIGHT_CLASS_TINY // w_class limits which devices can contain this component. - // 1: PDAs/Tablets, 2: Laptops, 3-4: Consoles only - var/obj/item/modular_computer/holder = null - // Computer that holds this hardware, if any. - - max_integrity = 200 - - var/power_usage = 0 // If the hardware uses extra power, change this. - var/enabled = 1 // If the hardware is turned off set this to 0. - var/critical = 0 // Prevent disabling for important component, like the CPU. - var/can_install = 1 // Prevents direct installation of removable media. - var/damage = 0 // Current damage level - var/max_damage = 100 // Maximal damage level. - var/damage_malfunction = 20 // "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things - var/damage_failure = 50 // "Failure" threshold. When damage exceeds this value the hardware piece will not work at all. - var/malfunction_probability = 10// Chance of malfunction when the component is damaged - var/device_type - -/obj/item/computer_hardware/New(var/obj/L) - ..() - pixel_x = rand(-8, 8) - pixel_y = rand(-8, 8) - -/obj/item/computer_hardware/Destroy() - if(holder) - holder.uninstall_component(src) - return ..() - - -/obj/item/computer_hardware/attackby(obj/item/I, mob/living/user) - // Multitool. Runs diagnostics - if(istype(I, /obj/item/multitool)) - to_chat(user, "***** DIAGNOSTICS REPORT *****") - diagnostics(user) - to_chat(user, "******************************") - return 1 - - // Cable coil. Works as repair method, but will probably require multiple applications and more cable. - if(istype(I, /obj/item/stack/cable_coil)) - var/obj/item/stack/S = I - if(obj_integrity == max_integrity) - to_chat(user, "\The [src] doesn't seem to require repairs.") - return 1 - if(S.use(1)) - to_chat(user, "You patch up \the [src] with a bit of \the [I].") - obj_integrity = min(obj_integrity + 10, max_integrity) - return 1 - - if(try_insert(I, user)) - return 1 - - return ..() - -// Called on multitool click, prints diagnostic information to the user. -/obj/item/computer_hardware/proc/diagnostics(var/mob/user) - to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]") - -// Handles damage checks -/obj/item/computer_hardware/proc/check_functionality() - if(!enabled) // Disabled. - return FALSE - - if(damage > damage_failure) // Too damaged to work at all. - return FALSE - - if(damage > damage_malfunction) // Still working. Well, sometimes... - if(prob(malfunction_probability)) - return FALSE - - return TRUE // Good to go. - -/obj/item/computer_hardware/examine(var/mob/user) - . = ..() - if(damage > damage_failure) - . += "It seems to be severely damaged!" - else if(damage > damage_malfunction) - . += "It seems to be damaged!" - else if(damage) - . += "It seems to be slightly damaged." - -// Component-side compatibility check. -/obj/item/computer_hardware/proc/can_install(obj/item/modular_computer/M, mob/living/user = null) - return can_install - -// Called when component is installed into PC. -/obj/item/computer_hardware/proc/on_install(obj/item/modular_computer/M, mob/living/user = null) - return - -// Called when component is removed from PC. -/obj/item/computer_hardware/proc/on_remove(obj/item/modular_computer/M, mob/living/user = null) - try_eject(forced = 1) - -// Called when someone tries to insert something in it - paper in printer, card in card reader, etc. -/obj/item/computer_hardware/proc/try_insert(obj/item/I, mob/living/user = null) - return FALSE - -// Called when someone tries to eject something from it - card from card reader, etc. -/obj/item/computer_hardware/proc/try_eject(slot=0, mob/living/user = null, forced = 0) - return FALSE diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm deleted file mode 100644 index 1b97ae5ede8..00000000000 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ /dev/null @@ -1,80 +0,0 @@ -/obj/item/computer_hardware/ai_slot - name = "intelliCard interface slot" - desc = "A module allowing this computer to interface with most common intelliCard modules. Necessary for some programs to run properly." - power_usage = 100 //W - icon_state = "card_mini" - w_class = WEIGHT_CLASS_SMALL - origin_tech = "programming=2" - device_type = MC_AI - - var/obj/item/aicard/stored_card = null - var/locked = FALSE - -/obj/item/computer_hardware/ai_slot/Destroy() - QDEL_NULL(stored_card) - return ..() - - -/obj/item/computer_hardware/ai_slot/examine(mob/user) - . = ..() - if(stored_card) - . += "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it" - -/obj/item/computer_hardware/ai_slot/on_install(obj/item/modular_computer/M, mob/living/user = null) - M.add_verb(device_type) - -/obj/item/computer_hardware/ai_slot/on_remove(obj/item/modular_computer/M, mob/living/user = null) - M.remove_verb(device_type) - try_eject(0, forced = 1) - -/obj/item/computer_hardware/ai_slot/try_insert(obj/item/I, mob/living/user = null) - if(!holder) - return FALSE - - if(!istype(I, /obj/item/aicard)) - return FALSE - - if(stored_card) - if(user) - to_chat(user, "You try to insert \the [I] into \the [src], but the slot is occupied.") - return FALSE - if(user && !user.unEquip(I)) - return FALSE - - I.forceMove(src) - stored_card = I - if(user) - to_chat(user, "You insert \the [I] into \the [src].") - - return TRUE - - -/obj/item/computer_hardware/ai_slot/try_eject(slot=0, mob/living/user = null, forced = 0) - if(!stored_card) - if(user) - to_chat(user, "There is no card in \the [src].") - return FALSE - - if(locked && !forced) - if(user) - to_chat(user, "Safeties prevent you from removing the card until reconstruction is complete...") - return FALSE - - if(stored_card) - stored_card.forceMove(get_turf(src)) - locked = FALSE - stored_card.verb_pickup() - stored_card = null - - if(user) - to_chat(user, "You remove the card from \the [src].") - return TRUE - return FALSE - -/obj/item/computer_hardware/ai_slot/attackby(obj/item/I, mob/living/user) - if(..()) - return - if(istype(I, /obj/item/screwdriver)) - to_chat(user, "You press down on the manual eject button with \the [I].") - try_eject(0, user, 1) - return diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm deleted file mode 100644 index 1a48110006a..00000000000 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ /dev/null @@ -1,108 +0,0 @@ -/obj/item/computer_hardware/battery - name = "power cell controller" - desc = "A charge controller for standard power cells, used in all kinds of modular computers." - icon_state = "cell_con" - critical = 1 - malfunction_probability = 1 - origin_tech = "powerstorage=1;engineering=1" - var/obj/item/stock_parts/cell/battery = null - device_type = MC_CELL - -/obj/item/computer_hardware/battery/get_cell() - return battery - -/obj/item/computer_hardware/battery/New(loc, battery_type = null) - if(battery_type) - battery = new battery_type(src) - ..() - -/obj/item/computer_hardware/battery/Destroy() - QDEL_NULL(battery) - return ..() - -/obj/item/computer_hardware/battery/on_remove(obj/item/modular_computer/M, mob/living/user = null) - try_eject(0, forced = 1) - -/obj/item/computer_hardware/battery/try_insert(obj/item/I, mob/living/user = null) - if(!holder) - return FALSE - - if(!istype(I, /obj/item/stock_parts/cell)) - return FALSE - - if(battery) - if(user) - to_chat(user, "You try to connect \the [I] to \the [src], but its connectors are occupied.") - return FALSE - - if(I.w_class > holder.max_hardware_size) - if(user) - to_chat(user, "This power cell is too large for \the [holder]!") - return FALSE - - if(user && !user.unEquip(I)) - return FALSE - - I.forceMove(src) - battery = I - if(user) - to_chat(user, "You connect \the [I] to \the [src].") - - return TRUE - - -/obj/item/computer_hardware/battery/try_eject(slot=0, mob/living/user = null, forced = 0) - if(!battery) - if(user) - to_chat(user, "There is no power cell connected to \the [src].") - return FALSE - else - battery.forceMove(get_turf(src)) - if(user) - to_chat(user, "You detach \the [battery] from \the [src].") - battery = null - - if(holder) - if(holder.enabled && !holder.use_power()) - holder.shutdown_computer() - - return TRUE - - -// Stock parts -/obj/item/stock_parts/cell/computer - name = "standard battery" - desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops." - icon = 'icons/obj/module.dmi' - icon_state = "cell_mini" - origin_tech = "powerstorage=2;engineering=1" - w_class = WEIGHT_CLASS_TINY - maxcharge = 750 - -/obj/item/stock_parts/cell/computer/advanced - name = "advanced battery" - desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices." - icon_state = "cell" - origin_tech = "powerstorage=2;engineering=2" - maxcharge = 1500 - -/obj/item/stock_parts/cell/computer/super - name = "super battery" - desc = "An advanced power cell, often used in high-end laptops." - icon_state = "cell" - origin_tech = "powerstorage=3;engineering=3" - maxcharge = 2000 - -/obj/item/stock_parts/cell/computer/micro - name = "micro battery" - desc = "A small power cell, commonly seen in most portable microcomputers." - icon_state = "cell_micro" - w_class = WEIGHT_CLASS_TINY - maxcharge = 500 - -/obj/item/stock_parts/cell/computer/nano - name = "nano battery" - desc = "A tiny power cell, commonly seen in low-end portable microcomputers." - icon_state = "cell_micro" - w_class = WEIGHT_CLASS_TINY - maxcharge = 300 diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm deleted file mode 100644 index fc1abc207a5..00000000000 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ /dev/null @@ -1,112 +0,0 @@ -/obj/item/computer_hardware/card_slot - name = "identification card authentication module" // \improper breaks the find_hardware_by_name proc - desc = "A module allowing this computer to read or write data on ID cards. Necessary for some programs to run properly." - power_usage = 10 //W - icon_state = "card_mini" - w_class = WEIGHT_CLASS_TINY - origin_tech = "programming=2" - device_type = MC_CARD - - var/obj/item/card/id/stored_card = null - var/obj/item/card/id/stored_card2 = null - -/obj/item/computer_hardware/card_slot/Destroy() - QDEL_NULL(stored_card) - QDEL_NULL(stored_card2) - return ..() - -/obj/item/computer_hardware/card_slot/GetAccess() - if(stored_card && stored_card2) // Best of both worlds - return (stored_card.GetAccess() | stored_card2.GetAccess()) - else if(stored_card) - return stored_card.GetAccess() - else if(stored_card2) - return stored_card2.GetAccess() - return ..() - -/obj/item/computer_hardware/card_slot/GetID() - if(stored_card) - return stored_card - else if(stored_card2) - return stored_card2 - return ..() - -/obj/item/computer_hardware/card_slot/on_install(obj/item/modular_computer/M, mob/living/user = null) - M.add_verb(device_type) - -/obj/item/computer_hardware/card_slot/on_remove(obj/item/modular_computer/M, mob/living/user = null) - M.remove_verb(device_type) - try_eject(0, forced = 1) - -/obj/item/computer_hardware/card_slot/try_insert(obj/item/I, mob/living/user = null) - if(!holder) - return FALSE - - if(!istype(I, /obj/item/card/id)) - return FALSE - - if(stored_card && stored_card2) - if(user) - to_chat(user, "You try to insert \the [I] into \the [src], but its slots are occupied.") - return FALSE - if(user && !user.unEquip(I)) - return FALSE - - I.forceMove(src) - - if(!stored_card) - stored_card = I - else - stored_card2 = I - - if(user) - to_chat(user, "You insert \the [I] into \the [src].") - - return TRUE - - -/obj/item/computer_hardware/card_slot/try_eject(slot = 0, mob/living/user = null, forced = 0) - if(!stored_card && !stored_card2) - if(user) - to_chat(user, "There are no cards in \the [src].") - return FALSE - - var/ejected = 0 - if(stored_card && (!slot || slot == 1)) - stored_card.forceMove(get_turf(src)) - stored_card.verb_pickup() - stored_card = null - ejected++ - - if(stored_card2 && (!slot || slot == 2)) - stored_card2.forceMove(get_turf(src)) - stored_card2.verb_pickup() - stored_card2 = null - ejected++ - - if(ejected) - if(holder) - if(holder.active_program) - holder.active_program.event_idremoved(0, slot) - - for(var/I in holder.idle_threads) - var/datum/computer_file/program/P = I - P.event_idremoved(1, slot) - - if(user) - to_chat(user, "You remove the card[ejected>1 ? "s" : ""] from \the [src].") - return TRUE - return FALSE - -/obj/item/computer_hardware/card_slot/attackby(obj/item/I, mob/living/user) - if(..()) - return - if(istype(I, /obj/item/screwdriver)) - to_chat(user, "You press down on the manual eject button with \the [I].") - try_eject(0,user) - return - -/obj/item/computer_hardware/card_slot/examine(mob/user) - . = ..() - if(stored_card || stored_card2) - . += "There appears to be something loaded in the card slots." diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm deleted file mode 100644 index ce7fc997192..00000000000 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ /dev/null @@ -1,173 +0,0 @@ -/obj/item/computer_hardware/hard_drive - name = "hard disk drive" - desc = "A small HDD, for use in basic computers where power efficiency is desired." - power_usage = 25 - icon_state = "harddisk_mini" - critical = 1 - w_class = WEIGHT_CLASS_TINY - origin_tech = "programming=1;engineering=1" - device_type = MC_HDD - var/max_capacity = 128 - var/used_capacity = 0 - var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY! - -/obj/item/computer_hardware/hard_drive/on_remove(obj/item/modular_computer/MC, mob/user) - MC.shutdown_computer() - -/obj/item/computer_hardware/hard_drive/proc/install_default_programs() - store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar - store_file(new/datum/computer_file/program/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository - store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. - -/obj/item/computer_hardware/hard_drive/examine(user) - . = ..() - . += "It has [max_capacity] GQ of storage capacity." - -/obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user) - ..() - // 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space. - to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999") - to_chat(user, "Storage capacity: [used_capacity]/[max_capacity]GQ") - -// Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. -/obj/item/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F) - if(!F || !istype(F)) - return 0 - - if(!can_store_file(F)) - return 0 - - if(!check_functionality()) - return 0 - - if(!stored_files) - return 0 - - // This file is already stored. Don't store it again. - if(F in stored_files) - return 0 - - F.holder = src - stored_files.Add(F) - recalculate_size() - return 1 - -// Use this proc to remove file from the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. -/obj/item/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F) - if(!F || !istype(F)) - return 0 - - if(!stored_files) - return 0 - - if(!check_functionality()) - return 0 - - if(F in stored_files) - stored_files -= F - recalculate_size() - return 1 - else - return 0 - -// Loops through all stored files and recalculates used_capacity of this drive -/obj/item/computer_hardware/hard_drive/proc/recalculate_size() - var/total_size = 0 - for(var/datum/computer_file/F in stored_files) - total_size += F.size - - used_capacity = total_size - -// Checks whether file can be stored on the hard drive. We can only store unique files, so this checks whether we wouldn't get a duplicity by adding a file. -/obj/item/computer_hardware/hard_drive/proc/can_store_file(var/datum/computer_file/F) - if(!F || !istype(F)) - return 0 - - if(F in stored_files) - return 0 - - var/name = F.filename + "." + F.filetype - for(var/datum/computer_file/file in stored_files) - if((file.filename + "." + file.filetype) == name) - return 0 - - // In the unlikely event someone manages to create that many files. - // BYOND is acting weird with numbers above 999 in loops (infinite loop prevention) - if(stored_files.len >= 999) - return 0 - if((used_capacity + F.size) > max_capacity) - return 0 - else - return 1 - - -// Tries to find the file by filename. Returns null on failure -/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(var/filename) - if(!check_functionality()) - return null - - if(!filename) - return null - - if(!stored_files) - return null - - for(var/datum/computer_file/F in stored_files) - if(F.filename == filename) - return F - return null - -/obj/item/computer_hardware/hard_drive/Destroy() - stored_files = null - return ..() - -/obj/item/computer_hardware/hard_drive/New() - install_default_programs() - ..() - - -/obj/item/computer_hardware/hard_drive/advanced - name = "advanced hard disk drive" - desc = "A hybrid HDD, for use in higher grade computers where balance between power efficiency and capacity is desired." - max_capacity = 256 - origin_tech = "programming=2;engineering=2" - power_usage = 50 // Hybrid, medium capacity and medium power storage - icon_state = "harddisk_mini" - w_class = WEIGHT_CLASS_SMALL - -/obj/item/computer_hardware/hard_drive/super - name = "super hard disk drive" - desc = "A high capacity HDD, for use in cluster storage solutions where capacity is more important than power efficiency." - max_capacity = 512 - origin_tech = "programming=3;engineering=3" - power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link. - icon_state = "harddisk_mini" - w_class = WEIGHT_CLASS_SMALL - -/obj/item/computer_hardware/hard_drive/cluster - name = "cluster hard disk drive" - desc = "A large storage cluster consisting of multiple HDDs for usage in dedicated storage systems." - power_usage = 500 - origin_tech = "programming=4;engineering=4" - max_capacity = 2048 - icon_state = "harddisk" - w_class = WEIGHT_CLASS_NORMAL - -// For tablets, etc. - highly power efficient. -/obj/item/computer_hardware/hard_drive/small - name = "solid state drive" - desc = "An efficient SSD for portable devices." - power_usage = 10 - origin_tech = "programming=2;engineering=2" - max_capacity = 64 - icon_state = "ssd_mini" - w_class = WEIGHT_CLASS_TINY - -/obj/item/computer_hardware/hard_drive/micro - name = "micro solid state drive" - desc = "A highly efficient SSD chip for portable devices." - power_usage = 2 - origin_tech = "programming=1;engineering=1" - max_capacity = 32 - icon_state = "ssd_micro" - w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm deleted file mode 100644 index 3e5409b5d61..00000000000 --- a/code/modules/modular_computers/hardware/network_card.dm +++ /dev/null @@ -1,82 +0,0 @@ -GLOBAL_VAR_INIT(ntnet_card_uid, 1) - -/obj/item/computer_hardware/network_card - name = "network card" - desc = "A basic wireless network card for usage with standard NTNet frequencies." - power_usage = 50 - origin_tech = "programming=2;engineering=1" - icon_state = "radio_mini" - var/identification_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user. - var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. - var/long_range = 0 - var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks. - malfunction_probability = 1 - device_type = MC_NET - -/obj/item/computer_hardware/network_card/diagnostics(var/mob/user) - ..() - to_chat(user, "NIX Unique ID: [identification_id]") - to_chat(user, "NIX User Tag: [identification_string]") - to_chat(user, "Supported protocols:") - to_chat(user, "511.m SFS (Subspace) - Standard Frequency Spread") - if(long_range) - to_chat(user, "511.n WFS/HB (Subspace) - Wide Frequency Spread/High Bandiwdth") - if(ethernet) - to_chat(user, "OpenEth (Physical Connection) - Physical network connection port") - -/obj/item/computer_hardware/network_card/New(var/l) - ..(l) - identification_id = GLOB.ntnet_card_uid - GLOB.ntnet_card_uid++ - -// Returns a string identifier of this network card -/obj/item/computer_hardware/network_card/proc/get_network_tag() - return "[identification_string] (NID [identification_id])" - -// 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection -/obj/item/computer_hardware/network_card/proc/get_signal(var/specific_action = 0) - if(!holder) // Hardware is not installed in anything. No signal. How did this even get called? - return 0 - - if(!check_functionality()) - return 0 - - if(ethernet) // Computer is connected via wired connection. - return 3 - - if(!GLOB.ntnet_global || !GLOB.ntnet_global.check_function(specific_action)) // NTNet is down and we are not connected via wired connection. No signal. - return 0 - - if(holder) - - var/turf/T = get_turf(holder) - if((T && istype(T)) && is_station_contact(T.z)) - // Computer is on station. Low/High signal depending on what type of network card you have - if(long_range) - return 2 - else - return 1 - - if(long_range) // Computer is not on station, but it has upgraded network card. Low signal. - return 1 - - return 0 // Computer is not on station and does not have upgraded network card. No signal. - - -/obj/item/computer_hardware/network_card/advanced - name = "advanced network card" - desc = "An advanced network card for usage with standard NTNet frequencies. Its transmitter is strong enough to connect even off-station." - long_range = 1 - origin_tech = "programming=4;engineering=2" - power_usage = 100 // Better range but higher power usage. - icon_state = "radio" - w_class = WEIGHT_CLASS_TINY - -/obj/item/computer_hardware/network_card/wired - name = "wired network card" - desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection." - ethernet = 1 - origin_tech = "programming=5;engineering=3" - power_usage = 100 // Better range but higher power usage. - icon_state = "net_wired" - w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/modular_computers/hardware/portable_disk.dm b/code/modules/modular_computers/hardware/portable_disk.dm deleted file mode 100644 index 93c9c1f412b..00000000000 --- a/code/modules/modular_computers/hardware/portable_disk.dm +++ /dev/null @@ -1,35 +0,0 @@ -/obj/item/computer_hardware/hard_drive/portable - name = "data disk" - desc = "Removable disk used to store data." - power_usage = 10 - icon_state = "datadisk6" - w_class = WEIGHT_CLASS_TINY - critical = 0 - max_capacity = 16 - origin_tech = "programming=1" - device_type = MC_SDD - -/obj/item/computer_hardware/hard_drive/portable/on_install(obj/item/modular_computer/M, mob/living/user = null) - M.add_verb(device_type) - -/obj/item/computer_hardware/hard_drive/portable/on_remove(obj/item/modular_computer/M, mob/living/user = null) - ..() - M.remove_verb(device_type) - -/obj/item/computer_hardware/hard_drive/portable/install_default_programs() - return // Empty by default - -/obj/item/computer_hardware/hard_drive/portable/advanced - name = "advanced data disk" - power_usage = 20 - icon_state = "datadisk5" - max_capacity = 64 - origin_tech = "programming=2" - -/obj/item/computer_hardware/hard_drive/portable/super - name = "super data disk" - desc = "Removable disk used to store large amounts of data." - power_usage = 40 - icon_state = "datadisk3" - max_capacity = 256 - origin_tech = "programming=4" diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm deleted file mode 100644 index 49c5d72a6f1..00000000000 --- a/code/modules/modular_computers/hardware/printer.dm +++ /dev/null @@ -1,70 +0,0 @@ -/obj/item/computer_hardware/printer - name = "printer" - desc = "Computer-integrated printer with paper recycling module." - power_usage = 100 - origin_tech = "programming=2;engineering=2" - icon_state = "printer" - w_class = WEIGHT_CLASS_NORMAL - device_type = MC_PRINT - var/stored_paper = 20 - var/max_paper = 30 - -/obj/item/computer_hardware/printer/diagnostics(mob/living/user) - ..() - to_chat(user, "Paper level: [stored_paper]/[max_paper]") - -/obj/item/computer_hardware/printer/examine(mob/user) - . = ..() - . += "Paper level: [stored_paper]/[max_paper]" - - -/obj/item/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "") - if(!stored_paper) - return FALSE - if(!check_functionality()) - return FALSE - - var/obj/item/paper/P = new/obj/item/paper(holder.drop_location()) - - // Damaged printer causes the resulting paper to be somewhat harder to read. - if(damage > damage_malfunction) - P.info = stars(text_to_print, 100-malfunction_probability) - else - P.info = text_to_print - if(paper_title) - P.name = paper_title - P.update_icon() - P.populatefields() - P.updateinfolinks() - stored_paper-- - P = null - - playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) - - return TRUE - -/obj/item/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null) - if(istype(I, /obj/item/paper)) - if(stored_paper >= max_paper) - if(user) - to_chat(user, "You try to add \the [I] into [src], but its paper bin is full!") - return FALSE - - if(user && !user.unEquip(I)) - return FALSE - - if(user) - to_chat(user, "You insert \the [I] into [src]'s paper recycler.") - qdel(I) - stored_paper++ - return TRUE - return FALSE - -/obj/item/computer_hardware/printer/mini - name = "miniprinter" - desc = "A small printer with paper recycling module." - power_usage = 50 - icon_state = "printer_mini" - w_class = WEIGHT_CLASS_TINY - stored_paper = 5 - max_paper = 15 diff --git a/code/modules/modular_computers/hardware/recharger.dm b/code/modules/modular_computers/hardware/recharger.dm deleted file mode 100644 index 418a9736528..00000000000 --- a/code/modules/modular_computers/hardware/recharger.dm +++ /dev/null @@ -1,94 +0,0 @@ -/obj/item/computer_hardware/recharger - critical = 1 - enabled = 1 - var/charge_rate = 100 - device_type = MC_CHARGE - -/obj/item/computer_hardware/recharger/proc/use_power(amount, charging=0) - if(charging) - return 1 - return 0 - -/obj/item/computer_hardware/recharger/process() - ..() - var/obj/item/computer_hardware/battery/battery_module = holder.all_components[MC_CELL] - if(!holder || !battery_module || !battery_module.battery) - return - - var/obj/item/stock_parts/cell/cell = battery_module.battery - if(cell.charge >= cell.maxcharge) - return - - if(use_power(charge_rate, charging=1)) - holder.give_power(charge_rate * GLOB.CELLRATE) - - -/obj/item/computer_hardware/recharger/APC - name = "area power connector" - desc = "A device that wirelessly recharges connected device from nearby APC." - icon_state = "charger_APC" - w_class = WEIGHT_CLASS_SMALL // Can't be installed into tablets/PDAs - origin_tech = "programming=2;engineering=2;powerstorage=3" - -/obj/item/computer_hardware/recharger/APC/use_power(amount, charging=0) - if(istype(holder.physical, /obj/machinery)) - var/obj/machinery/M = holder.physical - if(M.powered()) - M.use_power(amount) - return 1 - - else - var/area/A = get_area(src) - if(!istype(A)) - return 0 - - if(A.powered(EQUIP)) - A.use_power(amount, EQUIP) - return 1 - return 0 - -/obj/item/computer_hardware/recharger/wired - name = "wired power connector" - desc = "A power connector that recharges connected device from nearby power wire. Incompatible with portable computers." - icon_state = "charger_wire" - w_class = WEIGHT_CLASS_NORMAL - origin_tech = "engineering=2;powerstorage=1" - -/obj/item/computer_hardware/recharger/wired/can_install(obj/item/modular_computer/M, mob/living/user = null) - if(istype(M.physical, /obj/machinery) && M.physical.anchored) - return ..() - if(user) - to_chat(user, "\The [src] is incompatible with portable computers!") - return 0 - -/obj/item/computer_hardware/recharger/wired/use_power(amount, charging=0) - if(istype(holder.physical, /obj/machinery) && holder.physical.anchored) - var/obj/machinery/M = holder.physical - var/turf/T = M.loc - if(!T || !istype(T)) - return 0 - - var/obj/structure/cable/C = T.get_cable_node() - if(!C || !C.powernet) - return 0 - - var/power_in_net = C.powernet.avail-C.powernet.load - - if(power_in_net && power_in_net > amount) - C.powernet.load += amount - return 1 - - return 0 - - - -// This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes. -/obj/item/computer_hardware/recharger/lambda - name = "lambda coil" - desc = "A very complex device that draws power from its own bluespace dimension." - icon_state = "charger_lambda" - w_class = WEIGHT_CLASS_TINY - charge_rate = 100000 - -/obj/item/computer_hardware/recharger/lambda/use_power(amount, charging=0) - return 1 diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm deleted file mode 100644 index aa69b85b1df..00000000000 --- a/code/modules/modular_computers/laptop_vendor.dm +++ /dev/null @@ -1,291 +0,0 @@ -// A vendor machine for modular computer portable devices - Laptops and Tablets - -/obj/machinery/lapvend - name = "computer vendor" - desc = "A vending machine with a built-in microfabricator, capable of dispensing various NT-branded computers." - icon = 'icons/obj/vending.dmi' - icon_state = "robotics" - layer = BELOW_OBJ_LAYER - anchored = 1 - density = 1 - - // The actual laptop/tablet - var/obj/item/modular_computer/laptop/fabricated_laptop = null - var/obj/item/modular_computer/tablet/fabricated_tablet = null - - // Utility vars - var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen - var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet - var/total_price = 0 // Price of currently vended device. - - // Device loadout - var/dev_cpu = 1 // 1: Default, 2: Upgraded - var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range - var/dev_apc_recharger = 0 // 0: None, 1: Standard (LAPTOP ONLY) - var/dev_printer = 0 // 0: None, 1: Standard - var/dev_card = 0 // 0: None, 1: Standard - -// Removes all traces of old order and allows you to begin configuration from scratch. -/obj/machinery/lapvend/proc/reset_order() - state = 0 - devtype = 0 - QDEL_NULL(fabricated_laptop) - QDEL_NULL(fabricated_tablet) - dev_cpu = 1 - dev_battery = 1 - dev_disk = 1 - dev_netcard = 0 - dev_apc_recharger = 0 - dev_printer = 0 - dev_card = 0 - -// Recalculates the price and optionally even fabricates the device. -/obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = 0) - total_price = 0 - if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles - var/obj/item/computer_hardware/battery/battery_module = null - if(fabricate) - fabricated_laptop = new /obj/item/modular_computer/laptop/buildable(src) - fabricated_laptop.install_component(new /obj/item/computer_hardware/battery) - battery_module = fabricated_laptop.all_components[MC_CELL] - total_price = 99 - switch(dev_cpu) - if(1) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/processor_unit/small) - if(2) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/processor_unit) - total_price += 299 - switch(dev_battery) - if(1) // Basic(750C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer) - if(2) // Upgraded(1100C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/advanced) - total_price += 199 - if(3) // Advanced(1500C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/super) - total_price += 499 - switch(dev_disk) - if(1) // Basic(128GQ) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/hard_drive) - if(2) // Upgraded(256GQ) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/hard_drive/advanced) - total_price += 99 - if(3) // Advanced(512GQ) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/hard_drive/super) - total_price += 299 - switch(dev_netcard) - if(1) // Basic(Short-Range) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/network_card) - total_price += 99 - if(2) // Advanced (Long Range) - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/network_card/advanced) - total_price += 299 - if(dev_apc_recharger) - total_price += 399 - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/recharger/APC) - if(dev_printer) - total_price += 99 - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/printer/mini) - if(dev_card) - total_price += 199 - if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/card_slot) - - return total_price - else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. - var/obj/item/computer_hardware/battery/battery_module = null - if(fabricate) - fabricated_tablet = new(src) - fabricated_tablet.install_component(new /obj/item/computer_hardware/battery) - fabricated_tablet.install_component(new /obj/item/computer_hardware/processor_unit/small) - battery_module = fabricated_tablet.all_components[MC_CELL] - total_price = 199 - switch(dev_battery) - if(1) // Basic(300C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/nano) - if(2) // Upgraded(500C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/micro) - total_price += 199 - if(3) // Advanced(750C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer) - total_price += 499 - switch(dev_disk) - if(1) // Basic(32GQ) - if(fabricate) - fabricated_tablet.install_component(new /obj/item/computer_hardware/hard_drive/micro) - if(2) // Upgraded(64GQ) - if(fabricate) - fabricated_tablet.install_component(new /obj/item/computer_hardware/hard_drive/small) - total_price += 99 - if(3) // Advanced(128GQ) - if(fabricate) - fabricated_tablet.install_component(new /obj/item/computer_hardware/hard_drive) - total_price += 299 - switch(dev_netcard) - if(1) // Basic(Short-Range) - if(fabricate) - fabricated_tablet.install_component(new/obj/item/computer_hardware/network_card) - total_price += 99 - if(2) // Advanced (Long Range) - if(fabricate) - fabricated_tablet.install_component(new/obj/item/computer_hardware/network_card/advanced) - total_price += 299 - if(dev_printer) - total_price += 99 - if(fabricate) - fabricated_tablet.install_component(new/obj/item/computer_hardware/printer) - if(dev_card) - total_price += 199 - if(fabricate) - fabricated_tablet.install_component(new/obj/item/computer_hardware/card_slot) - return total_price - return 0 - - -/obj/machinery/lapvend/Topic(href, href_list) - if(..()) - return 1 - - switch(href_list["action"]) - if("pick_device") - if(state) // We've already picked a device type - return 0 - devtype = text2num(href_list["pick"]) - state = 1 - fabricate_and_recalc_price(0) - return 1 - if("clean_order") - reset_order() - return 1 - if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode - return 0 - switch(href_list["action"]) - if("confirm_order") - state = 2 // Wait for ID swipe for payment processing - fabricate_and_recalc_price(0) - return 1 - if("hw_cpu") - dev_cpu = text2num(href_list["cpu"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_battery") - dev_battery = text2num(href_list["battery"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_disk") - dev_disk = text2num(href_list["disk"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_netcard") - dev_netcard = text2num(href_list["netcard"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_tesla") - dev_apc_recharger = text2num(href_list["tesla"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_nanoprint") - dev_printer = text2num(href_list["print"]) - fabricate_and_recalc_price(0) - return 1 - if("hw_card") - dev_card = text2num(href_list["card"]) - fabricate_and_recalc_price(0) - return 1 - return 0 - -/obj/machinery/lapvend/attack_hand(mob/user) - ui_interact(user) - -/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "computer_fabricator.tmpl", "Personal Computer Vendor", 500, 700) - ui.set_auto_update(1) - ui.open() - -/obj/machinery/lapvend/ui_data(mob/user) - var/list/data[0] - data["state"] = state - if(state == 1) - data["devtype"] = devtype - data["hw_battery"] = dev_battery - data["hw_disk"] = dev_disk - data["hw_netcard"] = dev_netcard - data["hw_tesla"] = dev_apc_recharger - data["hw_nanoprint"] = dev_printer - data["hw_card"] = dev_card - data["hw_cpu"] = dev_cpu - if(state == 1 || state == 2) - data["totalprice"] = total_price - return data - -obj/machinery/lapvend/attackby(obj/item/I, mob/user) - var/obj/item/card/id/C - if(istype(I, /obj/item/card/id)) - C = I - if(istype(I, /obj/item/pda)) - var/obj/item/pda/PDA = I - if(PDA.id) - C = PDA.id - - if(C && istype(C) && state == 2) - if(process_payment(C, I)) - fabricate_and_recalc_price(1) - if((devtype == 1) && fabricated_laptop) - fabricated_laptop.forceMove(loc) - fabricated_laptop = null - else if((devtype == 2) && fabricated_tablet) - fabricated_tablet.update_icon() - fabricated_tablet.forceMove(loc) - fabricated_tablet = null - atom_say("Enjoy your new product!") - state = 3 - return 1 - return 0 - return ..() - - -// Simplified payment processing, returns 1 on success. -/obj/machinery/lapvend/proc/process_payment(obj/item/card/id/I, obj/item/ID_container) - visible_message("\The [usr] swipes \the [ID_container] through \the [src].") - var/datum/money_account/customer_account = get_card_account(I) - if(!customer_account || customer_account.suspended) - atom_say("Connection error. Unable to connect to account.") - return 0 - - if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2) - var/attempt_pin = input("Enter pin code", "Vendor transaction") as num - customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) - - if(!customer_account) - atom_say("Unable to access account: incorrect credentials.") - return 0 - - if(total_price > customer_account.money) - atom_say("Insufficient funds in account.") - return 0 - else - customer_account.charge(total_price, GLOB.vendor_account, - "Purchase of [(devtype == 1) ? "laptop computer" : "tablet microcomputer"].", - name, customer_account.owner_name, "Sale of [(devtype == 1) ? "laptop computer" : "tablet microcomputer"].", - customer_account.owner_name) - - return 1 diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm deleted file mode 100644 index cee3820b102..00000000000 --- a/code/modules/nano/modules/alarm_monitor.dm +++ /dev/null @@ -1,90 +0,0 @@ -/datum/nano_module/alarm_monitor - name = "Alarm monitor" - var/list_cameras = 0 // Whether or not to list camera references. A future goal would be to merge this with the enginering/security camera console. Currently really only for AI-use. - var/list/datum/alarm_handler/alarm_handlers // The particular list of alarm handlers this alarm monitor should present to the user. - -/datum/nano_module/alarm_monitor/all/New() - ..() - alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm) - -/datum/nano_module/alarm_monitor/engineering/New() - ..() - alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.fire_alarm, SSalarms.power_alarm) - -/datum/nano_module/alarm_monitor/security/New() - ..() - alarm_handlers = list(SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.motion_alarm) - -/datum/nano_module/alarm_monitor/proc/register(var/object, var/procName) - for(var/datum/alarm_handler/AH in alarm_handlers) - AH.register(object, procName) - -/datum/nano_module/alarm_monitor/proc/unregister(var/object) - for(var/datum/alarm_handler/AH in alarm_handlers) - AH.unregister(object) - -/datum/nano_module/alarm_monitor/proc/all_alarms() - var/list/all_alarms = new() - for(var/datum/alarm_handler/AH in alarm_handlers) - all_alarms += AH.alarms - - return all_alarms - -/datum/nano_module/alarm_monitor/proc/major_alarms() - var/list/all_alarms = new() - for(var/datum/alarm_handler/AH in alarm_handlers) - all_alarms += AH.major_alarms() - - return all_alarms - -/datum/nano_module/alarm_monitor/proc/minor_alarms() - var/list/all_alarms = new() - for(var/datum/alarm_handler/AH in alarm_handlers) - all_alarms += AH.minor_alarms() - - return all_alarms - -/datum/nano_module/alarm_monitor/Topic(ref, href_list) - if(..()) - return 1 - if(href_list["switchTo"]) - var/obj/machinery/camera/C = locate(href_list["switchTo"]) in GLOB.cameranet.cameras - if(!C || !isAI(usr)) - return - - usr.switch_to_camera(C) - return 1 - -/datum/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.default_state) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800, state = state) - ui.open() - ui.set_auto_update(1) - -/datum/nano_module/alarm_monitor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - - var/categories[0] - for(var/datum/alarm_handler/AH in alarm_handlers) - categories[++categories.len] = list("category" = AH.category, "alarms" = list()) - for(var/datum/alarm/A in AH.major_alarms()) - var/cameras[0] - var/lost_sources[0] - - if(isAI(user)) - for(var/obj/machinery/camera/C in A.cameras()) - cameras[++cameras.len] = C.nano_structure() - for(var/datum/alarm_source/AS in A.sources) - if(!AS.source) - lost_sources[++lost_sources.len] = AS.source_name - - categories[categories.len]["alarms"] += list(list( - "name" = sanitize(A.alarm_name()), - "origin_lost" = A.origin == null, - "has_cameras" = cameras.len, - "cameras" = cameras, - "lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : "")) - data["categories"] = categories - - return data diff --git a/code/modules/nano/modules/atmos_control.dm b/code/modules/nano/modules/atmos_control.dm index 2c74a1ce844..273b0bfc137 100644 --- a/code/modules/nano/modules/atmos_control.dm +++ b/code/modules/nano/modules/atmos_control.dm @@ -34,6 +34,11 @@ ui = new(user, src, ui_key, "atmos_control.tmpl", src.name, 900, 800, state = state) ui.add_template("mapContent", "atmos_control_map_content.tmpl") ui.add_template("mapHeader", "atmos_control_map_header.tmpl") + + // Send nanomaps + var/datum/asset/nanomaps = get_asset_datum(/datum/asset/simple/nanomaps) + nanomaps.send(user) + ui.set_show_map(1) ui.open() ui.set_auto_update(1) diff --git a/code/modules/nano/modules/ert_manager.dm b/code/modules/nano/modules/ert_manager.dm deleted file mode 100644 index 98a3e19d052..00000000000 --- a/code/modules/nano/modules/ert_manager.dm +++ /dev/null @@ -1,105 +0,0 @@ -/datum/nano_module/ert_manager - name = "ERT Manager" - var/ert_type = "Code Red" - var/commander_slots = 1 - var/security_slots = 3 - var/medical_slots = 3 - var/engineering_slots = 3 - var/janitor_slots = 0 - var/paranormal_slots = 0 - var/cyborg_slots = 0 - var/autoclose = 0 - - -/datum/nano_module/ert_manager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.admin_state) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(ui && autoclose) - ui.close() - return 0 - if(!ui) - ui = new(user, src, ui_key, "ert_config.tmpl", "ERT Panel", 600, 600, state = state) - ui.open() - ui.set_auto_update(1) - -/datum/nano_module/ert_manager/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["set_code"]) - ert_type = href_list["set_code"] - - if(href_list["set_com"]) - commander_slots = text2num(href_list["set_com"]) - - if(href_list["set_sec"]) - security_slots = text2num(href_list["set_sec"]) - - if(href_list["set_med"]) - medical_slots = text2num(href_list["set_med"]) - - if(href_list["set_eng"]) - engineering_slots = text2num(href_list["set_eng"]) - - if(href_list["set_jan"]) - janitor_slots = text2num(href_list["set_jan"]) - - if(href_list["set_par"]) - paranormal_slots = text2num(href_list["set_par"]) - - if(href_list["set_cyb"]) - cyborg_slots = text2num(href_list["set_cyb"]) - - if(href_list["dispatch_ert"]) - GLOB.ert_request_answered = TRUE - var/slots_list = list() - if(commander_slots > 0) - slots_list += "commander: [commander_slots]" - if(security_slots > 0) - slots_list += "security: [security_slots]" - if(medical_slots > 0) - slots_list += "medical: [medical_slots]" - if(engineering_slots > 0) - slots_list += "engineering: [engineering_slots]" - if(janitor_slots > 0) - slots_list += "janitor: [janitor_slots]" - if(paranormal_slots > 0) - slots_list += "paranormal: [paranormal_slots]" - if(cyborg_slots > 0) - slots_list += "cyborg: [cyborg_slots]" - var/slot_text = jointext(slots_list, ", ") - notify_ghosts("An ERT is being dispatched. Open positions: [slot_text]") - message_admins("[key_name_admin(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]", 1) - log_admin("[key_name(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]") - GLOB.event_announcement.Announce("Attention, [station_name()]. We are attempting to assemble an ERT. Standby.", "ERT Protocol Activated") - autoclose = 1 - ui_interact(usr) - trigger_armed_response_team(convert_ert_string(ert_type), commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots) - return 0 - - ui_interact(usr) - - -/proc/convert_ert_string(thestring) - switch(thestring) - if("Code Amber") - return new /datum/response_team/amber - if("Code Red") - return new /datum/response_team/red - if("Code Gamma") - return new /datum/response_team/gamma - - -/datum/nano_module/ert_manager/ui_data() - var/data[0] - data["alert_level"] = get_security_level() - data["ert_type"] = ert_type - data["com"] = commander_slots - data["sec"] = security_slots - data["med"] = medical_slots - data["eng"] = engineering_slots - data["jan"] = janitor_slots - data["par"] = paranormal_slots - data["cyb"] = cyborg_slots - - return data - diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index a65610c7382..f495466d3f5 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -42,7 +42,7 @@ if(in_range(user, src) && toppaper) . += toppaper.examine(user) -obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing) +/obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing) if(placing) if(containedpen) to_chat(user, "There's already a pen in [src]!") diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index b1fe71db72e..d94e69133a7 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -314,7 +314,7 @@ /obj/item/paper/contract/infernal/magic/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0) if(!istype(user) || !user.mind) return -1 - user.mind.AddSpell(new /obj/effect/proc_holder/spell/fireball/hellish(null)) + user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/fireball/hellish(null)) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) return ..() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 09858073142..32416a8d5e7 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -12,24 +12,32 @@ GLOBAL_LIST_EMPTY(fax_blacklist) insert_anim = "faxsend" pass_flags = PASSTABLE var/fax_network = "Local Fax Network" - var/syndie_restricted = FALSE //is it a syndicate base fax restricted from contacting NT assets? + /// If true, prevents fax machine from sending messages to NT machines + var/syndie_restricted = FALSE - var/long_range_enabled = 0 // Can we send messages off the station? + /// Can we send messages off-station? + var/long_range_enabled = FALSE req_one_access = list(ACCESS_LAWYER, ACCESS_HEADS, ACCESS_ARMORY) use_power = IDLE_POWER_USE idle_power_usage = 30 active_power_usage = 200 - var/obj/item/card/id/scan = null // identification + /// ID card inserted into the machine, used to log in with + var/obj/item/card/id/scan = null - var/authenticated = 0 - var/sendcooldown = 0 // to avoid spamming fax messages + /// Whether the machine is "logged in" or not + var/authenticated = FALSE + /// Next world.time at which this fax machine can send a message to CC/syndicate + var/sendcooldown = 0 + /// After sending a message to CC/syndicate, cannot send another to them for this many deciseconds var/cooldown_time = 1800 - var/department = "Unknown" // our department + /// Our department, determines whether this machine gets faxes sent to a department + var/department = "Unknown" - var/destination = "Not Selected" // the department we're sending to + /// Target department to send outgoing faxes to + var/destination /obj/machinery/photocopier/faxmachine/New() ..() @@ -44,7 +52,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine/longrange name = "long range fax machine" fax_network = "Central Command Quantum Entanglement Network" - long_range_enabled = 1 + long_range_enabled = TRUE /obj/machinery/photocopier/faxmachine/longrange/syndie name = "syndicate long range fax machine" @@ -58,17 +66,17 @@ GLOBAL_LIST_EMPTY(fax_blacklist) GLOB.hidden_departments |= department /obj/machinery/photocopier/faxmachine/attack_hand(mob/user) - ui_interact(user) + tgui_interact(user) /obj/machinery/photocopier/faxmachine/attack_ghost(mob/user) - ui_interact(user) + tgui_interact(user) /obj/machinery/photocopier/faxmachine/attackby(obj/item/item, mob/user, params) if(istype(item,/obj/item/card/id) && !scan) scan(item) else if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo) || istype(item, /obj/item/paper_bundle)) ..() - SSnanoui.update_uis(src) + SStgui.update_uis(src) else return ..() @@ -80,42 +88,6 @@ GLOBAL_LIST_EMPTY(fax_blacklist) else to_chat(user, "You swipe the card through [src], but nothing happens.") -/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "faxmachine.tmpl", "Fax Machine UI", 540, 450) - ui.open() - -/obj/machinery/photocopier/faxmachine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - var/is_authenticated = is_authenticated(user) - - if(scan) - data["scan_name"] = scan.name - else - data["scan_name"] = "-----" - data["authenticated"] = is_authenticated - if(!is_authenticated) - data["network"] = "Disconnected" - else if(!emagged) - data["network"] = fax_network - else - data["network"] = "ERR*?*%!*" - if(copyitem) - data["paper"] = copyitem.name - data["paperinserted"] = 1 - else - data["paper"] = "-----" - data["paperinserted"] = 0 - data["destination"] = destination - data["cooldown"] = sendcooldown - if((destination in GLOB.admin_departments) || (destination in GLOB.hidden_admin_departments)) - data["respectcooldown"] = 1 - else - data["respectcooldown"] = 0 - - return data - /obj/machinery/photocopier/faxmachine/proc/is_authenticated(mob/user) if(authenticated) return TRUE @@ -123,87 +95,134 @@ GLOBAL_LIST_EMPTY(fax_blacklist) return TRUE return FALSE -/obj/machinery/photocopier/faxmachine/Topic(href, href_list) - if(..()) - return 1 +/obj/machinery/photocopier/faxmachine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "FaxMachine", name, 540, 300, master_ui, state) + ui.open() +/obj/machinery/photocopier/faxmachine/tgui_data(mob/user) + var/list/data = list() + data["authenticated"] = is_authenticated(user) + data["scan_name"] = scan ? scan.name : FALSE + if(!data["authenticated"]) + data["network"] = "Disconnected" + else if(!emagged) + data["network"] = fax_network + else + data["network"] = "ERR*?*%!*" + data["paper"] = copyitem ? copyitem.name : FALSE + data["paperinserted"] = copyitem ? TRUE : FALSE + data["destination"] = destination ? destination : FALSE + data["sendError"] = FALSE + if(stat & (BROKEN|NOPOWER)) + data["sendError"] = "No Power" + else if(!data["authenticated"]) + data["sendError"] = "Not Logged In" + else if(!data["paper"]) + data["sendError"] = "Nothing Inserted" + else if(!data["destination"]) + data["sendError"] = "Destination Not Set" + else if((destination in GLOB.admin_departments) || (destination in GLOB.hidden_admin_departments)) + var/cooldown_seconds = cooldown_seconds() + if(cooldown_seconds) + data["sendError"] = "Re-aligning in [cooldown_seconds] seconds..." + return data + + +/obj/machinery/photocopier/faxmachine/tgui_act(action, params) + if(..()) + return var/is_authenticated = is_authenticated(usr) - if(href_list["send"]) - if(copyitem && is_authenticated) + . = TRUE + switch(action) + if("scan") // insert/remove your ID card + scan() + if("auth") // log in/out + if(!is_authenticated && scan) + if(scan.registered_name in GLOB.fax_blacklist) + to_chat(usr, "Login rejected: individual is blacklisted from fax network.") + playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + . = FALSE + else if(check_access(scan)) + authenticated = TRUE + else // ID doesn't have access to this machine + to_chat(usr, "Login rejected: ID card does not have required access.") + playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + . = FALSE + else if(is_authenticated) + authenticated = FALSE + if("paper") // insert/eject paper/paperbundle/photo + if(copyitem) + copyitem.forceMove(get_turf(src)) + if(ishuman(usr)) + if(!usr.get_active_hand() && Adjacent(usr)) + usr.put_in_hands(copyitem) + to_chat(usr, "You eject [copyitem] from [src].") + copyitem = null + else + var/obj/item/I = usr.get_active_hand() + if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) + usr.drop_item() + copyitem = I + I.forceMove(src) + to_chat(usr, "You insert [I] into [src].") + flick(insert_anim, src) + else + to_chat(usr, "[src] only accepts paper, paper bundles, and photos.") + . = FALSE + if("rename") // rename the item that is currently in the fax machine + if(copyitem) + var/n_name = sanitize(copytext(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name) as text, 1, MAX_MESSAGE_LEN)) + if((copyitem && copyitem.loc == src && usr.stat == 0)) + if(istype(copyitem, /obj/item/paper)) + copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]" + copyitem.desc = "This is a paper titled '" + copyitem.name + "'." + else if(istype(copyitem, /obj/item/photo)) + copyitem.name = "[(n_name ? text("[n_name]") : "photo")]" + else if(istype(copyitem, /obj/item/paper_bundle)) + copyitem.name = "[(n_name ? text("[n_name]") : "paper")]" + else + . = FALSE + else + . = FALSE + else + . = FALSE + if("dept") // choose which department receives the fax + if(is_authenticated) + var/lastdestination = destination + var/list/combineddepartments = GLOB.alldepartments.Copy() + if(long_range_enabled) + combineddepartments += GLOB.admin_departments.Copy() + if(emagged) + combineddepartments += GLOB.hidden_admin_departments.Copy() + combineddepartments += GLOB.hidden_departments.Copy() + if(syndie_restricted) + combineddepartments = GLOB.hidden_admin_departments.Copy() + combineddepartments += GLOB.hidden_departments.Copy() + for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes) + if(F.emagged)//we can contact emagged faxes on the station + combineddepartments |= F.department + destination = input(usr, "To which department?", "Choose a department", "") as null|anything in combineddepartments + if(!destination) + destination = lastdestination + if("send") // actually send the fax + if(!copyitem || !is_authenticated || !destination) + return + if(stat & (BROKEN|NOPOWER)) + return if((destination in GLOB.admin_departments) || (destination in GLOB.hidden_admin_departments)) + var/cooldown_seconds = cooldown_seconds() + if(cooldown_seconds > 0) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + to_chat(usr, "[src] is not ready for another [cooldown_seconds] seconds.") + return send_admin_fax(usr, destination) + sendcooldown = world.time + cooldown_time else sendfax(destination, usr) - - if(sendcooldown) - spawn(sendcooldown) // cooldown time - sendcooldown = 0 - SSnanoui.update_uis(src) - - if(href_list["paper"]) - if(copyitem) - copyitem.forceMove(get_turf(src)) - if(ishuman(usr)) - if(!usr.get_active_hand() && Adjacent(usr)) - usr.put_in_hands(copyitem) - to_chat(usr, "You eject \the [copyitem] from \the [src].") - copyitem = null - else - var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) - usr.drop_item() - copyitem = I - I.forceMove(src) - to_chat(usr, "You insert \the [I] into \the [src].") - flick(insert_anim, src) - - if(href_list["scan"]) - scan() - - if(href_list["dept"]) - if(is_authenticated) - var/lastdestination = destination - var/list/combineddepartments = GLOB.alldepartments.Copy() - if(long_range_enabled) - combineddepartments += GLOB.admin_departments.Copy() - - if(emagged) - combineddepartments += GLOB.hidden_admin_departments.Copy() - combineddepartments += GLOB.hidden_departments.Copy() - - if(syndie_restricted) - combineddepartments = GLOB.hidden_admin_departments.Copy() - combineddepartments += GLOB.hidden_departments.Copy() - for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes) - if(F.emagged)//we can contact emagged faxes on the station - combineddepartments |= F.department - - destination = input(usr, "To which department?", "Choose a department", "") as null|anything in combineddepartments - if(!destination) - destination = lastdestination - - if(href_list["auth"]) - if(!is_authenticated && scan) - if(scan.registered_name in GLOB.fax_blacklist) - playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - else if(check_access(scan)) - authenticated = 1 - else if(is_authenticated) - authenticated = 0 - - if(href_list["rename"]) - if(copyitem) - var/n_name = sanitize(copytext(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name) as text, 1, MAX_MESSAGE_LEN)) - if((copyitem && copyitem.loc == src && usr.stat == 0)) - if(istype(copyitem, /obj/item/paper)) - copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]" - copyitem.desc = "This is a paper titled '" + copyitem.name + "'." - else if(istype(copyitem, /obj/item/photo)) - copyitem.name = "[(n_name ? text("[n_name]") : "photo")]" - else if(istype(copyitem, /obj/item/paper_bundle)) - copyitem.name = "[(n_name ? text("[n_name]") : "paper")]" - - SSnanoui.update_uis(src) + if(.) + add_fingerprint(usr) /obj/machinery/photocopier/faxmachine/proc/scan(var/obj/item/card/id/card = null) if(scan) // Card is in machine @@ -226,7 +245,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) usr.drop_item() card.forceMove(src) scan = card - SSnanoui.update_uis(src) + SStgui.update_uis(src) /obj/machinery/photocopier/faxmachine/verb/eject_id() set category = null @@ -237,25 +256,20 @@ GLOBAL_LIST_EMPTY(fax_blacklist) return if(scan) - to_chat(usr, "You remove \the [scan] from \the [src].") + to_chat(usr, "You remove [scan] from [src].") scan.forceMove(get_turf(src)) if(!usr.get_active_hand() && Adjacent(usr)) usr.put_in_hands(scan) scan = null else - to_chat(usr, "There is nothing to remove from \the [src].") + to_chat(usr, "There is nothing to remove from [src].") /obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination,var/mob/sender) - if(stat & (BROKEN|NOPOWER)) - return - - use_power(200) - + use_power(active_power_usage) var/success = 0 for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes) if(F.department == destination) success = F.receivefax(copyitem) - if(success) var/datum/fax/F = new /datum/fax() F.name = copyitem.name @@ -272,10 +286,10 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming) if(stat & (BROKEN|NOPOWER)) - return 0 + return FALSE if(department == "Unknown") - return 0 //You can't send faxes to "Unknown" + return FALSE //You can't send faxes to "Unknown" flick("faxreceive", src) @@ -291,19 +305,13 @@ GLOBAL_LIST_EMPTY(fax_blacklist) else if(istype(incoming, /obj/item/paper_bundle)) bundlecopy(incoming) else - return 0 + return FALSE use_power(active_power_usage) - return 1 + return TRUE /obj/machinery/photocopier/faxmachine/proc/send_admin_fax(var/mob/sender, var/destination) - if(stat & (BROKEN|NOPOWER)) - return - - if(sendcooldown) - return - - use_power(200) + use_power(active_power_usage) if(!(istype(copyitem, /obj/item/paper) || istype(copyitem, /obj/item/paper_bundle) || istype(copyitem, /obj/item/photo))) visible_message("[src] beeps, \"Error transmitting message.\"") @@ -327,10 +335,12 @@ GLOBAL_LIST_EMPTY(fax_blacklist) for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes) if(F.department == destination) F.receivefax(copyitem) - sendcooldown = cooldown_time - spawn(50) - visible_message("[src] beeps, \"Message transmitted successfully.\"") + visible_message("[src] beeps, \"Message transmitted successfully.\"") +/obj/machinery/photocopier/faxmachine/proc/cooldown_seconds() + if(sendcooldown < world.time) + return 0 + return round((sendcooldown - world.time) / 10) /obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/faxtype, var/obj/item/sent, font_colour="#9A04D1") var/msg = "[faxname]: [key_name_admin(sender)] | REPLY: (RADIO) (FAX) ([ADMIN_SM(sender,"SM")]) | REJECT: (TEMPLATE) ([ADMIN_BSA(sender,"BSA")]) (EVILFAX) : Receiving '[sent.name]' via secure connection... view message" diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index eb8904cf3e8..17cfcacec62 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -150,7 +150,7 @@ // Explicitly only allow deletion from the local camera deletepicture(src) -obj/item/camera/siliconcam/proc/getsource() +/obj/item/camera/siliconcam/proc/getsource() if(istype(src.loc, /mob/living/silicon/ai)) return src diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm index f214e705268..cd549759c1c 100644 --- a/code/modules/pda/radio.dm +++ b/code/modules/pda/radio.dm @@ -70,26 +70,22 @@ switch(href_list["op"]) if("control") active = locate(href_list["bot"]) - spawn(0) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) if("scanbots") // find all bots botlist = null - spawn(0) - post_signal(control_freq, "command", "bot_status", s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", s_filter = bot_filter) if("botlist") active = null if("stop", "go", "home") - spawn(0) - post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) if("summon") - spawn(0) - post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(hostpda), "useraccess", hostpda.GetAccess(), "user", usr, s_filter = bot_filter) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(hostpda), "useraccess", hostpda.GetAccess(), "user", usr, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) /obj/item/integrated_radio/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots. if(SSradio) @@ -123,38 +119,30 @@ ..() switch(href_list["op"]) if("start") - spawn(0) - post_signal(control_freq, "command", "start", "active", active, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "start", "active", active, s_filter = RADIO_MULEBOT) if("unload") - spawn(0) - post_signal(control_freq, "command", "unload", "active", active, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "unload", "active", active, s_filter = RADIO_MULEBOT) if("setdest") if(GLOB.deliverybeacons) var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in GLOB.deliverybeacontags if(dest) - spawn(0) - post_signal(control_freq, "command", "target", "active", active, "destination", dest, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "target", "active", active, "destination", dest, s_filter = RADIO_MULEBOT) if("retoff") - spawn(0) - post_signal(control_freq, "command", "autoret", "active", active, "value", 0, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "autoret", "active", active, "value", 0, s_filter = RADIO_MULEBOT) if("reton") - spawn(0) - post_signal(control_freq, "command", "autoret", "active", active, "value", 1, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "autoret", "active", active, "value", 1, s_filter = RADIO_MULEBOT) if("pickoff") - spawn(0) - post_signal(control_freq, "command", "autopick", "active", active, "value", 0, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "autopick", "active", active, "value", 0, s_filter = RADIO_MULEBOT) if("pickon") - spawn(0) - post_signal(control_freq, "command", "autopick", "active", active, "value", 1, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "autopick", "active", active, "value", 1, s_filter = RADIO_MULEBOT) - spawn(10) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_MULEBOT) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_MULEBOT) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm index 1dfb819c826..c527e1dd12d 100644 --- a/code/modules/pda/utilities.dm +++ b/code/modules/pda/utilities.dm @@ -10,6 +10,10 @@ name = fon ? "Disable Flashlight" : "Enable Flashlight" pda.update_shortcuts() pda.set_light(fon ? f_lum : 0) + if(fon) + pda.overlays += image('icons/obj/pda.dmi', "pda-light") + else + pda.overlays -= image('icons/obj/pda.dmi', "pda-light") /datum/data/pda/utility/honk name = "Honk Synthesizer" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 409abe3d724..c4d3fb6cb91 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -25,6 +25,11 @@ #define APC_UPDATE_ICON_COOLDOWN 200 // 20 seconds +// main_status var +#define APC_EXTERNAL_POWER_NOTCONNECTED 0 +#define APC_EXTERNAL_POWER_NOENERGY 1 +#define APC_EXTERNAL_POWER_GOOD 2 + // APC malf status #define APC_MALF_NOT_HACKED 1 #define APC_MALF_HACKED 2 // APC hacked by user, and user is in its core. @@ -75,7 +80,7 @@ var/lastused_equip = 0 var/lastused_environ = 0 var/lastused_total = 0 - var/main_status = 0 + var/main_status = APC_EXTERNAL_POWER_NOTCONNECTED powernet = 0 // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :( var/malfhack = 0 //New var for my changes to AI malf. --NeoFite var/mob/living/silicon/ai/malfai = null //See above --NeoFite @@ -170,6 +175,7 @@ addtimer(CALLBACK(src, .proc/update), 5) /obj/machinery/power/apc/Destroy() + SStgui.close_uis(wires) GLOB.apcs -= src if(malfai && operating) malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) @@ -212,12 +218,11 @@ if(isarea(A)) area = A // no-op, keep the name - else if(isarea(A) && src.areastring == null) + else if(isarea(A) && !areastring) area = A name = "\improper [area.name] APC" else - area = get_area_name(areastring) - name = "\improper [area.name] APC" + name = "\improper [get_area_name(area, TRUE)] APC" area.apc |= src update_icon() @@ -429,8 +434,8 @@ //attack with an item - open/close cover, insert cell, or (un)lock interface /obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params) - if(issilicon(user) && get_dist(src,user)>1) - return src.attack_hand(user) + if(issilicon(user) && get_dist(src, user) > 1) + return attack_hand(user) else if (istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside if(cell) @@ -445,7 +450,7 @@ W.forceMove(src) cell = W user.visible_message(\ - "[user.name] has inserted the power cell to [src.name]!",\ + "[user.name] has inserted the power cell to [name]!",\ "You insert the power cell.") chargecount = 0 update_icon() @@ -474,7 +479,7 @@ return user.visible_message("[user.name] adds cables to the APC frame.", \ "You start adding cables to the APC frame...") - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) if(do_after(user, 20, target = src)) if(C.get_amount() < 10 || !C) return @@ -499,10 +504,10 @@ user.visible_message("[user.name] inserts the power control board into [src].", \ "You start to insert the power control board into the frame...") - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) if(do_after(user, 10, target = src)) - if(has_electronics==0) - has_electronics = 1 + if(!has_electronics) + has_electronics = TRUE locked = FALSE to_chat(user, "You place the power control board inside the frame.") qdel(W) @@ -549,11 +554,11 @@ return to_chat(user, "You are trying to remove the power control board..." ) if(I.use_tool(src, user, 50, volume = I.tool_volume)) - if(has_electronics==1) - has_electronics = 0 + if(has_electronics) + has_electronics = FALSE if(stat & BROKEN) user.visible_message(\ - "[user.name] has broken the power control board inside [src.name]!", + "[user.name] has broken the power control board inside [name]!", "You break the charred power control board and remove the remains.", "You hear a crack.") return @@ -561,19 +566,19 @@ else if(emagged) // We emag board, not APC's frame emagged = FALSE user.visible_message( - "[user.name] has discarded emaged power control board from [src.name]!", - "You discarded shorten board.") + "[user.name] has discarded the shorted power control board from [name]!", + "You discarded the shorted board.") return else if(malfhack) // AI hacks board, not APC's frame user.visible_message(\ - "[user.name] has discarded strangely programmed power control board from [src.name]!", - "You discarded strangely programmed board.") + "[user.name] has discarded strangely the programmed power control board from [name]!", + "You discarded the strangely programmed board.") malfai = null malfhack = 0 return else user.visible_message(\ - "[user.name] has removed the power control board from [src.name]!", + "[user.name] has removed the power control board from [name]!", "You remove the power control board.") new /obj/item/apc_electronics(loc) return @@ -648,7 +653,7 @@ else if(stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens!") else - if(allowed(usr) && !isWireCut(APC_WIRE_IDSCAN) && !malfhack) + if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.") update_icon() @@ -711,36 +716,29 @@ // attack with hand - remove cell (if cover open) or interact with the APC /obj/machinery/power/apc/attack_hand(mob/user) -// if(!can_use(user)) This already gets called in interact() and in topic() -// return if(!user) return - src.add_fingerprint(user) + add_fingerprint(user) - if(usr == user && opened && (!issilicon(user))) + if(usr == user && opened && !issilicon(user)) if(cell) - if(issilicon(user)) - cell.loc=src.loc // Drop it, whoops. - else - user.put_in_hands(cell) + user.put_in_hands(cell) cell.add_fingerprint(user) cell.update_icon() - - src.cell = null - user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.") -// to_chat(user, "You remove the power cell.") - charging = 0 - src.update_icon() + cell = null + user.visible_message("[user.name] removes [cell] from [src]!", "You remove the [cell].") + charging = FALSE + update_icon() return if(stat & (BROKEN|MAINT)) return - src.interact(user) + interact(user) /obj/machinery/power/apc/attack_ghost(mob/user) if(panel_open) wires.Interact(user) - return ui_interact(user) + return tgui_interact(user) /obj/machinery/power/apc/interact(mob/user) if(!user) @@ -749,7 +747,7 @@ if(panel_open) wires.Interact(user) - return ui_interact(user) + return tgui_interact(user) /obj/machinery/power/apc/proc/get_malf_status(mob/living/silicon/ai/malf) @@ -770,22 +768,16 @@ else return APC_MALF_NOT_HACKED -/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(!user) - return - - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/power/apc/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - // the ui does not exist, so we'll create a new one - ui = new(user, src, ui_key, "apc.tmpl", "[area.name] - APC", 510, issilicon(user) ? 535 : 460) + ui = new(user, src, ui_key, "APC", name, 510, 460, master_ui, state) ui.open() - // Auto update every Master Controller tick - ui.set_auto_update(1) -/obj/machinery/power/apc/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] +/obj/machinery/power/apc/tgui_data(mob/user) + var/list/data = list() data["locked"] = is_locked(user) + data["normallyLocked"] = locked data["isOperating"] = operating data["externalPower"] = main_status data["powerCellStatus"] = cell ? cell.percent() : null @@ -853,10 +845,6 @@ // to_chat(world, "[area.power_equip]") area.power_change() -/obj/machinery/power/apc/proc/isWireCut(var/wireIndex) - return wires.IsIndexCut(wireIndex) - - /obj/machinery/power/apc/proc/can_use(var/mob/user, var/loud = 0) //used by attack_hand() and Topic() if(user.can_admin_interact()) return 1 @@ -866,7 +854,7 @@ var/mob/living/silicon/ai/AI = user var/mob/living/silicon/robot/robot = user if( \ - src.aidisabled || \ + aidisabled || \ malfhack && istype(malfai) && \ ( \ (istype(AI) && (malfai!=AI && malfai != AI.parent)) || \ @@ -877,21 +865,21 @@ to_chat(user, "\The [src] has AI control disabled!") user << browse(null, "window=apc") user.unset_machine() - return 0 + return FALSE else - if((!in_range(src, user) || !istype(src.loc, /turf))) - return 0 + if((!in_range(src, user) || !istype(loc, /turf))) + return FALSE var/mob/living/carbon/human/H = user if(istype(H)) if(H.getBrainLoss() >= 60) for(var/mob/M in viewers(src, null)) to_chat(M, "[H] stares cluelessly at [src] and drools.") - return 0 + return FALSE else if(prob(H.getBrainLoss())) to_chat(user, "You momentarily forget how to use [src].") - return 0 - return 1 + return FALSE + return TRUE /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob) if(user.can_admin_interact()) @@ -909,104 +897,59 @@ else return locked -/obj/machinery/power/apc/Topic(href, href_list, var/usingUI = 1) - if(..()) - return 1 - - if(!can_use(usr, 1)) - return 1 - - if(href_list["lock"]) - if(!is_authenticated(usr)) - return - - coverlocked = !coverlocked - - else if(href_list["breaker"]) - if(!is_authenticated(usr)) - return - - toggle_breaker() - - else if(href_list["toggle_nightshift"]) - if(!is_authenticated(usr)) - return - - if(last_nightshift_switch > world.time + 100) // don't spam... - to_chat(usr, "[src]'s night lighting circuit breaker is still cycling!") - return - last_nightshift_switch = world.time - set_nightshift(!nightshift_lights) - - else if(href_list["cmode"]) - if(!is_authenticated(usr)) - return - - chargemode = !chargemode - if(!chargemode) - charging = 0 - update_icon() - - else if(href_list["eqp"]) - if(!is_authenticated(usr)) - return - - var/val = text2num(href_list["eqp"]) - equipment = setsubsystem(val) - update_icon() - update() - - else if(href_list["lgt"]) - if(!is_authenticated(usr)) - return - - var/val = text2num(href_list["lgt"]) - lighting = setsubsystem(val) - update_icon() - update() - - else if(href_list["env"]) - if(!is_authenticated(usr)) - return - - var/val = text2num(href_list["env"]) - environ = setsubsystem(val) - update_icon() - update() - else if( href_list["close"] ) - SSnanoui.close_user_uis(usr, src) - - return 0 - else if(href_list["close2"]) - usr << browse(null, "window=apcwires") - - return 0 - - else if(href_list["overload"]) - if(issilicon(usr) && !aidisabled) - overload_lighting() - - else if(href_list["malfhack"]) - if(get_malf_status(usr)) - malfhack(usr) - - else if(href_list["occupyapc"]) - if(get_malf_status(usr)) - malfoccupy(usr) - - else if(href_list["deoccupyapc"]) - if(get_malf_status(usr)) - malfvacate() - - else if(href_list["toggleaccess"]) - if(istype(usr, /mob/living/silicon)) - if(emagged || aidisabled || (stat & (BROKEN|MAINT))) - to_chat(usr, "The APC does not respond to the command.") +/obj/machinery/power/apc/tgui_act(action, params) + if(..() || !can_use(usr, TRUE) || (locked && !usr.has_unlimited_silicon_privilege && (action != "toggle_nightshift") && !usr.can_admin_interact())) + return + . = TRUE + switch(action) + if("lock") + if(usr.has_unlimited_silicon_privilege) + if(emagged || stat & BROKEN) + to_chat(usr, "The APC does not respond to the command!") + return FALSE + else + locked = !locked + update_icon() else - locked = !locked + to_chat(usr, "Access Denied!") + return FALSE + if("cover") + coverlocked = !coverlocked + if("breaker") + toggle_breaker(usr) + if("toggle_nightshift") + if(last_nightshift_switch > world.time + 100) // don't spam... + to_chat(usr, "[src]'s night lighting circuit breaker is still cycling!") + return FALSE + last_nightshift_switch = world.time + set_nightshift(!nightshift_lights) + if("charge") + chargemode = !chargemode + if("channel") + if(params["eqp"]) + equipment = setsubsystem(text2num(params["eqp"])) update_icon() - - return 0 + update() + else if(params["lgt"]) + lighting = setsubsystem(text2num(params["lgt"])) + update_icon() + update() + else if(params["env"]) + environ = setsubsystem(text2num(params["env"])) + update_icon() + update() + if("overload") + if(usr.has_unlimited_silicon_privilege) + INVOKE_ASYNC(src, /obj/machinery/power/apc.proc/overload_lighting) + if("hack") + if(get_malf_status(usr)) + malfhack(usr) + if("occupy") + if(get_malf_status(usr)) + malfoccupy(usr) + if("deoccupy") + if(get_malf_status(usr)) + malfvacate() /obj/machinery/power/apc/proc/toggle_breaker() operating = !operating @@ -1037,7 +980,7 @@ if(!malf.can_shunt) to_chat(malf, "You cannot shunt!") return - if(!is_station_level(src.z)) + if(!is_station_level(z)) return occupier = new /mob/living/silicon/ai(src,malf.laws,null,1) occupier.adjustOxyLoss(malf.getOxyLoss()) @@ -1084,21 +1027,21 @@ /obj/machinery/power/apc/proc/ion_act() //intended to be exactly the same as an AI malf attack - if(!src.malfhack && is_station_level(src.z)) + if(!malfhack && is_station_level(z)) if(prob(3)) - src.locked = 1 - if(src.cell.charge > 0) - src.cell.charge = 0 + locked = TRUE + if(cell.charge > 0) + cell.charge = 0 cell.corrupt() - src.malfhack = 1 + malfhack = TRUE update_icon() var/datum/effect_system/smoke_spread/smoke = new - smoke.set_up(3, 0, src.loc) + smoke.set_up(3, 0, loc) smoke.attach(src) smoke.start() do_sparks(3, 1, src) for(var/mob/M in viewers(src)) - M.show_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) + M.show_message("The [name] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) /obj/machinery/power/apc/surplus() @@ -1141,12 +1084,12 @@ var/excess = surplus() - if(!src.avail()) - main_status = 0 + if(!avail()) + main_status = APC_EXTERNAL_POWER_NOTCONNECTED else if(excess < 0) - main_status = 1 + main_status = APC_EXTERNAL_POWER_NOENERGY else - main_status = 2 + main_status = APC_EXTERNAL_POWER_GOOD if(debug) log_debug("Status: [main_status] - Excess: [excess] - Last Equip: [lastused_equip] - Last Light: [lastused_light] - Longterm: [longtermpower]") @@ -1192,31 +1135,31 @@ lighting = autoset(lighting, 1) environ = autoset(environ, 1) autoflag = 3 - if(report_power_alarm && is_station_contact(z)) - SSalarms.power_alarm.clearAlarm(loc, src) + if(report_power_alarm) + area.poweralert(TRUE, src) else if(cell.charge < 1250 && cell.charge > 750 && longtermpower < 0) // <30%, turn off equipment if(autoflag != 2) equipment = autoset(equipment, 2) lighting = autoset(lighting, 1) environ = autoset(environ, 1) - if(report_power_alarm && is_station_contact(z)) - SSalarms.power_alarm.triggerAlarm(loc, src) + if(report_power_alarm) + area.poweralert(FALSE, src) autoflag = 2 else if(cell.charge < 750 && cell.charge > 10) // <15%, turn off lighting & equipment if((autoflag > 1 && longtermpower < 0) || (autoflag > 1 && longtermpower >= 0)) equipment = autoset(equipment, 2) lighting = autoset(lighting, 2) environ = autoset(environ, 1) - if(report_power_alarm && is_station_contact(z)) - SSalarms.power_alarm.triggerAlarm(loc, src) + if(report_power_alarm) + area.poweralert(FALSE, src) autoflag = 1 else if(cell.charge <= 0) // zero charge, turn all off if(autoflag != 0) equipment = autoset(equipment, 0) lighting = autoset(lighting, 0) environ = autoset(environ, 0) - if(report_power_alarm && is_station_contact(z)) - SSalarms.power_alarm.triggerAlarm(loc, src) + if(report_power_alarm) + area.poweralert(FALSE, src) autoflag = 0 // now trickle-charge the cell @@ -1261,7 +1204,7 @@ if(shock_mobs.len) var/mob/living/L = pick(shock_mobs) L.electrocute_act(rand(5, 25), "electrical arc") - playsound(get_turf(L), 'sound/effects/eleczap.ogg', 75, 1) + playsound(get_turf(L), 'sound/effects/eleczap.ogg', 75, TRUE) Beam(L, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 5) else // no cell, switch everything off @@ -1271,8 +1214,8 @@ equipment = autoset(equipment, 0) lighting = autoset(lighting, 0) environ = autoset(environ, 0) - if(report_power_alarm && is_station_contact(z)) - SSalarms.power_alarm.triggerAlarm(loc, src) + if(report_power_alarm) + area.poweralert(FALSE, src) autoflag = 0 // update icon & area power if anything changed @@ -1344,11 +1287,10 @@ return if(cell && cell.charge >= 20) cell.use(20) - spawn(0) - for(var/obj/machinery/light/L in area) - if(prob(chance)) - L.break_light_tube(0, 1) - stoplag() + for(var/obj/machinery/light/L in area) + if(prob(chance)) + L.break_light_tube(0, 1) + stoplag() /obj/machinery/power/apc/proc/null_charge() for(var/obj/machinery/light/L in area) @@ -1372,4 +1314,22 @@ L.update(FALSE) CHECK_TICK +/obj/machinery/power/apc/proc/relock_callback() + locked = TRUE + updateDialog() + +/obj/machinery/power/apc/proc/check_main_power_callback() + if(!wires.is_cut(WIRE_MAIN_POWER1) && !wires.is_cut(WIRE_MAIN_POWER2)) + shorted = FALSE + updateDialog() + +/obj/machinery/power/apc/proc/check_ai_control_callback() + if(!wires.is_cut(WIRE_AI_CONTROL)) + aidisabled = FALSE + updateDialog() + #undef APC_UPDATE_ICON_COOLDOWN + +#undef APC_EXTERNAL_POWER_NOTCONNECTED +#undef APC_EXTERNAL_POWER_NOENERGY +#undef APC_EXTERNAL_POWER_GOOD diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 992020e7090..40969d7e677 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -229,7 +229,7 @@ By design, d1 is the smallest direction and d2 is the highest if(current_size >= STAGE_FIVE) deconstruct() -obj/structure/cable/proc/cable_color(colorC) +/obj/structure/cable/proc/cable_color(colorC) if(!colorC) color = COLOR_RED else if(colorC == "rainbow") diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index df457111704..9305faf6637 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -177,6 +177,8 @@ var/nightshift_light_power = 0.45 var/nightshift_light_color = "#FFDDCC" + var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode + // the smaller bulb light fixture /obj/machinery/light/small @@ -238,7 +240,11 @@ switch(status) // set icon_states if(LIGHT_OK) - icon_state = "[base_state][on]" + var/area/A = get_area(src) + if(A && A.fire) + icon_state = "[base_state]_emergency" + else + icon_state = "[base_state][on]" if(LIGHT_EMPTY) icon_state = "[base_state]-empty" on = FALSE @@ -260,10 +266,20 @@ on = FALSE update_icon() if(on) - var/BR = nightshift_enabled ? nightshift_light_range : brightness_range - var/PO = nightshift_enabled ? nightshift_light_power : brightness_power - var/CO = nightshift_enabled ? nightshift_light_color : brightness_color - var/matching = light_range == BR && light_power == PO && light_color == CO + var/BR = brightness_range + var/PO = brightness_power + var/CO = brightness_color + if(color) + CO = color + var/area/A = get_area(src) + if(A && A.fire) + CO = bulb_emergency_colour + else if(nightshift_enabled) + BR = nightshift_light_range + PO = nightshift_light_power + if(!color) + CO = nightshift_light_color + var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color if(!matching) switchcount++ if(rigged) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index b534fbbfda4..a0e10c73be8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -1,3 +1,5 @@ +#define SHEET_VOLUME 1000 //cm3 + //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power). /obj/machinery/power/port_gen name = "Placeholder Generator" //seriously, don't use this. It can't be anchored without VV magic. @@ -239,7 +241,7 @@ var/temp_loss = (temperature - cooling_temperature)/TEMPERATURE_DIVISOR temp_loss = between(2, round(temp_loss, 1), TEMPERATURE_CHANGE_MAX) temperature = max(temperature - temp_loss, cooling_temperature) - SSnanoui.update_uis(src) + SStgui.update_uis(src) if(overheating) overheating-- @@ -280,7 +282,7 @@ to_chat(user, "You add [amount] sheet\s to the [src.name].") sheets += amount addstack.use(amount) - SSnanoui.update_uis(src) + SStgui.update_uis(src) return else if(!active) if(istype(O, /obj/item/wrench)) @@ -312,78 +314,69 @@ /obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob) ..() - if(!anchored) - return - ui_interact(user) + tgui_interact(user) /obj/machinery/power/port_gen/pacman/attack_ai(var/mob/user as mob) - src.add_hiddenprint(user) - return src.attack_hand(user) + add_hiddenprint(user) + return attack_hand(user) /obj/machinery/power/port_gen/pacman/attack_ghost(var/mob/user) - return src.attack_hand(user) + return attack_hand(user) -/obj/machinery/power/port_gen/pacman/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(IsBroken()) - return - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/power/port_gen/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "pacman.tmpl", src.name, 500, 560) + ui = new(user, src, ui_key, "Pacman", name, 500, 260) ui.open() - ui.set_auto_update(1) -/obj/machinery/power/port_gen/pacman/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] +/obj/machinery/power/port_gen/pacman/tgui_data(mob/user) + var/list/data = list() data["active"] = active if(istype(user, /mob/living/silicon/ai)) - data["is_ai"] = 1 + data["is_ai"] = TRUE else if(istype(user, /mob/living/silicon/robot) && !Adjacent(user)) - data["is_ai"] = 1 + data["is_ai"] = TRUE else - data["is_ai"] = 0 + data["is_ai"] = FALSE + data["anchored"] = anchored + data["broken"] = IsBroken() data["output_set"] = power_output data["output_max"] = max_power_output data["output_safe"] = max_safe_output - data["output_watts"] = power_output * power_gen - data["temperature_current"] = src.temperature - data["temperature_max"] = src.max_temperature - data["temperature_overheat"] = overheating - // 1 sheet = 1000cm3? - data["fuel_stored"] = round((sheets * 1000) + (sheet_left * 1000)) - data["fuel_capacity"] = round(max_sheets * 1000, 0.1) - data["fuel_usage"] = active ? round((power_output / time_per_sheet) * 1000) : 0 + data["power_gen"] = power_gen + data["tmp_current"] = temperature + data["tmp_max"] = max_temperature + data["tmp_overheat"] = overheating + data["fuel_stored"] = round((sheets * SHEET_VOLUME) + (sheet_left * SHEET_VOLUME)) + data["fuel_cap"] = round(max_sheets * SHEET_VOLUME, 0.1) + data["fuel_usage"] = active ? round((power_output / time_per_sheet) * SHEET_VOLUME) : 0 data["fuel_type"] = sheet_name + data["has_fuel"] = HasFuel() return data -/obj/machinery/power/port_gen/pacman/Topic(href, href_list) +/obj/machinery/power/port_gen/pacman/tgui_act(action, params) if(..()) return - src.add_fingerprint(usr) - if(href_list["action"]) - if(href_list["action"] == "enable") - if(!active && HasFuel() && !IsBroken()) - active = 1 - update_icon() - if(href_list["action"] == "disable") - if(active) - active = 0 - update_icon() - if(href_list["action"] == "eject") - if(!active) - DropFuel() - if(href_list["action"] == "lower_power") - if(power_output > 1) - power_output-- - if(href_list["action"] == "higher_power") - if(power_output < max_power_output || (emagged && power_output < round(max_power_output*2.5))) - power_output++ + add_fingerprint(usr) - SSnanoui.update_uis(src) + . = TRUE + + switch(action) + if("toggle_power") + if(!powernet) //only a warning, process will disable + atom_say("Not connected to powernet.") + active = !active + update_icon() + if("eject_fuel") + DropFuel() + if("change_power") + var/newPower = text2num(params["change_power"]) + if(newPower) + power_output = clamp(newPower, 1, max_power_output) /obj/machinery/power/port_gen/pacman/super name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator" diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 046cf68a543..960340e90b6 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -310,16 +310,25 @@ field_generator power level display //This is here to help fight the "hurr durr, release singulo cos nobody will notice before the //singulo eats the evidence". It's not fool-proof but better than nothing. //I want to avoid using global variables. - spawn(1) - var/temp = 1 //stops spam - for(var/thing in GLOB.singularities) - var/obj/singularity/O = thing - if(O.last_warning && temp) - if((world.time - O.last_warning) > 50) //to stop message-spam - temp = 0 - message_admins("A singulo exists and a containment field has failed. Location: [get_area(src)] (JMP)",1) - investigate_log("has failed whilst a singulo exists.","singulo") - O.last_warning = world.time + INVOKE_ASYNC(src, .proc/admin_alert) + +/obj/machinery/field/generator/proc/admin_alert() + var/temp = TRUE //stops spam + for(var/thing in GLOB.singularities) + var/obj/singularity/O = thing + if(O.last_warning && temp && atoms_share_level(O, src)) + if((world.time - O.last_warning) > 50) //to stop message-spam + temp = FALSE + // To the person who asks "Hey affected, why are you using this massive operator when you can use AREACOORD?" Well, ill tell you + // get_area_name is fucking broken and uses a for(x in world) search + // It doesnt even work, is expensive, and returns 0 + // Im not refactoring one thing which could risk breaking all admin location logs + // Fight me + // [src ? "[get_location_name(src, TRUE)] [COORD(src)]" : "nonexistent location"] [ADMIN_JMP(src)] works much better and actually works at all + // Oh and yes, this exact comment was pasted from the exact same thing I did to tcomms code. Dont at me. + message_admins("A singularity exists and a containment field has failed on the same Z-Level. Singulo location: [O ? "[get_location_name(O, TRUE)] [COORD(O)]" : "nonexistent location"] [ADMIN_JMP(O)] | Field generator location: [src ? "[get_location_name(src, TRUE)] [COORD(src)]" : "nonexistent location"] [ADMIN_JMP(src)]") + investigate_log("has failed whilst a singulo exists.","singulo") + O.last_warning = world.time /obj/machinery/field/generator/shock_field(mob/living/user) if(fields.len) diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm index 43e8c9f8a8b..4835e09411c 100644 --- a/code/modules/power/singularity/investigate.dm +++ b/code/modules/power/singularity/investigate.dm @@ -1,4 +1,4 @@ -/area/engine/engineering/power_alert(var/alarming) - if(alarming) - investigate_log("has a power alarm!","singulo") +/area/engine/engineering/poweralert(state, source) + if(state != poweralm) + investigate_log("has a power alarm!", "singulo") ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index b8ba53ae432..d1c7d3433fe 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -27,6 +27,7 @@ use_log = list() /obj/machinery/particle_accelerator/control_box/Destroy() + SStgui.close_uis(wires) if(active) toggle_power() QDEL_NULL(wires) @@ -41,6 +42,11 @@ else if(construction_state == 2) // Wires exposed wires.Interact(user) +/obj/machinery/particle_accelerator/control_box/multitool_act(mob/living/user, obj/item/I) + if(construction_state == 2) // Wires exposed + wires.Interact(user) + return TRUE + /obj/machinery/particle_accelerator/control_box/update_state() if(construction_state < 3) use_power = NO_POWER_USE @@ -93,18 +99,18 @@ usr.unset_machine() return if(href_list["togglep"]) - if(!wires.IsIndexCut(PARTICLE_TOGGLE_WIRE)) + if(!wires.is_cut(WIRE_PARTICLE_POWER)) toggle_power() else if(href_list["scan"]) part_scan() else if(href_list["strengthup"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + if(!wires.is_cut(WIRE_PARTICLE_STRENGTH)) add_strength() else if(href_list["strengthdown"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + if(!wires.is_cut(WIRE_PARTICLE_STRENGTH)) remove_strength() updateDialog() @@ -229,6 +235,7 @@ investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo") if(active) msg_admin_attack("PA Control Computer turned ON by [key_name_admin(usr)]", ATKLOG_FEW) + usr.create_log(MISC_LOG, "PA Control Computer turned ON", src) log_game("PA Control Computer turned ON by [key_name(usr)] in ([x],[y],[z])") use_log += text("\[[time_stamp()]\] [key_name(usr)] has turned on the PA Control Computer.") if(active) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 59ce091b170..2fa2c4c1573 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -227,8 +227,8 @@ if(terminal) terminal.master = null terminal = null - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/power/smes/proc/make_terminal(user, tempDir, tempLoc) // create a terminal object at the same position as original turf loc @@ -339,89 +339,91 @@ /obj/machinery/power/smes/attack_ai(mob/user) add_hiddenprint(user) - ui_interact(user) + tgui_interact(user) /obj/machinery/power/smes/attack_ghost(mob/user) - ui_interact(user) + tgui_interact(user) /obj/machinery/power/smes/attack_hand(mob/user) add_fingerprint(user) - ui_interact(user) + tgui_interact(user) -/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/power/smes/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) if(stat & BROKEN) return - - - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "smes.tmpl", "SMES Power Storage Unit", 540, 380) - // open the new ui window + ui = new(user, src, ui_key, "Smes", name, 340, 350, master_ui, state) ui.open() - // auto update every Master Controller tick - ui.set_auto_update(1) - -/obj/machinery/power/smes/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - - data["nameTag"] = name_tag - data["storedCapacity"] = round(100.0*charge/capacity, 0.1) - data["charging"] = inputting - data["chargeMode"] = input_attempt - data["chargeLevel"] = input_level - data["chargeMax"] = input_level_max - data["outputOnline"] = output_attempt - data["outputLevel"] = output_level - data["outputMax"] = output_level_max - data["outputLoad"] = round(output_used) - - if(outputting) - data["outputting"] = 2 // smes is outputting - else if(!outputting && output_attempt) - data["outputting"] = 1 // smes is online but not outputting because it's charge level is too low - else - data["outputting"] = 0 // smes is not outputting +/obj/machinery/power/smes/tgui_data(mob/user) + var/list/data = list( + "capacity" = capacity, + "capacityPercent" = round(100*charge/capacity, 0.1), + "charge" = charge, + "inputAttempt" = input_attempt, + "inputting" = inputting, + "inputLevel" = input_level, + "inputLevel_text" = DisplayPower(input_level), + "inputLevelMax" = input_level_max, + "inputAvailable" = input_available, + "outputAttempt" = output_attempt, + "outputting" = outputting, + "outputLevel" = output_level, + "outputLevel_text" = DisplayPower(output_level), + "outputLevelMax" = output_level_max, + "outputUsed" = round(output_used), + ) return data -/obj/machinery/power/smes/Topic(href, href_list) +/obj/machinery/power/smes/tgui_act(action, params) if(..()) - return 1 + return + . = TRUE + switch(action) + if("tryinput") + inputting(!input_attempt) + update_icon() + if("tryoutput") + outputting(!output_attempt) + update_icon() + if("input") + var/target = params["target"] + var/adjust = text2num(params["adjust"]) + if(target == "min") + target = 0 + else if(target == "max") + target = input_level_max + else if(adjust) + target = input_level + adjust + else if(text2num(target) != null) + target = text2num(target) + else + . = FALSE + if(.) + input_level = clamp(target, 0, input_level_max) + if("output") + var/target = params["target"] + var/adjust = text2num(params["adjust"]) + if(target == "min") + target = 0 + else if(target == "max") + target = output_level_max + else if(adjust) + target = output_level + adjust + else if(text2num(target) != null) + target = text2num(target) + else + . = FALSE + if(.) + output_level = clamp(target, 0, output_level_max) + else + . = FALSE + if(.) + log_smes(usr) - if( href_list["cmode"] ) - inputting(!input_attempt) - update_icon() - - else if( href_list["online"] ) - outputting(!output_attempt) - update_icon() - - else if( href_list["input"] ) - switch( href_list["input"] ) - if("min") - input_level = 0 - if("max") - input_level = input_level_max - if("set") - input_level = input(usr, "Enter new input level (0-[input_level_max])", "SMES Input Power Control", input_level) as num - input_level = max(0, min(input_level_max, input_level)) // clamp to range - - else if( href_list["output"] ) - switch( href_list["output"] ) - if("min") - output_level = 0 - if("max") - output_level = output_level_max - if("set") - output_level = input(usr, "Enter new output level (0-[output_level_max])", "SMES Output Power Control", output_level) as num - output_level = max(0, min(output_level_max, output_level)) // clamp to range - - investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") - - return 1 +/obj/machinery/power/smes/proc/log_smes(mob/user) + investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user ? key_name(user) : "outside forces"]", "singulo") /obj/machinery/power/smes/proc/ion_act() if(is_station_level(src.z)) @@ -448,6 +450,7 @@ smoke.attach(src) smoke.start() + /obj/machinery/power/smes/proc/inputting(var/do_input) input_attempt = do_input if(!input_attempt) @@ -459,14 +462,15 @@ outputting = 0 /obj/machinery/power/smes/emp_act(severity) - inputting(rand(0,1)) - outputting(rand(0,1)) + inputting(rand(0, 1)) + outputting(rand(0, 1)) output_level = rand(0, output_level_max) input_level = rand(0, input_level_max) charge -= 1e6/severity if(charge < 0) charge = 0 update_icon() + log_smes() ..() /obj/machinery/power/smes/engineering diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index d99df1de7bb..7bb2f16b64a 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -254,13 +254,17 @@ // Solar Control Computer // +#define TRACKER_OFF 0 +#define TRACKER_TIMED 1 +#define TRACKER_AUTO 2 + /obj/machinery/power/solar_control name = "solar panel control" desc = "A controller for solar panel arrays." icon = 'icons/obj/computer.dmi' icon_state = "computer" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 250 max_integrity = 200 @@ -272,17 +276,17 @@ var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) var/gen = 0 var/lastgen = 0 - var/track = 0 // 0= off 1=timed 2=auto (tracker) + var/track = TRACKER_OFF var/trackrate = 600 // 300-900 seconds var/nexttime = 0 // time for a panel to rotate of 1? in manual tracking - var/autostart = 0 // Automatically search for connected devices + var/autostart = FALSE // Automatically search for connected devices var/obj/machinery/power/tracker/connected_tracker = null var/list/connected_panels = list() // Used for mapping in solar array which automatically starts itself (telecomms, for example) /obj/machinery/power/solar_control/autostart - track = 2 // Auto tracking mode - autostart = 1 // Automatically start + track = TRACKER_AUTO + autostart = TRUE // Automatically search for connected devices /obj/machinery/power/solar_control/Initialize() SSsun.solars |= src @@ -294,7 +298,7 @@ set_panels(cdir) if(autostart) search_for_connected() - if(connected_tracker && track == 2) + if(connected_tracker && track == TRACKER_AUTO) connected_tracker.set_angle(SSsun.angle) set_panels(cdir) @@ -334,15 +338,9 @@ if(stat & (NOPOWER | BROKEN)) return - switch(track) - if(1) - if(trackrate) //we're manual tracking. If we set a rotation speed... - cdir = targetdir //...the current direction is the targetted one (and rotates panels to it) - if(2) // auto-tracking - if(connected_tracker) - connected_tracker.set_angle(SSsun.angle) - - set_panels(cdir) + if(track == TRACKER_AUTO && connected_tracker) // auto-tracking + connected_tracker.set_angle(SSsun.angle) + set_panels(cdir) updateDialog() /obj/machinery/power/solar_control/update_icon() @@ -359,44 +357,73 @@ overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)) /obj/machinery/power/solar_control/attack_ai(mob/user as mob) - src.add_hiddenprint(user) - ui_interact(user) + add_hiddenprint(user) + tgui_interact(user) /obj/machinery/power/solar_control/attack_ghost(mob/user as mob) - ui_interact(user) + tgui_interact(user) /obj/machinery/power/solar_control/attack_hand(mob/user) if(..(user)) - return 1 - + return TRUE if(stat & BROKEN) return + tgui_interact(user) - ui_interact(user) - -/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/power/solar_control/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "solar_control.tmpl", name, 490, 420) + ui = new(user, src, ui_key, "SolarControl", name, 490, 300) ui.open() - ui.set_auto_update(1) - -/obj/machinery/power/solar_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - - data["generated"] = round(lastgen) - data["angle"] = cdir - data["direction"] = angle2text(cdir) - - data["tracking_state"] = track - data["tracking_rate"] = trackrate - data["rotating_way"] = (trackrate<0 ? "CCW" : "CW") +/obj/machinery/power/solar_control/tgui_data(mob/user) + var/list/data = list() + data["generated"] = round(lastgen) //generated power by all connected panels + data["generated_ratio"] = data["generated"] / round(max(connected_panels.len, 1) * SOLARGENRATE) //power generation ratio. Used for the power bar + data["direction"] = angle2text(cdir) //current orientation of the panels + data["cdir"] = cdir //current orientation of the of the panels in degrees + data["tracking_state"] = track //tracker status: TRACKER_OFF, TRACKER_TIMED, TRACKER_AUTO + data["tracking_rate"] = trackrate //rotation speed of tracker in degrees/h + data["rotating_direction"] = (trackrate < 0 ? "Counter clockwise" : "Clockwise") //direction of tracker data["connected_panels"] = connected_panels.len - data["connected_tracker"] = (connected_tracker ? 1 : 0) - + data["connected_tracker"] = (connected_tracker ? TRUE : FALSE) return data +/obj/machinery/power/solar_control/tgui_act(action, params) + if(..()) + return + . = TRUE + + switch(action) + if("cdir") //change panel orientation + var/newAngle = text2num(params["cdir"]) + if(!isnull(newAngle)) //0 is ok + cdir = clamp(newAngle, 0, 359) + targetdir = cdir + set_panels(cdir) + if("tdir") //change tracker rotation + var/newTrackrate = text2num(params["tdir"]) + if(!newTrackrate) + newTrackrate = 1 + trackrate = clamp(newTrackrate, -7200, 7200) + nexttime = world.time + 36000 / abs(trackrate) + if("track") //change tracker status + track = text2num(params["track"]) + if(track == TRACKER_AUTO) + if(connected_tracker) + connected_tracker.set_angle(SSsun.angle) + set_panels(cdir) + else if(track == TRACKER_TIMED) + targetdir = cdir + if(trackrate) + nexttime = world.time + 36000 / abs(trackrate) + set_panels(targetdir) + if("refresh") + search_for_connected() + if(connected_tracker && track == TRACKER_AUTO) + connected_tracker.set_angle(SSsun.angle) + set_panels(cdir) + /obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) playsound(src.loc, I.usesound, 50, 1) @@ -450,50 +477,16 @@ if(stat & (NOPOWER | BROKEN)) return - if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list - if(connected_tracker.powernet != powernet) - connected_tracker.unset_control() + if(connected_tracker && connected_tracker.powernet != powernet) //NOTE : handled here so that we don't add trackers to the processing list + connected_tracker.unset_control() - if(track==1 && trackrate) //manual tracking and set a rotation speed - if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1?... - targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it - nexttime += 36000/abs(trackrate) //reset the counter for the next 1? - -/obj/machinery/power/solar_control/Topic(href, href_list) - if(..()) - return - - if(href_list["rate_control"]) - if(href_list["cdir"]) - src.cdir = dd_range(0,359,(360+src.cdir+text2num(href_list["cdir"]))%360) - src.targetdir = src.cdir - if(track == 2) //manual update, so losing auto-tracking - track = 0 - spawn(1) - set_panels(cdir) - if(href_list["tdir"]) - src.trackrate = dd_range(-7200,7200,src.trackrate+text2num(href_list["tdir"])) - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - - if(href_list["track"]) - track = text2num(href_list["track"]) - if(track == 2) - if(connected_tracker) - connected_tracker.set_angle(SSsun.angle) - set_panels(cdir) - else if(track == 1) //begin manual tracking - src.targetdir = src.cdir - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - set_panels(targetdir) - - if(href_list["search_connected"]) - search_for_connected() - if(connected_tracker && track == 2) - connected_tracker.set_angle(SSsun.angle) + //manual tracking and set a rotation speed + if(track == TRACKER_TIMED && trackrate && nexttime <= world.time) //every time we need to increase/decrease the angle by 1?... + targetdir = (targetdir + trackrate / abs(trackrate) + 360) % 360 //... do it + nexttime += 36000 / abs(trackrate) //reset the counter for the next 1? + cdir = targetdir set_panels(cdir) - return - //rotates the panel to the passed angle /obj/machinery/power/solar_control/proc/set_panels(var/cdir) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 5f58bcb5dd4..5743bea8475 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -21,6 +21,7 @@ RefreshParts() /obj/machinery/power/tesla_coil/Destroy() + SStgui.close_uis(wires) QDEL_NULL(wires) return ..() diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 8536a0195e3..0938dd7af76 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -19,6 +19,15 @@ var/click_cooldown_override = 0 //Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown. var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal + /// What type of muzzle flash effect will be shown. If null then no effect and flash of light will be shown + var/muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash + /// What color the flash has. If null then the flash won't cause lighting + var/muzzle_flash_color = LIGHT_COLOR_TUNGSTEN + /// What range the muzzle flash has + var/muzzle_flash_range = MUZZLE_FLASH_RANGE_WEAK + /// How strong the flash is + var/muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK + /obj/item/ammo_casing/New() ..() if(projectile_type) @@ -97,6 +106,7 @@ var/ammo_type = /obj/item/ammo_casing var/max_ammo = 7 var/multiple_sprites = 0 + var/icon_prefix // boxes with multiple sprites use this as their base var/caliber var/multiload = 1 var/list/initial_mats //For calculating refund values. @@ -123,6 +133,7 @@ if(keep) stored_ammo.Insert(1,b) update_mat_value() + update_icon() return b /obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0) @@ -191,11 +202,12 @@ update_icon() /obj/item/ammo_box/update_icon() + var/icon_base = initial(icon_prefix) ? initial(icon_prefix) : initial(icon_state) switch(multiple_sprites) if(1) - icon_state = "[initial(icon_state)]-[stored_ammo.len]" + icon_state = "[icon_base]-[stored_ammo.len]" if(2) - icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]" + icon_state = "[icon_base]-[stored_ammo.len ? "[max_ammo]" : "0"]" desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!" /obj/item/ammo_box/proc/update_mat_value() diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 92ecf815104..ec2bb5e6ad3 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -2,6 +2,8 @@ desc = "A .357 bullet casing." caliber = "357" projectile_type = /obj/item/projectile/bullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/rubber9mm desc = "A 9mm rubber bullet casing." @@ -14,6 +16,8 @@ icon_state = "762-casing" caliber = "a762" projectile_type = /obj/item/projectile/bullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/a762/enchanted projectile_type = /obj/item/projectile/bullet/weakbullet3 @@ -22,15 +26,20 @@ desc = "A .50AE bullet casing." caliber = ".50" projectile_type = /obj/item/projectile/bullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/c38 desc = "A .38 bullet casing." caliber = "38" icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/weakbullet2 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/c38/invisible projectile_type = /obj/item/projectile/bullet/weakbullet2/invisible + muzzle_flash_effect = null // invisible eh /obj/item/ammo_casing/c38/invisible/fake projectile_type = /obj/item/projectile/bullet/weakbullet2/invisible/fake @@ -39,12 +48,15 @@ desc = "A 10mm bullet casing." caliber = "10mm" projectile_type = /obj/item/projectile/bullet/midbullet3 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/c10mm/ap projectile_type = /obj/item/projectile/bullet/midbullet3/ap /obj/item/ammo_casing/c10mm/fire projectile_type = /obj/item/projectile/bullet/midbullet3/fire + muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/c10mm/hp projectile_type = /obj/item/projectile/bullet/midbullet3/hp @@ -53,62 +65,60 @@ desc = "A 9mm bullet casing." caliber = "9mm" projectile_type = /obj/item/projectile/bullet/weakbullet3 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL -/obj/item/ammo_casing/c9mmap - desc = "A 9mm bullet casing." - caliber = "9mm" +/obj/item/ammo_casing/c9mm/ap projectile_type = /obj/item/projectile/bullet/armourpiercing -/obj/item/ammo_casing/c9mmtox - desc = "A 9mm bullet casing." - caliber = "9mm" +/obj/item/ammo_casing/c9mm/tox projectile_type = /obj/item/projectile/bullet/toxinbullet -/obj/item/ammo_casing/c9mminc - desc = "A 9mm bullet casing." - caliber = "9mm" +/obj/item/ammo_casing/c9mm/inc projectile_type = /obj/item/projectile/bullet/incendiary/firebullet + muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/c46x30mm desc = "A 4.6x30mm bullet casing." caliber = "4.6x30mm" projectile_type = /obj/item/projectile/bullet/weakbullet3 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL -/obj/item/ammo_casing/c46x30mmap - desc = "A 4.6x30mm bullet casing." - caliber = "4.6x30mm" +/obj/item/ammo_casing/c46x30mm/ap projectile_type = /obj/item/projectile/bullet/armourpiercing -/obj/item/ammo_casing/c46x30mmtox - desc = "A 4.6x30mm bullet casing." - caliber = "4.6x30mm" +/obj/item/ammo_casing/c46x30mm/tox projectile_type = /obj/item/projectile/bullet/toxinbullet -/obj/item/ammo_casing/c46x30mminc - desc = "A 4.6x30mm bullet casing." - caliber = "4.6x30mm" +/obj/item/ammo_casing/c46x30mm/inc projectile_type = /obj/item/projectile/bullet/incendiary/firebullet + muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/rubber45 desc = "A .45 rubber bullet casing." caliber = ".45" icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/midbullet_r + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/c45 desc = "A .45 bullet casing." caliber = ".45" projectile_type = /obj/item/projectile/bullet/midbullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL -/obj/item/ammo_casing/c45nostamina - desc = "A .45 bullet casing." - caliber = ".45" +/obj/item/ammo_casing/c45/nostamina projectile_type = /obj/item/projectile/bullet/midbullet3 /obj/item/ammo_casing/n762 desc = "A 7.62x38mmR bullet casing." caliber = "n762" projectile_type = /obj/item/projectile/bullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/caseless/magspear name = "magnetic spear" @@ -118,6 +128,7 @@ icon_state = "magspear" throwforce = 15 //still deadly when thrown throw_speed = 3 + muzzle_flash_color = null /obj/item/ammo_casing/shotgun name = "shotgun slug" @@ -127,6 +138,8 @@ drop_sound = 'sound/weapons/gun_interactions/shotgun_fall.ogg' projectile_type = /obj/item/projectile/bullet materials = list(MAT_METAL=4000) + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/shotgun/buckshot @@ -153,6 +166,8 @@ icon_state = "bshell" projectile_type = /obj/item/projectile/bullet/weakbullet materials = list(MAT_METAL=250) + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/shotgun/improvised @@ -163,6 +178,8 @@ materials = list(MAT_METAL=250) pellets = 10 variance = 25 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/shotgun/improvised/overload @@ -174,6 +191,8 @@ materials = list(MAT_METAL=250) pellets = 4 variance = 40 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/shotgun/stunslug @@ -182,6 +201,9 @@ icon_state = "stunshell" projectile_type = /obj/item/projectile/bullet/stunshot materials = list(MAT_METAL=250) + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL + muzzle_flash_color = "#FFFF00" /obj/item/ammo_casing/shotgun/meteorshot @@ -203,12 +225,14 @@ would have difficulty with." icon_state = "pshell" projectile_type = /obj/item/projectile/beam/pulse/shot + muzzle_flash_color = LIGHT_COLOR_DARKBLUE /obj/item/ammo_casing/shotgun/incendiary name = "incendiary slug" desc = "An incendiary-coated shotgun slug." icon_state = "ishell" projectile_type = /obj/item/projectile/bullet/incendiary/shell + muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/shotgun/frag12 name = "FRAG-12 slug" @@ -223,6 +247,7 @@ projectile_type = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath pellets = 4 variance = 35 + muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/shotgun/ion name = "ion shell" @@ -232,12 +257,18 @@ projectile_type = /obj/item/projectile/ion/weak pellets = 4 variance = 35 + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL + muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE /obj/item/ammo_casing/shotgun/laserslug name = "laser slug" desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package." icon_state = "lshell" projectile_type = /obj/item/projectile/beam/laser + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL + muzzle_flash_color = LIGHT_COLOR_DARKRED /obj/item/ammo_casing/shotgun/techshell name = "unloaded technological shell" @@ -251,6 +282,8 @@ icon_state = "cshell" container_type = OPENCONTAINER projectile_type = /obj/item/projectile/bullet/dart + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/shotgun/dart/New() ..() @@ -275,18 +308,24 @@ desc = "A tranquilizer round used to subdue individuals utilizing stimulants." icon_state = "nshell" projectile_type = /obj/item/projectile/bullet/dart/syringe/tranquilizer + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL materials = list(MAT_METAL=250) /obj/item/ammo_casing/a556 desc = "A 5.56mm bullet casing." caliber = "a556" projectile_type = /obj/item/projectile/bullet/heavybullet + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/shotgun/fakebeanbag name = "beanbag shell" desc = "A weak beanbag shell." icon_state = "bshell" projectile_type = /obj/item/projectile/bullet/weakbullet/booze + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/rocket name = "rocket shell" @@ -294,6 +333,8 @@ icon_state = "rocketshell" projectile_type = /obj/item/missile caliber = "rocket" + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/caseless desc = "A caseless bullet casing." @@ -309,6 +350,8 @@ desc = "A .75 bullet casing." caliber = "75" projectile_type = /obj/item/projectile/bullet/gyro + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/a40mm name = "40mm HE shell" @@ -316,11 +359,14 @@ caliber = "40mm" icon_state = "40mmHE" projectile_type = /obj/item/projectile/bullet/a40mm + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/caseless/foam_dart name = "foam dart" desc = "It's nerf or nothing! Ages 8 and up." projectile_type = /obj/item/projectile/bullet/reusable/foam_dart + muzzle_flash_effect = null caliber = "foam_force" icon = 'icons/obj/guns/toy.dmi' icon_state = "foamdart" @@ -403,6 +449,7 @@ name = "assassination shell" desc = "A specialist shrapnel shell that has been laced with a silencing toxin." projectile_type = /obj/item/projectile/bullet/pellet/assassination + muzzle_flash_effect = null icon_state = "gshell" pellets = 6 variance = 25 @@ -411,9 +458,15 @@ desc = "A cap for children toys." caliber = "cap" projectile_type = /obj/item/projectile/bullet/cap + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL /obj/item/ammo_casing/laser desc = "An experimental laser casing." caliber = "laser" projectile_type = /obj/item/projectile/beam/laser + muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL + muzzle_flash_color = LIGHT_COLOR_DARKRED icon_state = "lasercasing" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 4484be63c83..53004b768db 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -1,10 +1,11 @@ /obj/item/ammo_box/a357 name = "speed loader (.357)" desc = "Designed to quickly reload revolvers." - icon_state = "357" ammo_type = /obj/item/ammo_casing/a357 max_ammo = 7 - multiple_sprites = 1 + icon_state = "357-7" // DEFAULT icon, composed of prefix + "-" + max_ammo for multiple_sprites == 1 boxes + multiple_sprites = 1 // see: /obj/item/ammo_box/update_icon() + icon_prefix = "357" // icon prefix, used in above formula to generate dynamic icons /obj/item/ammo_box/c38 name = "speed loader (.38)" @@ -12,7 +13,9 @@ icon_state = "38" ammo_type = /obj/item/ammo_casing/c38 max_ammo = 6 + icon_state = "38-6" // see previous entry for explanation of these vars multiple_sprites = 1 + icon_prefix = "38" /obj/item/ammo_box/c9mm name = "ammo box (9mm)" diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index bcadfc62e08..a809953b8fd 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -6,9 +6,11 @@ var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot. var/select_name = "energy" fire_sound = 'sound/weapons/laser.ogg' + muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy /obj/item/ammo_casing/energy/laser projectile_type = /obj/item/projectile/beam/laser + muzzle_flash_color = LIGHT_COLOR_DARKRED select_name = "kill" /obj/item/ammo_casing/energy/laser/cyborg //to balance cyborg energy cost seperately @@ -16,6 +18,7 @@ /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/item/projectile/beam/laser + muzzle_flash_color = LIGHT_COLOR_DARKRED e_cost = 83 select_name = "kill" @@ -40,6 +43,7 @@ /obj/item/ammo_casing/energy/laser/pulse projectile_type = /obj/item/projectile/beam/pulse + muzzle_flash_color = LIGHT_COLOR_DARKBLUE e_cost = 200 select_name = "DESTROY" fire_sound = 'sound/weapons/pulse.ogg' @@ -52,6 +56,7 @@ /obj/item/ammo_casing/energy/laser/bluetag projectile_type = /obj/item/projectile/beam/lasertag/bluetag + muzzle_flash_color = LIGHT_COLOR_BLUE select_name = "bluetag" harmful = FALSE @@ -62,6 +67,7 @@ /obj/item/ammo_casing/energy/xray projectile_type = /obj/item/projectile/beam/xray + muzzle_flash_color = LIGHT_COLOR_GREEN e_cost = 100 fire_sound = 'sound/weapons/laser3.ogg' @@ -92,6 +98,7 @@ /obj/item/ammo_casing/energy/electrode projectile_type = /obj/item/projectile/energy/electrode + muzzle_flash_color = "#FFFF00" select_name = "stun" fire_sound = 'sound/weapons/taser.ogg' e_cost = 200 @@ -107,11 +114,13 @@ /obj/item/ammo_casing/energy/ion projectile_type = /obj/item/projectile/ion + muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE select_name = "ion" fire_sound = 'sound/weapons/ionrifle.ogg' /obj/item/ammo_casing/energy/declone projectile_type = /obj/item/projectile/energy/declone + muzzle_flash_color = LIGHT_COLOR_GREEN select_name = "declone" fire_sound = 'sound/weapons/pulse3.ogg' @@ -122,6 +131,7 @@ /obj/item/ammo_casing/energy/flora fire_sound = 'sound/effects/stealthoff.ogg' + muzzle_flash_color = LIGHT_COLOR_GREEN harmful = FALSE /obj/item/ammo_casing/energy/flora/yield @@ -146,10 +156,13 @@ /obj/item/ammo_casing/energy/meteor projectile_type = /obj/item/projectile/meteor + muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash + muzzle_flash_color = null select_name = "goddamn meteor" /obj/item/ammo_casing/energy/disabler projectile_type = /obj/item/projectile/beam/disabler + muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE select_name = "disable" e_cost = 50 fire_sound = 'sound/weapons/taser2.ogg' @@ -160,6 +173,7 @@ /obj/item/ammo_casing/energy/plasma projectile_type = /obj/item/projectile/plasma + muzzle_flash_color = LIGHT_COLOR_PURPLE select_name = "plasma burst" fire_sound = 'sound/weapons/plasma_cutter.ogg' delay = 15 @@ -172,6 +186,7 @@ /obj/item/ammo_casing/energy/wormhole projectile_type = /obj/item/projectile/beam/wormhole + muzzle_flash_color = "#33CCFF" e_cost = 0 fire_sound = 'sound/weapons/pulse3.ogg' var/obj/item/gun/energy/wormhole_projector/gun = null @@ -183,10 +198,13 @@ /obj/item/ammo_casing/energy/wormhole/orange projectile_type = /obj/item/projectile/beam/wormhole/orange + muzzle_flash_color = "#FF6600" select_name = "orange" /obj/item/ammo_casing/energy/bolt projectile_type = /obj/item/projectile/energy/bolt + muzzle_flash_color = null + muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash select_name = "bolt" e_cost = 500 fire_sound = 'sound/weapons/genhit.ogg' @@ -203,17 +221,21 @@ /obj/item/ammo_casing/energy/instakill projectile_type = /obj/item/projectile/beam/instakill + muzzle_flash_color = LIGHT_COLOR_PURPLE e_cost = 0 select_name = "DESTROY" /obj/item/ammo_casing/energy/instakill/blue projectile_type = /obj/item/projectile/beam/instakill/blue + muzzle_flash_color = LIGHT_COLOR_DARKBLUE /obj/item/ammo_casing/energy/instakill/red projectile_type = /obj/item/projectile/beam/instakill/red + muzzle_flash_color = LIGHT_COLOR_DARKRED /obj/item/ammo_casing/energy/plasma projectile_type = /obj/item/projectile/plasma + muzzle_flash_color = LIGHT_COLOR_PURPLE select_name = "plasma burst" fire_sound = 'sound/weapons/pulse.ogg' @@ -224,26 +246,31 @@ fire_sound = 'sound/magic/lightningbolt.ogg' e_cost = 200 select_name = "lightning beam" + muzzle_flash_color = LIGHT_COLOR_FADEDPURPLE projectile_type = /obj/item/projectile/energy/shock_revolver /obj/item/ammo_casing/energy/toxplasma projectile_type = /obj/item/projectile/energy/toxplasma + muzzle_flash_color = LIGHT_COLOR_FADEDPURPLE fire_sound = 'sound/weapons/taser2.ogg' select_name = "plasma dart" /obj/item/ammo_casing/energy/clown projectile_type = /obj/item/projectile/clown + muzzle_flash_effect = null fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg' select_name = "clown" /obj/item/ammo_casing/energy/sniper projectile_type = /obj/item/projectile/beam/sniper + muzzle_flash_color = LIGHT_COLOR_PINK fire_sound = 'sound/weapons/marauder.ogg' delay = 50 select_name = "snipe" /obj/item/ammo_casing/energy/teleport projectile_type = /obj/item/projectile/energy/teleport + muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE fire_sound = 'sound/weapons/wave.ogg' e_cost = 250 select_name = "teleport beam" @@ -258,6 +285,7 @@ /obj/item/ammo_casing/energy/mimic projectile_type = /obj/item/projectile/mimic + muzzle_flash_effect = null fire_sound = 'sound/weapons/bite.ogg' select_name = "gun mimic" var/mimic_type diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index c59e5890331..135f8c14718 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -271,15 +271,15 @@ /obj/item/ammo_box/magazine/wt550m9/wtap name = "wt550 magazine (Armour Piercing 4.6x30mm)" - ammo_type = /obj/item/ammo_casing/c46x30mmap + ammo_type = /obj/item/ammo_casing/c46x30mm/ap /obj/item/ammo_box/magazine/wt550m9/wttx name = "wt550 magazine (Toxin Tipped 4.6x30mm)" - ammo_type = /obj/item/ammo_casing/c46x30mmtox + ammo_type = /obj/item/ammo_casing/c46x30mm/tox /obj/item/ammo_box/magazine/wt550m9/wtic name = "wt550 magazine (Incendiary 4.6x30mm)" - ammo_type = /obj/item/ammo_casing/c46x30mminc + ammo_type = /obj/item/ammo_casing/c46x30mm/inc /obj/item/ammo_box/magazine/uzim9mm name = "uzi magazine (9mm)" @@ -302,17 +302,17 @@ /obj/item/ammo_box/magazine/smgm9mm/ap name = "SMG magazine (Armour Piercing 9mm)" - ammo_type = /obj/item/ammo_casing/c9mmap + ammo_type = /obj/item/ammo_casing/c9mm/ap materials = list(MAT_METAL = 3000) /obj/item/ammo_box/magazine/smgm9mm/toxin name = "SMG magazine (Toxin Tipped 9mm)" - ammo_type = /obj/item/ammo_casing/c9mmtox + ammo_type = /obj/item/ammo_casing/c9mm/tox materials = list(MAT_METAL = 3000) /obj/item/ammo_box/magazine/smgm9mm/fire name = "SMG Magazine (Incendiary 9mm)" - ammo_type = /obj/item/ammo_casing/c9mminc + ammo_type = /obj/item/ammo_casing/c9mm/inc materials = list(MAT_METAL = 3000) /obj/item/ammo_box/magazine/smgm9mm/update_icon() @@ -383,10 +383,7 @@ origin_tech = "combat=3;syndicate=1" caliber = "shotgun" max_ammo = 8 - -/obj/item/ammo_box/magazine/m12g/update_icon() - ..() - icon_state = "[initial(icon_state)]-[CEILING(ammo_count(0)/8, 1)*8]" + multiple_sprites = 2 /obj/item/ammo_box/magazine/m12g/buckshot name = "shotgun magazine (12g buckshot slugs)" @@ -414,6 +411,24 @@ icon_state = "m12gbc" ammo_type = /obj/item/ammo_casing/shotgun/breaching +/obj/item/ammo_box/magazine/m12g/XtrLrg + name = "\improper XL shotgun magazine (12g slugs)" + desc = "An extra large drum magazine." + icon_state = "m12gXlSl" + w_class = WEIGHT_CLASS_NORMAL + ammo_type = /obj/item/ammo_casing/shotgun + max_ammo = 16 + +/obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot + name = "\improper XL shotgun magazine (12g buckshot)" + icon_state = "m12gXlBs" + ammo_type = /obj/item/ammo_casing/shotgun/buckshot + +/obj/item/ammo_box/magazine/m12g/XtrLrg/dragon + name = "\improper XL shotgun magazine (12g dragon's breath)" + icon_state = "m12gXlDb" + ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath + /obj/item/ammo_box/magazine/toy name = "foam force META magazine" ammo_type = /obj/item/ammo_casing/caseless/foam_dart diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm index 5fa53566fe5..f37690e2787 100644 --- a/code/modules/projectiles/ammunition/special.dm +++ b/code/modules/projectiles/ammunition/special.dm @@ -2,6 +2,8 @@ name = "magic casing" desc = "I didn't even know magic needed ammo..." projectile_type = /obj/item/projectile/magic + muzzle_flash_color = COLOR_BLUE_GRAY + muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/magic /obj/item/ammo_casing/magic/change projectile_type = /obj/item/projectile/magic/change @@ -40,13 +42,14 @@ projectile_type = pick(typesof(/obj/item/projectile/magic)) ..() -/obj/item/ammo_casing/forcebolt +/obj/item/ammo_casing/magic/forcebolt projectile_type = /obj/item/projectile/forcebolt /obj/item/ammo_casing/syringegun name = "syringe gun spring" desc = "A high-power spring that throws syringes." projectile_type = null + muzzle_flash_effect = null /obj/item/ammo_casing/energy/c3dbullet projectile_type = /obj/item/projectile/bullet/midbullet3 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 3e41bf81271..ab21182e98f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -109,20 +109,33 @@ to_chat(user, "*click*") playsound(user, 'sound/weapons/empty.ogg', 100, 1) -/obj/item/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) +/obj/item/gun/proc/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE) if(recoil) shake_camera(user, recoil + 1, recoil) + var/muzzle_range = chambered.muzzle_flash_range + var/muzzle_strength = chambered.muzzle_flash_strength + var/muzzle_flash_time = 0.2 SECONDS if(suppressed) playsound(user, fire_sound, 10, 1) + muzzle_range *= 0.5 + muzzle_strength *= 0.2 + muzzle_flash_time *= 0.5 else playsound(user, fire_sound, 50, 1) - if(!message) - return - if(pointblank) - user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear \a [fire_sound_text]!") + if(message) + if(pointblank) + user.visible_message("[user] fires [src] point blank at [target]!", "You fire [src] point blank at [target]!", "You hear \a [fire_sound_text]!") + else + user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear \a [fire_sound_text]!") + if(chambered.muzzle_flash_effect) + var/obj/effect/temp_visual/target_angled/muzzle_flash/effect = new chambered.muzzle_flash_effect(get_turf(src), target, muzzle_flash_time) + effect.alpha = min(255, muzzle_strength * 255) + if(chambered.muzzle_flash_color) + effect.color = chambered.muzzle_flash_color + effect.set_light(muzzle_range, muzzle_strength, chambered.muzzle_flash_color) else - user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear \a [fire_sound_text]!") + effect.color = LIGHT_COLOR_TUNGSTEN /obj/item/gun/emp_act(severity) for(var/obj/O in contents) @@ -228,9 +241,9 @@ break else if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot - shoot_live_shot(user, 1, target, message) + shoot_live_shot(user, target, TRUE, message) else - shoot_live_shot(user, 0, target, message) + shoot_live_shot(user, target, FALSE, message) else shoot_with_empty_chamber(user) break @@ -250,9 +263,9 @@ return else if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot - shoot_live_shot(user, 1, target, message) + shoot_live_shot(user, target, TRUE, message) else - shoot_live_shot(user, 0, target, message) + shoot_live_shot(user, target, FALSE, message) else shoot_with_empty_chamber(user) return diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index d9f149b3b17..aec047ad89b 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -49,6 +49,7 @@ name = "alloy spike" desc = "A broadhead spike made out of a weird silvery metal." projectile_type = /obj/item/projectile/bullet/spike + muzzle_flash_effect = null throwforce = 5 w_class = WEIGHT_CLASS_NORMAL caliber = "spike" diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 19316cb9540..c715ba966dd 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -88,7 +88,7 @@ if(!holds_charge) empty() -/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot() +/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE) . = ..() attempt_reload() @@ -173,6 +173,7 @@ //Casing /obj/item/ammo_casing/energy/kinetic projectile_type = /obj/item/projectile/kinetic + muzzle_flash_color = null select_name = "kinetic" e_cost = 500 fire_sound = 'sound/weapons/kenetic_accel.ogg' // fine spelling there chap diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index da72c971130..44e393f9762 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -132,7 +132,7 @@ if(!suppressed) playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) user.visible_message("[user] cocks the [name] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") - shoot_live_shot() + shoot_live_shot(user, user, FALSE, FALSE) return OXYLOSS // Plasma Cutters // diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 72d128178a6..e028d970894 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -71,7 +71,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "focus" item_state = "focus" - ammo_type = list(/obj/item/ammo_casing/forcebolt) + ammo_type = /obj/item/ammo_casing/magic/forcebolt /obj/item/gun/magic/staff/spellblade name = "spellblade" diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 25db1f10dcb..ca4499c8832 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -95,6 +95,7 @@ if(!user.unEquip(A)) return to_chat(user, "You screw [S] onto [src].") + playsound(src, 'sound/items/screwdriver.ogg', 40, 1) suppressed = A S.oldsound = fire_sound S.initial_w_class = w_class @@ -120,6 +121,7 @@ ..() return to_chat(user, "You unscrew [suppressed] from [src].") + playsound(src, 'sound/items/screwdriver.ogg', 40, 1) user.put_in_hands(suppressed) fire_sound = S.oldsound w_class = S.initial_w_class diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 17a20f82d59..ea52a954a5b 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -275,13 +275,27 @@ if(magazine) overlays.Cut() overlays += "[magazine.icon_state]" - return + if(istype(magazine, /obj/item/ammo_box/magazine/m12g/XtrLrg)) + w_class = WEIGHT_CLASS_BULKY + else + w_class = WEIGHT_CLASS_NORMAL + else + w_class = WEIGHT_CLASS_NORMAL /obj/item/gun/projectile/automatic/shotgun/bulldog/update_icon() overlays.Cut() update_magazine() icon_state = "bulldog[chambered ? "" : "-e"]" +/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(var/obj/item/A as obj, mob/user as mob, params) + if(istype(A, /obj/item/ammo_box/magazine/m12g/XtrLrg)) + if(istype(loc, /obj/item/storage)) // To prevent inventory exploits + var/obj/item/storage/Strg = loc + if(Strg.max_w_class < WEIGHT_CLASS_BULKY) + to_chat(user, "You can't reload [src], with a XL mag, while it's in a normal bag.") + return + return ..() + /obj/item/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) ..() empty_alarm() diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 70229a7c6b0..d87b9a08d98 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -78,6 +78,7 @@ icon_state = "arrow" force = 10 projectile_type = /obj/item/projectile/bullet/reusable/arrow + muzzle_flash_effect = null caliber = "arrow" //quiver diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm index 3c25bc30f93..9c55f3b23fd 100644 --- a/code/modules/projectiles/guns/projectile/saw.dm +++ b/code/modules/projectiles/guns/projectile/saw.dm @@ -87,7 +87,7 @@ damage = 7 armour_penetration = 0 -obj/item/projectile/bullet/saw/incen/Move() +/obj/item/projectile/bullet/saw/incen/Move() ..() var/turf/location = get_turf(src) if(location) @@ -142,6 +142,8 @@ obj/item/projectile/bullet/saw/incen/Move() icon_state = "762-casing" caliber = "mm55645" projectile_type = /obj/item/projectile/bullet/saw + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG /obj/item/ammo_casing/mm556x45/bleeding desc = "A 556x45mm bullet casing with specialized inner-casing, that when it makes contact with a target, release tiny shrapnel to induce internal bleeding." @@ -159,3 +161,4 @@ obj/item/projectile/bullet/saw/incen/Move() /obj/item/ammo_casing/mm556x45/incen desc = "A 556x45mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. " projectile_type = /obj/item/projectile/bullet/saw/incen + muzzle_flash_color = LIGHT_COLOR_FIRE diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 6c11fda5fd7..c1824b48f7e 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -260,7 +260,7 @@ ..() guns_left = 0 -/obj/item/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) +/obj/item/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE) ..() if(guns_left) var/obj/item/gun/projectile/shotgun/boltaction/enchanted/GUN = new @@ -278,7 +278,7 @@ /obj/item/gun/projectile/shotgun/automatic -/obj/item/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj) +/obj/item/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE) ..() pump(user) diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 761c15a6141..316a22a4db1 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -78,6 +78,8 @@ desc = "A .50 bullet casing." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG + muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG icon_state = ".50" /obj/item/projectile/bullet/sniper @@ -192,6 +194,8 @@ desc = "A .50 caliber compact round casing." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper/compact + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL icon_state = ".50" /obj/item/projectile/bullet/sniper/compact //Can't dismember, and can't break things; just deals massive damage. diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index c33c649ae77..2a7fd2e602d 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -287,7 +287,7 @@ Range() sleep(max(1, speed)) -obj/item/projectile/proc/reflect_back(atom/source, list/position_modifiers = list(0, 0, 0, 0, 0, -1, 1, -2, 2)) +/obj/item/projectile/proc/reflect_back(atom/source, list/position_modifiers = list(0, 0, 0, 0, 0, -1, 1, -2, 2)) if(starting) var/new_x = starting.x + pick(position_modifiers) var/new_y = starting.y + pick(position_modifiers) @@ -306,7 +306,7 @@ obj/item/projectile/proc/reflect_back(atom/source, list/position_modifiers = lis xo = new_x - curloc.x Angle = null // Will be calculated in fire() -obj/item/projectile/Crossed(atom/movable/AM, oldloc) //A mob moving on a tile with a projectile is hit by it. +/obj/item/projectile/Crossed(atom/movable/AM, oldloc) //A mob moving on a tile with a projectile is hit by it. ..() if(isliving(AM) && AM.density && !checkpass(PASSMOB)) Bump(AM, 1) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 13f959be590..c320296e0bd 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -11,7 +11,7 @@ impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser is_reflectable = TRUE light_range = 2 - light_color = LIGHT_COLOR_RED + light_color = LIGHT_COLOR_DARKRED ricochets_max = 50 //Honk! ricochet_chance = 80 @@ -109,11 +109,12 @@ icon_state = "laser" suit_types = list(/obj/item/clothing/suit/bluetag) impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser - light_color = LIGHT_COLOR_RED + light_color = LIGHT_COLOR_DARKRED /obj/item/projectile/beam/lasertag/bluetag icon_state = "bluelaser" suit_types = list(/obj/item/clothing/suit/redtag) + light_color = LIGHT_COLOR_BLUE /obj/item/projectile/beam/sniper name = "sniper beam" @@ -161,7 +162,7 @@ /obj/item/projectile/beam/instakill/red icon_state = "red_laser" impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser - light_color = LIGHT_COLOR_RED + light_color = LIGHT_COLOR_DARKRED /obj/item/projectile/beam/instakill/on_hit(atom/target) . = ..() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2323aa06cf4..d6140d28f4e 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -31,16 +31,17 @@ M.AdjustDrowsy(10) A.volume += 5 //Because we can -/obj/item/projectile/bullet/weakbullet2 //detective revolver instastuns, but multiple shots are better for keeping punks down +/obj/item/projectile/bullet/weakbullet2 //detective revolver name = "rubber bullet" damage = 5 - weaken = 3 - stamina = 60 + stamina = 35 icon_state = "bullet-r" /obj/item/projectile/bullet/weakbullet2/invisible //finger gun bullets name = "invisible bullet" damage = 0 + weaken = 3 + stamina = 60 icon_state = null hitsound_wall = null diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 91d5900610d..bacf2285c83 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -24,6 +24,7 @@ var/list/hacked_reagents = list("toxin") var/hack_message = "You disable the safety safeguards, enabling the \"Mad Scientist\" mode." var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode." + var/is_drink = FALSE /obj/machinery/chem_dispenser/get_cell() return cell @@ -120,7 +121,6 @@ var/usedpower = cell.give(recharge_amount) if(usedpower) use_power(15 * recharge_amount) - SSnanoui.update_uis(src) // update all UIs attached to src recharge_counter = 0 return recharge_counter++ @@ -131,7 +131,6 @@ else spawn(rand(0, 15)) stat |= NOPOWER - SSnanoui.update_uis(src) // update all UIs attached to src /obj/machinery/chem_dispenser/ex_act(severity) if(severity < 3) @@ -145,19 +144,17 @@ beaker = null overlays.Cut() -/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) +/obj/machinery/chem_dispenser/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "chem_dispenser.tmpl", ui_title, 390, 655) - // open the new ui window + ui = new(user, src, ui_key, "ChemDispenser", ui_title, 390, 655) ui.open() -/obj/machinery/chem_dispenser/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) +/obj/machinery/chem_dispenser/tgui_data(mob/user) var/data[0] + data["glass"] = is_drink data["amount"] = amount data["energy"] = cell.charge ? cell.charge * powerefficiency : "0" //To prevent NaN in the UI. data["maxEnergy"] = cell.maxcharge * powerefficiency @@ -187,63 +184,59 @@ return data -/obj/machinery/chem_dispenser/Topic(href, href_list) +/obj/machinery/chem_dispenser/tgui_act(actions, params) if(..()) - return TRUE + return + if(stat & (NOPOWER|BROKEN)) + return - if(href_list["amount"]) - amount = round(text2num(href_list["amount"]), 1) // round to nearest 1 - if(amount < 0) // Since the user can actually type the commands himself, some sanity checking - amount = 0 - if(amount > 100) - amount = 100 - - if(href_list["dispense"]) - if(!is_operational() || QDELETED(cell)) - return - if(beaker && dispensable_reagents.Find(href_list["dispense"])) + . = TRUE + switch(actions) + if("amount") + amount = clamp(round(text2num(params["amount"]), 1), 0, 50) // round to nearest 1 and clamp to 0 - 50 + if("dispense") + if(!is_operational() || QDELETED(cell)) + return + if(!beaker || !dispensable_reagents.Find(params["reagent"])) + return var/datum/reagents/R = beaker.reagents var/free = R.maximum_volume - R.total_volume var/actual = min(amount, (cell.charge * powerefficiency) * 10, free) - if(!cell.use(actual / powerefficiency)) atom_say("Not enough energy to complete operation!") return - - R.add_reagent(href_list["dispense"], actual) + R.add_reagent(params["reagent"], actual) overlays.Cut() if(!icon_beaker) - icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position. + icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position. icon_beaker.pixel_x = rand(-10, 5) overlays += icon_beaker - - if(href_list["remove"]) - if(beaker) - if(href_list["removeamount"]) - var/amount = text2num(href_list["removeamount"]) - if(isnum(amount) && (amount > 0)) - var/datum/reagents/R = beaker.reagents - var/id = href_list["remove"] - R.remove_reagent(id, amount) - else if(isnum(amount) && (amount == -1)) //Isolate instead - var/datum/reagents/R = beaker.reagents - var/id = href_list["remove"] - R.isolate_reagent(id) - - if(href_list["ejectBeaker"]) - if(beaker) + if("remove") + var/amount = text2num(params["amount"]) + if(!beaker || !amount) + return + var/datum/reagents/R = beaker.reagents + var/id = params["reagent"] + if(amount > 0) + R.remove_reagent(id, amount) + else if(amount == -1) //Isolate instead + R.isolate_reagent(id) + if("ejectBeaker") + if(!beaker) + return beaker.forceMove(loc) if(Adjacent(usr) && !issilicon(usr)) usr.put_in_hands(beaker) beaker = null overlays.Cut() + else + return FALSE add_fingerprint(usr) - return TRUE // update UIs attached to this object /obj/machinery/chem_dispenser/attackby(obj/item/I, mob/user, params) if(exchange_parts(user, I)) - SSnanoui.update_uis(src) + SStgui.update_uis(src) return if(isrobot(user)) @@ -263,9 +256,9 @@ beaker = I I.forceMove(src) to_chat(user, "You set [I] on the machine.") - SSnanoui.update_uis(src) // update all UIs attached to src + SStgui.update_uis(src) // update all UIs attached to src if(!icon_beaker) - icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position. + icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position. icon_beaker.pixel_x = rand(-10, 5) overlays += icon_beaker return @@ -299,8 +292,7 @@ to_chat(user, unhack_message) dispensable_reagents -= hacked_reagents hackedcheck = FALSE - SSnanoui.update_uis(src) - + SStgui.update_uis(src) /obj/machinery/chem_dispenser/screwdriver_act(mob/user, obj/item/I) if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", "[initial(icon_state)]", I)) @@ -321,14 +313,14 @@ return attack_hand(user) /obj/machinery/chem_dispenser/attack_ghost(mob/user) - if(user.can_admin_interact()) - return attack_hand(user) + if(stat & BROKEN) + return + tgui_interact(user) /obj/machinery/chem_dispenser/attack_hand(mob/user) if(stat & BROKEN) return - - ui_interact(user) + tgui_interact(user) /obj/machinery/chem_dispenser/soda icon_state = "soda_dispenser" @@ -342,6 +334,7 @@ hacked_reagents = list("thirteenloko") hack_message = "You change the mode from 'McNano' to 'Pizza King'." unhack_message = "You change the mode from 'Pizza King' to 'McNano'." + is_drink = TRUE /obj/machinery/chem_dispenser/soda/New() ..() @@ -377,6 +370,7 @@ hacked_reagents = list("goldschlager", "patron", "absinthe", "ethanol", "nothing", "sake") hack_message = "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes." unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes." + is_drink = TRUE /obj/machinery/chem_dispenser/beer/New() ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 39aa91099c0..8fddc97537f 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -1,15 +1,19 @@ /obj/machinery/chem_heater name = "chemical heater" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "mixer0b" use_power = IDLE_POWER_USE idle_power_usage = 40 - resistance_flags = FIRE_PROOF | ACID_PROOF + resistance_flags = FIRE_PROOF|ACID_PROOF var/obj/item/reagent_containers/beaker = null var/desired_temp = T0C var/on = FALSE + /// Whether this should auto-eject the beaker once done heating/cooling. + var/auto_eject = FALSE + /// The higher this number, the faster reagents will heat/cool. + var/speed_increase = 0 /obj/machinery/chem_heater/New() ..() @@ -19,35 +23,36 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() +/obj/machinery/chem_heater/RefreshParts() + speed_increase = initial(speed_increase) + for(var/obj/item/stock_parts/micro_laser/M in component_parts) + speed_increase += 5 * (M.rating - 1) + /obj/machinery/chem_heater/process() ..() - if(stat & NOPOWER) + if(stat & (NOPOWER|BROKEN)) return - var/state_change = FALSE if(on) if(beaker) if(!beaker.reagents.total_volume) on = FALSE - SSnanoui.update_uis(src) return - beaker.reagents.temperature_reagents(desired_temp) - beaker.reagents.temperature_reagents(desired_temp) - if(abs(beaker.reagents.chem_temp - desired_temp) <= 3) + beaker.reagents.temperature_reagents(desired_temp, max(1, 35 - speed_increase)) + if(round(beaker.reagents.chem_temp) == round(desired_temp)) + playsound(loc, 'sound/machines/ding.ogg', 50, 1) on = FALSE - state_change = TRUE - - if(state_change) - SSnanoui.update_uis(src) + if(auto_eject) + eject_beaker() /obj/machinery/chem_heater/proc/eject_beaker(mob/user) if(beaker) beaker.forceMove(get_turf(src)) - if(Adjacent(user) && !issilicon(user)) + if(user && Adjacent(user) && !issilicon(user)) user.put_in_hands(beaker) beaker = null icon_state = "mixer0b" on = FALSE - SSnanoui.update_uis(src) + SStgui.update_uis(src) /obj/machinery/chem_heater/power_change() if(powered()) @@ -55,7 +60,6 @@ else spawn(rand(0, 15)) stat |= NOPOWER - SSnanoui.update_uis(src) /obj/machinery/chem_heater/attackby(obj/item/I, mob/user) if(isrobot(user)) @@ -71,7 +75,7 @@ I.forceMove(src) to_chat(user, "You add the beaker to the machine!") icon_state = "mixer1b" - SSnanoui.update_uis(src) + SStgui.update_uis(src) return if(exchange_parts(user, I)) @@ -95,62 +99,62 @@ default_deconstruction_crowbar(user, I) /obj/machinery/chem_heater/attack_hand(mob/user) - ui_interact(user) + tgui_interact(user) /obj/machinery/chem_heater/attack_ghost(mob/user) - if(user.can_admin_interact()) - return attack_hand(user) + tgui_interact(user) /obj/machinery/chem_heater/attack_ai(mob/user) add_hiddenprint(user) return attack_hand(user) -/obj/machinery/chem_heater/Topic(href, href_list) +/obj/machinery/chem_heater/tgui_act(action, params) if(..()) - return FALSE + return + if(stat & (NOPOWER|BROKEN)) + return - if(href_list["toggle_on"]) - if(!beaker.reagents.total_volume) - return FALSE - on = !on - . = 1 - - if(href_list["adjust_temperature"]) - var/val = href_list["adjust_temperature"] - if(isnum(val)) - desired_temp = clamp(desired_temp+val, 0, 1000) - else if(val == "input") - var/target = input("Please input the target temperature", name) as num - desired_temp = clamp(target, 0, 1000) + . = TRUE + switch(action) + if("toggle_on") + on = !on + if("adjust_temperature") + desired_temp = clamp(text2num(params["target"]), 0, 1000) + if("eject_beaker") + eject_beaker(usr) + . = FALSE + if("toggle_autoeject") + auto_eject = !auto_eject else return FALSE - . = 1 + add_fingerprint(usr) - if(href_list["eject_beaker"]) - eject_beaker(usr) - . = 0 //updated in eject_beaker() already - -/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) +/obj/machinery/chem_heater/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) if(user.stat || user.restrained()) return - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "chem_heater.tmpl", "ChemHeater", 350, 270) + ui = new(user, src, ui_key, "ChemHeater", "Chemical Heater", 350, 270, master_ui, state) ui.open() -/obj/machinery/chem_heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) +/obj/machinery/chem_heater/tgui_data(mob/user) var/data[0] + var/cur_temp = beaker ? beaker.reagents.chem_temp : null data["targetTemp"] = desired_temp + data["targetTempReached"] = FALSE + data["autoEject"] = auto_eject data["isActive"] = on - data["isBeakerLoaded"] = beaker ? 1 : 0 + data["isBeakerLoaded"] = beaker ? TRUE : FALSE - data["currentTemp"] = beaker ? beaker.reagents.chem_temp : null + data["currentTemp"] = cur_temp data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null data["beakerMaxVolume"] = beaker ? beaker.volume : null + if(cur_temp) + data["targetTempReached"] = round(cur_temp) == round(desired_temp) + //copy-pasted from chem dispenser var/beakerContents[0] if(beaker) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 4d1f577969c..f2b3247fe4b 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -1,3 +1,9 @@ +#define MAX_PILL_SPRITE 20 //max icon state of the pill sprites +#define MAX_MULTI_AMOUNT 20 // Max number of pills/patches that can be made at once +#define MAX_UNITS_PER_PILL 100 // Max amount of units in a pill +#define MAX_UNITS_PER_PATCH 30 // Max amount of units in a patch +#define MAX_CUSTOM_NAME_LEN 64 // Max length of a custom pill/condiment/whatever + /obj/machinery/chem_master name = "\improper ChemMaster 3000" density = TRUE @@ -14,10 +20,12 @@ var/useramount = 30 // Last used amount var/pillamount = 10 var/patchamount = 10 - var/bottlesprite = "bottle" - var/pillsprite = "1" + var/bottlesprite = 1 + var/pillsprite = 1 var/client/has_sprites = list() var/printing = FALSE + var/static/list/pill_bottle_wrappers + var/static/list/bottle_styles /obj/machinery/chem_master/New() ..() @@ -94,7 +102,7 @@ beaker = I I.forceMove(src) to_chat(user, "You add the beaker to the machine!") - SSnanoui.update_uis(src) + SStgui.update_uis(src) update_icon() else if(istype(I, /obj/item/storage/pill_bottle)) @@ -109,14 +117,10 @@ loaded_pill_bottle = I I.forceMove(src) to_chat(user, "You add [I] into the dispenser slot!") - SSnanoui.update_uis(src) + SStgui.update_uis(src) else return ..() - - - - /obj/machinery/chem_master/crowbar_act(mob/user, obj/item/I) if(!panel_open) return @@ -142,319 +146,127 @@ power_change() return TRUE -/obj/machinery/chem_master/Topic(href, href_list) +/obj/machinery/chem_master/tgui_act(action, params, datum/tgui/ui, datum/tgui_state/state) if(..()) + return + if(stat & (NOPOWER|BROKEN)) + return + + if(tgui_act_modal(action, params, ui, state)) return TRUE add_fingerprint(usr) usr.set_machine(src) - - if(href_list["ejectp"]) - if(loaded_pill_bottle) - loaded_pill_bottle.forceMove(loc) - loaded_pill_bottle = null - else if(href_list["change_pillbottle"]) - if(loaded_pill_bottle) - var/list/wrappers = list("Default wrapper", "Red wrapper", "Green wrapper", "Pale green wrapper", "Blue wrapper", "Light blue wrapper", "Teal wrapper", "Yellow wrapper", "Orange wrapper", "Pink wrapper", "Brown wrapper") - var/chosen = input(usr, "Select a pillbottle wrapper", "Pillbottle wrapper", wrappers[1]) as null|anything in wrappers - if(!chosen) + . = TRUE + switch(action) + if("toggle") + mode = !mode + if("ejectp") + if(loaded_pill_bottle) + loaded_pill_bottle.forceMove(loc) + loaded_pill_bottle = null + if("print") + if(printing || condi) return - var/color - switch(chosen) - if("Default wrapper") - loaded_pill_bottle.cut_overlays() - return - if("Red wrapper") - color = COLOR_RED - if("Green wrapper") - color = COLOR_GREEN - if("Pink wrapper") - color = COLOR_PINK - if("Teal wrapper") - color = COLOR_TEAL - if("Blue wrapper") - color = COLOR_BLUE - if("Brown wrapper") - color = COLOR_MAROON - if("Light blue wrapper") - color = COLOR_CYAN_BLUE - if("Yellow wrapper") - color = COLOR_YELLOW - if("Pale green wrapper") - color = COLOR_PALE_BTL_GREEN - if("Orange wrapper") - color = COLOR_ORANGE - loaded_pill_bottle.wrapper_color = color - loaded_pill_bottle.apply_wrap() - else if(href_list["close"]) - usr << browse(null, "window=chem_master") - onclose(usr, "chem_master") - usr.unset_machine() - return - if(href_list["print_p"]) - if(!printing) + var/idx = text2num(params["idx"]) || 0 + var/from_beaker = text2num(params["beaker"]) || FALSE + var/reagent_list = from_beaker ? beaker.reagents.reagent_list : reagents.reagent_list + if(idx < 1 || idx > length(reagent_list)) + return + + var/datum/reagent/R = reagent_list[idx] + printing = TRUE visible_message("[src] rattles and prints out a sheet of paper.") playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) + var/obj/item/paper/P = new /obj/item/paper(loc) - P.info = "
" + P.info = "
" P.info += "Time of analysis: [station_time_timestamp()]
" - P.info += "Chemical name: [href_list["name"]]
" - if(href_list["name"] == "Blood") - var/datum/reagents/R = beaker.reagents - var/datum/reagent/blood/G - for(var/datum/reagent/F in R.reagent_list) - if(F.name == href_list["name"]) - G = F - break - var/B = G.data["blood_type"] - var/C = G.data["blood_DNA"] - P.info += "Description:
Blood Type: [B]
DNA: [C]" + P.info += "Chemical name: [R.name]
" + if(istype(R, /datum/reagent/blood)) + var/datum/reagent/blood/B = R + P.info += "Description: N/A
Blood Type: [B.data["blood_type"]]
DNA: [B.data["blood_DNA"]]" else - P.info += "Description: [href_list["desc"]]" + P.info += "Description: [R.description]" P.info += "
Notes:
" - P.name = "Chemical Analysis - [href_list["name"]]" - printing = FALSE + P.name = "Chemical Analysis - [R.name]" + spawn(50) + printing = FALSE + else + . = FALSE - if(beaker) - var/datum/reagents/R = beaker.reagents - if(href_list["analyze"]) - var/dat = "" - if(!condi) - if(href_list["name"] == "Blood") - var/datum/reagent/blood/G - for(var/datum/reagent/F in R.reagent_list) - if(F.name == href_list["name"]) - G = F - break - var/A = G.name - var/B = G.data["blood_type"] - var/C = G.data["blood_DNA"] - dat += "
Name:
[A]
Description:
Blood Type: [B]
DNA: [C]" - else - dat += "
Name:
[href_list["name"]]
Description:
[href_list["desc"]]" - dat += "
(Print Analysis)
" - dat += "(Back)" + if(. || !beaker) + return + + . = TRUE + var/datum/reagents/R = beaker.reagents + switch(action) + if("add") + var/id = params["id"] + var/amount = text2num(params["amount"]) + if(!id || !amount) + return + R.trans_id_to(src, id, amount) + if("remove") + var/id = params["id"] + var/amount = text2num(params["amount"]) + if(!id || !amount) + return + if(mode) + reagents.trans_id_to(beaker, id, amount) else - dat += "
Name:
[href_list["name"]]
Description:
[href_list["desc"]]
(Back)" - usr << browse(dat, "window=chem_master;size=575x500") - return - - else if(href_list["add"]) - - if(href_list["amount"]) - var/id = href_list["add"] - var/amount = text2num(href_list["amount"]) - R.trans_id_to(src, id, amount) - - else if(href_list["addcustom"]) - - var/id = href_list["addcustom"] - useramount = input("Select the amount to transfer.", 30, useramount) as num - useramount = isgoodnumber(useramount) - Topic(null, list("amount" = "[useramount]", "add" = "[id]")) - - else if(href_list["remove"]) - - if(href_list["amount"]) - var/id = href_list["remove"] - var/amount = text2num(href_list["amount"]) - if(mode) - reagents.trans_id_to(beaker, id, amount) - else - reagents.remove_reagent(id, amount) - - - else if(href_list["removecustom"]) - - var/id = href_list["removecustom"] - useramount = input("Select the amount to transfer.", 30, useramount) as num - useramount = isgoodnumber(useramount) - Topic(null, list("amount" = "[useramount]", "remove" = "[id]")) - - else if(href_list["toggle"]) - mode = !mode - - else if(href_list["main"]) - attack_hand(usr) - return - else if(href_list["eject"]) - if(beaker) - beaker.forceMove(get_turf(src)) - if(Adjacent(usr) && !issilicon(usr)) - usr.put_in_hands(beaker) - beaker = null - reagents.clear_reagents() - update_icon() - else if(href_list["createpill"] || href_list["createpill_multiple"]) - if(!condi) - var/count = 1 - if(href_list["createpill_multiple"]) - count = input("Select the number of pills to make.", 10, pillamount) as num|null - if(count == null) - return - count = isgoodnumber(count) - if(count > 20) - count = 20 //Pevent people from creating huge stacks of pills easily. Maybe move the number to defines? - if(count <= 0) - return - var/amount_per_pill = reagents.total_volume / count - if(amount_per_pill > 100) - amount_per_pill = 100 - var/name = clean_input("Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill]u)") - if(!name) - return - name = reject_bad_text(name) - while(count--) - if(reagents.total_volume <= 0) - to_chat(usr, "Not enough reagents to create these pills!") - return - var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc) - if(!name) - name = reagents.get_master_reagent_name() - P.name = "[name] pill" - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) - P.icon_state = "pill"+pillsprite - reagents.trans_to(P, amount_per_pill) - if(loaded_pill_bottle && loaded_pill_bottle.type == /obj/item/storage/pill_bottle) - if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots) - P.forceMove(loaded_pill_bottle) - updateUsrDialog() - else - var/name = clean_input("Name:", "Name your bag!", reagents.get_master_reagent_name()) - if(!name) - return - name = reject_bad_text(name) - var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(loc) - if(!name) name = reagents.get_master_reagent_name() - P.originalname = name - P.name = "[name] pack" - P.desc = "A small condiment pack. The label says it contains [name]." - reagents.trans_to(P, 10) - else if(href_list["createpatch"] || href_list["createpatch_multiple"]) - if(!condi) - var/count = 1 - if(href_list["createpatch_multiple"]) - count = input("Select the number of patches to make.", 10, patchamount) as num|null - if(count == null) - return - count = isgoodnumber(count) - if(!count || count <= 0) - return - if(count > 20) - count = 20 //Pevent people from creating huge stacks of patches easily. Maybe move the number to defines? - var/amount_per_patch = reagents.total_volume/count - if(amount_per_patch > 30) - amount_per_patch = 30 - var/name = clean_input("Name:", "Name your patch!", "[reagents.get_master_reagent_name()] ([amount_per_patch]u)") - if(!name) - return - name = reject_bad_text(name) - var/is_medical_patch = chemical_safety_check(reagents) - while(count--) - var/obj/item/reagent_containers/food/pill/patch/P = new/obj/item/reagent_containers/food/pill/patch(loc) - if(!name) name = reagents.get_master_reagent_name() - P.name = "[name] patch" - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) - reagents.trans_to(P,amount_per_patch) - if(is_medical_patch) - P.instant_application = TRUE - P.icon_state = "bandaid_med" - if(loaded_pill_bottle && loaded_pill_bottle.type == /obj/item/storage/pill_bottle/patch_pack) - if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots) - P.forceMove(loaded_pill_bottle) - updateUsrDialog() - - else if(href_list["createbottle"]) - if(!condi) - var/name = clean_input("Name:", "Name your bottle!", reagents.get_master_reagent_name()) - if(!name) - return - name = reject_bad_text(name) - var/obj/item/reagent_containers/glass/bottle/reagent/P = new/obj/item/reagent_containers/glass/bottle/reagent(loc) - if(!name) - name = reagents.get_master_reagent_name() - P.name = "[name] bottle" - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) - P.icon_state = bottlesprite - reagents.trans_to(P, 50) - else - var/obj/item/reagent_containers/food/condiment/P = new/obj/item/reagent_containers/food/condiment(loc) - reagents.trans_to(P, 50) - else if(href_list["change_pill"]) - #define MAX_PILL_SPRITE 20 //max icon state of the pill sprites - var/dat = "
![](\"pill[i].png\") | "
- if(j == 5)
- dat += "
![](\"[i].png\") | "
- if(j == 5)
- dat += "
\ + Use a wrench on the belt to rotate it.
\ + Use a crowbar on the belt to dislodge it." layer = CONVEYOR_LAYER // so they appear under stuff but not below stuff like vents anchored = TRUE move_force = MOVE_FORCE_DEFAULT @@ -231,7 +233,10 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) /obj/machinery/conveyor_switch name = "conveyor switch" - desc = "This switch controls any and all conveyor belts it is linked to." + desc = "This switch controls any and all conveyor belts it is linked to.
\ + Use a multitool to toggle one-way mode.
\ + Use a crowbar to dislodge it.
\ + Dislodge the switch and use it on a section of conveyor belt or conveyor placer to link them." icon = 'icons/obj/recycling.dmi' icon_state = "switch-off" var/position = DIRECTION_OFF @@ -338,7 +343,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) icon = 'icons/obj/recycling.dmi' icon_state = "conveyor_loose" name = "conveyor belt assembly" - desc = "A conveyor belt assembly, used for the assembly of conveyor belt systems." + desc = "A conveyor belt assembly, used for the assembly of conveyor belt systems.
\ + Use the assembly on the ground to finalize it.
\ + Use a conveyor belt switch on the assembly to link them." w_class = WEIGHT_CLASS_BULKY var/id @@ -369,7 +376,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) /obj/item/conveyor_switch_construct name = "conveyor switch assembly" - desc = "A conveyor control switch assembly. When set up, it'll control any and all conveyor belts it is linked to." + desc = "A conveyor control switch assembly. When set up, it'll control any and all conveyor belts it is linked to.
\ + Use it on a section of conveyor belt to link them together.
\ + Use the assembly on the ground to finalize it." icon = 'icons/obj/recycling.dmi' icon_state = "switch" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index eda48794d86..309cdb7eef1 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -15,7 +15,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). var/list/categories = list( "AI Modules", "Computer Boards", - "Computer Parts", "Engineering Machinery", "Exosuit Modules", "Hydroponics Machinery", diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index e813597c4d8..a014a6be34b 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -872,22 +872,6 @@ build_path = /obj/item/storage/conveyor category = list("initial", "Construction") -/datum/design/laptop - name = "Laptop Frame" - id = "laptop" - build_type = AUTOLATHE - materials = list(MAT_METAL = 10000, MAT_GLASS = 1000) - build_path = /obj/item/modular_computer/laptop/buildable - category = list("initial", "Miscellaneous") - -/datum/design/tablet - name = "Tablet Frame" - id = "tablet" - build_type = AUTOLATHE - materials = list(MAT_METAL = 2000, MAT_GLASS = 1000) - build_path = /obj/item/modular_computer/tablet - category = list("initial", "Miscellaneous") - /datum/design/mousetrap name = "Mousetrap" id = "mousetrap" diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index b70771cb8d3..f01fc5303a9 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -88,7 +88,7 @@ id = "weed_killer" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 50) - build_path = /obj/item/reagent_containers/glass/bottle/killer/weedkiller + build_path = /obj/item/reagent_containers/glass/bottle/nutrient/killer/weedkiller category = list("initial","Botany Chemicals") /datum/design/pest_spray @@ -96,12 +96,12 @@ id = "pest_spray" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 50) - build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller + build_path = /obj/item/reagent_containers/glass/bottle/nutrient/killer/pestkiller category = list("initial","Botany Chemicals") /datum/design/botany_bottle - name = "Empty Bottle" - id = "botany_bottle" + name = "Empty Jug" + id = "botany_jug" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 5) build_path = /obj/item/reagent_containers/glass/bottle/nutrient/empty diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 826bdbf16aa..054dc2db810 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -272,6 +272,16 @@ build_path = /obj/item/circuitboard/solar_control category = list("Computer Boards") +/datum/design/sm_monitor + name = "Console Board (Supermatter Monitoring)" + desc = "Allows for the construction of circuit boards used to build a supermatter monitoring console" + id = "sm_monitor" + req_tech = list("programming" = 2, "powerstorage" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000) + build_path = /obj/item/circuitboard/sm_monitor + category = list("Computer Boards") + /datum/design/spacepodlocator name = "Console Board (Spacepod Locator)" desc = "Allows for the construction of circuit boards used to build a space-pod locating console" diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm deleted file mode 100644 index 438a679f97a..00000000000 --- a/code/modules/research/designs/computer_part_designs.dm +++ /dev/null @@ -1,251 +0,0 @@ -//////////////////////////////////////// -///////////Computer Parts/////////////// -//////////////////////////////////////// - -/datum/design/disk/normal - name = "hard disk drive" - id = "hdd_basic" - req_tech = list("programming" = 1, "engineering" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 400, MAT_GLASS = 100) - build_path = /obj/item/computer_hardware/hard_drive - category = list("Computer Parts") - -/datum/design/disk/advanced - name = "advanced hard disk drive" - id = "hdd_advanced" - req_tech = list("programming" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 800, MAT_GLASS = 200) - build_path = /obj/item/computer_hardware/hard_drive/advanced - category = list("Computer Parts") - -/datum/design/disk/super - name = "super hard disk drive" - id = "hdd_super" - req_tech = list("programming" = 3, "engineering" = 3) - build_type = PROTOLATHE - materials = list(MAT_METAL = 1600, MAT_GLASS = 400) - build_path = /obj/item/computer_hardware/hard_drive/super - category = list("Computer Parts") - -/datum/design/disk/cluster - name = "cluster hard disk drive" - id = "hdd_cluster" - req_tech = list("programming" = 4, "engineering" = 4) - build_type = PROTOLATHE - materials = list(MAT_METAL = 3200, MAT_GLASS = 800) - build_path = /obj/item/computer_hardware/hard_drive/cluster - category = list("Computer Parts") - -/datum/design/disk/small - name = "solid state drive" - id = "ssd_small" - req_tech = list("programming" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 800, MAT_GLASS = 200) - build_path = /obj/item/computer_hardware/hard_drive/small - category = list("Computer Parts") - -/datum/design/disk/micro - name = "micro solid state drive" - id = "ssd_micro" - req_tech = list("programming" = 1, "engineering" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 400, MAT_GLASS = 100) - build_path = /obj/item/computer_hardware/hard_drive/micro - category = list("Computer Parts") - - -// Network cards -/datum/design/netcard/basic - name = "network card" - id = "netcard_basic" - req_tech = list("programming" = 2, "engineering" = 1) - build_type = IMPRINTER - materials = list(MAT_METAL = 250, MAT_GLASS = 100) - build_path = /obj/item/computer_hardware/network_card - category = list("Computer Parts") - -/datum/design/netcard/advanced - name = "advanced network card" - id = "netcard_advanced" - req_tech = list("programming" = 4, "engineering" = 2) - build_type = IMPRINTER - materials = list(MAT_METAL = 500, MAT_GLASS = 200) - build_path = /obj/item/computer_hardware/network_card/advanced - category = list("Computer Parts") - -/datum/design/netcard/wired - name = "wired network card" - id = "netcard_wired" - req_tech = list("programming" = 5, "engineering" = 3) - build_type = IMPRINTER - materials = list(MAT_METAL = 2500, MAT_GLASS = 400) - build_path = /obj/item/computer_hardware/network_card/wired - category = list("Computer Parts") - - -// Data disks -/datum/design/portabledrive/basic - name = "data disk" - id = "portadrive_basic" - req_tech = list("programming" = 1) - build_type = IMPRINTER - materials = list(MAT_GLASS = 800) - build_path = /obj/item/computer_hardware/hard_drive/portable - category = list("Computer Parts") - -/datum/design/portabledrive/advanced - name = "advanced data disk" - id = "portadrive_advanced" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1600) - build_path = /obj/item/computer_hardware/hard_drive/portable/advanced - category = list("Computer Parts") - -/datum/design/portabledrive/super - name = "super data disk" - id = "portadrive_super" - req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS = 3200) - build_path = /obj/item/computer_hardware/hard_drive/portable/super - category = list("Computer Parts") - - -// Card slot -/datum/design/cardslot - name = "ID card slot" - id = "cardslot" - req_tech = list("programming" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 600) - build_path = /obj/item/computer_hardware/card_slot - category = list("Computer Parts") - -// Intellicard slot -/datum/design/aislot - name = "Intellicard slot" - id = "aislot" - req_tech = list("programming" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 600) - build_path = /obj/item/computer_hardware/ai_slot - category = list("Computer Parts") - -// Mini printer -/datum/design/miniprinter - name = "miniprinter" - id = "miniprinter" - req_tech = list("programming" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 600) - build_path = /obj/item/computer_hardware/printer/mini - category = list("Computer Parts") - - -// APC Link -/datum/design/APClink - name = "area power connector" - id = "APClink" - req_tech = list("programming" = 2, "powerstorage" = 3, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 2000) - build_path = /obj/item/computer_hardware/recharger/APC - category = list("Computer Parts") - - -// Batteries -/datum/design/battery/controller - name = "power cell controller" - id = "bat_control" - req_tech = list("powerstorage" = 1, "engineering" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 400) - build_path = /obj/item/computer_hardware/battery - category = list("Computer Parts") - -/datum/design/battery/normal - name = "battery module" - id = "bat_normal" - req_tech = list("powerstorage" = 1, "engineering" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 400) - build_path = /obj/item/stock_parts/cell/computer - category = list("Computer Parts") - -/datum/design/battery/advanced - name = "advanced battery module" - id = "bat_advanced" - req_tech = list("powerstorage" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 800) - build_path = /obj/item/stock_parts/cell/computer/advanced - category = list("Computer Parts") - -/datum/design/battery/super - name = "super battery module" - id = "bat_super" - req_tech = list("powerstorage" = 3, "engineering" = 3) - build_type = PROTOLATHE - materials = list(MAT_METAL = 1600) - build_path = /obj/item/stock_parts/cell/computer/super - category = list("Computer Parts") - -/datum/design/battery/nano - name = "nano battery module" - id = "bat_nano" - req_tech = list("powerstorage" = 1, "engineering" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 200) - build_path = /obj/item/stock_parts/cell/computer/nano - category = list("Computer Parts") - -/datum/design/battery/micro - name = "micro battery module" - id = "bat_micro" - req_tech = list("powerstorage" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 400) - build_path = /obj/item/stock_parts/cell/computer/micro - category = list("Computer Parts") - - -// Processor unit -/datum/design/cpu - name = "processor board" - id = "cpu_normal" - req_tech = list("programming" = 3, "engineering" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1600) - build_path = /obj/item/computer_hardware/processor_unit - category = list("Computer Parts") - -/datum/design/cpu/small - name = "microprocessor" - id = "cpu_small" - req_tech = list("programming" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 800) - build_path = /obj/item/computer_hardware/processor_unit/small - category = list("Computer Parts") - -/datum/design/cpu/photonic - name = "photonic processor board" - id = "pcpu_normal" - req_tech = list("programming" = 5, "engineering" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS= 6400, MAT_GOLD = 2000) - build_path = /obj/item/computer_hardware/processor_unit/photonic - category = list("Computer Parts") - -/datum/design/cpu/photonic/small - name = "photonic microprocessor" - id = "pcpu_small" - req_tech = list("programming" = 4, "engineering" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 3200, MAT_GOLD = 1000) - build_path = /obj/item/computer_hardware/processor_unit/photonic/small - category = list("Computer Parts") diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm index eb0901b71e2..af6fc828ad3 100644 --- a/code/modules/research/designs/equipment_designs.dm +++ b/code/modules/research/designs/equipment_designs.dm @@ -71,6 +71,16 @@ build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") +/datum/design/skills_hud + name = "Skills HUD" + desc = "A heads-up display that scans the humans in view and shows a summary of their NT employment history." + id = "skills_hud" + req_tech = list("magnets" = 3, "combat" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 500, MAT_GLASS = 500) + build_path = /obj/item/clothing/glasses/hud/skills + category = list("Equipment") + /datum/design/mesons name = "Optical Meson Scanners" desc = "Used for seeing walls, floors, and stuff through anything." diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 3900acf5093..5cd4c9bdc81 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -531,13 +531,3 @@ materials = list(MAT_GLASS=1000) build_path = /obj/item/circuitboard/plantgenes category = list("Hydroponics Machinery") - -/datum/design/ntnet_relay - name = "Machine Design (NTNet Relay Board)" - desc = "The circuit board for a wireless network relay." - id = "ntnet_relay" - req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS=1000) - build_path = /obj/item/circuitboard/machine/ntnet_relay - category = list("Subspace Telecomms") diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 75e64a43215..7bd5b3e9c93 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1094,7 +1094,7 @@ name = "Cyborg Upgrade (Safety Override)" id = "borg_syndicate_module" build_type = MECHFAB - req_tech = list("combat" = 4, "syndicate" = 2) + req_tech = list("combat" = 7, "programming" = 7) build_path = /obj/item/borg/upgrade/syndicate materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_DIAMOND = 10000) construction_time = 120 diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 3fe0ef54c0c..009e4810d3e 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -335,7 +335,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder) return FALSE // don't fuck with the stupid blackbox shit -proc/feedback_set(var/variable,var/value) +/proc/feedback_set(var/variable,var/value) if(IsAdminAdvancedProcCall()) to_chat(usr, "Feedback edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit feedback data via advanced proc-call") @@ -351,7 +351,7 @@ proc/feedback_set(var/variable,var/value) FV.set_value(value) -proc/feedback_inc(var/variable,var/value) +/proc/feedback_inc(var/variable,var/value) if(IsAdminAdvancedProcCall()) to_chat(usr, "Feedback edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit feedback data via advanced proc-call") @@ -367,7 +367,7 @@ proc/feedback_inc(var/variable,var/value) FV.inc(value) -proc/feedback_dec(var/variable,var/value) +/proc/feedback_dec(var/variable,var/value) if(IsAdminAdvancedProcCall()) to_chat(usr, "Feedback edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit feedback data via advanced proc-call") @@ -383,7 +383,7 @@ proc/feedback_dec(var/variable,var/value) FV.dec(value) -proc/feedback_set_details(var/variable,var/details) +/proc/feedback_set_details(var/variable,var/details) if(IsAdminAdvancedProcCall()) to_chat(usr, "Feedback edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit feedback data via advanced proc-call") @@ -400,7 +400,7 @@ proc/feedback_set_details(var/variable,var/details) FV.set_details(details) -proc/feedback_add_details(var/variable,var/details) +/proc/feedback_add_details(var/variable,var/details) if(IsAdminAdvancedProcCall()) to_chat(usr, "Feedback edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit feedback data via advanced proc-call") diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6f2e608ef4b..8e85c041708 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -17,7 +17,6 @@ Note: Must be placed west/left of and R&D console to function. var/list/categories = list( "Bluespace", - "Computer Parts", "Equipment", "Janitorial", "Medical", diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 84f15745df6..ce1580d13ce 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -68,6 +68,7 @@ eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src)) eyeobj.origin = src eyeobj.visible_icon = 1 + eyeobj.acceleration = FALSE eyeobj.icon = 'icons/obj/abductor.dmi' eyeobj.icon_state = "camera_target" diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index f2d559e8b1f..78022bb6d7c 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -33,8 +33,8 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE) to_chat(usr, "Central Command has already dispatched an emergency response team!") return - var/datum/nano_module/ert_manager/E = new() - E.ui_interact(usr) + var/datum/tgui_module/ert_manager/E = new() + E.tgui_interact(usr) /mob/dead/observer/proc/JoinResponseTeam() @@ -209,7 +209,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE) var/paranormal_outfit var/borg_path = /mob/living/silicon/robot/ert -/datum/response_team/proc/setSlots(com=1, sec=3, med=3, eng=3, jan=0, par=0, cyb=0) +/datum/response_team/proc/setSlots(com=1, sec=4, med=0, eng=0, jan=0, par=0, cyb=0) slots["Commander"] = com slots["Security"] = sec slots["Medic"] = med @@ -318,3 +318,4 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE) name = "centcomm bounced radio" frequency = ERT_FREQ icon_state = "radio" + freqlock = TRUE diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index f4ab9561bd5..96825ebdab7 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -36,7 +36,7 @@ rt_job = "Emergency Response Team Leader" rt_mob_job = "ERT Commander" - uniform = /obj/item/clothing/under/rank/centcom_officer + uniform = /obj/item/clothing/under/rank/centcom_officer/sensor back = /obj/item/storage/backpack/ert/commander id = /obj/item/card/id/ert/commander @@ -56,12 +56,12 @@ gloves = /obj/item/clothing/gloves/color/black suit = /obj/item/clothing/suit/armor/vest/ert/command glasses = /obj/item/clothing/glasses/sunglasses + mask = /obj/item/clothing/mask/gas/sechailer belt = /obj/item/gun/energy/gun backpack_contents = list( /obj/item/clothing/head/helmet/ert/command = 1, - /obj/item/clothing/mask/gas/sechailer = 1, /obj/item/restraints/handcuffs = 1, /obj/item/storage/lockbox/mindshield = 1, /obj/item/flashlight = 1 @@ -73,6 +73,7 @@ gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/commander glasses = /obj/item/clothing/glasses/sunglasses + mask = /obj/item/clothing/mask/gas/sechailer/swat cybernetic_implants = list( /obj/item/organ/internal/cyberimp/eyes/hud/security, /obj/item/organ/internal/cyberimp/chest/nutriment @@ -80,7 +81,6 @@ belt = /obj/item/gun/energy/gun/blueshield/pdw9 backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/gun/energy/ionrifle/carbine = 1, /obj/item/restraints/handcuffs = 1, /obj/item/clothing/shoes/magboots = 1, @@ -93,11 +93,11 @@ gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma glasses = /obj/item/clothing/glasses/night + mask = /obj/item/clothing/mask/gas/sechailer/swat suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 belt = /obj/item/gun/projectile/automatic/pistol/enforcer/lethal backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/restraints/handcuffs = 1, /obj/item/storage/lockbox/mindshield = 1, /obj/item/gun/energy/ionrifle/carbine = 1, @@ -107,7 +107,7 @@ cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/arm/flash ) @@ -117,7 +117,7 @@ name = "RT Security" rt_job = "Emergency Response Team Officer" rt_mob_job = "ERT Security" - uniform = /obj/item/clothing/under/rank/security + uniform = /obj/item/clothing/under/rank/security/sensor back = /obj/item/storage/backpack/ert/security belt = /obj/item/storage/belt/security/response_team pda = /obj/item/pda/heads/ert/security @@ -130,12 +130,12 @@ suit = /obj/item/clothing/suit/armor/vest/ert/security suit_store = /obj/item/gun/energy/gun/advtaser glasses = /obj/item/clothing/glasses/hud/security/sunglasses + mask = /obj/item/clothing/mask/gas/sechailer r_hand = /obj/item/gun/energy/laser backpack_contents = list( /obj/item/clothing/head/helmet/ert/security = 1, - /obj/item/clothing/mask/gas/sechailer = 1, /obj/item/storage/box/zipties = 1, /obj/item/storage/box/teargas = 1, /obj/item/flashlight/seclite = 1 @@ -149,6 +149,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/security suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 glasses = /obj/item/clothing/glasses/sunglasses + mask = /obj/item/clothing/mask/gas/sechailer r_hand = /obj/item/gun/projectile/automatic/lasercarbine @@ -159,11 +160,9 @@ ) backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer = 1, /obj/item/clothing/shoes/magboots = 1, /obj/item/storage/box/handcuffs = 1, - /obj/item/storage/box/teargas = 1, - /obj/item/grenade/flashbang = 1, + /obj/item/grenade/flashbang = 2, /obj/item/ammo_box/magazine/laser = 2 ) @@ -175,13 +174,13 @@ belt = /obj/item/storage/belt/security/response_team_gamma suit_store = /obj/item/gun/energy/gun/nuclear glasses = /obj/item/clothing/glasses/night + mask = /obj/item/clothing/mask/gas/sechailer/swat l_pocket = /obj/item/restraints/legcuffs/bola/energy r_pocket = /obj/item/extinguisher/mini r_hand = /obj/item/gun/energy/immolator/multi backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/flashbangs = 1, /obj/item/whetstone = 1, @@ -191,9 +190,9 @@ cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/arm/telebaton, - /obj/item/organ/internal/cyberimp/chest/reviver + /obj/item/organ/internal/cyberimp/chest/reviver/hardened ) @@ -217,12 +216,12 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer suit_store = /obj/item/tank/emergency_oxygen/engi glasses = /obj/item/clothing/glasses/meson + mask = /obj/item/clothing/mask/gas l_pocket = /obj/item/gun/energy/gun/mini r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( - /obj/item/clothing/mask/gas = 1, /obj/item/t_scanner = 1, /obj/item/stack/sheet/glass/fifty = 1, /obj/item/stack/sheet/metal/fifty = 1, @@ -237,6 +236,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma suit_store = /obj/item/tank/emergency_oxygen/engi glasses = /obj/item/clothing/glasses/meson + mask = /obj/item/clothing/mask/gas cybernetic_implants = list( /obj/item/organ/internal/cyberimp/eyes/shield, /obj/item/organ/internal/cyberimp/chest/nutriment @@ -245,7 +245,6 @@ r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( - /obj/item/clothing/mask/gas = 1, /obj/item/rcd/preloaded = 1, /obj/item/rcd_ammo = 3, /obj/item/gun/energy/gun = 1 @@ -259,12 +258,12 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 glasses = /obj/item/clothing/glasses/meson/night + mask = /obj/item/clothing/mask/gas/sechailer/swat l_pocket = /obj/item/t_scanner/extended_range r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/rcd/combat = 1, /obj/item/rcd_ammo/large = 3 ) @@ -272,7 +271,7 @@ cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/eyes/shield, /obj/item/organ/internal/cyberimp/arm/toolset ) @@ -353,6 +352,7 @@ gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma glasses = /obj/item/clothing/glasses/night + mask = /obj/item/clothing/mask/gas/sechailer/swat suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 belt = /obj/item/defibrillator/compact/loaded @@ -361,7 +361,6 @@ r_pocket = /obj/item/reagent_containers/hypospray/autoinjector backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/bodyanalyzer/advanced = 1, /obj/item/extinguisher/mini = 1, /obj/item/roller = 1, @@ -375,7 +374,7 @@ /obj/item/organ/internal/cyberimp/arm/medibeam, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/medical, - /obj/item/organ/internal/cyberimp/brain/anti_stun + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened ) //////////////////// PARANORMAL /////////////////// @@ -390,11 +389,11 @@ shoes = /obj/item/clothing/shoes/combat l_ear = /obj/item/radio/headset/ert/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses + mask = /obj/item/clothing/mask/gas/sechailer/swat belt = /obj/item/storage/belt/security/response_team id = /obj/item/card/id/centcom pda = /obj/item/pda/centcom backpack_contents = list( - /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/storage/box/zipties = 1, /obj/item/flashlight/seclite = 1 ) @@ -435,7 +434,7 @@ cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/brain/anti_stun + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened ) //////////////////// JANITORIAL /////////////////// @@ -444,7 +443,7 @@ name = "RT Janitor" rt_job = "Emergency Response Team Janitor" rt_mob_job = "ERT Janitor" - uniform = /obj/item/clothing/under/color/purple + uniform = /obj/item/clothing/under/color/purple/sensor back = /obj/item/storage/backpack/ert/janitor belt = /obj/item/storage/belt/janitor/full gloves = /obj/item/clothing/gloves/color/yellow @@ -500,5 +499,6 @@ ) cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/advmop + /obj/item/organ/internal/cyberimp/arm/advmop, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened ) diff --git a/code/modules/ruins/lavalandruin_code/animal_hospital.dm b/code/modules/ruins/lavalandruin_code/animal_hospital.dm index 1cf21d5a890..18ea13770a6 100644 --- a/code/modules/ruins/lavalandruin_code/animal_hospital.dm +++ b/code/modules/ruins/lavalandruin_code/animal_hospital.dm @@ -6,9 +6,10 @@ name = "broken rejuvenation pod" desc = "A small sleeper typically used to instantly restore minor wounds. This one seems broken, and its occupant is comatose." mob_name = "a translocated vet" - flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \ + description = "You are an intern working in an animal hospital that suddenly got transported to lavaland. Good luck." + flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \ everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; you see them right now. So where is \ - everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe they can tell you what happened." + everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe they can tell you what happened." assignedrole = "Translocated Vet" allow_species_pick = TRUE diff --git a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm index 62b2343f10a..c173097fcad 100644 --- a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm +++ b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm @@ -67,9 +67,10 @@ anchored = FALSE move_resist = MOVE_FORCE_NORMAL density = FALSE - flavour_text = "You are an ash walker. Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. \ - You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. \ -
You are free to attack miners and other outsiders. DO NOT leave Lavaland without admin permission! DO NOT attack the mining outpost without being provoked." + important_info = "Do not leave Lavaland without admin permission. Do not attack the mining outpost without being provoked." + description = "You are an ashwalker, a native inhabitant of Lavaland. Try to survive with nothing but spears and other tribal technology. Bring dead bodies back to your tendril to create more of your kind. You are free to attack miners and other outsiders." + flavour_text = "Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. \ + You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest." assignedrole = "Ash Walker" /obj/effect/mob_spawn/human/ash_walker/special(mob/living/carbon/human/new_spawn) diff --git a/code/modules/ruins/lavalandruin_code/hermit.dm b/code/modules/ruins/lavalandruin_code/hermit.dm index a28f30b9ed1..93056ee1d9a 100644 --- a/code/modules/ruins/lavalandruin_code/hermit.dm +++ b/code/modules/ruins/lavalandruin_code/hermit.dm @@ -10,7 +10,8 @@ random = TRUE allow_species_pick = TRUE mob_species = /datum/species/human - flavour_text = "You've been stranded in this godless prison of a planet for longer than you can remember. Each day you barely scrape by, and between the terrible \ + description = "You are a single survivor stranded on lavaland in a makeshift shelter. Try to survive with barely any equipment. For when miner is just too boring." + flavour_text = "You've been stranded in this godless prison of a planet for longer than you can remember. Each day you barely scrape by, and between the terrible \ conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \ the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... " assignedrole = "Hermit" @@ -22,28 +23,28 @@ if(1) flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \ only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \ - life and sent you to this hell are forever branded into your memory." + life and sent you to this hell are forever branded into your memory." outfit.uniform = /obj/item/clothing/under/assistantformal outfit.shoes = /obj/item/clothing/shoes/black outfit.back = /obj/item/storage/backpack if(2) flavour_text += "you're an exile from the Tiger Cooperative. Their technological fanaticism drove you to question the power and beliefs of the Exolitics, and they saw you as a \ heretic and subjected you to hours of horrible torture. You were hours away from execution when a high-ranking friend of yours in the Cooperative managed to secure you a pod, \ - scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since." + scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since." outfit.uniform = /obj/item/clothing/under/color/orange outfit.shoes = /obj/item/clothing/shoes/orange outfit.back = /obj/item/storage/backpack if(3) flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \ - to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there." + to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there." outfit.uniform = /obj/item/clothing/under/rank/medical outfit.suit = /obj/item/clothing/suit/storage/labcoat outfit.back = /obj/item/storage/backpack/medic outfit.shoes = /obj/item/clothing/shoes/black if(4) - flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \ + flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \ at one of Nanotrasen's state-of-the-art research facilities, were in one of the escape pods alone and saw the red button. It was big and shiny, and it caught your eye. You pressed \ - it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now." + it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now." outfit.uniform = /obj/item/clothing/under/color/grey/glorf outfit.shoes = /obj/item/clothing/shoes/black outfit.back = /obj/item/storage/backpack diff --git a/code/modules/ruins/lavalandruin_code/seed_vault.dm b/code/modules/ruins/lavalandruin_code/seed_vault.dm index 2c999a7ce29..1a5e863c52f 100644 --- a/code/modules/ruins/lavalandruin_code/seed_vault.dm +++ b/code/modules/ruins/lavalandruin_code/seed_vault.dm @@ -18,9 +18,10 @@ roundstart = FALSE death = FALSE mob_species = /datum/species/diona/pod - flavour_text = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \ + description = "You are a diona on Lavaland with access to a full botany setup. Perfect to mess around with plants in peace." + flavour_text = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \ seed vaults and spread them across the universe to every planet they could chart. You are in one such seed vault. Your goal is to cultivate and spread life wherever it will go while waiting \ - for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago." + for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago." assignedrole = "Lifebringer" /obj/effect/mob_spawn/human/seed_vault/special(mob/living/new_spawn) diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm index d053e139f61..1e745e8d3ed 100644 --- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm +++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm @@ -28,8 +28,10 @@ death = FALSE icon = 'icons/obj/cryogenic2.dmi' icon_state = "sleeper_s" - flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue your research as best you can, and try to keep a low profile. The base is rigged with explosives, do not abandon it or let it fall into enemy hands! \ -
You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. DO NOT work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. DO NOT leave your base without admin permission." + important_info = "Do not work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. Do not leave your base without admin permission." + description = "Experiment with deadly chems and viruses in peace or help any visiting Syndicate Agent." + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue your research as best you can, and try to keep a low profile. The base is rigged with explosives, do not abandon it or let it fall into enemy hands!\ + It's been made clear to you that the Syndicate will make you regret it if you disappoint them." outfit = /datum/outfit/lavaland_syndicate assignedrole = "Lavaland Syndicate" del_types = list() // Necessary to prevent del_types from removing radio! @@ -59,13 +61,13 @@ /obj/effect/mob_spawn/human/lavaland_syndicate/comms name = "Syndicate Comms Agent sleeper" mob_name = "Syndicate Comms Agent" - flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands! \ -
You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. DO NOT work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. DO NOT leave your base without admin permission." + important_info = "Do not work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. Do not leave your base without admin permission. Do not reveal the existence of yourself to NT." + description = "Monitor comms and cameras and try to assist any agents on station while keeping your existence a secret." + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile." outfit = /datum/outfit/lavaland_syndicate/comms /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space - flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands! \ -
You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. DO NOT work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. DO NOT leave your base without admin permission." + flavour_text = "You are a syndicate agent, employed in a small listening outpost. You'd be bored to death if you couldn't listen in on those NT idiots mess up all the time." /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize(mapload) . = ..() diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index 87723701281..e51355e89bb 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -4,17 +4,17 @@ icon = 'icons/obj/monitors.dmi' icon_state = "auth_off" - var/active = 0 //This gets set to 1 on all devices except the one where the initial request was made. - var/event = "" - var/screen = 1 + var/active = FALSE // This gets set to TRUE on all devices except the one where the initial request was made. + var/event + var/swiping = FALSE // on swiping screen? var/list/ert_chosen = list() - var/confirmed = 0 //This variable is set by the device that confirms the request. - var/confirm_delay = 20 //(2 seconds) - var/busy = 0 //Busy when waiting for authentication or an event request has been sent from this device. + var/confirmed = FALSE // This variable is set by the device that confirms the request. + var/confirm_delay = 5 SECONDS // time allowed for a second person to confirm a swipe. + var/busy = FALSE // Busy when waiting for authentication or an event request has been sent from this device. var/obj/machinery/keycard_auth/event_source var/mob/event_triggered_by var/mob/event_confirmed_by - var/ert_reason = "Reason for ERT" + var/ert_reason anchored = 1 use_power = IDLE_POWER_USE @@ -35,16 +35,19 @@ return if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) if(check_access(W)) - if(active == 1) + if(active) //This is not the device that made the initial request. It is the device confirming the request. if(event_source) - event_source.confirmed = 1 + event_source.confirmed = TRUE event_source.event_confirmed_by = usr - else if(screen == 2) - if(event == "Emergency Response Team" && ert_reason == "Reason for ERT") - to_chat(user, "Supply a reason for calling the ERT first!") + SStgui.update_uis(event_source) + SStgui.update_uis(src) + else if(swiping) + if(event == "Emergency Response Team" && !ert_reason) + to_chat(user, "Supply a reason for calling the ERT first!") return event_triggered_by = usr + SStgui.update_uis(src) broadcast_request() //This is the device making the initial event request. It needs to broadcast to other devices else to_chat(user, "Access denied.") @@ -59,57 +62,58 @@ stat |= NOPOWER /obj/machinery/keycard_auth/attack_ghost(mob/user) - ui_interact(user) + tgui_interact(user) -/obj/machinery/keycard_auth/attack_hand(mob/user as mob) +/obj/machinery/keycard_auth/attack_hand(mob/user) if(..()) - return 1 - ui_interact(user) + return TRUE + tgui_interact(user) -/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(busy) - to_chat(user, "This device is busy.") - return - - user.set_machine(src) - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/keycard_auth/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "keycard_auth.tmpl", "Keycard Authentication Device UI", 540, 320) + ui = new(user, src, ui_key, "KeycardAuth", name, 540, 300, master_ui, state) ui.open() -/obj/machinery/keycard_auth/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - data["screen"] = screen - data["event"] = event - data["ertreason"] = ert_reason + +/obj/machinery/keycard_auth/tgui_data() + var/list/data = list() + data["redAvailable"] = GLOB.security_level == SEC_LEVEL_RED ? FALSE : TRUE + data["swiping"] = swiping + data["busy"] = busy + data["event"] = active && event_source && event_source.event ? event_source.event : event + data["ertreason"] = active && event_source && event_source.ert_reason ? event_source.ert_reason : ert_reason + data["isRemote"] = active ? TRUE : FALSE + data["hasSwiped"] = event_triggered_by ? TRUE : FALSE + data["hasConfirm"] = event_confirmed_by || (active && event_source && event_source.event_confirmed_by) ? TRUE : FALSE return data -/obj/machinery/keycard_auth/Topic(href, href_list) +/obj/machinery/keycard_auth/tgui_act(action, params) if(..()) - return 1 - - if(busy) - to_chat(usr, "This device is busy.") return + if(busy) + to_chat(usr, "This device is busy.") + return + if(!allowed(usr)) + to_chat(usr, "Access denied.") + return + . = TRUE + switch(action) + if("ert") + ert_reason = stripped_input(usr, "Reason for ERT Call:", "", "") + if("reset") + reset() + if("triggerevent") + event = params["triggerevent"] + swiping = TRUE - if(href_list["triggerevent"]) - event = href_list["triggerevent"] - screen = 2 - if(href_list["reset"]) - reset() - if(href_list["ert"]) - ert_reason = stripped_input(usr, "Reason for ERT Call:", "", "") - - SSnanoui.update_uis(src) add_fingerprint(usr) - return /obj/machinery/keycard_auth/proc/reset() - active = 0 - event = "" - screen = 1 - confirmed = 0 + active = FALSE + event = null + swiping = FALSE + confirmed = FALSE event_source = null icon_state = "auth_off" event_triggered_by = null @@ -125,7 +129,7 @@ sleep(confirm_delay) if(confirmed) - confirmed = 0 + confirmed = FALSE trigger_event(event) log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]") message_admins("[key_name_admin(event_triggered_by)] triggered and [key_name_admin(event_confirmed_by)] confirmed event [event]", 1) @@ -135,16 +139,17 @@ if(stat & (BROKEN|NOPOWER)) return event_source = source - busy = 1 - active = 1 + busy = TRUE + active = TRUE + SStgui.update_uis(src) icon_state = "auth_on" sleep(confirm_delay) event_source = null icon_state = "auth_off" - active = 0 - busy = 0 + active = FALSE + busy = FALSE /obj/machinery/keycard_auth/proc/trigger_event() switch(event) @@ -178,7 +183,7 @@ if(fullmin_count) GLOB.ert_request_answered = TRUE ERT_Announce(ert_reason , event_triggered_by, 0) - ert_reason = "Reason for ERT" + ert_reason = null feedback_inc("alert_keycard_auth_ert",1) spawn(3000) if(!GLOB.ert_request_answered) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index aa0a21a165a..3fb173e7ac2 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -301,6 +301,7 @@ spawn(0) D.open() */ //Leaving this here incase someone decides to port -tg-'s escape shuttle stuff: + // This basically opens a big-ass row of blast doors when the shuttle arrives at centcom /obj/docking_port/mobile/pod name = "escape pod" diff --git a/code/modules/shuttle/ert.dm b/code/modules/shuttle/ert.dm index 5168ce89278..ddb7bb343b6 100644 --- a/code/modules/shuttle/ert.dm +++ b/code/modules/shuttle/ert.dm @@ -6,13 +6,12 @@ resistance_flags = INDESTRUCTIBLE flags = NODECONSTRUCT -/obj/machinery/computer/shuttle/ert/Topic(href, href_list) - if(href_list["move"]) +/obj/machinery/computer/shuttle/ert/can_call_shuttle(mob/user, action) + if(action == "move") var/authorized_roles = list(SPECIAL_ROLE_ERT, SPECIAL_ROLE_DEATHSQUAD) - if(!((usr.mind?.assigned_role in authorized_roles) || is_admin(usr))) - message_admins("Potential ERT shuttle hijack, ERT shuttle moved by unauthorized user: [key_name_admin(usr)]") - ..() - + if(!((user.mind?.assigned_role in authorized_roles) || is_admin(user))) + message_admins("Potential ERT shuttle hijack, ERT shuttle moved by unauthorized user: [key_name_admin(user)]") + return TRUE /obj/machinery/computer/camera_advanced/shuttle_docker/ert name = "specops navigation computer" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index cfd3ab8e6f2..86cfe2a7444 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -727,13 +727,13 @@ name = "Shuttle Console" icon_screen = "shuttle" icon_keyboard = "tech_key" - req_access = list( ) + req_access = list() circuit = /obj/item/circuitboard/shuttle var/shuttleId var/possible_destinations = "" var/admin_controlled var/max_connect_range = 7 - var/docking_request = 0 + var/moved = FALSE //workaround for nukie shuttle, hope I find a better way to do this... /obj/machinery/computer/shuttle/New(location, obj/item/circuitboard/shuttle/C) ..() @@ -773,21 +773,20 @@ return connect() add_fingerprint(user) - ui_interact(user) + tgui_interact(user) -/obj/machinery/computer/shuttle/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/computer/shuttle/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "shuttle_console.tmpl", M ? M.name : "shuttle", 300, 200) + ui = new(user, src, ui_key, "ShuttleConsole", name, 350, 150, master_ui, state) ui.open() -/obj/machinery/computer/shuttle/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] +/obj/machinery/computer/shuttle/tgui_data(mob/user) + var/list/data = list() var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) data["status"] = M ? M.getStatusText() : null if(M) - data["shuttle"] = 1 + data["shuttle"] = TRUE //this should just be boolean, right? var/list/docking_ports = list() data["docking_ports"] = docking_ports var/list/options = params2list(possible_destinations) @@ -799,34 +798,35 @@ docking_ports[++docking_ports.len] = list("name" = S.name, "id" = S.id) data["docking_ports_len"] = docking_ports.len data["admin_controlled"] = admin_controlled - data["docking_request"] = docking_request - return data -/obj/machinery/computer/shuttle/Topic(href, href_list) - if(..()) - return 1 - +/obj/machinery/computer/shuttle/tgui_act(action, params) + if(..()) //we can't actually interact, so no action + return TRUE if(!allowed(usr)) to_chat(usr, "Access denied.") - return - + return TRUE + if(!can_call_shuttle(usr, action)) + return TRUE var/list/options = params2list(possible_destinations) - if(href_list["move"]) - if(!options.Find(href_list["move"])) //I see you're trying Href exploits, I see you're failing, I SEE ADMIN WARNING. - // Seriously, though, NEVER trust a Topic with something like this. Ever. - // Sidenote for whoever did this last. Why did you set it to echo whatever the user entered to admin chat? You solved one exploit and created another. + if(action == "move") + var/destination = params["move"] + if(!options.Find(destination))//figure out if this translation works message_admins("EXPLOIT: [ADMIN_LOOKUPFLW(usr)] attempted to move [src] to an invalid location! [ADMIN_COORDJMP(src)]") return - switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1, usr)) + switch(SSshuttle.moveShuttle(shuttleId, destination, TRUE, usr)) if(0) atom_say("Shuttle departing! Please stand away from the doors.") usr.create_log(MISC_LOG, "used [src] to call the [shuttleId] shuttle") + if(!moved) + moved = TRUE + add_fingerprint(usr) + return TRUE if(1) to_chat(usr, "Invalid shuttle requested.") else to_chat(usr, "Unable to comply.") - return 1 + /obj/machinery/computer/shuttle/emag_act(mob/user) if(!emagged) @@ -834,6 +834,10 @@ emagged = 1 to_chat(user, "You fried the consoles ID checking system.") +//for restricting when the computer can be used, needed for some console subtypes. +/obj/machinery/computer/shuttle/proc/can_call_shuttle(mob/user, action) + return TRUE + /obj/machinery/computer/shuttle/ferry name = "transport ferry console" circuit = /obj/item/circuitboard/ferry @@ -844,25 +848,23 @@ /obj/machinery/computer/shuttle/ferry/request name = "ferry console" circuit = /obj/item/circuitboard/ferry/request - var/cooldown //prevents spamming admins + var/next_request //to prevent spamming admins possible_destinations = "ferry_home" - admin_controlled = 1 + admin_controlled = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF -/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list) - if(..()) - return 1 - if(href_list["request"]) - if(cooldown) +/obj/machinery/computer/shuttle/ferry/request/tgui_act(action, params) + if(..()) // Note that the parent handels normal shuttle movement on top of security checks + return + if(action == "request") + if(world.time < next_request) return - cooldown = 1 + next_request = world.time + 60 SECONDS //1 minute cooldown to_chat(usr, "Your request has been recieved by Centcom.") log_admin("[key_name(usr)] requested to move the transport ferry to Centcom.") message_admins("FERRY: [key_name_admin(usr)] (Move Ferry) is requesting to move the transport ferry to Centcom.
" var/pointsEarned for(var/atom/movable/MA in areaInstance) @@ -231,7 +226,7 @@ msg += "+[pointsEarned]: Received [crate_count] crate(s).
" SSshuttle.points += pointsEarned - SSshuttle.centcom_message = msg + SSshuttle.centcom_message += "[msg]
" /proc/forbidden_atoms_check(atom/A) var/list/blacklist = list( @@ -387,156 +382,23 @@ icon_screen = "supply" req_access = list(ACCESS_CARGO) circuit = /obj/item/circuitboard/supplycomp - var/temp = null + /// Is this a public console (Confirm + Shuttle controls are not visible) + var/is_public = FALSE + /// Time of last request var/reqtime = 0 - var/hacked = 0 - var/can_order_contraband = 0 - var/last_viewed_group = "categories" - var/datum/supply_packs/content_pack + /// Can we order special supplies + var/hacked = FALSE + /// Can we order contraband + var/can_order_contraband = FALSE -/obj/machinery/computer/ordercomp +/obj/machinery/computer/supplycomp/public name = "Supply Ordering Console" desc = "Used to order supplies from cargo staff." icon = 'icons/obj/computer.dmi' icon_screen = "request" circuit = /obj/item/circuitboard/ordercomp - var/reqtime = 0 - var/last_viewed_group = "categories" - var/datum/supply_packs/content_pack - -/obj/machinery/computer/ordercomp/attack_ai(var/mob/user as mob) - return attack_hand(user) - -/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) - ui_interact(user) - -/obj/machinery/computer/ordercomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui) - if(!ui) - ui = new(user, src, ui_key, "order_console.tmpl", name, ORDER_SCREEN_WIDTH, ORDER_SCREEN_HEIGHT) - ui.open() - -/obj/machinery/computer/ordercomp/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - data["last_viewed_group"] = last_viewed_group - - var/category_list[0] - for(var/category in GLOB.all_supply_groups) - category_list.Add(list(list("name" = get_supply_group_name(category), "category" = category))) - data["categories"] = category_list - var/cat = text2num(last_viewed_group) - var/packs_list[0] - for(var/set_name in SSshuttle.supply_packs) - var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name] - if((!pack.contraband && !pack.hidden && !pack.special && pack.group == cat) || (!pack.contraband && !pack.hidden && (pack.special && pack.special_enabled) && pack.group == cat)) - // 0/1 after the pack name (set_name) is a boolean for ordering multiple crates - packs_list.Add(list(list("name" = pack.name, "amount" = pack.amount, "cost" = pack.cost, "command1" = list("doorder" = "[set_name]0"), "command2" = list("doorder" = "[set_name]1"), "command3" = list("contents" = set_name)))) - - data["supply_packs"] = packs_list - if(content_pack) - var/pack_name = sanitize(content_pack.name) - data["contents_name"] = pack_name - data["contents"] = content_pack.manifest - data["contents_access"] = content_pack.access ? get_access_desc(content_pack.access) : "None" - - var/requests_list[0] - for(var/set_name in SSshuttle.requestlist) - var/datum/supply_order/SO = set_name - if(SO) - // Check if the user owns the request, so they can cancel requests - var/obj/item/card/id/I = user.get_id_card() - var/owned = 0 - if(I && SO.orderedby == I.registered_name) - owned = 1 - requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "owned" = owned, "command1" = list("rreq" = SO.ordernum)))) - data["requests"] = requests_list - var/orders_list[0] - for(var/set_name in SSshuttle.shoppinglist) - var/datum/supply_order/SO = set_name - if(SO) - orders_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby))) - data["orders"] = orders_list - - data["points"] = round(SSshuttle.points) - data["send"] = list("send" = 1) - - data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE - data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home" - data["timeleft"] = SSshuttle.supply.timeLeft(600) - return data - -/obj/machinery/computer/ordercomp/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["doorder"]) - if(world.time < reqtime) - visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") - SSnanoui.update_uis(src) - return 1 - - var/index = copytext(href_list["doorder"], 1, length(href_list["doorder"])) //text2num(copytext(href_list["doorder"], 1)) - var/multi = text2num(copytext(href_list["doorder"], -1)) - if(!isnum(multi)) - return 1 - var/datum/supply_packs/P = SSshuttle.supply_packs[index] - if(!istype(P)) - return 1 - var/crates = 1 - if(multi) - var/num_input = input(usr, "Amount:", "How many crates?") as null|num - if(!num_input || ..()) - return 1 - crates = clamp(round(num_input), 1, 20) - - var/timeout = world.time + 600 - var/reason = input(usr,"Reason:","Why do you require this item?","") as null|text - if(world.time > timeout || !reason || ..()) - return 1 - reason = sanitize(copytext(reason, 1, MAX_MESSAGE_LEN)) - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - reqtime = (world.time + 5) % 1e5 - - //make our supply_order datums - for(var/i = 1; i <= crates; i++) - var/datum/supply_order/O = SSshuttle.generateSupplyOrder(index, idname, idrank, reason, crates) - if(!O) return - if(i == 1) - O.generateRequisition(loc) - - else if(href_list["rreq"]) - var/ordernum = text2num(href_list["rreq"]) - var/obj/item/card/id/I = usr.get_id_card() - for(var/i=1, i<=SSshuttle.requestlist.len, i++) - var/datum/supply_order/SO = SSshuttle.requestlist[i] - if(SO.ordernum == ordernum && (I && SO.orderedby == I.registered_name)) - SSshuttle.requestlist.Cut(i,i+1) - break - - else if(href_list["last_viewed_group"]) - content_pack = null - last_viewed_group = text2num(href_list["last_viewed_group"]) - - else if(href_list["contents"]) - var/topic = href_list["contents"] - if(topic == 1) - content_pack = null - else - var/datum/supply_packs/P = SSshuttle.supply_packs[topic] - content_pack = P - - add_fingerprint(usr) - SSnanoui.update_uis(src) - return 1 + req_access = list() + is_public = TRUE /obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob) return attack_hand(user) @@ -547,47 +409,25 @@ return 1 post_signal("supply") - ui_interact(user) + tgui_interact(user) return /obj/machinery/computer/supplycomp/emag_act(user as mob) if(!hacked) to_chat(user, "Special supplies unlocked.") - hacked = 1 + hacked = TRUE return -/obj/machinery/computer/supplycomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui) +/obj/machinery/computer/supplycomp/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "supply_console.tmpl", name, SUPPLY_SCREEN_WIDTH, SUPPLY_SCREEN_HEIGHT) + ui = new(user, src, ui_key, "CargoConsole", name, 900, 800, master_ui, state) ui.open() -/obj/machinery/computer/supplycomp/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) - var/data[0] - data["last_viewed_group"] = last_viewed_group +/obj/machinery/computer/supplycomp/tgui_data(mob/user) + var/list/data = list() - var/category_list[0] - for(var/category in GLOB.all_supply_groups) - category_list.Add(list(list("name" = get_supply_group_name(category), "category" = category))) - data["categories"] = category_list - - var/cat = text2num(last_viewed_group) - var/packs_list[0] - for(var/set_name in SSshuttle.supply_packs) - var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name] - if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special)) - if(pack.group == cat) - // 0/1 after the pack name (set_name) is a boolean for ordering multiple crates - packs_list.Add(list(list("name" = pack.name, "amount" = pack.amount, "cost" = pack.cost, "command1" = list("doorder" = "[set_name]0"), "command2" = list("doorder" = "[set_name]1"), "command3" = list("contents" = set_name)))) - - data["supply_packs"] = packs_list - if(content_pack) - var/pack_name = sanitize(content_pack.name) - data["contents_name"] = pack_name - data["contents"] = content_pack.manifest - data["contents_access"] = content_pack.access ? get_access_desc(content_pack.access) : "None" - - var/requests_list[0] + var/list/requests_list = list() for(var/set_name in SSshuttle.requestlist) var/datum/supply_order/SO = set_name if(SO) @@ -596,146 +436,177 @@ requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment, "command1" = list("confirmorder" = SO.ordernum), "command2" = list("rreq" = SO.ordernum)))) data["requests"] = requests_list - var/orders_list[0] + var/list/orders_list = list() for(var/set_name in SSshuttle.shoppinglist) var/datum/supply_order/SO = set_name if(SO) orders_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment))) data["orders"] = orders_list - data["canapprove"] = (SSshuttle.supply.getDockedId() == "supply_away") && !(SSshuttle.supply.mode != SHUTTLE_IDLE) + data["is_public"] = is_public + + data["canapprove"] = (SSshuttle.supply.getDockedId() == "supply_away") && !(SSshuttle.supply.mode != SHUTTLE_IDLE) && !is_public data["points"] = round(SSshuttle.points) - data["send"] = list("send" = 1) - data["message"] = SSshuttle.centcom_message ? SSshuttle.centcom_message : "Remember to stamp and send back the supply manifests." data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home" data["timeleft"] = SSshuttle.supply.timeLeft(600) data["can_launch"] = !SSshuttle.supply.canMove() + + return data + +/obj/machinery/computer/supplycomp/tgui_static_data(mob/user) + var/list/data = list() + var/list/packs_list = list() + + for(var/set_name in SSshuttle.supply_packs) + var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name] + if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special)) + packs_list.Add(list(list("name" = pack.name, "cost" = pack.cost, "ref" = "[pack.UID()]", "contents" = pack.tgui_manifest, "cat" = pack.group))) + + data["supply_packs"] = packs_list + + var/list/categories = list() // meow + for(var/category in GLOB.all_supply_groups) + categories.Add(list(list("name" = get_supply_group_name(category), "category" = category))) + data["categories"] = categories + return data /obj/machinery/computer/supplycomp/proc/is_authorized(mob/user) if(allowed(user)) - return 1 + return TRUE if(user.can_admin_interact()) - return 1 + return TRUE - return 0 + return FALSE -/obj/machinery/computer/supplycomp/Topic(href, href_list) +/obj/machinery/computer/supplycomp/tgui_act(action, list/params) if(..()) - return 1 + return - if(!is_authorized(usr)) - return 1 + // If its not a public console, and they aint authed, dont let them use this + if(!is_public && !is_authorized(usr)) + return if(!SSshuttle) - log_runtime(EXCEPTION("The SSshuttle controller datum is missing somehow."), src) - return 1 - - if(href_list["send"]) - if(SSshuttle.supply.canMove()) - to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") - else if(SSshuttle.supply.getDockedId() == "supply_home") - SSshuttle.toggleShuttle("supply", "supply_home", "supply_away", 1) - investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents: [SSshuttle.sold_atoms]", "cargo") - else if(!SSshuttle.supply.request(SSshuttle.getDock("supply_home"))) - post_signal("supply") - if(LAZYLEN(SSshuttle.shoppinglist) && prob(10)) - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = SSshuttle.ordernum - O.object = SSshuttle.supply_packs[pick(SSshuttle.supply_packs)] - O.orderedby = random_name(pick(MALE,FEMALE), species = "Human") - SSshuttle.shoppinglist += O - investigate_log("Random [O.object] crate added to supply shuttle") - - else if(href_list["doorder"]) - if(world.time < reqtime) - visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") - SSnanoui.update_uis(src) - return 1 - - var/index = copytext(href_list["doorder"], 1, length(href_list["doorder"])) //text2num(copytext(href_list["doorder"], 1)) - var/multi = text2num(copytext(href_list["doorder"], -1)) - if(!isnum(multi)) - return 1 - var/datum/supply_packs/P = SSshuttle.supply_packs[index] - if(!istype(P)) - return 1 - var/crates = 1 - if(multi) - var/num_input = input(usr, "Amount:", "How many crates?") as null|num - if(!num_input || !is_authorized(usr) || ..()) - return 1 - crates = clamp(round(num_input), 1, 20) - - var/timeout = world.time + 600 - var/reason = input(usr,"Reason:","Why do you require this item?","") as null|text - if(world.time > timeout || !reason || !is_authorized(usr) || ..()) - return 1 - reason = sanitize(copytext(reason, 1, MAX_MESSAGE_LEN)) - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - //make our supply_order datums - for(var/i = 1; i <= crates; i++) - var/datum/supply_order/O = SSshuttle.generateSupplyOrder(index, idname, idrank, reason, crates) - if(!O) return 1 - if(i == 1) - O.generateRequisition(loc) - - else if(href_list["confirmorder"]) - if(SSshuttle.supply.getDockedId() != "supply_away" || SSshuttle.supply.mode != SHUTTLE_IDLE) - return 1 - var/ordernum = text2num(href_list["confirmorder"]) - var/datum/supply_order/O - var/datum/supply_packs/P - for(var/i=1, i<=SSshuttle.requestlist.len, i++) - var/datum/supply_order/SO = SSshuttle.requestlist[i] - if(SO.ordernum == ordernum) - O = SO - P = O.object - if(SSshuttle.points >= P.cost) - SSshuttle.requestlist.Cut(i,i+1) - SSshuttle.points -= P.cost - SSshuttle.shoppinglist += O - investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", "cargo") - else - to_chat(usr, "There are insufficient supply points for this request.") - break - - else if(href_list["rreq"]) - var/ordernum = text2num(href_list["rreq"]) - for(var/i=1, i<=SSshuttle.requestlist.len, i++) - var/datum/supply_order/SO = SSshuttle.requestlist[i] - if(SO.ordernum == ordernum) - SSshuttle.requestlist.Cut(i,i+1) - break - - else if(href_list["last_viewed_group"]) - content_pack = null - last_viewed_group = text2num(href_list["last_viewed_group"]) - - else if(href_list["contents"]) - var/topic = href_list["contents"] - if(topic == 1) - content_pack = null - else - var/datum/supply_packs/P = SSshuttle.supply_packs[topic] - content_pack = P + stack_trace("The SSshuttle controller datum is missing somehow.") + return + . = TRUE add_fingerprint(usr) - SSnanoui.update_uis(src) - return 1 + + switch(action) + if("moveShuttle") + // Public consoles cant move the shuttle. Dont allow exploiters. + if(is_public) + return + if(SSshuttle.supply.canMove()) + to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") + else if(SSshuttle.supply.getDockedId() == "supply_home") + SSshuttle.toggleShuttle("supply", "supply_home", "supply_away", 1) + investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents: [SSshuttle.sold_atoms]", "cargo") + else if(!SSshuttle.supply.request(SSshuttle.getDock("supply_home"))) + post_signal("supply") + if(LAZYLEN(SSshuttle.shoppinglist) && prob(10)) + var/datum/supply_order/O = new /datum/supply_order() + O.ordernum = SSshuttle.ordernum + O.object = SSshuttle.supply_packs[pick(SSshuttle.supply_packs)] + O.orderedby = random_name(pick(MALE,FEMALE), species = "Human") + SSshuttle.shoppinglist += O + investigate_log("Random [O.object] crate added to supply shuttle") + + if("order") + if(world.time < reqtime) + visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") + return + + var/amount = 1 + if(params["multiple"] == "1") // 1 is a string here. DO NOT MAKE THIS A BOOLEAN YOU DORK + var/num_input = input(usr, "Amount", "How many crates? (20 Max)") as null|num + if(!num_input || (!is_public && !is_authorized(usr)) || ..()) // Make sure they dont walk away + return + amount = clamp(round(num_input), 1, 20) + + + var/datum/supply_packs/P = locateUID(params["crate"]) + if(!istype(P)) + return + + var/timeout = world.time + 600 // If you dont type the reason within a minute, theres bigger problems here + var/reason = input(usr, "Reason", "Why do you require this item?","") as null|text + if(world.time > timeout || !reason || (!is_public && !is_authorized(usr)) || ..()) + // Cancel if they take too long, they dont give a reason, they aint authed, or if they walked away + return + reason = sanitize(copytext(reason, 1, MAX_MESSAGE_LEN)) + + var/idname = "*None Provided*" + var/idrank = "*None Provided*" + + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + idname = H.get_authentification_name() + idrank = H.get_assignment() + else if(issilicon(usr)) + idname = usr.real_name + + //make our supply_order datums + for(var/i = 1; i <= amount; i++) + var/datum/supply_order/O = SSshuttle.generateSupplyOrder(params["crate"], idname, idrank, reason, amount) + if(!O) + return + if(i == 1) + O.generateRequisition(loc) + + if("approve") + // Public consoles cant approve stuff + if(is_public) + return + if(SSshuttle.supply.getDockedId() != "supply_away" || SSshuttle.supply.mode != SHUTTLE_IDLE) + return + + var/ordernum = text2num(params["ordernum"]) + var/datum/supply_order/O + var/datum/supply_packs/P + for(var/i=1, i<=SSshuttle.requestlist.len, i++) + var/datum/supply_order/SO = SSshuttle.requestlist[i] + if(SO.ordernum == ordernum) + O = SO + P = O.object + if(SSshuttle.points >= P.cost) + SSshuttle.requestlist.Cut(i,i+1) + SSshuttle.points -= P.cost + SSshuttle.shoppinglist += O + investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", "cargo") + else + to_chat(usr, "There are insufficient supply points for this request.") + break + + if("deny") + var/ordernum = text2num(params["ordernum"]) + for(var/i=1, i<=SSshuttle.requestlist.len, i++) + var/datum/supply_order/SO = SSshuttle.requestlist[i] + if(SO.ordernum == ordernum) + // If we are on a public console, only allow cancelling of our own orders + if(is_public) + var/obj/item/card/id/I = usr.get_id_card() + if(I && SO.orderedby == I.registered_name) + SSshuttle.requestlist.Cut(i,i+1) + break + // If we arent public, were cargo access. CANCELLATIONS FOR EVERYONE + else + SSshuttle.requestlist.Cut(i,i+1) + break + + // Popup to show CC message logs. Its easier this way to avoid box-spam in TGUI + if("showMessages") + // Public consoles cant view messages + if(is_public) + return + var/datum/browser/ccmsg_browser = new(usr, "ccmsg", "Central Command Cargo Message Log", 800, 600) + ccmsg_browser.set_content(SSshuttle.centcom_message) + ccmsg_browser.open() /obj/machinery/computer/supplycomp/proc/post_signal(var/command) var/datum/radio_frequency/frequency = SSradio.return_frequency(DISPLAY_FREQ) @@ -748,9 +619,3 @@ status_signal.data["command"] = command frequency.post_signal(src, status_signal) - - -#undef ORDER_SCREEN_WIDTH -#undef ORDER_SCREEN_HEIGHT -#undef SUPPLY_SCREEN_WIDTH -#undef SUPPLY_SCREEN_HEIGHT diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index f9ec738b167..1ff2959ff08 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -11,20 +11,18 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF flags = NODECONSTRUCT var/challenge = FALSE - var/moved = FALSE /obj/machinery/computer/shuttle/syndicate/recall name = "syndicate shuttle recall terminal" circuit = /obj/item/circuitboard/shuttle/syndicate/recall possible_destinations = "syndicate_away" -/obj/machinery/computer/shuttle/syndicate/Topic(href, href_list) - if(href_list["move"]) +/obj/machinery/computer/shuttle/syndicate/can_call_shuttle(user, action) + if(action == "move") if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER) - to_chat(usr, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.") - return 0 - moved = TRUE - ..() + to_chat(user, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.") + return FALSE + return TRUE /obj/machinery/computer/shuttle/syndicate/drop_pod name = "syndicate assault pod control" @@ -35,11 +33,11 @@ shuttleId = "steel_rain" possible_destinations = null -/obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list) - if(href_list["move"]) +/obj/machinery/computer/shuttle/syndicate/drop_pod/can_call_shuttle(user, action) + if(action == "move") if(z != level_name_to_num(CENTCOMM)) - to_chat(usr, "Pods are one way!") - return 0 + to_chat(user, "Pods are one way!") + return FALSE ..() /obj/machinery/computer/shuttle/sst diff --git a/code/modules/spacepods/construction.dm b/code/modules/spacepods/construction.dm index be2998fc0a3..d24758c3b19 100644 --- a/code/modules/spacepods/construction.dm +++ b/code/modules/spacepods/construction.dm @@ -222,7 +222,7 @@ // EOF ) - spawn_result(mob/user as mob) - ..() - feedback_inc("spacepod_created",1) - return +/datum/construction/reversible2/pod/spawn_result(mob/user as mob) + ..() + feedback_inc("spacepod_created",1) + return diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index 56e7f8f96ba..7d28be5c5cf 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -296,7 +296,7 @@ return var/sound/S = sound(mysound) S.wait = 0 //No queue - S.channel = open_sound_channel() + S.channel = SSsounds.random_available_channel() S.volume = 50 for(var/mob/M in passengers | pilot) M << S diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 426af9a97ac..4e9b5e57630 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -91,7 +91,7 @@ /obj/machinery/bsa/middle/proc/check_completion() if(!front || !back) - return "No linked parts detected!" + return "No multitool-linked parts detected!" if(!front.anchored || !back.anchored || !anchored) return "Linked parts unwrenched!" if(front.y != y || back.y != y || !(front.x > x && back.x < x || front.x < x && back.x > x) || front.z != z || back.z != z) @@ -305,51 +305,45 @@ /obj/machinery/computer/bsa_control/attack_hand(mob/user) if(..()) return 1 - ui_interact(user) + tgui_interact(user) -/obj/machinery/computer/bsa_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/computer/bsa_control/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "bsa.tmpl", name, 400, 305) + ui = new(user, src, ui_key, "BlueSpaceArtilleryControl", name, 400, 155, master_ui, state) ui.open() - ui.set_auto_update(1) -/obj/machinery/computer/bsa_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) +/obj/machinery/computer/bsa_control/tgui_data(mob/user) var/list/data = list() data["connected"] = cannon data["notice"] = notice if(target) data["target"] = get_target_name() - if(cannon) var/reload_cooldown = cannon.reload_cooldown var/last_fire_time = cannon.last_fire_time var/time_to_wait = max(0, round(reload_cooldown - ((world.time / 10) - last_fire_time))) var/minutes = max(0, round(time_to_wait / 60)) var/seconds = max(0, time_to_wait - (60 * minutes)) - - data["reloadtime_mins"] = minutes - data["reloadtime_secs"] = (seconds < 10) ? "0[seconds]" : seconds + var/seconds2 = (seconds < 10) ? "0[seconds]" : seconds + data["reloadtime_text"] = "[minutes]:[seconds2]" data["ready"] = minutes == 0 && seconds == 0 else data["ready"] = FALSE - return data -/obj/machinery/computer/bsa_control/Topic(href, href_list) +/obj/machinery/computer/bsa_control/tgui_act(action, params) if(..()) - return 1 - - if(href_list["build"]) - cannon = deploy() - . = TRUE - else if(href_list["fire"]) - fire(usr) - . = TRUE - else if(href_list["recalibrate"]) - calibrate(usr) - . = TRUE + return + switch(action) + if("build") + cannon = deploy() + if("fire") + fire(usr) + if("recalibrate") + calibrate(usr) update_icon() + return TRUE /obj/machinery/computer/bsa_control/proc/calibrate(mob/user) var/list/gps_locators = list() diff --git a/code/modules/station_goals/station_goal.dm b/code/modules/station_goals/station_goal.dm index 47f65ea2553..7f13651168b 100644 --- a/code/modules/station_goals/station_goal.dm +++ b/code/modules/station_goals/station_goal.dm @@ -13,7 +13,7 @@ /datum/station_goal/proc/send_report() GLOB.priority_announcement.Announce("Priority Nanotrasen directive received. Project \"[name]\" details inbound.", "Incoming Priority Message", 'sound/AI/commandreport.ogg') - print_command_report(get_report(), "Nanotrasen Directive [pick(GLOB.phonetic_alphabet)] \Roman[rand(1,50)]") + print_command_report(get_report(), "Nanotrasen Directive [pick(GLOB.phonetic_alphabet)] \Roman[rand(1,50)]", FALSE) on_report() /datum/station_goal/proc/on_report() diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index 4c1610474ba..0a0f19fb0f7 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -111,6 +111,12 @@ typepath = /obj/item/instrument/eguitar cost = 500 +/datum/storeitem/banjo + name = "Banjo" + desc = "It's pretty much just a drum with a neck and strings." + typepath = /obj/item/instrument/banjo + cost = 500 + /datum/storeitem/piano_synth name = "Piano Synthesizer" desc = "An advanced electronic synthesizer that can emulate various instruments." diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 19ff7fa37d8..8e007f60f89 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -1,5 +1,3 @@ -#define STUN_SET_AMOUNT 2 - /obj/item/organ/internal/cyberimp name = "cybernetic implant" desc = "a state-of-the-art implant that improves a baseline's functionality" @@ -128,17 +126,27 @@ implant_color = "#FFFF00" slot = "brain_antistun" origin_tech = "materials=5;programming=4;biotech=5" + var/stun_max_amount = 2 + +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened + name = "Hardened CNS Rebooter implant" + emp_proof = TRUE + +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened/Initialize(mapload) + . = ..() + desc += " The implant has been hardened. It is invulnerable to EMPs." /obj/item/organ/internal/cyberimp/brain/anti_stun/on_life() ..() if(crit_fail) return - if(owner.stunned > STUN_SET_AMOUNT) - owner.SetStunned(STUN_SET_AMOUNT) - if(owner.weakened > STUN_SET_AMOUNT) - owner.SetWeakened(STUN_SET_AMOUNT) + if(owner.stunned > stun_max_amount) + owner.SetStunned(stun_max_amount) + if(owner.weakened > stun_max_amount) + owner.SetWeakened(stun_max_amount) /obj/item/organ/internal/cyberimp/brain/anti_stun/emp_act(severity) + ..() if(crit_fail || emp_proof) return crit_fail = TRUE @@ -147,6 +155,12 @@ /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/reboot() crit_fail = FALSE +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened + name = "Hardened CNS Rebooter implant" + desc = "A military-grade version of the standard implant, for NT's more elite forces." + origin_tech = "materials=6;programming=5;biotech=5" + emp_proof = TRUE + /obj/item/organ/internal/cyberimp/brain/clown_voice name = "Comical implant" desc = "Uh oh." diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index b0403d8ae49..837c6e0d056 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -54,7 +54,7 @@ var/obj/item/organ/external/BP = X var/brutedamage = BP.brute_dam - if(BP.is_robotic() && !ismachineperson(src)) + if(BP.is_robotic()) continue //We want an accurate reading of .len diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 1b205f957ce..59385ff85a3 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -8,7 +8,7 @@ var/eye_colour = "#000000" // Should never be null var/list/colourmatrix = null var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white. - var/list/replace_colours = LIST_GREYSCALE_REPLACE + var/list/replace_colours = GREYSCALE_COLOR_REPLACE var/dependent_disabilities = list() //Gets set by eye-dependent disabilities such as colourblindness so the eyes can transfer the disability during transplantation. var/weld_proof = null //If set, the eyes will not take damage during welding. eg. IPC optical sensors do not take damage when they weld things while all other eyes will. diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 3dab4065f7d..5b9b5056604 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -236,35 +236,6 @@ status &= ~ORGAN_SPLINTED status |= ORGAN_ROBOT -/obj/item/organ/external/emp_act(severity) - if(!is_robotic() || emp_proof) - return - if(tough) - switch(severity) - if(1) - receive_damage(0, 5.5) - if(owner) - owner.Stun(10) - if(2) - receive_damage(0, 2.8) - if(owner) - owner.Stun(5) - else - switch(severity) - if(1) - receive_damage(0, 20) - if(2) - receive_damage(0, 7) - -/obj/item/organ/internal/emp_act(severity) - if(!is_robotic() || emp_proof) - return - switch(severity) - if(1) - receive_damage(20, 1) - if(2) - receive_damage(7, 1) - /obj/item/organ/proc/shock_organ(intensity) return diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 143bf1d1ed6..5fdf95f09a9 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -41,6 +41,9 @@ var/list/obj/item/organ/external/children var/list/convertable_children = list() + // Does the organ take reduce damage from EMPs? IPC limbs get this by default + var/emp_resistant = FALSE + // Internal organs of this body part var/list/internal_organs = list() @@ -256,6 +259,34 @@ return update_icon() +/obj/item/organ/external/emp_act(severity) + if(!is_robotic() || emp_proof) + return + if(tough) // Augmented limbs + switch(severity) + if(1) + receive_damage(0, 5.5) + if(owner) + owner.Stun(10) + if(2) + receive_damage(0, 2.8) + if(owner) + owner.Stun(5) + else if(emp_resistant) // IPC limbs + switch(severity) + if(1) + // 5.28 (9 * 0.66 burn_mod) burn damage, 65.34 damage with 11 limbs. + receive_damage(0, 9) + if(2) + // 3.63 (5 * 0.66 burn_mod) burn damage, 39.93 damage with 11 limbs. + receive_damage(0, 5.5) + else // Basic prosthetic limbs + switch(severity) + if(1) + receive_damage(0, 20) + if(2) + receive_damage(0, 7) + /* This function completely restores a damaged organ to perfect condition. */ diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 53283ada95e..5151b347f4d 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -73,6 +73,15 @@ A.Remove(M) return src +/obj/item/organ/internal/emp_act(severity) + if(!is_robotic() || emp_proof) + return + switch(severity) + if(1) + receive_damage(20, 1) + if(2) + receive_damage(7, 1) + /obj/item/organ/internal/replaced(var/mob/living/carbon/human/target) insert(target) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 91e4a2f6781..70f3ff43fa1 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -30,7 +30,7 @@ // message is the custom message to be displayed -mob/living/carbon/human/proc/custom_pain(message) +/mob/living/carbon/human/proc/custom_pain(message) if(stat >= UNCONSCIOUS) return @@ -49,7 +49,7 @@ mob/living/carbon/human/proc/custom_pain(message) to_chat(src, msg) next_pain_time = world.time + 100 -mob/living/carbon/human/proc/handle_pain() +/mob/living/carbon/human/proc/handle_pain() // not when sleeping if(stat >= UNCONSCIOUS) diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index b61a7c429bc..b9afa20b7d2 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -54,8 +54,6 @@ var/eggs_hatched = 0 // num of hatch events completed var/awaymission_checked = FALSE var/awaymission_infection = FALSE // TRUE if infection occurred inside gateway - var/list/types_basic = list(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray) - var/list/types_adv = list(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray, /mob/living/simple_animal/hostile/poison/terror_spider/green) /obj/item/organ/internal/body_egg/terror_eggs/on_life() @@ -104,12 +102,16 @@ var/infection_completed = FALSE var/obj/structure/spider/spiderling/terror_spiderling/S = new(get_turf(owner)) switch(eggs_hatched) - if(0) // First spiderling - S.grow_as = pick(types_basic) - if(1) // Second - S.grow_as = pick(types_adv) - if(2) // Last - S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/princess + if(0) // 1st spiderling + S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/gray + if(1) // 2nd + S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/red + if(2) // 3rd + S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/brown + if(3) // 4th + S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/green + if(4) // 5th + S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/green infection_completed = TRUE S.immediate_ventcrawl = TRUE eggs_hatched++ diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm index 52cad684e11..415cdb7875d 100644 --- a/code/modules/surgery/organs/subtypes/machine.dm +++ b/code/modules/surgery/organs/subtypes/machine.dm @@ -5,6 +5,7 @@ min_broken_damage = 30 encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/head/ipc/New(mob/living/carbon/holder, datum/species/species_override = null) ..(holder, /datum/species/machine) // IPC heads need to be explicitly set to this since you can print them @@ -13,6 +14,7 @@ /obj/item/organ/external/chest/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/chest/ipc/New() ..() @@ -21,6 +23,7 @@ /obj/item/organ/external/groin/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/groin/ipc/New() ..() @@ -29,6 +32,7 @@ /obj/item/organ/external/arm/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/arm/ipc/New() ..() @@ -37,6 +41,7 @@ /obj/item/organ/external/arm/right/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/arm/right/ipc/New() ..() @@ -45,6 +50,7 @@ /obj/item/organ/external/leg/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/leg/ipc/New() ..() @@ -53,6 +59,7 @@ /obj/item/organ/external/leg/right/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/leg/right/ipc/New() ..() @@ -61,6 +68,7 @@ /obj/item/organ/external/foot/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/foot/ipc/New() ..() @@ -69,6 +77,7 @@ /obj/item/organ/external/foot/right/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/foot/right/ipc/New() ..() @@ -77,6 +86,7 @@ /obj/item/organ/external/hand/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/hand/ipc/New() ..() @@ -85,6 +95,7 @@ /obj/item/organ/external/hand/right/ipc encased = null status = ORGAN_ROBOT + emp_resistant = TRUE /obj/item/organ/external/hand/right/ipc/New() ..() diff --git a/code/modules/surgery/organs/subtypes/tajaran.dm b/code/modules/surgery/organs/subtypes/tajaran.dm index e8d87b55b89..226bc82dd2d 100644 --- a/code/modules/surgery/organs/subtypes/tajaran.dm +++ b/code/modules/surgery/organs/subtypes/tajaran.dm @@ -7,14 +7,14 @@ icon = 'icons/obj/species_organs/tajaran.dmi' name = "tajaran eyeballs" colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability. - replace_colours = LIST_TAJ_REPLACE + replace_colours = TRITANOPIA_COLOR_REPLACE see_in_dark = 8 /obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. name = "farwa eyeballs" colourmatrix = MATRIX_TAJ_CBLIND see_in_dark = 8 - replace_colours = LIST_TAJ_REPLACE + replace_colours = TRITANOPIA_COLOR_REPLACE /obj/item/organ/internal/heart/tajaran name = "tajaran heart" diff --git a/code/modules/surgery/organs/subtypes/vulpkanin.dm b/code/modules/surgery/organs/subtypes/vulpkanin.dm index a2815d32dc6..bd56532ebd9 100644 --- a/code/modules/surgery/organs/subtypes/vulpkanin.dm +++ b/code/modules/surgery/organs/subtypes/vulpkanin.dm @@ -7,14 +7,14 @@ name = "vulpkanin eyeballs" icon = 'icons/obj/species_organs/vulpkanin.dmi' colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability. - replace_colours = LIST_VULP_REPLACE + replace_colours = PROTANOPIA_COLOR_REPLACE see_in_dark = 8 /obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. name = "wolpin eyeballs" colourmatrix = MATRIX_VULP_CBLIND see_in_dark = 8 - replace_colours = LIST_VULP_REPLACE + replace_colours = PROTANOPIA_COLOR_REPLACE /obj/item/organ/internal/heart/vulpkanin name = "vulpkanin heart" diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index c9b26f61228..dd73cf0f02a 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -157,7 +157,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby")) if(L.can_hear() && !L.null_rod_check() && L != owner && L.stat != DEAD) if(ishuman(L)) var/mob/living/carbon/human/H = L - if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) + if(H.check_ear_prot() >= HEARING_PROTECTION_TOTAL) continue listeners += L diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index f1da4ed89ba..a33a1d141f9 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -23,9 +23,12 @@ /datum/tgui_module/crew_monitor/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - // The 557 may seem random, but its the perfectsize for margins on the nanomap - ui = new(user, src, ui_key, "CrewMonitor", name, 1400, 557, master_ui, state) - ui.autoupdate = TRUE + ui = new(user, src, ui_key, "CrewMonitor", name, 800, 600, master_ui, state) + + // Send nanomaps + var/datum/asset/nanomaps = get_asset_datum(/datum/asset/simple/nanomaps) + nanomaps.send(user) + ui.open() diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm new file mode 100644 index 00000000000..582d03f5a54 --- /dev/null +++ b/code/modules/tgui/modules/ert_manager.dm @@ -0,0 +1,100 @@ +/datum/tgui_module/ert_manager + name = "ERT Manager" + var/ert_type = "Red" + var/commander_slots = 1 // defaults for open slots + var/security_slots = 4 + var/medical_slots = 0 + var/engineering_slots = 0 + var/janitor_slots = 0 + var/paranormal_slots = 0 + var/cyborg_slots = 0 + +/datum/tgui_module/ert_manager/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_admin_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "ERTManager", name, 350, 430, master_ui, state) + ui.autoupdate = TRUE + ui.open() + +/datum/tgui_module/ert_manager/tgui_data(mob/user) + var/list/data = list() + data["str_security_level"] = capitalize(get_security_level()) + switch(GLOB.security_level) + if(SEC_LEVEL_GREEN) + data["security_level_color"] = "green" + if(SEC_LEVEL_BLUE) + data["security_level_color"] = "blue" + if(SEC_LEVEL_RED) + data["security_level_color"] = "red" + else + data["security_level_color"] = "purple" + data["ert_type"] = ert_type + data["com"] = commander_slots + data["sec"] = security_slots + data["med"] = medical_slots + data["eng"] = engineering_slots + data["jan"] = janitor_slots + data["par"] = paranormal_slots + data["cyb"] = cyborg_slots + data["total"] = commander_slots + security_slots + medical_slots + engineering_slots + janitor_slots + paranormal_slots + cyborg_slots + data["spawnpoints"] = GLOB.emergencyresponseteamspawn.len + return data + +/datum/tgui_module/ert_manager/tgui_act(action, params) + if(..()) + return + . = TRUE + switch(action) + if("ert_type") + ert_type = params["ert_type"] + if("toggle_com") + commander_slots = commander_slots ? 0 : 1 + if("set_sec") + security_slots = text2num(params["set_sec"]) + if("set_med") + medical_slots = text2num(params["set_med"]) + if("set_eng") + engineering_slots = text2num(params["set_eng"]) + if("set_jan") + janitor_slots = text2num(params["set_jan"]) + if("set_par") + paranormal_slots = text2num(params["set_par"]) + if("set_cyb") + cyborg_slots = text2num(params["set_cyb"]) + if("dispatch_ert") + var/datum/response_team/D + switch(ert_type) + if("Amber") + D = new /datum/response_team/amber + if("Red") + D = new /datum/response_team/red + if("Gamma") + D = new /datum/response_team/gamma + else + to_chat(usr, "Invalid ERT type.") + return + GLOB.ert_request_answered = TRUE + var/slots_list = list() + if(commander_slots > 0) + slots_list += "commander: [commander_slots]" + if(security_slots > 0) + slots_list += "security: [security_slots]" + if(medical_slots > 0) + slots_list += "medical: [medical_slots]" + if(engineering_slots > 0) + slots_list += "engineering: [engineering_slots]" + if(janitor_slots > 0) + slots_list += "janitor: [janitor_slots]" + if(paranormal_slots > 0) + slots_list += "paranormal: [paranormal_slots]" + if(cyborg_slots > 0) + slots_list += "cyborg: [cyborg_slots]" + var/slot_text = english_list(slots_list) + notify_ghosts("An ERT is being dispatched. Open positions: [slot_text]") + message_admins("[key_name_admin(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]", 1) + log_admin("[key_name(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]") + GLOB.event_announcement.Announce("Attention, [station_name()]. We are attempting to assemble an ERT. Standby.", "ERT Protocol Activated") + trigger_armed_response_team(D, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots) + else + return FALSE + diff --git a/code/modules/tgui/plugins/login.dm b/code/modules/tgui/plugins/login.dm new file mode 100644 index 00000000000..af0e42b0364 --- /dev/null +++ b/code/modules/tgui/plugins/login.dm @@ -0,0 +1,204 @@ +/** + * tgui login + * + * Allows the handling of logins using IDs within tgui. + * + * Two key procs: + * * [/obj/proc/tgui_login_act] - Call in your tgui_act() proc to catch any login actions and handle them. + * * [/obj/proc/tgui_login_data] - Call in your tgui_data() proc to pass login info. + * + * How to use (DM side): + * 1. Call [/obj/proc/tgui_login_act] at the start of your tgui_act() proc + * 2. Call [/obj/proc/tgui_login_data] in your tgui_data() proc while passing the data list + * 3. In your object, call [/obj/proc/tgui_login_get] to get the current login state. + * 4. Optional: call [/obj/proc/tgui_login_attackby] in your attackby() to make the login process easier. + * + * How to use (JS side): Use the
The server is restarting. Reconnect (' + timeLeftSecs + ')
', 'internal');
+
+ opts.rebootIntervalHandler = setInterval(function() {
+ timeLeftSecs -= intervalSecs;
+ if (timeLeftSecs <= 0) {
+ $("#reconnectTimer").text('Reconnecting...');
+ window.location.href = 'byond://winset?command=.reconnect';
+ clearInterval(opts.rebootIntervalHandler)
+ opts.rebootIntervalHandler = null;
+ } else {
+ $("#reconnectTimer").text('Reconnect (' + timeLeftSecs + ')');
+ }
+ }, intervalSecs * 1000);
+}
+
+function rebootFinished() {
+ if (opts.rebootIntervalHandler != null) {
+ clearInterval(opts.rebootIntervalHandler)
+ }
+ $(" Reconnected automatically!").insertBefore("#reconnectTimer");
+ $("#reconnectTimer").remove();
+}
+
/*****************************************
*
* MAKE MACRO DICTIONARY
@@ -652,7 +683,7 @@ $(function() {
'shideSpam': getCookie('hidespam'),
'darkChat': getCookie('darkChat'),
};
-
+
if (savedConfig.sfontSize) {
$messages.css('font-size', savedConfig.sfontSize);
internalOutput('Loaded font size setting of: '+savedConfig.sfontSize+'', 'internal');
@@ -1010,18 +1041,18 @@ $(function() {
} else {
xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
}
-
+
// synchronous requests are depricated in modern browsers
- xmlHttp.open('GET', 'browserOutput.css', true);
+ xmlHttp.open('GET', 'browserOutput.css', true);
xmlHttp.onload = function (e) {
if (xmlHttp.status === 200) { // request successful
-
+
// Generate Log
var saved = '';
saved += $messages.html();
saved = saved.replace(/&/g, '&');
saved = saved.replace(/
-
-{{if !data.occupied}}
- No occupant detected.
-{{else}} -Occupant Data:
-
-
-
- Name:
-
-
- {{:data.occupant.name}}
-
-
-
-
- Health:
-
- {{:helper.displayBar(data.occupant.health, -100, 100, (data.occupant.health >= 50) ? 'good' : (data.occupant.health >= 0) ? 'average' : 'bad')}}
-
- {{:helper.smoothRound(data.occupant.health)}}%
-
-
-
-
-
- Status:
-
-
- {{if data.occupant.stat==0}}
- Alive
- {{else data.occupant.stat==1}}
- Critical
- {{else}}
- Dead
- {{/if}}
-
-
-
- {{if data.occupant.hasBorer}}
-
- Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.
- Temperature:
-
-
- {{:helper.smoothRound(data.occupant.bodyTempC)}}°C, {{:helper.smoothRound(data.occupant.bodyTempF)}}°F
-
- - {{/if}} - {{if data.occupant.blind}} - Cataracts detected.
- {{/if}} - {{if data.occupant.colourblind}} - Photoreceptor abnormalities detected.
- {{/if}} - {{if data.occupant.nearsighted}} - Retinal misalignment detected.
- {{/if}} - -
- {{:helper.link('Print', 'print', {'print_p' : 1, 'name' : data.occupant.name})}} - {{:helper.link('Eject Occupant', 'arrow-circle-o-down', {'ejectify' : 1}, data.occupied ? null : 'disabled')}} -
- - Damage: -
| Brute Damage: | -Brain Damage: | -
| {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth+100, (data.occupant.bruteLoss < 15) ? 'notgood' : (data.occupant.bruteLoss < 40) ? 'average' : 'bad', data.occupant.bruteLoss) }} | -{{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth+100, (data.occupant.brainLoss < 15) ? 'notgood' : (data.occupant.brainLoss < 40) ? 'average' : 'bad', data.occupant.brainLoss)}} | -
| Resp. Damage: | -Radiation Level: | -
| {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth+100, (data.occupant.oxyLoss < 15) ? 'notgood' : (data.occupant.oxyLoss < 40) ? 'average' : 'bad', data.occupant.oxyLoss)}} | -{{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth+100, (data.occupant.radLoss < 15) ? 'notgood' : (data.occupant.radLoss < 40) ? 'average' : 'bad', data.occupant.radLoss)}} | -
| Toxin Damage: | -Genetic Damage: | -
| {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth+100, (data.occupant.toxLoss < 15) ? 'notgood' : (data.occupant.toxLoss < 40) ? 'average' : 'bad', data.occupant.toxLoss)}} | -{{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth+100, (data.occupant.cloneLoss < 15) ? 'notgood' : (data.occupant.cloneLoss < 40) ? 'average' : 'bad', data.occupant.cloneLoss)}} | -
| Burn Severity: | -Paralysis %: ({{:helper.smoothRound(data.occupant.paralysisSeconds)}} seconds left) | -
| {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth+100, (data.occupant.fireLoss < 15) ? 'notgood' : (data.occupant.fireLoss < 40) ? 'average' : 'bad', data.occupant.fireLoss)}} | -{{:helper.displayBar(data.occupant.paralysis, 0, 100, (data.occupant.paralysis < 25) ? 'notgood' : (data.occupant.paralysis < 50) ? 'average' : 'bad', data.occupant.paralysis)}} | -
- Blood: -
-
- Pulse:
{{:data.occupant.blood.pulse}} bpm
-
-
- {{/if}}
- Blood Level:
- {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, (data.occupant.blood.percent <= 60) ? 'bad' : (data.occupant.blood.percent <= 90) ? 'average' : 'good' )}}
- {{:helper.smoothRound(data.occupant.blood.percent)}}%, {{:helper.smoothRound(data.occupant.blood.bloodLevel)}}cl
- - {{if data.occupant.hasVirus}} - - Viral pathogen detected in blood stream. -
- {{/if}} - {{if data.occupant.implant_len}} -
- Implants -
| {{:value.name}} |
- {{/if}} - External Organs -
| Name | -Total damage | -Brute damage | -Burn damage | -Injuries | -
|---|---|---|---|---|
| {{:value.name}} | -{{:helper.displayBar(value.totalLoss, 0, value.maxHealth, (value.totalLoss < value.bruised) ? 'notgood' : (value.totalLoss < value.broken) ? 'average' : 'bad', value.totalLoss) }} | -{{if value.bruteLoss> 0}} {{else}} {{/if}} {{:helper.smoothRound(value.bruteLoss)}} | -{{if value.fireLoss> 0}} {{else}} {{/if}} {{:helper.smoothRound(value.fireLoss)}} | -
-
- {{if value.internalBleeding}} internal bleeding {{/if}} - {{if value.lungRuptured}} lung ruptured {{/if}} - {{if value.status.broken}} {{:value.status.broken}} {{/if}} - {{if value.germ_level > 100}} - {{if value.germ_level < 300}} - mild infection - {{else value.germ_level < 400}} - mild infection+ - {{else value.germ_level < 500}} - mild infection++ - {{else value.germ_level < 700}} - acute infection - {{else value.germ_level < 800}} - acute infection+ - {{else value.germ_level < 900}} - acute infection++ - {{else value.germ_level >= 900}} - septic - {{/if}} - {{/if}} - {{if value.open}} open incision {{/if}} - - {{if value.status.splinted}} splinted {{/if}} - {{if value.status.robotic}} robotic {{/if}} - {{if value.status.dead}} DEAD - {{/for}} - {{/if}} - |
-
- Internal Organs -
| Name | -Brute damage | -Injuries | -
|---|---|---|
| {{:value.name}} |
- {{:helper.displayBar(value.damage, 0, value.maxHealth, (value.damage < value.bruised) ? 'notgood' : (value.damage < value.broken) ? 'average' : 'bad', value.damage) }} | -
-
- {{if value.germ_level > 100}}
- {{if value.germ_level < 300}}
- mild infection - {{else value.germ_level < 400}} - mild infection+ - {{else value.germ_level < 500}} - mild infection++ - {{else value.germ_level < 700}} - acute Infection - {{else value.germ_level < 800}} - acute Infection+ - {{else value.germ_level < 900}} - acute Infection++ - {{else value.germ_level >= 900}} - septic - {{/if}} - {{/if}} - - {{if value.robotic == 1}} robotic {{/if}} - {{if value.robotic == 2}} assisted {{/if}} - {{if value.dead}} DEAD {{/if}} - |
-
-
- {{empty}} - No laws detected! - {{/for}} - -
-{{else}}
- Stored AI: {{:data.occupant}}
-Information
-
- Integrity
-
-
- {{:data.integrity}}%
-
-
- Status
-
-
- {{if data.stat == 2}}
- Non-functional
- {{else}}
- Functional
- {{/if}}
-
-
- Wireless Activity
-
-
- {{:helper.link('Enabled','check',{'wireless' : 0},data.wireless == 0 ? 'selected' : '')}}
- {{:helper.link('Disabled','close',{'wireless' : 1},data.wireless == 1 ? 'selected' : '')}}
-
-
- Subspace Transceiver
-
-
- {{:helper.link('Enabled','check',{'radio' : 0},data.radio == 0 ? 'selected' : '')}}
- {{:helper.link('Disabled','close',{'radio' : 1},data.radio == 1 ? 'selected' : '')}}
-
- Laws
- {{for data.laws}} - {{:value.number}}: {{:value.law}}- {{empty}} - No laws detected! - {{/for}} - -
Actions
- {{if data.active}} - Reconstruction in progress, please wait. - {{:helper.displayBar(data.integrity, 0, 100, (data.integrity >= 75) ? 'good' : (data.integrity >= 25) ? 'average' : 'bad')}} - {{:helper.smoothRound(data.integrity)}}% - {{/if}} -
- {{:helper.link('Reconstruct', 'wrench', {'fix' : 1}, data.active || data.integrity >= 100 ? 'disabled' : '')}}
-
- No artificial intelligence detected.
-{{/if}} \ No newline at end of file diff --git a/nano/templates/aicard.tmpl b/nano/templates/aicard.tmpl deleted file mode 100644 index 8ebe6cff319..00000000000 --- a/nano/templates/aicard.tmpl +++ /dev/null @@ -1,98 +0,0 @@ - - - - - -{{if data.has_ai}} -
-
-
- {{if data.has_laws}}
-
- Hardware Integrity:
-
-
- {{:data.hardware_integrity}}%
-
- | Index | Law |
| {{:value.index}}. | {{:value.law}} |
| Radio Subspace Transceiver | -{{:helper.link("Enabled", null, {'radio' : 0}, data.radio ? 'selected' : null)}} | -{{:helper.link("Disabled", null, {'radio' : 1}, data.radio ? null : 'redButton' )}} | -
| Wireless Interface | -{{:helper.link("Enabled", null, {'wireless' : 0}, data.wireless ? 'selected' : null)}} | -{{:helper.link("Disabled", null, {'wireless' : 1}, data.wireless ? null : 'redButton' )}} | -
| AI wipe in progress... | ||
| Wipe AI | -{{:helper.link("Wipe", 'exclamation-circle', {'wipe' : 1}, null, 'redButton')}} | -
{{:value.category}}
- {{for value.alarms :alarmValue:alarmIndex}} - {{if alarmValue.origin_lost}} - {{:alarmValue.name}} Alarm Origin Lost- {{else}} - {{:alarmValue.name}}
- {{/if}} - {{if alarmValue.has_cameras || alarmValue.lost_sources != ""}} -
- {{if alarmValue.has_cameras}}
-
- {{/if}}
- {{empty}}
- --All Systems Nominal
- {{/for}}
-{{/for}}
\ No newline at end of file
diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl
deleted file mode 100644
index 234074fe577..00000000000
--- a/nano/templates/apc.tmpl
+++ /dev/null
@@ -1,197 +0,0 @@
-
- {{for alarmValue.cameras :cameraValue:cameraIndex}}
- {{if cameraValue.deact}}
- {{:helper.link(cameraValue.name + " (deactivated)", '', {}, 'inactive')}}
- {{else}}
- {{:helper.link(cameraValue.name, '', {'switchTo' : cameraValue.camera})}}
- {{/if}}
- {{/for}}
-
- {{else}}
- No cameras found.
- {{/if}}
- {{if alarmValue.lost_sources != ""}}
-
-
- {{/if}}
- Lost Alarm Sources: {{:alarmValue.lost_sources}}
-
- {{if data.siliconUser}}
-
-
-
- Interface Lock:
-
-
- {{:helper.link('Engaged', 'lock', {'toggleaccess' : 1}, data.siliconLock ? 'selected' : null)}}{{:helper.link('Disengaged', 'unlock', {'toggleaccess' : 1}, data.malfStatus >= 2 ? 'linkOff' : (data.siliconLock ? null : 'selected'))}}
-
-
- {{else}}
- {{if data.locked}}
- Swipe an ID card to unlock this interface
- {{else}}
- Swipe an ID card to lock this interface
- {{/if}}
- {{/if}}
-
-
-
-
-
diff --git a/nano/templates/atmos_alert.tmpl b/nano/templates/atmos_alert.tmpl
deleted file mode 100644
index bdb6c2c872b..00000000000
--- a/nano/templates/atmos_alert.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-Power Status
- -
-
-
-
- Main Breaker:
-
-
- {{if data.locked && !data.siliconUser}}
- {{if data.isOperating}}
- On
- {{else}}
- Off
- {{/if}}
- {{else}}
- {{:helper.link('On', 'power-off', {'breaker' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'breaker' : 1}, data.isOperating ? null : 'selected')}}
- {{/if}}
-
-
-
-
-
- External Power:
-
-
- {{if data.externalPower == 2}}
- Good
- {{else data.externalPower == 1}}
- Low
- {{else}}
- None
- {{/if}}
-
-
-
-
- {{if data.powerCellStatus != null}}
-
- Power Cell:
-
- {{if data.powerCellStatus == null}}
-
- Power cell removed.
-
- {{else}}
-
- {{:helper.displayBar(data.powerCellStatus, 0, 100, (data.powerCellStatus >= 50) ? 'good' : (data.powerCellStatus >= 25) ? 'average' : 'bad')}}
-
- {{:helper.smoothRound(data.powerCellStatus, 1)}}%
-
- {{/if}}
-
-
- {{/if}}
-
-
-
- Charge Mode:
-
-
- {{if data.locked && !data.siliconUser}}
- {{if data.chargeMode}}
- Auto
- {{else}}
- Off
- {{/if}}
- {{else}}
- {{:helper.link('Auto', 'refresh', {'cmode' : 1}, data.chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, data.chargeMode ? null : 'selected')}}
- {{/if}}
-
- {{if data.chargingStatus > 1}}
- [Fully Charged]
- {{else data.chargingStatus == 1}}
- [Charging]
- {{else}}
- [Not Charging]
- {{/if}}
-
- Power Channels
- - {{for data.powerChannels}} -
-
- {{/for}}
-
-
- {{:value.title}}:
-
-
- {{:helper.smoothRound(value.powerLoad)}} W
-
-
-
- {{if value.status <= 1}}
- Off
- {{else value.status >= 2}}
- On
- {{/if}}
- {{if data.locked}}
- {{if value.status == 1 || value.status == 3}}
- Auto
- {{else}}
- Manual
- {{/if}}
- {{/if}}
-
- {{if !data.locked || data.siliconUser}}
-
- {{:helper.link('Auto', 'refresh', value.topicParams.auto, (value.status == 1 || value.status == 3) ? 'selected' : null)}}
- {{:helper.link('On', 'power-off', value.topicParams.on, (value.status == 2) ? 'selected' : null)}}
- {{:helper.link('Off', 'close', value.topicParams.off, (value.status == 0) ? 'selected' : null)}}
-
- {{/if}}
-
-
-
-
- Total Load:
-
-
- {{:helper.smoothRound(data.totalLoad)}} W
-
-
-
-
- {{if data.siliconUser}}
-
- Cover Lock:
-
-
- {{if data.locked && !data.siliconUser}}
- {{if data.coverLocked}}
- Engaged
- {{else}}
- Disengaged
- {{/if}}
- {{else}}
- {{:helper.link('Engaged', 'lock', {'lock' : 1}, data.coverLocked ? 'selected' : null)}}{{:helper.link('Disengaged', 'unlock', {'lock' : 1}, data.coverLocked ? null : 'selected')}}
- {{/if}}
-
- System Overrides
- -
- {{:helper.link('Overload Lighting Circuit', 'lightbulb-o', {'overload' : 1})}}
- {{if data.malfStatus == 1}}
- {{:helper.link('Override Programming', 'file-text', {'malfhack' : 1})}}
- {{else data.malfStatus == 2}}
- {{:helper.link('Shunt Core Processes', 'arrow-down', {'occupyapc' : 1})}}
- {{else data.malfStatus == 3}}
- {{:helper.link('Return to Main Core', 'arrow-left', {'deoccupyapc' : 1})}}
- {{else data.malfStatus == 4}}
- {{:helper.link('Shunt Core Processes', 'arrow-down', {'occupyapc' : 1}, 'linkOff')}}
- {{/if}}
-
- {{/if}}
-
-
-
-
-
- Night Shift Lighting:
-
-
- {{if data.locked}}
- {{if data.nightshiftLights}}
- On
- {{else}}
- Off
- {{/if}}
- {{else}}
- {{:helper.link('Enabled', 'lightbulb-o', {'toggle_nightshift' : 1}, data.nightshiftLights ? 'selected' : null)}}{{:helper.link('Disabled', 'lightbulb-o', {'toggle_nightshift' : 1}, data.nightshiftLights ? null : 'selected')}}
- {{/if}}
-
- Priority Alerts
-{{for data.priority_alarms}} -
- {{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
-
-{{empty}}
- No priority alerts detected.
-{{/for}}
-
-Minor Alerts
-{{for data.minor_alarms}} -
- {{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
-
-{{empty}}
- No minor alerts detected.
-{{/for}}
-
diff --git a/nano/templates/atmos_filter.tmpl b/nano/templates/atmos_filter.tmpl
deleted file mode 100644
index e0715e243c5..00000000000
--- a/nano/templates/atmos_filter.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-Power:
- {{:helper.link(data.on ? 'On' : 'Off', data.on ? 'power-off' : 'times', {'power' : 1}, null, data.on ? 'selected' : null)}}
-
-
-Output Pressure:
-
- {{:helper.link('Set', 'pencil', {'pressure' : 'input'})}}
- {{:helper.link('Max', 'plus', {'pressure' : 'max'}, data.pressure == data.max_pressure ? 'disabled' : null)}}
- {{:helper.smoothRound(data.pressure)}} kPa
-
-
-
-
diff --git a/nano/templates/atmos_mixer.tmpl b/nano/templates/atmos_mixer.tmpl
deleted file mode 100644
index 3bae7f993bd..00000000000
--- a/nano/templates/atmos_mixer.tmpl
+++ /dev/null
@@ -1,32 +0,0 @@
-Filter:
-
- {{:helper.link('Nothing', null, {'filter' : -1}, data.filter_type == -1 ? 'selected' : null)}}
- {{:helper.link('Plasma', null, {'filter' : 0}, data.filter_type == 0 ? 'selected' : null)}}
- {{:helper.link('O2', null, {'filter' : 1}, data.filter_type == 1 ? 'selected' : null)}}
- {{:helper.link('N2', null, {'filter' : 2}, data.filter_type == 2 ? 'selected' : null)}}
- {{:helper.link('CO2', null, {'filter' : 3}, data.filter_type == 3 ? 'selected' : null)}}
- {{:helper.link('N2O', null, {'filter' : 4}, data.filter_type == 4 ? 'selected' : null)}}
-
-
-
-Power:
- {{:helper.link(data.on ? 'On' : 'Off', data.on ? 'power-off' : 'times', {'power' : 1}, null, data.on ? 'selected' : null)}}
-
-
-Output Pressure:
-
- {{:helper.link('Set', 'pencil', {'pressure' : 'input'})}}
- {{:helper.link('Max', 'plus', {'pressure' : 'max'}, data.pressure == data.max_pressure ? 'disabled' : null)}}
- {{:helper.smoothRound(data.pressure)}} kPa
-
-
-
-Node 1:
-
- {{:helper.link('', null, {'node1' : -0.1}, data.node1_concentration == 0 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node1' : -0.01}, data.node1_concentration == 0 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node1' : 0.01}, data.node1_concentration == 100 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node1' : 0.1}, data.node1_concentration == 100 ? 'disabled' : null)}}
- {{:helper.smoothRound(data.node1_concentration)}}%
-
-
-
\ No newline at end of file
diff --git a/nano/templates/atmos_pump.tmpl b/nano/templates/atmos_pump.tmpl
deleted file mode 100644
index a27e5b710dd..00000000000
--- a/nano/templates/atmos_pump.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-Node 2:
-
- {{:helper.link('', null, {'node2' : -0.1}, data.node2_concentration == 0 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node2' : -0.01}, data.node2_concentration == 0 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node2' : 0.01}, data.node2_concentration == 100 ? 'disabled' : null)}}
- {{:helper.link('', null, {'node2' : 0.1}, data.node2_concentration == 100 ? 'disabled' : null)}}
- {{:helper.smoothRound(data.node2_concentration)}}%
-
-
-
-{{if data.max_rate}}
- Power:
- {{:helper.link(data.on ? 'On' : 'Off', data.on ? 'power-off' : 'times', {'power' : 1}, null, data.on ? 'selected' : null)}}
-
-
-{{else}}
- Transfer Rate:
-
- {{:helper.link('Set', 'pencil', {'rate' : 'input'})}}
- {{:helper.link('Max', 'plus', {'rate' : 'max'}, data.rate == data.max_rate ? 'disabled' : null)}}
- {{:helper.smoothRound(data.rate)}} L/s
-
-
-
-{{/if}}
-
diff --git a/nano/templates/autolathe.tmpl b/nano/templates/autolathe.tmpl
deleted file mode 100644
index d56ae4926c3..00000000000
--- a/nano/templates/autolathe.tmpl
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-{{if data.screen == 2 || data.screen == 3}}
- Output Pressure:
-
- {{:helper.link('Set', 'pencil', {'pressure' : 'input'})}}
- {{:helper.link('Max', 'plus', {'pressure' : 'max'}, data.pressure == data.max_pressure ? 'disabled' : null)}}
- {{:helper.smoothRound(data.pressure)}} kPa
-
-
- {{:helper.link('Main Menu', 'reply', {'menu' : 1})}}
-
-{{/if}}
-
-|
-
- {{if data.screen == 1}}
-
- Autolathe Menu-
-
Viewing Category {{:data.selected_category}}:- {{else data.screen == 3}} -Search Results for '{{:data.search}}':- {{/if}} -
|
-
-
-
- Queue contains:- {{if data.queue}} - {{if data.processing}} -
|
-
-
-
- Cell:
-
-
- {{:data.cell_id}}
-
-
-
-
- Occupant:
-
-
- {{:data.occupant}}
-
-
-
-
- Crimes:
-
-
- {{:data.crimes}}
-
-
-
-
- Brigged By:
-
-
- {{:data.brigged_by}}
-
-
-
-
- Time Brigged For:
-
-
- {{:data.time_set}}
-
-
-
-{{if data.isAllowed}}
-
- Time Left:
-
-
- {{:data.time_left}}
-
-
-
- {{if !data.timing}}
-
- Actions:
-
-
- {{:helper.link('Flash', 'flash', {'flash' : 1}, null, data.isAllowed ? '' : 'dsabled')}}
- {{:helper.link('Release', null, {'release' : 1}, null, data.isAllowed ? '' : 'disabled')}}
-
- Inmate Information
-
-
-
- Name:
-
-
- {{:helper.link('Set', 'pencil', {'prisoner_name' : 'input'})}} {{:data.prisoner_name}}
-
-
-
-
- Charge:
-
-
- {{:helper.link('Set', 'pencil', {'prisoner_charge' : 'input'})}} {{:data.prisoner_charge}}
-
-
-
- {{:helper.link('Submit', null, {'set_timer' : 1}, null, data.isAllowed ? '' : 'disabled')}}
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/bsa.tmpl b/nano/templates/bsa.tmpl
deleted file mode 100644
index a0e8a60deb5..00000000000
--- a/nano/templates/bsa.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-
-{{if data.notice}}
-
- Time (in minutes):
-
-
- {{:helper.link('Set', 'pencil', {'prisoner_time' : 'input'})}} {{:data.prisoner_time}}
-
- {{:data.notice}}
-{{/if}}
-Bluespace Artillery Control
-
-
-
- Target:
-
-
- {{:helper.link(data.target ? data.target : "None", 'crosshairs', {'recalibrate' : 1})}}
-
-
-
-
- Reload Cooldown:
-
-
- {{if data.ready}}
- Ready
- {{else data.reloadtime_mins || data.reloadtime_secs}}
- {{:data.reloadtime_mins}}:{{:data.reloadtime_secs}}
- {{else}}
- No cannon connected!
- {{/if}}
-
-
-
-{{if !data.connected}}
-
- Controls:
-
-
- {{:helper.link('FIRE!', 'warning', {'fire' : 1}, data.ready && data.target ? null : 'disabled')}}
-
-
-
-{{else}}
-
- Maintenance:
-
-
- {{:helper.link('Complete Deployment', 'wrench', {'build' : 1})}}
-
--Deployment of weapon authorized by Nanotrasen Naval Command. Remember, friendly fire is grounds for termination of your contract and life. -{{/if}} \ No newline at end of file diff --git a/nano/templates/canister.tmpl b/nano/templates/canister.tmpl deleted file mode 100644 index 5aaa15d4fe3..00000000000 --- a/nano/templates/canister.tmpl +++ /dev/null @@ -1,158 +0,0 @@ -{{if data.menu == 0}} -
Tank Status
-
-
-
-
- Tank Label:
-
-
-
- {{:data.name}}
{{:helper.link('Relabel', 'pencil', {'choice' : 'menu', 'mode_target' : 1}, data.canLabel ? null : 'disabled')}}
-
-
-
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.tankPressure)}} kPa
-
-
-
-
-
- Port Status:
-
-
- {{:data.portConnected ? 'Connected' : 'Disconnected'}}
-
- Holding Tank Status
- {{if data.hasHoldingTank}} -
-
-
-
- Tank Label:
-
-
-
- {{:data.holdingTank.name}}
{{:helper.link('Eject', 'eject', {'remove_tank' : 1})}}
-
-
- {{else}}
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.holdingTank.tankPressure)}} kPa
-
- No holding tank inserted.
- Release Valve Status
-
-
-
-
- Release Pressure:
-
-
- {{:helper.displayBar(data.releasePressure, data.minReleasePressure, data.maxReleasePressure)}}
-
-
- {{:helper.link('-', null, {'pressure_adj' : -1000}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -100}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -10}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -1}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}}
-
- {{:data.releasePressure}} kPa
- {{:helper.link('+', null, {'pressure_adj' : 1}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 10}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 100}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 1000}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
-
-
-{{else}}
- {{:helper.link('Go back', 'home', {'choice' : 'menu', 'mode_target' : 0}, null)}}
-
- Release Valve:
-
-
- {{:helper.link('Open', 'unlock', {'toggle' : 1}, data.valveOpen ? 'selected' : null)}}{{:helper.link('Close', 'lock', {'toggle' : 1}, data.valveOpen ? null : 'selected')}}
-
- Relabel
-
- Name:
-
-
-
-
-
- {{:data.name}}
{{:helper.link('Rename', 'pencil', {'rename' : 1}, data.canLabel ? null : 'disabled')}}
- Colors
-
-
-
-
- {{:data.colorContainer.prim.name}}
- {{for data.colorContainer.prim.options}}
-
- {{if value.icon == data.canister_color.prim}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.prim.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', 'selected')}}
- {{else}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.prim.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', null)}}
- {{/if}}
-
- {{/for}}
-
-
- {{:data.colorContainer.sec.name}}
- {{:helper.link("None", '', {'choice' : data.colorContainer.sec.name, 'icon' : "none"}, data.canLabel ? null : 'disabled', data.colorContainer.sec.anycolor ? null : 'selected')}}
- {{for data.colorContainer.sec.options}}
-
- {{if value.icon == data.canister_color.sec}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.sec.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', 'selected')}}
- {{else}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.sec.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', null)}}
- {{/if}}
-
- {{/for}}
-
-
- {{:data.colorContainer.ter.name}}
- {{:helper.link("None", '', {'choice' : data.colorContainer.ter.name, 'icon' : "none"}, data.canLabel ? null : 'disabled', data.colorContainer.ter.anycolor ? null : 'selected')}}
- {{for data.colorContainer.ter.options}}
-
- {{if value.icon == data.canister_color.ter}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.ter.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', 'selected')}}
- {{else}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.ter.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', null)}}
- {{/if}}
-
- {{/for}}
-
-
- {{:data.colorContainer.quart.name}}
- {{:helper.link("None", '', {'choice' : data.colorContainer.quart.name, 'icon' : "none"}, data.canLabel ? null : 'disabled', data.colorContainer.quart.anycolor ? null : 'selected')}}
- {{for data.colorContainer.quart.options}}
-
- {{if value.icon == data.canister_color.quart}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.quart.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', 'selected')}}
- {{else}}
- {{:helper.link(value.name, '', {'choice' : data.colorContainer.quart.name, 'icon' : value.icon}, data.canLabel ? null : 'disabled', null)}}
- {{/if}}
-
- {{/for}}
- Decals
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/card_prog.tmpl b/nano/templates/card_prog.tmpl
deleted file mode 100644
index 7054f8bf4c2..00000000000
--- a/nano/templates/card_prog.tmpl
+++ /dev/null
@@ -1,309 +0,0 @@
-{{if data.printing}}
- Pick and choose:
-
- {{for data.possibleDecals}}
- {{:helper.link(value.name, '', {'choice' : 'decals', 'icon' : value.icon}, data.canLabel ? null : 'disabled', value.active ? 'selected' : null)}}
- {{/for}}
-
- The computer is currently busy.
-
- Printing...
-
- - Thank you for your patience! -
-{{else}} - {{:helper.link('Access Modification', 'home', {'action' : 'PRG_mode', 'mode_target' : 0}, !data.mode ? 'disabled' : null)}} - {{:helper.link('Job Management', 'gear', {'action' : 'PRG_mode', 'mode_target' : 1}, data.mode == 1 ? 'disabled' : null)}} - {{:helper.link('Crew Manifest', 'folder-open', {'action' : 'PRG_mode', 'mode_target' : 2}, data.mode == 2 ? 'disabled' : null)}} - {{:helper.link('Print', 'print', {'action' : 'PRG_print'}, data.printer && (data.mode == 2 || data.has_modify && !data.mode) ? null : 'disabled')}} - {{:helper.link('Records', 'file', {'action' : 'PRG_mode', 'mode_target' : 3}, (data.mode == 3) ? 'disabled' : null)}} - - {{if data.mode == 1}} -
-
- Job Management
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'action' : 'PRG_scan'})}}
-
-
- Cooldown:
-
-
- {{if data.cooldown_mins > 0 || data.cooldown_mins == 0 && data.cooldown_secs > 0}}
- Next change in: {{:data.cooldown_mins}}:{{:data.cooldown_secs}}
- {{else}}
- Ready
- {{/if}}
-
- -
- {{for data.job_slots}}
-
- {{else data.mode == 2}}
-
- {{:value.title}}: {{:value.current_positions}}/{{:value.total_positions}}
- {{:helper.link('-', null, {'action' : 'PRG_make_job_unavailable', 'job' : value.title}, value.can_close == 1 && data.authenticated ? null : 'disabled')}}
- {{:helper.link('+', null, {'action' : 'PRG_make_job_available', 'job' : value.title}, value.can_open == 1 && data.authenticated ? null : 'disabled')}}
- {{:helper.link('Pri', null, {'action' : 'PRG_prioritize_job', 'job' : value.title}, value.can_prioritize > 0 && data.authenticated ? null : 'disabled')}} {{if value.can_prioritize == 2}}Priority Job {{/if}}
-
- {{/for}}
-
-
- Crew Manifest
-
- {{:data.manifest}}
-
- {{else data.mode == 3}}
-
-
- Records
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'action' : 'PRG_scan'})}}
-
-
- {{if data.authenticated}}
- {{:data.id_change_html}}
- {{if data.centcom_access}}
- {{:helper.link('Delete Records By: ' + data.scan_owner, null, {'action' : 'PRG_wipe_my_logs'}, null, 'linkDanger')}}
- {{/if}}
- {{if !data.target_dept}}
- {{:helper.link('Delete ALL Records', null, {'action' : 'PRG_wipe_all_logs'}, null, 'linkDanger')}}
- {{/if}}
- {{else}}
- Please insert an authorized ID into the terminal to proceed.
- {{/if}} -
- {{else}}
- - {{/if}} -
-
-
- {{if !data.authenticated}}
- Please insert the IDs into the terminal to proceed.Access Modification
-- {{/if}} - -
-
-
- Target Identity:
-
-
- {{:helper.link(data.target_name, 'eject', {'action' : 'PRG_modify'})}}
-
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'action' : 'PRG_scan'})}}
-
- - - {{if data.authenticated}} - - - {{if data.has_modify}} -
-
-
-
-
-
-
- Details
-
-
-
-
- Terminations:
-
-
- {{if data.target_rank == "Terminated"}}
- {{:data.target_owner}} has already been terminated!
- {{else}}
- {{:helper.link('Terminate ' + data.target_owner, 'gear', {'action' : 'PRG_terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}}
- {{/if}}
-
-
-
-
- Assignment
-
-
- {{:data.target_rank}}
-
-
-
-
-
-
- {{if data.centcom_access}}
-
-
- Central Command
-
- {{for data.all_centcom_access}}
- {{:helper.link(value.desc, '', {'action' : 'PRG_access', 'access_target' : value.ref, 'allowed' : value.allowed}, null, value.allowed ? 'selected' : null)}}
- {{/for}}
-
- {{else}}
-
-
- Card Skin
- {{for data.all_centcom_skins}}
- {{:helper.link(value.display_name, '', {'action' : 'PRG_skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
- {{/for}}
-
-
- {{:data.station_name}}
-
- {{for data.regions}}
-
- {{/if}}
- {{/if}}
- {{/if}}
- {{/if}}
-{{/if}}
diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl
deleted file mode 100644
index 74d694530c9..00000000000
--- a/nano/templates/chem_dispenser.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
- {{/for}}
- {{:value.name}}
- {{for value.accesses :accessValue:accessKey}}
-
- {{:helper.link(accessValue.desc, '', {'action' : 'PRG_access', 'access_target' : accessValue.ref, 'allowed' : accessValue.allowed}, null, accessValue.allowed ? 'selected' : null)}}
-
- {{/for}}
-
-
- Card Skin
- {{for data.card_skins}}
- {{:helper.link(value.display_name, '', {'action' : 'PRG_skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
- {{/for}}
-
-
-
-
- Energy:
-
-
- {{:helper.displayBar(data.energy, 0, data.maxEnergy, 'good', data.energy + ' Units')}}
-
-
-
-
- Dispense:
-
-
- {{:helper.link('1', 'gear', {'amount' : 1}, (data.amount == 1) ? 'selected' : null)}}
- {{:helper.link('5', 'gear', {'amount' : 5}, (data.amount == 5) ? 'selected' : null)}}
- {{:helper.link('10', 'gear', {'amount' : 10}, (data.amount == 10) ? 'selected' : null)}}
- {{:helper.link('20', 'gear', {'amount' : 20}, (data.amount == 20) ? 'selected' : null)}}
- {{:helper.link('30', 'gear', {'amount' : 30}, (data.amount == 30) ? 'selected' : null)}}
- {{:helper.link('50', 'gear', {'amount' : 50}, (data.amount == 50) ? 'selected' : null)}}
-
-
-
-
- {{if data.glass}}
- Drink Dispenser
- {{else}}
- Chemical Dispenser
- {{/if}}
-
-
-
-
- {{for data.chemicals}}
- {{:helper.link(value.title, 'arrow-circle-down', value.commands, null, data.glass ? 'fixedLeftWide' : 'fixedLeft')}}
- {{/for}}
-
-
-
-
-
- {{if data.glass}}
- Glass
- {{else}}
- Beaker
- {{/if}} Contents
-
-
- {{:helper.link(data.glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled', 'floatRight')}}
-
-
-
diff --git a/nano/templates/chem_heater.tmpl b/nano/templates/chem_heater.tmpl
deleted file mode 100644
index 9d9e16fa7e1..00000000000
--- a/nano/templates/chem_heater.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- {{if data.isBeakerLoaded}}
- {{if data.beakerCurrentVolume}}
- Dispose:
- {{/if}}
- Volume: {{:data.beakerCurrentVolume}} / {{:data.beakerMaxVolume}}
- {{for data.beakerContents}} -
- - {{for data.beakerContents}} -
-
-
- {{empty}}
- {{if data.glass}}Glass{{else}}Beaker{{/if}} is empty
-
- {{/for}}
- {{else}}
-
- No {{if data.glass}}Glass{{else}}Beaker{{/if}} loaded
-
- {{/if}}
-
-
- {{:value.volume}} units of {{:value.name}}
-
-
-
- {{:helper.link('Isolate', null, {'remove' : value.id, 'removeamount' : -1})}}
- {{:helper.link('1', null, {'remove' : value.id, 'removeamount' : 1})}}
- {{:helper.link('5', null, {'remove' : value.id, 'removeamount' : 5})}}
- {{:helper.link('10', null, {'remove' : value.id, 'removeamount' : 10})}}
- {{:helper.link('ALL', null, {'remove' : value.id, 'removeamount' : value.volume})}}
-
-
-
-
- Status:
-
-
- {{:helper.link(data.isActive ? 'On' : 'Off', 'power-off', {'toggle_on' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
-
-
-
-
- Target:
-
-
- {{:helper.link(data.targetTemp + 'K', 'gear', {'adjust_temperature' : 'input'}, null)}}
-
-
-
-
- Beaker
-
-
- {{:helper.link('Eject', 'eject', {'eject_beaker' : 1}, data.isBeakerLoaded ? null : 'disabled', 'floatRight')}}
-
-
-
\ No newline at end of file
diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl
deleted file mode 100644
index e91a43d357b..00000000000
--- a/nano/templates/chem_master.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{if data.beaker}}
-
-
-
-
-
-
-
- {{if data.isBeakerLoaded}}
- Volume: {{:helper.smoothRound(data.beakerCurrentVolume)}} / {{:data.beakerMaxVolume}}
- Temperature: {{:helper.smoothRound(data.currentTemp)}} Kelvin
- {{for data.beakerContents}} - {{:value.volume}} units of {{:value.name}}
- {{/for}} - {{else}} - No beaker loaded - {{/if}} -
- - Temperature: {{:helper.smoothRound(data.currentTemp)}} Kelvin
- {{for data.beakerContents}} - {{:value.volume}} units of {{:value.name}}
- {{/for}} - {{else}} - No beaker loaded - {{/if}} -
{{:helper.link('Eject Beaker and Clear Buffer', 'eject', {'eject': 1})}}
-
-
- Add to buffer:
- {{for data.beaker_reagents}} -
-
- {{/for}}
- {{:value.name}}, {{:value.volume}} units
- {{:helper.link('Analyze', 'search', {'analyze': 1, 'desc': value.description, 'name': value.name})}}
- {{:helper.link('1', 'plus', {'add': value.id, 'amount': 1})}}
- {{:helper.link('5', 'plus', {'add': value.id, 'amount': 5})}}
- {{:helper.link('10', 'plus', {'add': value.id, 'amount': 10})}}
- {{:helper.link('All', 'plus', {'add': value.id, 'amount': value.volume})}}
- {{:helper.link('Custom', 'plus', {'addcustom': value.id})}}
-
-
-
- {{for data.buffer_reagents}}
-
-
-
- Transfer to {{:helper.link(data.mode ? 'beaker' : 'disposal', 'arrows-h', {'toggle': 1})}}
-
-
- {{for data.buffer_reagents}}
-
-
- {{/for}}
- {{:value.name}}, {{:value.volume}} units
- {{:helper.link('Analyze', 'search', {'analyze': 1, 'desc': value.description, 'name': value.name})}}
- {{:helper.link('1', 'plus', {'remove': value.id, 'amount': 1})}}
- {{:helper.link('5', 'plus', {'remove': value.id, 'amount': 5})}}
- {{:helper.link('10', 'plus', {'remove': value.id, 'amount': 10})}}
- {{:helper.link('All', 'plus', {'remove': value.id, 'amount': value.volume})}}
- {{:helper.link('Custom', 'plus', {'removecustom': value.id})}}
-
-
-{{else}}
- No beaker loadedContainers:
-
- {{if data.condi}}
- {{:helper.link('Create pack (10u max)', 'arrow-right', {'createpill': 1})}}
- {{:helper.link('Create bottle (50u max)', 'arrow-right', {'createbottle': 1})}}
- {{else}}
-
-
- {{/if}}
-
- | - {{:helper.link('Create pill (100u max)', 'arrow-right', {'createpill': 1})}} - | -- {{:helper.link('Multiple', 'arrow-right', {'createpill_multiple': 1})}} - | -- {{:helper.link('Style', 'pencil', {'change_pill': 1})}} - | -
- 
- |
-
| - {{:helper.link('Create patch (30u max)', 'arrow-right', {'createpatch': 1})}} - | -- {{:helper.link('Multiple', 'arrow-right', {'createpatch_multiple': 1})}} - | -||
| - {{:helper.link('Create bottle (50u max)', 'arrow-right', {'createbottle': 1})}} - | -- {{:helper.link('Style', 'pencil', {'change_bottle': 1})}} - | -
- 
- |
-
-{{/if}} -
-
- {{if data.loaded_pill_bottle}}
-
-
- {{else}}
-
-
- {{/if}}
-
-
\ No newline at end of file
diff --git a/nano/templates/cloning_console.tmpl b/nano/templates/cloning_console.tmpl
deleted file mode 100644
index c541ca6d6b4..00000000000
--- a/nano/templates/cloning_console.tmpl
+++ /dev/null
@@ -1,148 +0,0 @@
-
-| - {{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}} - | -- {{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}} - | -
| - {{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}} - | -
-
-{{if data.menu == 1}}
-
-
- Menu
-
- {{:helper.link('Main', 'home', {'menu' : 1}, data.menu == 1 ? 'selected' : '')}}{{:helper.link('Records', 'folder-open', {'menu' : 2}, data.menu == 2 ? 'selected' : '')}}
-
-
-
- Refresh
-
- {{:helper.link('Refresh', 'refresh', {'refresh' : 1})}}
-
-
-
- {{if data.disk}}
- Autoprocessing
-
- {{if data.autoallowed}}
- {{:helper.link('Enabled', 'check', {'task' : 'autoprocess'}, data.autoprocess ? 'selected' : '')}}{{:helper.link('Disabled', 'close', {'task' : 'stopautoprocess'}, !data.autoprocess ? 'selected' : '')}}
- {{else}}
- {{:helper.link('Enabled', 'check', null, 'disabled')}}{{:helper.link('Disabled', 'close', null, 'selected')}}
- {{/if}}
-
-
-
- {{/if}}
-Disk
- {{:helper.link('Eject', 'eject', {'disk' : 'eject'})}}
- Modules
-
-
- Scanner
-
- {{if data.scanner}} Found!{{else}} Error: Not detected!{{/if}}
-
-
-
- {{if data.scanner}}
- Pods
-
- {{if data.numberofpods}} Found {{:data.numberofpods}}!{{else}} Error: None detected!{{/if}}
-
- Scanner Functions
- {{if data.loading}} - Scanning... - {{else}} - {{:data.scantemp}} - {{/if}} -
-
- Scan Occupant
- {{:helper.link('Scan', 'search', {'scan' : 1}, !data.occupant ? 'disabled' : '')}}
-
-
- {{if data.can_brainscan}}
- Scanner Lock
- {{if data.occupant}}{{:helper.link('Engaged', 'lock', {'lock' : 1}, data.locked ? 'selected' : '')}}{{else}} {{:helper.link('Engaged', 'lock', null, 'disabled')}}{{/if}}{{:helper.link('Disengaged', 'unlock', {'lock' : 1}, !data.locked ? 'selected' : '')}}
-
-
- {{/if}}
- {{/if}}
- {{if data.numberofpods}}
- Scan Mode
-
- {{:helper.link('Brain', null, {'toggle_mode' : 1}, !data.scan_mode ? '' : 'selected')}}{{:helper.link('Body', null, {'toggle_mode' : 1}, data.scan_mode ? '' : 'selected')}}
-
- Pods
- {{for data.pods}} - {{:value.name}} -
-
-
- Biomass
-
- {{:value.biomass}}
-
-
-
-
- {{/for}}
- {{/if}}
-{{/if}}
-{{if data.menu == 2}}
- Select
-
- {{:helper.link('Select', 'check', {'selectpod' : value.pod}, value.pod == data.selected_pod ? 'selected' : '')}}
-
- Current Records
- {{if data.temp}} -
- {{:data.temp}}
-
- {{/if}}
- {{for data.records}}
- {{:helper.link(value.realname, 'arrow-circle-down', {'view_rec' : value.record})}}
- {{empty}}
- No records found!
- {{/for}}
-{{/if}}
-{{if data.menu == 3}}
- Selected Record
- {{if data.temp}} -
- {{:data.temp}}
-
- {{/if}}
- {{if !data.activerecord}}
- Error: Record not found!
- {{else}}
-
- Real Name: {{:data.realname}}
- Health: {{:data.health}} (OXY - BURN - TOX - BRUTE) -
- - Health: {{:data.health}} (OXY - BURN - TOX - BRUTE) -
- UI: {{:data.unidentity}}
- SE:
- {{if data.disk}}
- - SE:
{{:data.strucenzymes}}
-
-
- {{/if}}
- Disk
- {{:helper.link('Load from Disk', 'floppy-o', {'disk' : 'load'})}}{{:helper.link('Save UI + UE', 'arrow-circle-up', {'save_disk' : 'ue'})}}{{:helper.link('Save UI', 'arrow-circle-up', {'save_disk' : 'ui'})}}{{:helper.link('Save SE', 'arrow-circle-up', {'save_disk' : 'se'})}}
-
-
- {{/if}}
-{{/if}}
-{{if data.menu == 4}}
- Actions
- {{:helper.link('Clone', 'arrow-right', {'clone' : data.activerecord}, !data.podready ? 'disabled' : '')}}{{:helper.link('Delete', 'trash', {'del_rec' : 1})}}
- Confirm Record Deletion
- {{if data.temp}} -
- {{:data.temp}}
-
- {{/if}}
-
- {{:helper.link('Scan Card and Confirm', 'trash', {'del_rec' : 1})}}{{:helper.link('Cancel', 'close', {'menu' : 3})}}
-
-{{/if}}
-
diff --git a/nano/templates/comm_console.tmpl b/nano/templates/comm_console.tmpl
deleted file mode 100644
index 2c36a011ac6..00000000000
--- a/nano/templates/comm_console.tmpl
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-{{if !data.authenticated}}
-Please swipe your ID card. {{:helper.link('Log In','unlock',{'login':1},null,'fixed')}}
-{{else}}
- {{if !data.is_ai}}
- Please remember to {{:helper.link('Log Out','lock',{'logout':1},null,'fixed')}}
- {{/if}}
- {{if data.lastCallLoc}}
- Most recent shuttle call/recall traced to: {{:data.lastCallLoc}}
- {{else}}
- Unable to trace most recent shuttle call/recall signal.
- {{/if}}
-
-
-
- {{if data.screen==1}}
-
- Emergency Shuttle:
- {{if data.shuttle.eta}} -ETA:
-
- {{>data.shuttle.eta}}
-
- {{/if}}
- Options:
-
- {{if data.shuttle.callStatus == 1 && !data.is_ai}}
- {{:helper.link('Cancel Shuttle','arrow-left',{'operation':'cancelshuttle'})}}
- {{else data.shuttle.callStatus == 2}}
- {{:helper.link('Call Shuttle','arrow-circle-down',{'operation':'callshuttle'})}}
- {{/if}}
-
- Menu
-
- {{if data.authenticated==2}}
-
- {{else data.screen==2}}
-
-
- {{:helper.link('Make an Announcement','info',{'operation':'announce'})}}
-
-
- {{if data.emagged}}
- {{:helper.link('Message [UNKNOWN]','envelope',{'operation':'MessageSyndicate'})}}
-
-
- {{:helper.link('Reset Relays','refresh',{'operation':'RestoreBackup'})}}
- {{else}}
- {{:helper.link('Message CentComm','envelope',{'operation':'MessageCentcomm'})}}
- {{/if}}
-
-
- {{:helper.link('Request Nuclear Authentication Codes','exclamation-triangle',{'operation':'nukerequest'})}}
-
- {{/if}}
-
- {{:helper.link('Change Alert Level','signal',{'operation':'changeseclevel'})}}
-
-
- {{:helper.link('Change Status Displays','info',{'operation':'status'})}}
-
-
- {{:helper.link('Message List','comment',{'operation':'messagelist'})}}
-
-
- {{:helper.link('Restart Nano-Mob Hunter GO! Server','power-off',{'operation':'RestartNanoMob'})}}
-
- Status Displays
- {{:helper.link('Back','home',{'operation':'main'})}} -Presets
- {{for data.stat_display.presets}} -
-
- {{/for}}
- {{:helper.link(value.label,'info',{'operation':'setstat','statdisp':value.name},null,(name==data.stat_display.type?'linkOn':''))}}
- Alerts
- {{for data.stat_display.alerts}} -
-
- {{/for}}
- {{:helper.link(value.label,'exclamation-triangle',{'operation':'setstat','statdisp':'alert','alert':value.alert},null,(value.alert==data.stat_display.type?'linkOn':''))}}
- Messages
-
- {{if data.stat_display.type}}
-
- {{else data.screen==3}}
-
-
-
- {{:helper.link('Line 1:','gear',{'operation':'setmsg1'})}}
- {{>data.stat_display.line_1}}
-
-
- {{/if}}
- {{:helper.link('Line 2:','gear',{'operation':'setmsg2'})}}
- {{>data.stat_display.line_2}}
- Messages
- {{if data.current_message}} - {{:helper.link('Messages','home',{'operation':'messagelist'})}} -{{:data.current_message_title}}
-
- {{:data.current_message}}
-
- {{else}}
- {{:helper.link('Back','home',{'operation':'main'})}}
- {{for data.messages}}
-
- {{:value.title}}
- {{:helper.link('Open','envelope-o',{'operation':'messagelist','msgid':value.id})}} - {{:helper.link('Delete','close',{'operation':'delmessage','msgid':value.id})}} -
- {{/for}}
- {{/if}}
- {{else data.screen==4}}
-
- - {{:helper.link('Open','envelope-o',{'operation':'messagelist','msgid':value.id})}} - {{:helper.link('Delete','close',{'operation':'delmessage','msgid':value.id})}} -
Security Level
- {{:helper.link('Back','home',{'operation':'main'})}} -
-
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/comm_program.tmpl b/nano/templates/comm_program.tmpl
deleted file mode 100644
index b1c64c6f4e3..00000000000
--- a/nano/templates/comm_program.tmpl
+++ /dev/null
@@ -1,129 +0,0 @@
-{{if !data.authenticated}}
-
-
- Security Level:
- {{>data.str_security_level}}
-
-
- Presets:
-
- {{for data.levels}}
- {{:helper.link(value.name,'comment',{'operation':'newalertlevel','level':value.id},null,(value.id==data.security_level?'linkOn':''))}}
- {{/for}}
-
- Please swipe your ID card. {{:helper.link('Log In', 'unlock', {'PRG_login' : 1}, null, 'fixed')}}
-{{else}}
- {{if !data.is_ai}}
- Please remember to {{:helper.link('Log Out', 'lock', {'PRG_logout' : 1}, null, 'fixed')}}
- {{/if}}
- {{if data.lastCallLoc}}
- Most recent shuttle call/recall traced to: {{:data.lastCallLoc}}
- {{else}}
- Unable to trace most recent shuttle call/recall signal.
- {{/if}}
-
-
-
- {{if data.screen==1}}
-
- Emergency Shuttle:
- {{if data.shuttle.eta}} -ETA:
-
- {{>data.shuttle.eta}}
-
- {{/if}}
- Options:
-
- {{if data.shuttle.callStatus == 1 && !data.is_ai}}
- {{:helper.link('Cancel Shuttle', 'arrow-left', {'PRG_operation' : 'cancelshuttle'})}}
- {{else data.shuttle.callStatus == 2}}
- {{:helper.link('Call Shuttle', 'arrow-circle-down', {'PRG_operation' : 'callshuttle'})}}
- {{/if}}
-
- Menu
-
- {{if data.authenticated==2}}
-
- {{else data.screen==2}}
-
-
- {{:helper.link('Make an Announcement', 'info', {'PRG_operation' : 'announce'})}}
-
-
- {{if data.emagged}}
- {{:helper.link('Message [UNKNOWN]', 'envelope', {'PRG_operation' : 'MessageSyndicate'})}}
- {{else}}
- {{:helper.link('Message CentComm', 'envelope', {'PRG_operation' : 'MessageCentcomm'})}}
- {{/if}}
-
-
- {{:helper.link('Request Nuclear Authentication Codes', 'exclamation-triangle', {'PRG_operation' : 'nukerequest'})}}
-
- {{/if}}
-
- {{:helper.link('Change Alert Level', 'signal', {'PRG_operation' : 'changeseclevel'})}}
-
-
- {{:helper.link('Change Status Displays', 'info', {'PRG_operation' : 'status'})}}
-
-
- {{:helper.link('Message List', 'comment', {'PRG_operation' : 'messagelist'})}}
-
-
- {{:helper.link('Restart Nano-Mob Hunter GO! Server', 'power-off', {'PRG_operation' : 'RestartNanoMob'})}}
-
- Status Displays
- {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}} -Presets
- {{for data.stat_display.presets}} -
-
- {{/for}}
- {{:helper.link(value.label, 'info', {'PRG_operation' : 'setstat', 'statdisp' : value.name}, name == data.stat_display.type ? 'selected' : null)}}
- Alerts
- {{for data.stat_display.alerts}} -
-
- {{/for}}
- {{:helper.link(value.label, 'exclamation-triangle', {'PRG_operation' : 'setstat', 'statdisp' : 'alert', 'alert' : value.alert}, value.alert == data.stat_display.type ? 'selected' : null)}}
- Messages
-
- {{if data.stat_display.type}}
-
- {{else data.screen==3}}
-
-
-
- {{:helper.link('Line 1:', 'gear', {'PRG_operation':'setmsg1'})}}
- {{>data.stat_display.line_1}}
-
-
- {{/if}}
- {{:helper.link('Line 2:', 'gear', {'PRG_operation':'setmsg2'})}}
- {{>data.stat_display.line_2}}
- Messages
- {{if data.current_message}} - {{:helper.link('Messages', 'home', {'PRG_operation' : 'messagelist'})}} -{{:data.current_message_title}}
-
- {{:data.current_message}}
-
- {{else}}
- {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}}
- {{for data.messages}}
-
- {{:value.title}}
- {{:helper.link('Open', 'envelope-o', {'PRG_operation' : 'messagelist', 'msgid' : value.id})}} - {{:helper.link('Delete', 'close', {'PRG_operation' : 'delmessage', 'msgid' : value.id})}} -
- {{/for}}
- {{/if}}
- {{else data.screen==4}}
-
- - {{:helper.link('Open', 'envelope-o', {'PRG_operation' : 'messagelist', 'msgid' : value.id})}} - {{:helper.link('Delete', 'close', {'PRG_operation' : 'delmessage', 'msgid' : value.id})}} -
Security Level
- {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}} -
-
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/computer_fabricator.tmpl b/nano/templates/computer_fabricator.tmpl
deleted file mode 100644
index 268f585a3da..00000000000
--- a/nano/templates/computer_fabricator.tmpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{:helper.link('Clear Order', 'circle', {'action' : 'clean_order'})}}
-
- Security Level:
- {{>data.str_security_level}}
-
-
- Presets:
-
- {{for data.levels}}
- {{:helper.link(value.name, 'comment', {'PRG_operation' : 'newalertlevel', 'level' : value.id}, value.id == data.security_level ? 'selected' : null)}}
- {{/for}}
-
- -Your new computer device you always dreamed of is just four steps away...
-{{if data.state == 0}} -
-
-{{else data.state == 1}}
- Step 1: Select your device type
- {{:helper.link('Laptop', 'laptop', {'action' : 'pick_device', 'pick' : 1})}} - {{:helper.link('Tablet', 'tablet', {'action' : 'pick_device', 'pick' : 2})}} -
-
-
-
-
-
-
- Battery allows your device to operate without external utility power source. Advanced batteries increase battery life.
- Hard Drive stores file on your device. Advanced drives can store more files, but use more power, shortening battery life.
- Network Card allows your device to wirelessly connect to stationwide NTNet network. Basic cards are limited to on-station use, while advanced cards can operate anywhere near the station, which includes the asteroid outposts.
- Processor Unit is critical for your device's functionality. It allows you to run programs from your hard drive. Advanced CPUs use more power, but allow you to run more programs on background at once.
- Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source. This component is currently unavailable on tablet computers due to size restrictions.
- Nano Printer is device that allows for various paperwork manipulations, such as, scanning of documents or printing new ones. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
- Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards. -
-{{else data.state == 2}}
- Step 2: Personalise your device
-| Current Price: - | {{:data.totalprice}}C - | ||
| Battery: - | {{:helper.link('Standard', 'bolt', {'action' : 'hw_battery', 'battery' : 1}, data.hw_battery == 1 ? "selected" : null)}} - | {{:helper.link('Upgraded', 'bolt', {'action' : 'hw_battery', 'battery' : 2}, data.hw_battery == 2 ? "selected" : null)}} - | {{:helper.link('Advanced', 'bolt', {'action' : 'hw_battery', 'battery' : 3}, data.hw_battery == 3 ? "selected" : null)}} - |
| Hard Drive: - | {{:helper.link('Standard', 'hdd-o', {'action' : 'hw_disk', 'disk' : 1}, data.hw_disk == 1 ? "selected" : null)}} - | {{:helper.link('Upgraded', 'hdd-o', {'action' : 'hw_disk', 'disk' : 2}, data.hw_disk == 2 ? "selected" : null)}} - | {{:helper.link('Advanced', 'hdd-o', {'action' : 'hw_disk', 'disk' : 3}, data.hw_disk == 3 ? "selected" : null)}} - |
| Network Card: - | {{:helper.link('None', 'times', {'action' : 'hw_netcard', 'netcard' : 0}, data.hw_netcard == 0 ? "selected" : null)}} - | {{:helper.link('Standard', 'signal', {'action' : 'hw_netcard', 'netcard' : 1}, data.hw_netcard == 1 ? "selected" : null)}} - | {{:helper.link('Advanced', 'signal', {'action' : 'hw_netcard', 'netcard' : 2}, data.hw_netcard == 2 ? "selected" : null)}} - |
| Nano Printer: - | {{:helper.link('None', 'times', {'action' : 'hw_nanoprint', 'print' : 0}, data.hw_nanoprint == 0 ? "selected" : null)}} - | {{:helper.link('Standard', 'print', {'action' : 'hw_nanoprint', 'print' : 1}, data.hw_nanoprint == 1 ? "selected" : null)}} - | |
| Card Reader: - | {{:helper.link('None', 'times', {'action' : 'hw_card', 'card' : 0}, data.hw_card == 0 ? "selected" : null)}} - | {{:helper.link('Standard', 'credit-card', {'action' : 'hw_card', 'card' : 1}, data.hw_card == 1 ? "selected" : null)}} - | |
| Processor Unit: - | {{:helper.link('Standard', 'tasks', {'action' : 'hw_cpu', 'cpu' : 1}, data.hw_cpu == 1 ? "selected" : null)}} - | {{:helper.link('Advanced', 'tasks', {'action' : 'hw_cpu', 'cpu' : 2}, data.hw_cpu == 2 ? "selected" : null)}} - | |
| Tesla Relay: - | {{:helper.link('None', 'times', {'action' : 'hw_tesla', 'tesla' : 0}, data.hw_tesla == 0 ? "selected" : null)}} - | {{:helper.link('Standard', 'plug', {'action' : 'hw_tesla', 'tesla' : 1}, data.hw_tesla == 1 ? "selected" : null)}} - |
| Confirm Order: - | {{:helper.link('CONFIRM', 'check', {'action' : 'confirm_order'})}} - |
- Battery allows your device to operate without external utility power source. Advanced batteries increase battery life.
- Hard Drive stores file on your device. Advanced drives can store more files, but use more power, shortening battery life.
- Network Card allows your device to wirelessly connect to stationwide NTNet network. Basic cards are limited to on-station use, while advanced cards can operate anywhere near the station, which includes the asteroid outposts.
- Processor Unit is critical for your device's functionality. It allows you to run programs from your hard drive. Advanced CPUs use more power, but allow you to run more programs on background at once.
- Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source. This component is currently unavailable on tablet computers due to size restrictions.
- Nano Printer is device that allows for various paperwork manipulations, such as, scanning of documents or printing new ones. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
- Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards. -
Step 3: Payment
- Your device is now ready for fabrication..- Please swipe your identification card to finish purchase.
- Total price: {{:data.totalprice}}C -{{else data.state == 3}} -
Step 4: Thank you for your purchase
- Should you experience any issues with your new device, contact technical support at support@computerservice.nt -{{/if}} diff --git a/nano/templates/computer_main.tmpl b/nano/templates/computer_main.tmpl deleted file mode 100644 index 9aad3d58609..00000000000 --- a/nano/templates/computer_main.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -No program loaded. Please select program from list below. -
-
- {{for data.programs}}
-
-
\ No newline at end of file
diff --git a/nano/templates/cryo.tmpl b/nano/templates/cryo.tmpl
deleted file mode 100644
index de949c855f2..00000000000
--- a/nano/templates/cryo.tmpl
+++ /dev/null
@@ -1,117 +0,0 @@
-
- | {{:helper.link(value.desc, null, {'action' : 'PC_runprogram', 'name' : value.name})}} - | {{:helper.link(' |
Cryo Cell Status
- -
- {{if !data.hasOccupant}}
-
-
-
-
- Cell Unoccupied
- {{else}}
-
- {{:data.occupant.name}}
- {{if data.occupant.stat == 0}}
- Conscious
- {{else data.occupant.stat == 1}}
- Unconscious
- {{else}}
- DEAD
- {{/if}}
-
-
- {{if data.occupant.stat < 2}}
-
-
-
- Health:
- {{if data.occupant.health >= 0}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
- {{else}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
- {{/if}}
- {{:helper.smoothRound(data.occupant.health)}}
-
-
-
- Brute Damage:
- {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.bruteLoss)}}
-
-
-
- Resp. Damage:
- {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.oxyLoss)}}
-
-
-
- Toxin Damage:
- {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.toxLoss)}}
-
-
- {{/if}}
- {{/if}}
- Burn Severity:
- {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.fireLoss)}}
- -
-
-
- Cell Temperature:
- {{:helper.smoothRound(data.cellTemperature)}} K
-
- Cryo Cell Operation
-
-
-
- Cryo Cell Status:
-
-
- {{:helper.link('On', 'power-off', {'switchOn' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, data.isOperating ? null : 'selected')}}
-
-
- {{:helper.link('Eject Occupant', 'arrow-circle-o-down', {'ejectOccupant' : 1}, data.hasOccupant ? null : 'disabled')}}
-
-
-
-
-
- Beaker:
-
-
- {{if data.isBeakerLoaded}}
- {{:data.beakerLabel ? data.beakerLabel : 'No label'}}
- {{if data.beakerVolume}} - {{:helper.smoothRound(data.beakerVolume)}} units remaining
- {{else}} - Beaker is empty - {{/if}} - {{else}} - No beaker loaded - {{/if}} -
- - {{if data.beakerVolume}} - {{:helper.smoothRound(data.beakerVolume)}} units remaining
- {{else}} - Beaker is empty - {{/if}} - {{else}} - No beaker loaded - {{/if}} -
- {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
-
-
-
-
- Auto-eject healthy patients:
-
-
- {{:helper.link('On', 'power-off', {'auto_eject_healthy_on' : 1}, data.auto_eject_healthy ? 'selected' : null)}}{{:helper.link('Off', 'close', {'auto_eject_healthy_off' : 0}, data.auto_eject_healthy ? null : 'selected')}}
-
-
-
diff --git a/nano/templates/dna_modifier.tmpl b/nano/templates/dna_modifier.tmpl
deleted file mode 100644
index 2789a4a7881..00000000000
--- a/nano/templates/dna_modifier.tmpl
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
- Auto-eject dead patients:
-
-
- {{:helper.link('On', 'power-off', {'auto_eject_dead_on' : 1}, data.auto_eject_dead ? 'selected' : null)}}{{:helper.link('Off', 'close', {'auto_eject_dead_off' : 0}, data.auto_eject_dead ? null : 'selected')}}
-
- Status
- -
- {{if !data.hasOccupant}}
-
-
- Cell Unoccupied
- {{else}}
-
- {{:data.occupant.name}} =>
- {{if data.occupant.stat == 0}}
- Conscious
- {{else data.occupant.stat == 1}}
- Unconscious
- {{else}}
- DEAD
- {{/if}}
-
-
- {{if !data.occupant.isViableSubject || !data.occupant.uniqueIdentity || !data.occupant.structuralEnzymes}}
-
- The occupant's DNA structure is ruined beyond recognition, please insert a subject with an intact DNA structure.
-
- {{else data.occupant.stat < 2}}
-
-
-
- Health:
- {{if data.occupant.health >= 0}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
- {{else}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
- {{/if}}
- {{:helper.smoothRound(data.occupant.health)}}
-
-
-
- Radiation:
- {{:helper.displayBar(data.occupant.radiationLevel, 0, 100, 'average')}}
- {{:helper.smoothRound(data.occupant.radiationLevel)}}
-
-
-
- {{/if}}
- {{/if}}
-
-Unique Enzymes:
- {{:data.occupant.uniqueEnzymes ? data.occupant.uniqueEnzymes : 'Unknown'}}
- Operations
- {{if !data.occupant.isViableSubject || !data.occupant.uniqueIdentity || !data.occupant.structuralEnzymes}} -
- No operation possible on this subject
-
- {{else}}
-
- {{:helper.link('Modify U.I.', 'link', {'selectMenuKey' : 'ui'}, data.selectedMenuKey == 'ui' ? 'selected' : null)}}
- {{:helper.link('Modify S.E.', 'link', {'selectMenuKey' : 'se'}, data.selectedMenuKey == 'se' ? 'selected' : null)}}
- {{:helper.link('Transfer Buffers', 'floppy-o', {'selectMenuKey' : 'buffer'}, data.selectedMenuKey == 'buffer' ? 'selected' : null)}}
- {{:helper.link('Rejuvenators', 'plus', {'selectMenuKey' : 'rejuvenators'}, data.selectedMenuKey == 'rejuvenators' ? 'selected' : null)}}
-
-
- Modify Unique Identifier
- {{:helper.displayDNABlocks(data.occupant.uniqueIdentity, data.selectedUIBlock, data.selectedUISubBlock, data.dnaBlockSize, 'UI')}} - -
-
-
- Target:
-
-
- {{:helper.link('-', null, {'changeUITarget' : 0}, (data.selectedUITarget > 0) ? null : 'disabled')}}
-
- {{:data.selectedUITargetHex}}
- {{:helper.link('+', null, {'changeUITarget' : 1}, (data.selectedUITarget < 15) ? null : 'disabled')}}
-
-
- {{else data.selectedMenuKey == 'se'}}
-
- {{:helper.link('Irradiate Block', 'exclamation-circle', {'pulseUIRadiation' : 1}, !data.occupant.isViableSubject ? 'disabled' : null)}}
-
- Modify Structural Enzymes
- {{:helper.displayDNABlocks(data.occupant.structuralEnzymes, data.selectedSEBlock, data.selectedSESubBlock, data.dnaBlockSize, 'SE')}} - -
-
- {{else data.selectedMenuKey == 'buffer'}}
-
- {{:helper.link('Irradiate Block', 'exclamation-circle', {'pulseSERadiation' : 1}, !data.occupant.isViableSubject ? 'disabled' : null)}}
-
- Transfer Buffers
- {{for data.buffers}} -Buffer {{:(index + 1)}}
-
-
- {{/for}}
-
-
-
- {{if value.data}}
-
- Load Data:
-
-
- {{:helper.link('Subject U.I.', 'link', {'bufferOption' : 'saveUI', 'bufferId' : (index + 1)}, !data.hasOccupant ? 'disabled' : null)}}
- {{:helper.link('Subject U.I. + U.E.', 'link', {'bufferOption' : 'saveUIAndUE', 'bufferId' : (index + 1)}, !data.hasOccupant ? 'disabled' : null)}}
- {{:helper.link('Subject S.E.', 'link', {'bufferOption' : 'saveSE', 'bufferId' : (index + 1)}, !data.hasOccupant ? 'disabled' : null)}}
- {{:helper.link('From Disk', 'floppy-o', {'bufferOption' : 'loadDisk', 'bufferId' : (index + 1)}, (!data.hasDisk || !data.disk.data) ? 'disabled' : null)}}
-
-
-
-
- Label:
-
-
- {{:helper.link(value.label, 'file', {'bufferOption' : 'changeLabel', 'bufferId' : (index + 1)})}}
-
-
-
-
- Subject:
-
-
- {{:value.owner ? value.owner : 'Unknown'}}
-
-
-
- {{else}}
-
- Stored Data:
-
-
- {{:value.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}}
- {{:value.ue ? ' + Unique Enzymes' : ''}}
-
-
-
- {{/if}}
-
- This buffer is empty.
-
-
-
-
- Options:
-
-
- {{:helper.link('Clear', 'trash', {'bufferOption' : 'clear', 'bufferId' : (index + 1)}, !value.data ? 'disabled' : null)}}
- {{:helper.link('Injector', data.isInjectorReady ? 'pencil' : 'clock-o', {'bufferOption' : 'createInjector', 'bufferId' : (index + 1)}, (!data.isInjectorReady || !value.data) ? 'disabled' : null)}}
- {{:helper.link('Block Injector', data.isInjectorReady ? 'pencil' : 'clock-o', {'bufferOption' : 'createInjector', 'bufferId' : (index + 1), 'createBlockInjector' : 1}, (!data.isInjectorReady || !value.data) ? 'disabled' : null)}}
- {{:helper.link('Transfer', 'exclamation-circle', {'bufferOption' : 'transfer', 'bufferId' : (index + 1)}, (!data.hasOccupant || !value.data) ? 'disabled' : null)}}
- {{:helper.link('Save To Disk', 'floppy-o', {'bufferOption' : 'saveDisk', 'bufferId' : (index + 1)}, (!value.data || !data.hasDisk) ? 'disabled' : null)}}
-
- Data Disk
-
- {{if data.hasDisk}}
- {{if data.disk.data}}
-
- {{else data.selectedMenuKey == 'rejuvenators'}}
-
-
-
- Label:
-
-
- {{:data.disk.label ? data.disk.label : 'No Label'}}
-
-
-
-
- Subject:
-
-
- {{:data.disk.owner ? data.disk.owner : 'Unknown'}}
-
-
-
- {{else}}
-
- Stored Data:
-
-
- {{:data.disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}}
- {{:data.disk.ue ? ' + Unique Enzymes' : ''}}
-
-
-
- {{/if}}
- {{else}}
-
- Disk is blank.
-
-
-
- {{/if}}
-
- No disk inserted.
-
-
-
-
- Options:
-
-
- {{:helper.link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, (!data.hasDisk || !data.disk.data) ? 'disabled' : null)}}
- {{:helper.link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !data.hasDisk ? 'disabled' : null)}}
-
- Rejuvenators
-
-
-
- Inject:
-
-
- {{:helper.link('5', 'pencil', {'injectRejuvenators' : 5}, (!data.hasOccupant || !data.beakerVolume) ? 'disabled' : null)}}
- {{:helper.link('10', 'pencil', {'injectRejuvenators' : 10}, (!data.hasOccupant || !data.beakerVolume) ? 'disabled' : null)}}
- {{:helper.link('20', 'pencil', {'injectRejuvenators' : 20}, (!data.hasOccupant || !data.beakerVolume) ? 'disabled' : null)}}
- {{:helper.link('30', 'pencil', {'injectRejuvenators' : 30}, (!data.hasOccupant || !data.beakerVolume) ? 'disabled' : null)}}
- {{:helper.link('50', 'pencil', {'injectRejuvenators' : 50}, (!data.hasOccupant || !data.beakerVolume) ? 'disabled' : null)}}
-
-
-
- {{/if}}
-
-
- Beaker:
-
-
- {{if data.isBeakerLoaded}}
- {{:data.beakerLabel ? data.beakerLabel : 'No label'}}
- {{if data.beakerVolume}} - {{:data.beakerVolume}} units remaining
- {{else}} - Beaker is empty - {{/if}} - {{else}} - No beaker loaded - {{/if}} -
- - {{if data.beakerVolume}} - {{:data.beakerVolume}} units remaining
- {{else}} - Beaker is empty - {{/if}} - {{else}} - No beaker loaded - {{/if}} -
- {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
-
- Radiation Emitter Settings
-
-
-
- Intensity:
-
-
- {{:helper.link('-', null, {'radiationIntensity' : 0}, (data.radiationIntensity > 1) ? null : 'disabled')}}
-
- {{:data.radiationIntensity}}
- {{:helper.link('+', null, {'radiationIntensity' : 1}, (data.radiationIntensity < 10) ? null : 'disabled')}}
-
-
-
- Duration:
-
-
- {{:helper.link('-', null, {'radiationDuration' : 0}, (data.radiationDuration > 2) ? null : 'disabled')}}
-
- {{:data.radiationDuration}}
- {{:helper.link('+', null, {'radiationDuration' : 1}, (data.radiationDuration < 20) ? null : 'disabled')}}
-
-
- {{/if}}
-{{/if}}
-
-
-
-
- {{:helper.link('Pulse Radiation', 'exclamation-circle', {'pulseRadiation' : 1}, !data.hasOccupant ? 'disabled' : null)}}
-
- - -
-
-
- Occupant:
-
-
- {{:helper.link('Eject Occupant', 'eject', {'ejectOccupant' : 1}, data.locked || !data.hasOccupant || data.irradiating ? 'disabled' : null)}}
-
-
-
-
-{{if data.irradiating}}
-
- Door Lock:
-
-
- {{:helper.link('Engaged', 'lock', {'toggleLock' : 1}, data.locked ? 'selected' : !data.hasOccupant ? 'disabled' : null)}}
- {{:helper.link('Disengaged', 'unlock', {'toggleLock' : 1}, !data.locked ? 'selected' : data.irradiating ? 'disabled' : null)}}
-
-
-
-{{/if}}
diff --git a/nano/templates/door_control.tmpl b/nano/templates/door_control.tmpl
deleted file mode 100644
index 3c8dc66afb7..00000000000
--- a/nano/templates/door_control.tmpl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
- Irradiating Subject
-For {{:data.irradiating}} seconds.
-
-
-
-
- Main power is
- {{if data.main_power_loss == 0}}
- online
- {{else data.main_power_loss == -1}}
- offline
- {{else}}
- offline for {{:data.main_power_loss}} second{{:data.main_power_loss == 1 ? '' : 's'}}
- {{/if}}.
-
-
- {{:helper.link(data.main_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'main_power'}, data.main_power_loss == 0 ? null : 'disabled', data.main_power_loss == 0 ? 'redButton' : null)}}
-
-
-
-
-
- Backup power is
- {{if data.backup_power_loss == 0}}
- online
- {{else data.backup_power_loss == -1}}
- offline
- {{else}}
- offline for {{:data.backup_power_loss}} second{{:data.backup_power_loss == 1 ? '' : 's'}}
- {{/if}}.
-
-
- {{:helper.link(data.backup_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'backup_power'}, data.backup_power_loss == 0 ? null : 'disabled', data.backup_power_loss == 0 ? 'redButton' : null)}}
-
-
-
-
-
- Electrified Status:
-
-
- {{:helper.link('Offline' , null, {'command' : 'electrify_permanently', 'activate' : "0" }, data.electrified == 0 ? 'selected' : null)}}
- {{:helper.link(data.electrified <= 0 ? 'Temporary (30s)' : 'Temporary (' + data.electrified +'s)', null, {'command' : 'electrify_temporary', 'activate' : "1"}, null, data.electrified > 0 ? 'redButton' : null)}}
- {{:helper.link('Permanent', null, {'command' : 'electrify_permanently', 'activate' : "1"}, data.electrified == -1 ? 'redButton' : null)}}
-
-- -
| {{:value.name}}: | -{{:helper.link(value.enabled, null, {'command' : value.command, 'activate' : value.act ? 1 : 0}, value.active ? 'selected' : null)}} | -{{:helper.link(value.disabled, null, {'command' : value.command, 'activate' : value.act ? 0 : 1}, !value.active ? (value.danger ? 'redButton' : 'selected') : null)}} | -
-
-
-
- | Station Alert Level | {{:data.alert_level}} | -
| ERT Type | - {{if data.ert_type == 'Code Amber'}} AMBER {{else}} {{:helper.link('Amber', null, {"set_code": 'Code Amber'})}} {{/if}} - {{if data.ert_type == 'Code Red'}} RED {{else}} {{:helper.link('Red', null, {"set_code": 'Code Red'})}} {{/if}} - {{if data.ert_type == 'Code Gamma'}} GAMMA {{else}} {{:helper.link('Gamma', null, {"set_code": 'Code Gamma'})}} {{/if}} - | -
-
-
-
-
-
- | Department | Slots | Change Slots |
|---|---|---|
| Command | {{if data.com == 0}}-{{else}}{{:helper.smoothRound(data.com)}}{{/if}} | - {{:helper.link('0', null, {"set_com": 0})}} - {{:helper.link('1', null, {"set_com": 1})}} |
| Security | {{if data.sec == 0}}-{{else}}{{:helper.smoothRound(data.sec)}}{{/if}} | - {{:helper.link('0', null, {"set_sec": 0})}} - {{:helper.link('1', null, {"set_sec": 1})}} - {{:helper.link('2', null, {"set_sec": 2})}} - {{:helper.link('3', null, {"set_sec": 3})}} - {{:helper.link('4', null, {"set_sec": 4})}} - {{:helper.link('5', null, {"set_sec": 5})}} - | -
| Medical | {{if data.med == 0}}-{{else}}{{:helper.smoothRound(data.med)}}{{/if}} | - {{:helper.link('0', null, {"set_med": 0})}} - {{:helper.link('1', null, {"set_med": 1})}} - {{:helper.link('2', null, {"set_med": 2})}} - {{:helper.link('3', null, {"set_med": 3})}} - {{:helper.link('4', null, {"set_med": 4})}} - {{:helper.link('5', null, {"set_med": 5})}} - | -
| Engineering | {{if data.eng == 0}}-{{else}}{{:helper.smoothRound(data.eng)}}{{/if}} | - {{:helper.link('0', null, {"set_eng": 0})}} - {{:helper.link('1', null, {"set_eng": 1})}} - {{:helper.link('2', null, {"set_eng": 2})}} - {{:helper.link('3', null, {"set_eng": 3})}} - {{:helper.link('4', null, {"set_eng": 4})}} - {{:helper.link('5', null, {"set_eng": 5})}} - | -
| Paranormal | {{if data.par == 0}}-{{else}}{{:helper.smoothRound(data.par)}}{{/if}} | - {{:helper.link('0', null, {"set_par": 0})}} - {{:helper.link('1', null, {"set_par": 1})}} - {{:helper.link('2', null, {"set_par": 2})}} - {{:helper.link('3', null, {"set_par": 3})}} - {{:helper.link('4', null, {"set_par": 4})}} - {{:helper.link('5', null, {"set_par": 5})}} - | -
| Janitor | {{if data.jan == 0}}-{{else}}{{:helper.smoothRound(data.jan)}}{{/if}} | - {{:helper.link('0', null, {"set_jan": 0})}} - {{:helper.link('1', null, {"set_jan": 1})}} - {{:helper.link('2', null, {"set_jan": 2})}} - {{:helper.link('3', null, {"set_jan": 3})}} - {{:helper.link('4', null, {"set_jan": 4})}} - {{:helper.link('5', null, {"set_jan": 5})}} - | -
| {{if data.ert_type == 'Code Gamma'}}GAMMA {{/if}}Cyborg | {{if data.cyb == 0}}-{{else}}{{:helper.smoothRound(data.cyb)}}{{/if}} | - {{:helper.link('0', null, {"set_cyb": 0})}} - {{:helper.link('1', null, {"set_cyb": 1})}} - {{:helper.link('2', null, {"set_cyb": 2})}} - {{:helper.link('3', null, {"set_cyb": 3})}} - {{:helper.link('4', null, {"set_cyb": 4})}} - {{:helper.link('5', null, {"set_cyb": 5})}} - |
-
- {{:helper.link('Dispatch', null, {"dispatch_ert": 1})}}
-
-
diff --git a/nano/templates/faxmachine.tmpl b/nano/templates/faxmachine.tmpl
deleted file mode 100644
index e52c40eb927..00000000000
--- a/nano/templates/faxmachine.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-Authorization
-
-
-
- Confirm identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'scan' : 1})}}
-
-
-
-
- Authorize:
-
-
- {{:helper.link(data.authenticated ? 'Log Out' : 'Log In', data.authenticated ? 'unlock' : 'lock', {'auth' : 1})}}
-
--
-
-Fax Menu
-
-
-
- Network:
-
-
-
- {{:data.network}}
-
-
-
-
- Currently sending:
-
-
- {{:helper.link(data.paper, 'eject', {'paper' : 1})}}
- {{if data.paperinserted}}
- {{:helper.link('Rename', 'pencil', {'rename' : 1})}}
- {{/if}}
-
-
-
-
- Sending to:
-
-
- {{:helper.link(data.destination, 'print', {'dept' : 1}, !data.authenticated ? 'disabled' : '')}}
-
-
-
\ No newline at end of file
diff --git a/nano/templates/file_manager.tmpl b/nano/templates/file_manager.tmpl
deleted file mode 100644
index 51d40b84475..00000000000
--- a/nano/templates/file_manager.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{{if data.error}}
-
- Action:
-
-
- {{if data.authenticated}}
- {{:helper.link(data.cooldown && data.respectcooldown ? "Realigning" : "Send", data.cooldown && data.respectcooldown ? 'clock-o' : "envelope-o", {'send' : 1}, data.cooldown && data.respectcooldown ? 'disabled' : "")}}
- {{else}}
- {{:helper.link(data.cooldown && data.respectcooldown ? "Realigning" : "Send", data.cooldown && data.respectcooldown ? 'clock-o' : "envelope-o", null, !data.authenticated ? 'disabled' : "")}}
- {{/if}}
-
-An error has occurred and this program can not continue.
- Additional information: {{:data.error}}- Please try again. If the problem persists contact your system administrator for assistance. - {{:helper.link('Restart program', null, {'action' : 'PRG_closefile'})}} -{{else}} - {{if data.filename}} -
Viewing file {{:data.filename}}
-
- {{:helper.link('CLOSE', null, {'action' : 'PRG_closefile'})}}
- {{:helper.link('EDIT', null, {'action' : 'PRG_edit'})}}
- {{:helper.link('PRINT', null, {'action' : 'PRG_printfile'})}}
-
- {{:data.filedata}} - {{else}} -
Available files (local):
-
-
-
-
- {{if data.usbconnected}}
- | File name | -File type | -File size (GQ) | -Operations | -
|---|---|---|---|
| {{:value.name}} | -.{{:value.type}} | -{{:value.size}}GQ | -- {{:helper.link('VIEW', 'eye', {'action' : 'PRG_openfile', 'name' : value.name})}} - {{:helper.link('DELETE', 'trash', {'action' : 'PRG_deletefile', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{:helper.link('RENAME', 'pencil', {'action' : 'PRG_rename', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{:helper.link('CLONE', 'files-o', {'action' : 'PRG_clone', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{if !value.encrypted}} - {{:helper.link('ENCRYPT', null, {'action' : 'PRG_encrypt', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{else}} - {{:helper.link('DECRYPT', null, {'action' : 'PRG_decrypt', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{/if}} - {{if data.usbconnected}} - {{:helper.link('EXPORT', 'upload', {'action' : 'PRG_copytousb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{/if}} - | -
Available files (portable device):
-
-
-
-
- {{/if}}
- {{:helper.link('NEW DATA FILE', 'file-text', {'action' : 'PRG_newtextfile'})}}
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/firealarm.tmpl b/nano/templates/firealarm.tmpl
deleted file mode 100644
index 5ddaa2977f4..00000000000
--- a/nano/templates/firealarm.tmpl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-| File name | -File type | -File size (GQ) | -Operations | -
|---|---|---|---|
| {{:value.name}} | -.{{:value.type}} | -{{:value.size}}GQ | -- {{:helper.link('DELETE', 'trash', {'action' : 'PRG_usbdeletefile', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{if data.usbconnected}} - {{:helper.link('IMPORT', 'download', {'action' : 'PRG_copyfromusb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} - {{/if}} - | -
-
-
-
- Fire Alarm
-
-
- {{:helper.link('Activated', 'lightbulb-o', {'alarm' : 1}, data.fire ? 'selected' : '')}}
- {{:helper.link('Deactivated', 'lightbulb-o', {'reset' : 1}, data.fire ? '' : 'selected')}}
-
-
-
-
-
- Security Level
-
-
- {{if data.sec_level == "green"}}
- Green
- {{else data.sec_level == "blue"}}
- Blue
- {{else data.sec_level == "red"}}
- Red
- {{else data.sec_level == "gamma"}}
- Gamma
- {{else data.sec_level == "epsilon"}}
- Contracts terminated.
- {{else data.sec_level == "delta"}}
- Nuclear device primed.
- {{else}}
- ERR: Unable to ascertain security level. Please see an authorized NT fire alarm technician.
- {{/if}}
-
-
-
-
-
- Timer System
-
-
- {{:helper.link('Initiate', 'play', {'time': 1}, data.timing ? 'selected' : '')}}
- {{:helper.link('Stop', 'pause', {'time': 0}, data.timing ? '' : 'selected')}}
-
-
-
-
-{{if data.timing}}
-
- Time Modifiers
-
-
- {{:helper.link('30', 'minus', {'tp': -30})}}
- {{:helper.link('1', 'minus', {'tp': -1 })}}
- {{:helper.link('1', 'plus', {'tp': +1 })}}
- {{:helper.link('30', 'plus', {'tp': +30})}}
-
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/freezer.tmpl b/nano/templates/freezer.tmpl
deleted file mode 100644
index 582598e05c5..00000000000
--- a/nano/templates/freezer.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-
- Time Left
-
-
- {{:data.time_left}}
-
-
-
-
-
- Status:
-
-
- {{:helper.link('On', 'power-off', {'toggleStatus' : 1}, data.on ? 'selected' : null)}}{{:helper.link('Off', 'close', {'toggleStatus' : 1}, data.on ? null : 'selected')}}
-
-
-
-
-
- Gas Pressure:
-
-
- {{:helper.smoothRound(data.gasPressure)}} kPa
-
-Gas Temperature
-
-
-
-
- Current:
-
-
- {{:helper.displayBar(data.gasTemperature, data.minGasTemperature, data.maxGasTemperature, data.gasTemperatureClass)}}
-
-
- {{:helper.smoothRound(data.gasTemperature)}} K ({{:helper.smoothRound(data.gasTemperatureCelsius)}} °C)
-
-
-
-
diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl
deleted file mode 100644
index 606af520168..00000000000
--- a/nano/templates/identification_computer.tmpl
+++ /dev/null
@@ -1,347 +0,0 @@
-{{if data.printing}}
-
- Target:
-
-
- {{:helper.displayBar(data.targetGasTemperature, data.minGasTemperature, data.maxGasTemperature)}}
-
-
- {{:helper.link('Min', null, {'minimum' : 'yes'}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
- {{:helper.link('-', null, {'temp' : -100}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
- {{:helper.link('-', null, {'temp' : -10}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
- {{:helper.link('-', null, {'temp' : -1}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
-
- {{:data.targetGasTemperature}} K ({{:data.targetGasTemperatureCelsius}} °C)
- {{:helper.link('+', null, {'temp' : 1}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
- {{:helper.link('+', null, {'temp' : 10}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
- {{:helper.link('+', null, {'temp' : 100}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
- {{:helper.link('Max', null, {'maximum' : 'yes'}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
- The computer is currently busy.
-
- Printing...
-
- - Thank you for your patience! -
-{{else}} - {{:helper.link('Access Modification', 'home', {'choice' : 'mode', 'mode_target' : 0}, !data.mode ? 'disabled' : null)}} - {{if !data.target_dept}}{{:helper.link('Job Management', 'gear', {'choice' : 'mode', 'mode_target' : 1}, data.mode == 1 ? 'disabled' : null)}}{{/if}} - {{:helper.link('Crew Manifest', 'folder-open', {'choice' : 'mode', 'mode_target' : 2}, data.mode == 2 ? 'disabled' : null)}} - {{if !data.target_dept}}{{:helper.link('Print', 'print', {'choice' : 'print'}, (data.mode == 2 || data.has_modify && !data.mode) ? null : 'disabled')}}{{/if}} - {{:helper.link('Records', 'file', {'choice' : 'mode', 'mode_target' : 3}, (data.mode == 3) ? 'disabled' : null)}} - - {{if data.mode == 1 && !data.target_dept}} -
-
- Job Management
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'choice' : 'scan'})}}
-
-
- Cooldown:
-
-
- {{if data.cooldown_mins > 0 || data.cooldown_mins == 0 && data.cooldown_secs > 0}}
- Next change in: {{:data.cooldown_mins}}:{{:data.cooldown_secs}}
- {{else}}
- Ready
- {{/if}}
-
- -
- {{for data.job_slots}}
-
- {{else data.mode == 2}}
-
- {{:value.title}}: {{:value.current_positions}}/{{:value.total_positions}}
- {{:helper.link('-', null, {'choice' : 'make_job_unavailable', 'job' : value.title}, value.can_close == 1 && data.authenticated ? null : 'disabled')}}
- {{:helper.link('+', null, {'choice' : 'make_job_available', 'job' : value.title}, value.can_open == 1 && data.authenticated ? null : 'disabled')}}
- {{:helper.link('Pri', null, {'choice' : 'prioritize_job', 'job' : value.title}, value.can_prioritize > 0 && data.authenticated ? null : 'disabled')}} {{if value.can_prioritize == 2}}Priority Job {{/if}}
-
- {{/for}}
-
-
- Crew Manifest
-
- {{:data.manifest}}
-
- {{else data.mode == 3}}
-
-
- Records
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'choice' : 'scan'})}}
-
-
- {{if data.authenticated}}
- {{:data.id_change_html}}
- {{if data.centcom_access}}
- {{:helper.link('Delete Records By: ' + data.scan_owner, null, {'choice' : 'wipe_my_logs'}, null, 'linkDanger')}}
- {{/if}}
- {{if !data.target_dept}}
- {{:helper.link('Delete ALL Records', null, {'choice' : 'wipe_all_logs'}, null, 'linkDanger')}}
- {{/if}}
- {{else}}
- Please insert an authorized ID into the terminal to proceed.
- {{/if}} -
- {{else}}
- - {{/if}} -
-
-
- {{if !data.authenticated}}
- Please insert the IDs into the terminal to proceed.Access Modification
-- {{/if}} - -
-
-
- Target Identity:
-
-
- {{:helper.link(data.target_name, 'eject', {'choice' : 'modify'})}}
-
-
-
-
- Authorized Identity:
-
-
- {{:helper.link(data.scan_name, 'eject', {'choice' : 'scan'})}}
-
- - - {{if data.authenticated}} - - - {{if data.has_modify}} - {{if !data.target_dept}} -
-
-
-
-
-
- {{/if}}
- {{if data.target_rank != "Terminated"}}
- Details
-
-
- {{/if}}
- {{if !data.target_dept}}
-
- Demotions:
-
-
- {{if data.target_rank == "Demoted"}}
- {{:data.target_owner}} has already been demoted!
- {{else}}
- {{:helper.link('Demote ' + data.target_owner, 'gear', {'choice' : 'demote'}, (data.target_rank == "Civilian" || data.target_rank == "Unassigned") ? 'disabled' : null, (data.target_rank == "Civilian" || data.target_rank == "Unassigned") ? 'disabled' : 'linkDanger')}}
- {{/if}}
-
-
-
-
-
- Terminations:
-
-
- {{if data.target_rank == "Terminated"}}
- {{:data.target_owner}} has already been terminated!
- {{else}}
- {{:helper.link('Terminate ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}}
- {{/if}}
-
-
-
-
- {{else}}
-
- Assignment
-
-
-
- {{/if}}
-
- Assignment for {{:data.target_owner}}
-
-
- {{:data.target_rank}}
-
-
-
-
-
-
- {{if data.centcom_access}}
-
-
- Central Command
-
- {{for data.all_centcom_access}}
- {{:helper.link(value.desc, '', {'choice' : 'access', 'access_target' : value.ref, 'allowed' : value.allowed}, null, value.allowed ? 'selected' : null)}}
- {{/for}}
-
- {{else}}
- {{if !data.target_dept}}
-
-
- Card Skin
- {{for data.all_centcom_skins}}
- {{:helper.link(value.display_name, '', {'choice' : 'skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
- {{/for}}
-
-
- {{:data.station_name}}
-
- {{for data.regions}}
-
- {{/if}}
- {{/if}}
- {{/if}}
- {{/if}}
- {{/if}}
-{{/if}}
diff --git a/nano/templates/keycard_auth.tmpl b/nano/templates/keycard_auth.tmpl
deleted file mode 100644
index 96a3f44f60a..00000000000
--- a/nano/templates/keycard_auth.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- {{/for}}
- {{:value.name}}
- {{for value.accesses :accessValue:accessKey}}
-
- {{:helper.link(accessValue.desc, '', {'choice' : 'access', 'access_target' : accessValue.ref, 'allowed' : accessValue.allowed}, null, accessValue.allowed ? 'selected' : null)}}
-
- {{/for}}
-
-
- Card Skin
- {{for data.card_skins}}
- {{:helper.link(value.display_name, '', {'choice' : 'skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
- {{/for}}
-
-
\ No newline at end of file
diff --git a/nano/templates/laptop_configuration.tmpl b/nano/templates/laptop_configuration.tmpl
deleted file mode 100644
index 95dd315b90e..00000000000
--- a/nano/templates/laptop_configuration.tmpl
+++ /dev/null
@@ -1,71 +0,0 @@
-Welcome to computer configuration utility. Please consult your system administrator if you have any questions about your device.Keycard Authentication Device
- This device is used to trigger certain high security events. It requires the simultaneous swipe of two high-level ID cards. -
- {{if data.screen == 1}}
-
-Trigger Event
- {{:helper.link('Red Alert', 'exclamation-triangle', { 'triggerevent' : 'Red Alert' })}} - {{:helper.link('Emergency Response Team', 'exclamation-triangle', { 'triggerevent' : 'Emergency Response Team' })}} - {{:helper.link('Grant Emergency Maintenance Access', 'unlock', { 'triggerevent' : 'Grant Emergency Maintenance Access' })}} - {{:helper.link('Revoke Emergency Maintenance Access', 'lock', { 'triggerevent' : 'Revoke Emergency Maintenance Access' })}} - {{:helper.link('Activate Station-Wide Emergency Access', 'unlock', { 'triggerevent' : 'Activate Station-Wide Emergency Access' })}} - {{:helper.link('Deactivate Station-Wide Emergency Access', 'lock', { 'triggerevent' : 'Deactivate Station-Wide Emergency Access' })}} - {{else data.screen == 2}} - {{if data.event == 'Emergency Response Team'}} -
-
- {{/if}}
- Reason for ERT Call:
-
- {{:helper.link(data.ertreason, 'exclamation-triangle', { 'ert' : 'callreason' })}}
-
- Please swipe your card to authorize the following event:
-{{:data.event}}
- {{:helper.link('Back', 'close', { 'reset' : 1 })}}
- {{/if}}
- -
-
-
-Power Supply
- {{if data.battery}} -
-
- Battery Status
- Active
-
-
- Battery Rating
- {{:data.battery.max}}
-
-
- ETA
- {{:data.eta.hours ? helper.smoothRound(data.eta.hours) + "h " : ""}}{{:data.eta.minutes ? helper.smoothRound(data.eta.minutes) + "m " : ""}}{{:helper.smoothRound(data.eta.seconds)}}s
-
-
- {{else}}
- Battery Charge
- {{:helper.displayBar(data.battery.charge, 0, data.battery.max, (data.battery.charge > data.battery.max/2) ? 'good' : (data.battery.charge > data.battery.max/4) ? 'average' : 'bad')}}
-
- {{:helper.smoothRound(data.battery.charge, 1)}}/{{:data.battery.max}}
-
-
-
- {{/if}}
-
- Battery Status
- Not Available
-
-
-Power Usage
- {{:data.power_usage}}W
-
-
-
-File System
-
-
-Used Capacity
- {{:helper.displayBar(data.disk_used, 0, data.disk_size, (data.disk_used > data.disk_size*0.75) ? 'bad' : (data.disk_used > data.disk_size/2) ? 'average' : 'good')}}
-
- {{:helper.smoothRound(data.disk_used, 1)}}/{{:data.disk_size}}GQ
-
-
-
-
- {{/for}} -
\ No newline at end of file
diff --git a/nano/templates/mech_bay_console.tmpl b/nano/templates/mech_bay_console.tmpl
deleted file mode 100644
index 2a4cf5d6085..00000000000
--- a/nano/templates/mech_bay_console.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-Computer Components
- {{for data.hardware}} -{{:value.name}}
- {{:value.desc}}-
-
-
- State
- {{:value.enabled ? "Enabled" : "Disabled"}}
-
-
-
- {{if !value.critical}}
- Power Usage
- {{:value.powerusage}}W
-
-
- {{/if}}
- Toggle Component
- {{:helper.link(value.enabled ? 'On' : 'Off', value.enabled ? 'power-off' : 'close', {'action' : 'PC_toggle_component', 'name' : value.name})}}
- - {{/for}} -
Subsystems
-
-
-
- Power Port:
-
-
- {{if data.recharge_port}}
- OK
- {{else}}
- ERROR
- {{/if}}
-
-
-
-{{if data.has_mech}}
-
- Mecha:
-
-
- {{if data.has_mech}}
- LOCATED ({{:data.mecha_name}})
- {{else}}
- NONE
- {{/if}}
-
- Charging
-
-
-
- Charge Level:
-
-
- {{:helper.displayBar(data.mecha_charge_percentage, 0, 100)}}
-
-
- {{:helper.smoothRound(data.mecha_charge_percentage)}}%
-
- -
-
-
- Cell Rating:
-
-
- {{:data.mecha_maxcharge}}
-
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/med_data.tmpl b/nano/templates/med_data.tmpl
deleted file mode 100644
index f47e13c6885..00000000000
--- a/nano/templates/med_data.tmpl
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
- Cell Charge:
-
-
- {{:helper.smoothRound(data.mecha_charge)}}
-
-
-
-
- Confirm Identity:
-
-
- {{:helper.link(data.scan ? data.scan : "----------", 'eject', {'scan' : 1}, null, data.scan ? 'itemContentWide' : 'fixedLeft')}}
-
--{{if data.authenticated}} - {{if data.screen == 1}} -
Menu
-
-
- {{else data.screen == 2}}
- {{:helper.link('Search Records', 'search', {'search' : 1})}}
- {{:helper.link('List Records', 'list', {'screen' : 2})}}
- {{:helper.link('Virus Database', 'database', {'screen' : 5})}}
- {{:helper.link('Medbot Tracking', 'plus-square', {'screen' : 6})}}
- {{:helper.link('Record Maintenance', 'wrench', {'screen' : 3})}}
- {{:helper.link('Logout', 'lock', {'logout' : 1})}}
- Record List
- {{for data.records}}
- {{:helper.link(value.id + ': ' + value.name, 'user', {'d_rec' : value.ref})}}
- {{/for}}
- -
{{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
- {{else data.screen == 3}}
- Records Maintenance
-{{:helper.link('Backup To Disk', 'download', {'back' : 1}, 'disabled')}}
- {{:helper.link('Upload From disk', 'upload', {'u_load' : 1}, 'disabled')}}
- {{:helper.link('Delete All Records', 'trash', {'del_all' : 1})}}
- {{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
- {{else data.screen == 4}}
- Medical Record
- General Data
- {{if data.general.empty}}
-
-
-
- {{/if}}
-
- |
- {{for data.general.fields}}
-
-
- {{/for}}
- {{:value.field}}
- {{:helper.link(value.value, value.edit ? 'pencil' : 'user-times', {'field' : value.edit}, value.edit ? null : 'disabled')}}
- |
-
- {{if data.general.has_photos}}
- {{for data.general.photos}}
- {{if value.photo}}
- |
-
Medical Data
- {{if data.medical.empty}}
-
-
- {{:helper.link('New Record', 'plus', {'new' : 1})}}
- Menu
- {{else}}
- {{for data.medical.fields}}
-
-
- {{if value.line_break}}
- {{:value.field}}
- {{:helper.link(value.value, 'pencil', {'field' : value.edit})}}
- - {{/if}} - {{/for}} - -
Comments/Log
- {{for data.medical.comments}}
- {{:value}}
- {{:helper.link('Remove entry', 'trash', {'del_c' : index})}}
- - {{/for}} - -
-
-
- {{:helper.link('Add Entry', 'plus', {'add_c' : 1})}}
- Menu
- {{:helper.link('Delete Record (Medical Only)', 'trash', {'del_r' : 1})}}
- {{/if}}
-
- {{:helper.link('Print Record', 'print', {'print_p' : 1})}}
- {{:helper.link('Back', 'arrow-left', {'screen' : 2})}}
- {{else data.screen == 5}}
- Virus Database
- {{for data.virus}}
- {{:helper.link(value.name, 'arrow-right', {'vir' : value.D})}}
- {{/for}}
- - {{:helper.link('Back', 'arrow-left', {'screen' : 1})}} - {{else data.screen == 6}} -
Medical Robot Monitor
- {{for data.medbots}}
- {{:value.name}}
-
-
- Location:
- {{:value.x}}, {{:value.y}}
-
-
- Status:
-
- {{:value.on ? "Online" : "Offline"}}. {{if value.use_beaker}}Reservoir: [{{:value.total_volume}}/{{:value.maximum_volume}}]{{else}}Using internal synthesizer.{{/if}}
-
- - {{empty}} -
None detected!
- {{/for}}
- {{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
- {{/if}}
-{{else}}
- Menu
- {{:helper.link('Login', 'unlock', {'login' : 1})}} -{{/if}} - -{{if data.temp}} -
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/ntnet_chat.tmpl b/nano/templates/ntnet_chat.tmpl
deleted file mode 100644
index c3f2573f8e2..00000000000
--- a/nano/templates/ntnet_chat.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{{if data.adminmode}}
-
- {{if data.temp.notice}}
- {{:data.temp.text}}
- {{else}}
- {{:data.temp.text}}
- {{/if}}
-
-
- {{if data.temp.has_buttons}}
-
-
-
- {{/if}}
-
-
-
-
- {{for data.temp.buttons}}
- {{:helper.link(value.name, value.icon, {'temp' : 1, 'temp_action' : value.href}, value.status)}}
- {{/for}}
-
-
-
- {{:helper.link('Clear screen', 'home', {'temp' : 1})}}
- ADMINISTRATIVE MODE
-{{/if}} - -{{if data.title}} -
-
- Current channel:
- {{:data.title}}
-
-
- Operator access:
- {{if data.is_operator}}Enabled{{else}}Disabled{{/if}}
-
-
- Chat Window
- Controls:
-
-
-
-
- | {{:helper.link('Send message', 'comment-o', {'action' : 'PRG_speak'})}} - |
| {{:helper.link('Change nickname', 'pencil', {'action' : 'PRG_changename'})}} - |
| {{:helper.link('Toggle administration mode', 'lock', {'action' : 'PRG_toggleadmin'})}} - |
| {{:helper.link('Leave channel', 'sign-out', {'action' : 'PRG_leavechannel'})}} - |
| {{:helper.link('Save log to local drive', 'download', {'action' : 'PRG_savelog'})}} - {{if data.is_operator}} - |
| {{:helper.link('Rename channel', 'pencil', {'action' : 'PRG_renamechannel'})}} - |
| {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}} - |
| {{:helper.link('Delete channel', 'trash', {'action' : 'PRG_deletechannel'})}} - {{/if}} - |
-
- Connected Users
-
-
- {{for data.messages}}
- {{:value.msg}}
- {{/for}} -
- - {{/for}} -
- {{for data.clients}} - {{:value.name}}
- {{/for}} -{{else}} - Controls: -
| {{:helper.link('Change nickname', 'pencil', {'action' : 'PRG_changename'})}} - |
| {{:helper.link('New Channel', 'plus', {'action' : 'PRG_newchannel'})}} - |
| {{:helper.link('Toggle administration mode', 'lock', {'action' : 'PRG_toggleadmin'})}} - |
| {{:helper.link(value.chan, 'sign-in', {'action' : 'PRG_joinchannel', 'id' : value.id})}} - {{/for}} - |
- {{for data.dos_strings}} - {{:value.nums}}
- {{/for}} - {{:helper.link('ABORT', 'ban', {'action' : 'PRG_reset'})}} -{{else}} - ##DoS traffic generator ready. Select target device.
-
-
- Targeted device ID:
- {{if data.focus}}{{:data.focus}}{{else}}None{{/if}}
-
- {{:helper.link('EXECUTE', 'play', {'action' : 'PRG_execute'})}}
-
- Detected devices on network:-
| {{:helper.link(value.id, null, {'action' : 'PRG_target_relay', 'targid' : value.id})}} - {{/for}} - |
-{{if data.error}} -
Download Error
-
-
- Information
- {{:data.error}}
-
-
-{{else}}
- {{if data.downloadname}}
- Reset Program
- {{:helper.link('RESET', 'times', {'action' : 'PRG_reseterror'})}}
- Download Running
-
- Please wait...
-
- {{else}}
-
-
- File name
- {{:data.downloadname}}
-
-
- File description
- {{:data.downloaddesc}}
-
-
- File size
- {{:helper.smoothRound(data.downloadcompletion, 1)}}/{{:data.downloadsize}}GQ
-
-
- Transfer Rate
- {{:data.downloadspeed}} GQ/s
-
-
- Download progress
- {{:helper.displayBar(data.downloadcompletion, 0, data.downloadsize, (data.downloadcompletion > data.downloadsize/2) ? 'good' : (data.downloadcompletion > data.downloadsize/4) ? 'average' : 'bad')}}
-
- {{:helper.smoothRound(data.downloadcompletion, 1)}}/{{:data.downloadsize}}GQ
-
- Primary software repository
-
-
-
- {{if data.hackedavailable}}
-
-
- {{for data.downloadable_programs}}
- Hard drive
- {{:helper.displayBar(data.disk_used, 0, data.disk_size, (data.disk_used > data.disk_size/2) ? 'bad' : (data.disk_used > data.disk_size/4) ? 'average' : 'good')}}
-
- {{:helper.smoothRound(data.disk_used, 1)}}/{{:data.disk_size}}GQ
-
- -
-
- File name
- {{:value.filename}} ({{:value.size}} GQ)
-
-
- Program name
- {{:value.filedesc}}
-
-
- Description
- {{:value.fileinfo}}
-
-
- Compatibility
- {{:value.compatibility}}
-
-
- {{/for}}
- File controls
- {{:helper.link('DOWNLOAD', 'download', {'action' : 'PRG_downloadfile', 'filename' : value.filename}, value.status)}}
- UNKNOWN software repository
-
- Please note that Nanotrasen does not recommend download of software from non-official servers.
- {{for data.hacked_programs}}
-
-
- {{/if}}
- {{/if}}
-{{/if}}
--
-
- File name
- {{:value.filename}} ({{:value.size}} GQ)
-
-
- Program name
- {{:value.filedesc}}
-
-
- Description
- {{:value.fileinfo}}
-
-
- {{/for}}
- File controls
- {{:helper.link('DOWNLOAD', 'download', {'action' : 'PRG_downloadfile', 'filename' : value.filename})}}
- NTOS v2.0.4b Copyright Nanotrasen 2557 - 2559 diff --git a/nano/templates/ntnet_monitor.tmpl b/nano/templates/ntnet_monitor.tmpl deleted file mode 100644 index 319baa872f0..00000000000 --- a/nano/templates/ntnet_monitor.tmpl +++ /dev/null @@ -1,102 +0,0 @@ -
WIRELESS CONNECTIVITY
-
-
-
-
- Active NTNet Relays:
-
-
- {{:data.ntnetrelays}}
-
- {{if data.ntnetrelays}}
-
-
-
- System status:
-
-
- {{:data.ntnetstatus ? "ENABLED" : "DISABLED"}}
-
-
-
- Caution - Disabling wireless transmitters when using wireless device may prevent you from re-enabling them again!
- {{else}}
-
- Control:
-
-
- {{:helper.link('TOGGLE', null, {'action' : 'toggleWireless'})}}
-
- Wireless coverage unavailable, no relays are connected.
- {{/if}} -FIREWALL CONFIGURATION
-
-
-
-
-
-| PROTOCOL | -STATUS | -CONTROL | -
|---|---|---|
| Software Downloads | -{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 1})}} |
- |
| Peer to Peer Traffic | -{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 2})}} |
- |
| Communication Systems | -{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 3})}} |
- |
| Remote System Control | -{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 4})}} |
-
SECURITY SYSTEMS
-{{if data.idsalarm}} -
-
-{{/if}}
-
-
-
-
- NETWORK INCURSION DETECTED
- An abnormal activity has been detected in the network. Please verify system logs for more information -
-
-Intrusion Detection System:
- {{:data.idsstatus ? 'ENABLED' : 'DISABLED'}}
-
-
-Maximal Log Count:
- {{:data.ntnetmaxlogs}}
-
-
-System Logs
-Controls:
-
-
-
-
-| {{:helper.link('RESET IDS', null, {'action' : 'resetIDS'})}} - |
| {{:helper.link('TOGGLE IDS', null, {'action' : 'toggleIDS'})}} - |
| {{:helper.link('SET LOG LIMIT', null, {'action' : 'updatemaxlogs'})}} - |
| {{:helper.link('PURGE LOGS', null, {'action' : 'purgelogs'})}} - |
-
\ No newline at end of file
diff --git a/nano/templates/ntnet_relay.tmpl b/nano/templates/ntnet_relay.tmpl
deleted file mode 100644
index 8625f94dd14..00000000000
--- a/nano/templates/ntnet_relay.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- {{for data.ntnetlogs}}
- {{:value.entry}}
- {{/for}} -
- - {{/for}} -
Relay
-{{if data.dos_crashed}} -NETWORK BUFFERS OVERLOADED
-Overload Recovery Mode
- This system is suffering temporary outage due to overflow of traffic buffers. Until buffered traffic is processed, all further requests will be dropped. Frequent occurences of this error may indicate insufficient hardware capacity of your network. Please contact your network planning department for instructions on how to resolve this issue. -ADMINISTRATIVE OVERRIDE
- CAUTION - Data loss may occur - {{:helper.link('Purge buffered traffic', 'signal', {'action' : 'restart'})}} -{{else}} -
-
-
- Relay status
- {{:helper.link(data.enabled ? "ENABLED" : "DISABLED", 'power-off', {'action' : 'toggle'})}}
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/ntnet_transfer.tmpl b/nano/templates/ntnet_transfer.tmpl
deleted file mode 100644
index 660838b94dc..00000000000
--- a/nano/templates/ntnet_transfer.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-{{if data.error}}
- Network buffer status
- {{:data.dos_overload}}/{{:data.dos_capacity}} GQ
-
-
- {{:helper.link('Clear', null, {'action' : 'PRG_reset'})}} -
-{{else data.downloading}}
- An error has occurred during operation...
- Additional information: {{:data.error}}- {{:helper.link('Clear', null, {'action' : 'PRG_reset'})}} -
Download in progress...
-
-
- Downloaded file:
- {{:data.download_name}}
-
-
- Download progress:
- {{:helper.smoothRound(data.download_progress)}}/{{:data.download_size}}GQ
-
-
- Transfer speed:
- {{:data.download_netspeed}}GQ/s
-
-
-{{else data.uploading}}
- Controls:
- {{:helper.link('Abort download', 'arrow-left', {'action' : 'PRG_reset'})}}
- Server enabled
-
-
- Connected clients:
- {{:data.upload_clients}}
-
-
- Provided file:
- {{:data.upload_filename}}
-
-
- Server password:
- {{if data.upload_haspassword}}ENABLED{{else}}DISABLED{{/if}}
-
-
-{{else data.upload_filelist}}
- Commands:
-
- {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}}
- {{:helper.link('Exit server', 'arrow-left', {'action' : 'PRG_reset'})}}
-
- File transfer server ready. Select file to upload:
-| File name | File size | Controls - {{for data.upload_filelist}} - |
|---|---|---|
| {{:value.filename}} - | {{:value.size}}GQ - | {{:helper.link('Select', 'upload', {'action' : 'PRG_uploadfile', 'id' : value.uid})}} - {{/for}} - |
- {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}} - {{:helper.link('Return', 'arrow-left', {'action' : 'PRG_reset'})}} -{{else}} -
Available files:
-| Server UID | File Name | File Size | Password Protection | Operations - {{for data.servers}} - | |
|---|---|---|---|---|---|
| {{:value.uid}} - | {{:value.filename}} - | {{:value.size}}GQ - {{if value.haspassword}} - | Enabled - {{else}} - | Disabled - {{/if}} - - | {{:helper.link('Download', 'download', {'action' : 'PRG_downloadfile', 'id' : value.uid})}} - {{/for}} - |
- {{:helper.link('Send file', 'upload', {'action' : 'PRG_uploadmenu'})}} -{{/if}} \ No newline at end of file diff --git a/nano/templates/nuclear_bomb.tmpl b/nano/templates/nuclear_bomb.tmpl deleted file mode 100644 index f2a12651af6..00000000000 --- a/nano/templates/nuclear_bomb.tmpl +++ /dev/null @@ -1,145 +0,0 @@ - -{{if data.is_syndicate}} - {{:helper.syndicateMode()}} -{{/if}} -
-
-Authorization Disk:
-
- {{if data.auth}}
- {{:helper.link('++++++++++', 'eject', {'auth' : 1})}}
- {{else}}
- {{:helper.link('----------', 'floppy-o', {'auth' : 1})}}
- {{/if}}
-
--
-
-
-Status:
- {{:data.authstatus}} - {{:data.safe}}
-
-
-
-Time Left:
- {{:data.time}}
-
- {{if data.auth && data.yescode}}
-
-
-
-
-
- Timer
-
-
- {{:helper.link('On', 'play', {'timer' : 1}, data.timer ? 'selected' : '')}}
- {{:helper.link('Off', 'stop', {'timer' : 0}, !data.timer ? 'selected' : '')}}
-
-
-
-
- {{else}}
-
-
- Set Time
-
-
- {{:helper.link('--', '', {'time' : -10}, data.time <= 120 ? 'disabled' : '')}}
- {{:helper.link('-', '', {'time' : -1}, data.time <= 120 ? 'disabled' : '')}}
-
-
- {{:data.time}}
-
- {{:helper.link('+', '', {'time' : 1})}}
- {{:helper.link('++', '', {'time' : 10})}}
-
-
-
- Timer
-
-
- {{:helper.link('On', 'play', null, 'disabled')}}
- {{:helper.link('Off', 'pause', null, 'disabled')}}
-
-
-
- {{/if}}
-
- Set Time
-
-
- {{:helper.link('--', '', null, 'disabled')}}
- {{:helper.link('-', '', null, 'disabled')}}
-
-
- {{:data.time}}
-
- {{:helper.link('+', '', null, 'disabled')}}
- {{:helper.link('++', '', null, 'disabled')}}
-
- {{if data.auth && data.yescode}}
-
-
-
-
- Safety
-
-
- {{:helper.link('Engaged', 'info', {'safety' : 1}, data.safety ? 'selected' : '')}}
- {{:helper.link('Disengaged', 'exclamation-triangle', {'safety' : 0}, data.safety ? '' : 'selected')}}
-
-
-
-
- {{else}}
-
-
- Anchor
-
-
- {{:helper.link('Engaged', 'lock', {'anchor' : 1}, data.anchored ? 'selected' : '')}}
- {{:helper.link('Disengaged', 'unlock', {'anchor' : 0}, data.anchored ? '' : 'selected')}}
-
-
-
-
- Safety
-
-
- {{:helper.link('Engaged', 'info', null, 'disabled')}}
- {{:helper.link('Disengaged', 'exclamation-triangle', null, 'disabled')}}
-
-
-
- {{/if}}
-
- Anchor
-
-
- {{:helper.link('Engaged', 'lock', null, 'disabled')}}
- {{:helper.link('Disengaged', 'unlock', null, 'disabled')}}
-
- -
-
\ No newline at end of file
diff --git a/nano/templates/omni_filter.tmpl b/nano/templates/omni_filter.tmpl
deleted file mode 100644
index 8a3ffac0af7..00000000000
--- a/nano/templates/omni_filter.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-
- >{{if data.message}} {{:data.message}}{{/if}}
-
-
-
-
- {{:helper.link('1', '', {'type' : 1})}}{{:helper.link('2', '', {'type' : 2})}}{{:helper.link('3', '', {'type' : 3})}}
-
-
- {{:helper.link('4', '', {'type' : 4})}}{{:helper.link('5', '', {'type' : 5})}}{{:helper.link('6', '', {'type' : 6})}}
-
-
- {{:helper.link('7', '', {'type' : 7})}}{{:helper.link('8', '', {'type' : 8})}}{{:helper.link('9', '', {'type' : 9})}}
-
-
- {{:helper.link('R', '', {'type' : 'R'})}}{{:helper.link('0', '', {'type' : 0})}}{{:helper.link('E', '', {'type' : 'E'})}}
-
-
-
\ No newline at end of file
diff --git a/nano/templates/omni_mixer.tmpl b/nano/templates/omni_mixer.tmpl
deleted file mode 100644
index 3d637687553..00000000000
--- a/nano/templates/omni_mixer.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-
- {{:helper.link(data.power ? 'On' : 'Off', null, {'command' : 'power'}, data.config ? 'disabled' : null)}}
-
-
- {{:helper.link('Configure', null, {'command' : 'configure'}, null, data.config ? 'selected' : null)}}
-
-
- {{if data.config}}
-
-
-
-
-
-
- Port
- {{for data.ports}}
- {{:value.dir}} Port
- {{/for}}
-
-
- Input
- {{for data.ports}}
-
- {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : value.dir}, null, value.input ? 'selected' : null)}}
-
- {{/for}}
-
-
- Output
- {{for data.ports}}
-
- {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : value.dir}, null, value.output ? 'selected' : null)}}
-
- {{/for}}
-
-
- Filter
- {{for data.ports}}
-
- {{:helper.link(value.f_type ? value.f_type : 'None', null, {'command' : 'switch_filter', 'mode' : value.f_type, 'dir' : value.dir}, value.filter ? null : 'disabled', value.f_type ? 'selected' : null)}}
-
- {{/for}}
-
- Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-
-
- {{:helper.link('Set Flow Rate Limit', null, {'command' : 'set_flow_rate'})}}
-
-
- {{else}}
-
-
-
-
-
-
- Port
- {{for data.ports}}
- {{:value.dir}} Port
- {{/for}}
-
-
- Mode
- {{for data.ports}}
-
- {{if value.input}}
- Input
- {{else value.output}}
- Output
- {{else value.f_type}}
- {{:value.f_type}}
- {{else}}
- Disabled
- {{/if}}
-
- {{/for}}
-
- Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-
-
-
- Flow Rate: {{:(data.last_flow_rate/10)}} L/s
-
- {{/if}}
-
-
\ No newline at end of file
diff --git a/nano/templates/op_computer.tmpl b/nano/templates/op_computer.tmpl
deleted file mode 100644
index 77894bcba16..00000000000
--- a/nano/templates/op_computer.tmpl
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
- {{:helper.link(data.power ? 'On' : 'Off', null, {'command' : 'power'}, data.config ? 'disabled' : null)}}
-
-
- {{:helper.link('Configure', null, {'command' : 'configure'}, null, data.config ? 'selected' : null)}}
-
-
- {{if data.config}}
-
-
-
-
-
-
- Port
- {{for data.ports}}
- {{:value.dir}} Port
- {{/for}}
-
-
- Input
- {{for data.ports}}
-
- {{:helper.link(' ', null, value.input ? {'command' : 'switch_mode', 'mode' : 'none', 'dir' : value.dir} : {'command' : 'switch_mode', 'mode' : 'in', 'dir' : value.dir}, value.output ? 'disabled' : null, value.input ? 'selected' : null)}}
-
- {{/for}}
-
-
- Output
- {{for data.ports}}
-
- {{:helper.link(' ', null, value.output ? null : {'command' : 'switch_mode', 'mode' : 'out', 'dir' : value.dir}, null, value.output ? 'selected' : null)}}
-
- {{/for}}
-
-
- Concentration
- {{for data.ports}}
-
- {{:helper.link( value.input ? helper.round(value.concentration*100)+' %' : '-', null, {'command' : 'switch_con', 'dir' : value.dir}, value.input ? null : 'disabled')}}
-
- {{/for}}
-
-
- Lock
- {{for data.ports}}
-
- {{:helper.link(' ', value.con_lock ? 'lock' : 'unlock', {'command' : 'switch_conlock', 'dir' : value.dir}, value.input ? null : 'disabled', value.con_lock ? 'selected' : null)}}
-
- {{/for}}
-
- Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-
-
- {{:helper.link('Set Flow Rate Limit', null, {'command' : 'set_flow_rate'})}}
-
-
- {{else}}
-
-
-
-
-
-
- Port
- {{for data.ports}}
- {{:value.dir}} Port
- {{/for}}
-
-
- Mode
- {{for data.ports}}
-
- {{if value.input}}
- Input
- {{else value.output}}
- Output
- {{else}}
- Disabled
- {{/if}}
-
- {{/for}}
-
-
- Concentration
- {{for data.ports}}
-
- {{if value.input}}
- {{:helper.round(value.concentration*100)}} %
- {{else}}
- -
- {{/if}}
-
- {{/for}}
-
- Flow Rate: {{:(data.last_flow_rate/10)}} L/s
-
-
- {{/if}}
-Patient Monitor
- -
- {{if data.choice==0}}
- {{if !data.hasOccupant}}
-
-
-
- {{/if}} -
-
-
-
-
diff --git a/nano/templates/order_console.tmpl b/nano/templates/order_console.tmpl
deleted file mode 100644
index 271e35c525a..00000000000
--- a/nano/templates/order_console.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-No Patient Detected
- {{else}}
-
- {{:data.occupant.name}} =>
- {{if data.occupant.stat == 0}}
- Conscious
- {{else data.occupant.stat == 1}}
- Unconscious
- {{else}}
- DEAD
- {{/if}}
-
-
-
-
-
- Health:
- {{if data.occupant.health >= data.occupant.maxHealth}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
- {{else data.occupant.health > 0}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'average')}}
- {{else data.occupant.health >= data.minhealth}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
- {{else}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'bad alignRight')}}
- {{/if}}
- {{:helper.smoothRound(data.occupant.health)}}
-
-
-
- Brute Damage:
- {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.bruteLoss)}}
-
-
-
- Resp. Damage:
- {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.oxyLoss)}}
-
-
-
- Toxin Damage:
- {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.toxLoss)}}
-
-
-
- Burn Severity:
- {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.fireLoss)}}
-
-
- {{if data.occupant.hasBlood}}
- Patient Temperature:
- {{if data.occupant.temperatureSuitability == -3}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'bad')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == -2}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == -1}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 0}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'good')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 1}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 2}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 3}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'bad')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{/if}}
- -
-
- Blood Level:
- {{if data.occupant.bloodPercent <= 60}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'bad')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{else data.occupant.bloodPercent <= 90}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'average')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{else}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'good')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{/if}}
-
-
- Blood Type:
{{:data.occupant.bloodType}}
-
-
- {{/if}}
- {{if data.occupant.inSurgery}}
- Pulse:
{{:data.occupant.pulse}} bpm
-
-
-
- {{/if}}
- Initiated Surgery Procedure:
{{:data.occupant.surgeryName}}
- -
Next Step:
{{:data.occupant.stepName}}
-
- -
- {{/if}} -
-
- {{else}}
-
- {{:helper.link('Options', 'gear', {'choiceOn' : 1})}}
-
-
-
-
- Loudspeaker:
-
-
- {{:helper.link('On', 'power-off', {'verboseOn' : 1}, data.verbose ? 'selected' : null)}}
- {{:helper.link('Off', 'close', {'verboseOff' : 1}, data.verbose ? null : 'selected')}}
-
- -
-
-
-
- Health Announcer:
-
-
- {{:helper.link('On', 'power-off', {'healthOn' : 1}, data.health ? 'selected' : null)}}
- {{:helper.link('Off', 'close', {'healthOff' : 1}, data.health ? null : 'selected')}}
-
-
-
-
-
- Health Announcer Threshold:
- {{:helper.link('-', null, {'health_adj' : -100}, (data.healthAlarm >= 0) ? null : 'disabled')}}
- {{:helper.link('-', null, {'health_adj' : -10}, (data.healthAlarm >= -90) ? null : 'disabled')}}
- {{:helper.link('-', null, {'health_adj' : -1}, (data.healthAlarm > -100) ? null : 'disabled')}}
-
- {{if data.healthAlarm >= 100}}
- {{:helper.displayBar(data.healthAlarm, 0, 100, 'good')}}
- {{else data.healthAlarm > 0}}
- {{:helper.displayBar(data.healthAlarm, 0, 100, 'average')}}
- {{else data.healthAlarm >= -100}}
- {{:helper.displayBar(data.healthAlarm, 0, -100, 'average alignRight')}}
- {{else}}
- {{:helper.displayBar(data.healthAlarm, 0, -100, 'bad alignRight')}}
- {{/if}}
-
- {{:helper.link('+', null, {'health_adj' : 1}, (data.healthAlarm < 100) ? null : 'disabled')}}
- {{:helper.link('+', null, {'health_adj' : 10}, (data.healthAlarm <= 90) ? null : 'disabled')}}
- {{:helper.link('+', null, {'health_adj' : 100}, (data.healthAlarm <= 0) ? null : 'disabled')}}
- {{: data.healthAlarm }}
- -
-
-
-
- Oxygen Alarm:
-
-
- {{:helper.link('On', 'power-off', {'oxyOn' : 1}, data.oxy ? 'selected' : null)}}
- {{:helper.link('Off', 'close', {'oxyOff' : 1}, data.oxy ? null : 'selected')}}
-
-
-
-
-
- Oxygen Alert Threshold:
- {{:helper.link('-', null, {'oxy_adj' : -100}, (data.oxyAlarm >= 100) ? null : 'disabled')}}
- {{:helper.link('-', null, {'oxy_adj' : -10}, (data.oxyAlarm >= 10) ? null : 'disabled')}}
- {{:helper.link('-', null, {'oxy_adj' : -1}, (data.oxyAlarm >= 0) ? null : 'disabled')}}
- {{:helper.displayBar( data.oxyAlarm, 0, 200, 'good')}}
- {{:helper.link('+', null, {'oxy_adj' : 1}, (data.oxyAlarm < 200) ? null : 'disabled')}}
- {{:helper.link('+', null, {'oxy_adj' : 10}, (data.oxyAlarm <= 190) ? null : 'disabled')}}
- {{:helper.link('+', null, {'oxy_adj' : 100}, (data.oxyAlarm <= 100) ? null : 'disabled')}}
- {{: data.oxyAlarm }}
- -
-
-
- Critical Alert:
-
-
- {{:helper.link('On', 'power-off', {'critOn' : 1}, data.crit ? 'selected' : null)}}
- {{:helper.link('Off', 'close', {'critOff' : 1}, data.crit ? null : 'selected')}}
-
- -
-
- {{/if}}
-
- {{:helper.link('Return', 'arrow-left', {'choiceOff' : 1})}}
-
-
-
-
- Supply Points:
-
-
- {{:data.points}}
-
-
-
-
- Shuttle Status:
-
-
- {{if !data.moving && !data.at_station}}
- Docked off-station.
- {{else !data.moving && data.at_station}}
- Docked at the station.
- {{else data.moving}}
- Shuttle is en route (ETA: {{:data.timeleft}} minute{{if data.timeleft != 1}}s{{/if}}).
- {{/if}}
-
-
-
-
- Supply Crates
-
-
-
-
-
-
-
-
-
- Categories
-
- {{for data.categories}}
-
- {{:helper.link(value.name, 'gear', {'last_viewed_group':value.category}, (data.last_viewed_group==value.category) ? 'linkOn' : '', 'category')}}
-
- {{/for}}
-
-
\ No newline at end of file
diff --git a/nano/templates/pacman.tmpl b/nano/templates/pacman.tmpl
deleted file mode 100644
index f76d967a6af..00000000000
--- a/nano/templates/pacman.tmpl
+++ /dev/null
@@ -1,113 +0,0 @@
-
- Supply Orders
-
-
-
-
-
-
- Status
-
-
-
- Generator Status:
-
-
- {{if data.active}}
- Online
- {{else}}
- Offline
- {{/if}}
-
-
- Generator Control:
-
-
- {{if data.active}}
- {{:helper.link('STOP', 'power-off', {'action' : "disable"})}}
- {{else}}
- {{:helper.link('START', 'power-off', {'action' : "enable"})}}
- {{/if}}
-
-Fuel
-
-
-
- Fuel Type:
-
-
- {{:data.fuel_type}}
-
-
- Fuel Level:
-
-
- {{if data.fuel_stored >= 5000}}
- {{:helper.displayBar(data.fuel_stored, 0, data.fuel_capacity, 'good')}}
-
{{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{else data.fuel_stored >= 1000}} - {{:helper.displayBar(data.fuel_stored, 0, data.fuel_capacity, 'average')}} -
{{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{else}} - {{:helper.displayBar(data.fuel_stored, 0, data.fuel_capacity, 'bad')}} -
{{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{/if}} -
- {{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{else data.fuel_stored >= 1000}} - {{:helper.displayBar(data.fuel_stored, 0, data.fuel_capacity, 'average')}} -
{{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{else}} - {{:helper.displayBar(data.fuel_stored, 0, data.fuel_capacity, 'bad')}} -
{{:helper.smoothRound(data.fuel_stored)}}/{{:data.fuel_capacity}} cm3 - {{/if}} -
- Fuel Usage:
-
-
- {{:helper.smoothRound(data.fuel_usage)}} cm3/s
-
- {{if !data.is_ai}}
-
- Control:
-
-
- {{:helper.link('EJECT FUEL', 'arrow-down', {'action' : "eject"}, data.active ? 'disabled' : null)}}
-
- {{/if}}
-Output
-
-
-
- Power setting:
-
-
- {{if data.output_set > data.output_safe}}
- {{:data.output_set}} / {{:data.output_max}} ({{:data.output_watts}} W)
- {{else}}
- {{:data.output_set}} / {{:data.output_max}} ({{:data.output_watts}} W)
- {{/if}}
-
-
- Control:
-
-
- {{:helper.link('+', null, {'action' : "higher_power"})}}
- {{:helper.link('-', null, {'action' : "lower_power"})}}
-
-Temperature
-
-
\ No newline at end of file
diff --git a/nano/templates/portpump.tmpl b/nano/templates/portpump.tmpl
deleted file mode 100644
index 91e37f38975..00000000000
--- a/nano/templates/portpump.tmpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
- Temperature:
-
-
- {{if data.temperature_current < (data.temperature_max * 0.8)}}
- {{:helper.displayBar(data.temperature_current, 0, (data.temperature_max * 1.5), 'good')}}
-
{{:helper.smoothRound(data.temperature_current)}} C - {{else data.temperature_current < data.temperature_max}} - {{:helper.displayBar(data.temperature_current, 0, (data.temperature_max * 1.5), 'average')}} -
{{:helper.smoothRound(data.temperature_current)}} C - {{else}} - {{:helper.displayBar(data.temperature_current, 0, (data.temperature_max * 1.5), 'bad')}} -
{{:helper.smoothRound(data.temperature_current)}} C - {{/if}} -
- {{:helper.smoothRound(data.temperature_current)}} C - {{else data.temperature_current < data.temperature_max}} - {{:helper.displayBar(data.temperature_current, 0, (data.temperature_max * 1.5), 'average')}} -
{{:helper.smoothRound(data.temperature_current)}} C - {{else}} - {{:helper.displayBar(data.temperature_current, 0, (data.temperature_max * 1.5), 'bad')}} -
{{:helper.smoothRound(data.temperature_current)}} C - {{/if}} -
- Generator Status:
-
-
- {{if data.temperature_overheat > 50}}
- DANGER: CRITICAL OVERHEAT! Deactivate generator immediately!
- {{else data.temperature_overheat > 20}}
- WARNING: Overheating!
- {{else data.temperature_overheat > 1}}
- Temperature High
- {{else}}
- Optimal
- {{/if}}
-
-Pump Status
-
-
-
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.tankPressure)}} kPa
-
-
-
-
-
- Port Status:
-
-
- {{:data.portConnected ? 'Connected' : 'Disconnected'}}
-
-Holding Tank Status
-{{if data.hasHoldingTank}} -
-
-
-
- Tank Label:
-
-
-
- {{:data.holdingTank.name}}
{{:helper.link('Eject', 'eject', {'remove_tank' : 1})}}
-
-
-{{else}}
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.holdingTank.tankPressure)}} kPa
-
- No holding tank inserted.
- Power Regulator Status
-
-
-
-
- Target Pressure:
-
-
- {{:helper.displayBar(data.targetpressure, data.minpressure, data.maxpressure)}}
-
-
- {{:helper.link('-', null, {'pressure_adj' : -1000}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -100}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -10}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
- {{:helper.link('-', null, {'pressure_adj' : -1}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
-
- {{:data.targetpressure}} kPa
- {{:helper.link('+', null, {'pressure_adj' : 1}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 10}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 100}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'pressure_adj' : 1000}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
-
-
-
-
- Power Switch:
-
-
- {{:helper.link('On', 'unlock', {'power' : 1}, data.on ? 'selected' : null)}}{{:helper.link('Off', 'lock', {'power' : 1}, data.on ? null : 'selected')}}
-
-
-
-
-
diff --git a/nano/templates/portscrubber.tmpl b/nano/templates/portscrubber.tmpl
deleted file mode 100644
index 855b290886e..00000000000
--- a/nano/templates/portscrubber.tmpl
+++ /dev/null
@@ -1,74 +0,0 @@
-
- Pump Direction:
-
-
- {{:helper.link('Out', 'arrow-right', {'direction' : 1}, data.pump_dir ? 'selected' : null)}}{{:helper.link('In', 'arrow-left', {'direction' : 1}, data.pump_dir ? null : 'selected')}}
-
-Scrubber Status
-
-
-
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.tankPressure)}} kPa
-
-
-
-
-
- Port Status:
-
-
- {{:data.portConnected ? 'Connected' : 'Disconnected'}}
-
-Holding Tank Status
-{{if data.hasHoldingTank}} -
-
-
-
- Tank Label:
-
-
-
- {{:data.holdingTank.name}}
{{:helper.link('Eject', 'eject', {'remove_tank' : 1})}}
-
-
-{{else}}
-
- Tank Pressure:
-
-
- {{:helper.smoothRound(data.holdingTank.tankPressure)}} kPa
-
- No holding tank inserted.
- Power Regulator Status
-
-
-
-
- Volume Rate:
-
-
- {{:helper.displayBar(data.rate, data.minrate, data.maxrate)}}
-
-
- {{:helper.link('-', null, {'volume_adj' : -1000}, (data.rate > data.minrate) ? null : 'disabled')}}
- {{:helper.link('-', null, {'volume_adj' : -100}, (data.rate > data.minrate) ? null : 'disabled')}}
- {{:helper.link('-', null, {'volume_adj' : -10}, (data.rate > data.minrate) ? null : 'disabled')}}
- {{:helper.link('-', null, {'volume_adj' : -1}, (data.rate > data.minrate) ? null : 'disabled')}}
-
- {{:data.rate}} kPa
- {{:helper.link('+', null, {'volume_adj' : 1}, (data.rate < data.maxrate) ? null : 'disabled')}}
- {{:helper.link('+', null, {'volume_adj' : 10}, (data.rate < data.maxrate) ? null : 'disabled')}}
- {{:helper.link('+', null, {'volume_adj' : 100}, (data.rate < data.maxrate) ? null : 'disabled')}}
- {{:helper.link('+', null, {'volume_adj' : 1000}, (data.rate < data.maxrate) ? null : 'disabled')}}
-
-
-
diff --git a/nano/templates/radio_basic.tmpl b/nano/templates/radio_basic.tmpl
deleted file mode 100644
index c6a59d59691..00000000000
--- a/nano/templates/radio_basic.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
-
-{{if data.useSyndMode}}
- {{:helper.syndicateMode()}}
-{{/if}}
-
-
- Power Switch:
-
-
- {{:helper.link('On', 'unlock', {'power' : 1}, data.on ? 'selected' : null)}}{{:helper.link('Off', 'lock', {'power' : 1}, data.on ? null : 'selected')}}
-
-
-
-
-
- Microphone
-
-
- {{if data.mic_cut}}
- {{:helper.link('On', null, null, 'disabled')}}
- {{:helper.link('Off', null, null, 'disabled')}}
- {{else}}
- {{:helper.link('On', null, {'talk' : 0}, data.mic_status ? 'selected' : null)}}
- {{:helper.link('Off', null, {'talk' : 1}, data.mic_status ? null : 'selected')}}
- {{/if}}
-
-
-
-
-{{if data.has_subspace}}
-
- Speaker
-
-
- {{if data.spk_cut}}
- {{:helper.link('On', null, null, 'disabled')}}
- {{:helper.link('Off', null, null, 'disabled')}}
- {{else}}
- {{:helper.link('On', null, {'listen' : 0}, data.speaker ? 'selected' : null)}}
- {{:helper.link('Off', null, {'listen' : 1}, data.speaker ? null : 'selected')}}
- {{/if}}
-
-
-
-{{/if}}
-
-{{if data.has_loudspeaker}}
-
- Subspace Transmission:
-
-
- {{:helper.link('On', null, {'mode' : 1}, data.subspace ? 'selected' : null)}}
- {{:helper.link('Off', null, {'mode' : 0}, data.subspace ? null : 'selected')}}
-
-
-
-{{/if}}
-
-
- Loudspeaker:
-
-
- {{:helper.link('On', null, {'shutup' : 0}, data.loudspeaker ? 'selected' : null)}}
- {{:helper.link('Off', null, {'shutup' : 1}, data.loudspeaker ? null : 'selected')}}
-
-
-
-
-{{if data.chan_list_len >= 1}}
-
- Frequency: {{:data.freq}}
-
-
- {{:helper.link('--', null, {'freq' : -10})}}
- {{:helper.link('-', null, {'freq' : -2})}}
- {{:helper.link('+', null, {'freq' : 2})}}
- {{:helper.link('++', null, {'freq' : 10})}}
-
-Channels
-
- {{for data.chan_list}}
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/radio_electro.tmpl b/nano/templates/radio_electro.tmpl
deleted file mode 100644
index 9fb8183ad01..00000000000
--- a/nano/templates/radio_electro.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- ◼{{:value.display_name}}
-
-
- {{if value.secure_channel}}
- {{:helper.link('On', null, {'ch_name' : value.chan, 'listen' : value.sec_channel_listen}, value.sec_channel_listen ? null : 'selected')}}
- {{:helper.link('Off', null, {'ch_name' : value.chan, 'listen' : value.sec_channel_listen}, value.sec_channel_listen ? 'selected' : null)}}
- {{else}}
- {{:helper.link('Switch', null, {'spec_freq' : value.chan}, data.rawfreq == value.chan ? 'selected' : null)}}
- {{/if}}
-
- {{/for}}
-
-
-
-
- Power
-
-
- {{:helper.link('On', null, {'power' : 1}, data.power ? 'selected' : null)}}
- {{:helper.link('Off', null, {'power' : 1}, data.power ? null : 'selected')}}
-
-
-
-
-
- Frequency: {{:data.freq}}
-
-
- {{:helper.link('--', null, {'freq' : -10})}}
- {{:helper.link('-', null, {'freq' : -2})}}
- {{:helper.link('+', null, {'freq' : 2})}}
- {{:helper.link('++', null, {'freq' : 10})}}
-
-
-
\ No newline at end of file
diff --git a/nano/templates/revelation.tmpl b/nano/templates/revelation.tmpl
deleted file mode 100644
index 5412c440caa..00000000000
--- a/nano/templates/revelation.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{:helper.syndicateMode()}}
-
- Code: {{:data.code}}
-
-
- {{:helper.link('--', null, {'code' : -5})}}
- {{:helper.link('-', null, {'code' : -1})}}
- {{:helper.link('+', null, {'code' : 1})}}
- {{:helper.link('++', null, {'code' : 5})}}
-
-
-
\ No newline at end of file
diff --git a/nano/templates/robot_control.tmpl b/nano/templates/robot_control.tmpl
deleted file mode 100644
index 6e97ffaf3d7..00000000000
--- a/nano/templates/robot_control.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{if data.robots}}
- {{if !data.is_ai}}
-
- Payload status:
-
-
- {{if data.armed}}
- ARMED
- {{else}}
- DISARMED
- {{/if}}
-
-
- Controls:
-
-
-
-
-
-| {{:helper.link('OBFUSCATE PROGRAM NAME', 'eye-slash', {'action' : 'PRG_obfuscate'})}} - |
| {{:helper.link(data.armed ? 'DISARM' : 'ARM', data.armed ? 'crosshairs' : 'info', {'action' : 'PRG_arm'})}} - {{:helper.link('ACTIVATE', 'exclamation-triangle', {'action' : 'PRG_activate'}, data.armed ? null : 'disabled', data.armed ? 'redButton' : null)}} - |
-
- {{/if}}
- {{for data.robots}}
-
- Emergency Self-Destruct:
-
-
- {{if data.safety}}
- {{:helper.link('ARM', 'unlock', {'arm' : 1}, !data.allowed ? 'disabled' : null)}}
- {{:helper.link('DETONATE', 'exclamation-circle', {'nuke' : 1}, 'disabled')}}
- {{else}}
- {{:helper.link('DISARM', 'lock', {'arm' : 1}, !data.allowed ? 'disabled' : null)}}
- {{:helper.link('DETONATE', 'exclamation-circle', {'nuke' : 1}, !data.allowed ? 'disabled' : null, 'redButton')}}
- {{/if}}
-
-
- -
-
- {{/for}}
-{{else}}
- {{:value.name}}
-Information
- - Status: - - - {{:value.status}} - - - System Integrity: - - - {{:helper.smoothRound(value.health)}}% - - - Location: - - - ({{:value.xpos}}, {{:value.ypos}}, {{:value.zpos}}): {{:value.area}} - - - Master AI: - - - {{:value.master_ai}} - - - Module: - - - {{:value.module}} - - - {{if value.hackable}} - - Safeties: - - - ENABLED - - {{else value.hacked}} - - Safeties: - - - DISABLED - - {{/if}} -Power Cell
- {{if value.cell}} - - Rating: - - - {{:value.cell_capacity}} - - {{:helper.displayBar(value.cell_percentage, 0, 100, (value.cell_percentage >= 50) ? 'good' : (value.cell_percentage >= 25) ? 'average' : 'bad')}} - {{:helper.smoothRound(value.cell_percentage)}}% - {{else}} - Not Installed - {{:helper.displayBar(100, 0, 100, 'bad')}} - {{/if}} -Actions
- {{if value.status == "Operational"}} - {{:helper.link('Lockdown', 'lock', {'lockdown' : value.name}, !data.allowed ? 'disabled' : null)}} - {{else}} - {{:helper.link('Unlock', 'unlock', {'lockdown' : value.name}, !data.allowed ? 'disabled' : null)}} - {{/if}} - {{:helper.link('Self-Destruct', 'exclamation-circle', {'detonate' : value.name}, !data.allowed ? 'disabled' : null, 'redButton')}} - {{if value.hackable}} - {{:helper.link('Hack', 'calculator', {'hack' : value.name}, !data.allowed ? 'disabled' : null, 'redButton')}} - {{/if}} -
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/sec_camera.tmpl b/nano/templates/sec_camera.tmpl
deleted file mode 100644
index ebcf44c7ddb..00000000000
--- a/nano/templates/sec_camera.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-{{:helper.link('Show Map', 'thumb-tack', {'showMap' : 1})}}
-{{:helper.link('Reset', 'refresh', {'reset' : 1})}}
-No robots were found.
-
-
-
-{{if data.networks}}
-Current Camera:
- {{if data.current}}
- {{:data.current.name}}
- {{else}}
- None
- {{/if}}
-
-
-{{/if}}
-Networks
- Please select the networks you'd like this console to monitor. - {{if data.emagged}} -WARNING: Unauthorized access detected.
- {{/if}}
-
- {{for data.networks}}
- {{:helper.link(value.name, value.active ? 'minus' : 'plus', { 'activate' : value.name, 'active' : value.active }, '', value.active ? 'linkOn' : '')}}
- {{/for}}
-
-
-
-
diff --git a/nano/templates/sec_camera_map_content.tmpl b/nano/templates/sec_camera_map_content.tmpl
deleted file mode 100644
index 52dc8aeadd6..00000000000
--- a/nano/templates/sec_camera_map_content.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-{{for data.cameras}}
- {{if value.z == 1}}
- Cameras
- {{for data.cameras}} - {{if data.current && value.name == data.current.name}} - {{:helper.link(value.name, '', {'switchTo' : value.camera}, 'selected')}} - {{else value.deact}} - {{:helper.link(value.name + " (deactivated)", '', {}, 'inactive')}} - {{else}} - {{:helper.link(value.name, '', {'switchTo' : value.camera})}} - {{/if}} - {{/for}} -
- {{if data.current && value.name == data.current.name}}
- {{:helper.link("#", '', {'switchTo' : value.camera}, 'selected')}}
- {{else value.deact}}
- {{:helper.link('#', '', {}, 'inactive')}}
- {{else}}
- {{:helper.link("#", '', {'switchTo' : value.camera})}}
- {{/if}}
-
-
- {{/if}}
-{{/for}}
\ No newline at end of file
diff --git a/nano/templates/sec_camera_map_header.tmpl b/nano/templates/sec_camera_map_header.tmpl
deleted file mode 100644
index ebe90da3015..00000000000
--- a/nano/templates/sec_camera_map_header.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-{{:helper.link('Show Camera List', 'file-text', {'showMap' : 0})}}
-{{:helper.link('Reset', 'refresh', {'reset' : 1})}}
-
-
-
-
-Current Camera:
- {{if data.current}}
- {{:data.current.name}}
- {{else}}
- None
- {{/if}}
-
- Zoom Level:
-
diff --git a/nano/templates/shuttle_console.tmpl b/nano/templates/shuttle_console.tmpl
deleted file mode 100644
index 8277e92eb76..00000000000
--- a/nano/templates/shuttle_console.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-x1
- x2
- x4
- x8
-
-
-{{if data.shuttle}}
- {{if data.docking_ports_len}}
- Location:
- {{:data.status ? data.status : '*Missing*'}}
--
- {{for data.docking_ports}}
-
- {{else}}
- {{:helper.link('Send to ' + value.name, 'sign-out', {'move' : value.id})}}
- {{/for}}
-
-
- Status:
- Shuttle locked
- {{if data.admin_controlled}}
- , authorized personnel only
-
-
{{:helper.link('Request authorization', 'share-square-o', {'request' : 1})}}
- {{else}}
-
-
- - {{/if}} - {{/if}} - - {{if data.docking_request}} -
{{:helper.link('Request docking at the station', 'share-square-o', {'request' : 1})}}
- {{/if}}
-{{/if}}
diff --git a/nano/templates/skills_data.tmpl b/nano/templates/skills_data.tmpl
deleted file mode 100644
index 6f8fb1d6a0d..00000000000
--- a/nano/templates/skills_data.tmpl
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
-
-{{if !data.temp && data.screen == 1}}
-
-{{/if}}
-
-
-
-
-
- Confirm Identity:
-
-
- {{:helper.link(data.scan ? data.scan : "----------", 'eject', {'scan' : 1}, null, data.scan ? 'itemContentWide' : 'fixedLeft')}}
-
--{{if data.authenticated}} - {{if data.screen == 1}} -
-
- {{:helper.link('New Record', 'plus', {'new_g' : 1})}}
- Record List
- | - Search: - | -
-
-
-
-
-
-
- | {{:helper.link('Name', null, {'sort' : 'name'}, null, 'infoButton')}} | -{{:helper.link('ID', null, {'sort' : 'id'}, null, 'infoButton')}} | -{{:helper.link('Rank', null, {'sort' : 'rank'}, null, 'infoButton')}} | -{{:helper.link('Fingerprints', null, {'sort' : 'fingerprint'}, null, 'infoButton')}} | -
|---|---|---|---|
| {{:helper.link(value.name, 'user', {'d_rec' : value.ref}, null, 'infoButton')}} | -{{:value.id}} | -{{:value.rank}} | -{{:value.fingerprint}} | -
Menu
- {{:helper.link('Record Maintenance', 'wrench', {'screen' : 2})}}
- {{:helper.link('Logout', 'lock', {'logout' : 1})}}
- {{else data.screen == 2}}
- Records Maintenance
-{{:helper.link('Backup To Disk', 'download', {'back' : 1}, 'disabled')}}
- {{:helper.link('Upload From disk', 'upload', {'u_load' : 1}, 'disabled')}}
- {{:helper.link('Delete All Records', 'trash', {'del_all' : 1})}}
- {{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
- {{else data.screen == 3}}
- Employment Record
- General Data
- {{if data.general.empty}}
-
-
-
-
- |
- {{for data.general.fields}}
-
-
- {{/for}}
-
- {{:value.field}}
-
-
- {{:helper.link(value.value, value.name ? 'pencil' : 'user-times', {'field' : value.name}, value.name ? null : 'disabled')}}
-
- |
-
- {{if data.general.has_photos}}
- {{for data.general.photos}}
- {{if value.photo}}
- |
-
Employment Data
-
-
- {{/if}}
-
- Employment/skills summary:
-
-
- {{:data.general.notes ? data.general.notes : 'None'}}
-
- Menu
- {{:helper.link('Delete Record (All)', 'trash', {'del_rg' : 1})}}
- {{:helper.link('Print Record', 'print', {'print_r' : 1})}}
- {{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
- {{/if}}
-{{else}}
- Menu
- {{:helper.link('Login', 'unlock', {'login' : 1})}} -{{/if}} - -{{if data.temp}} -
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/sleeper.tmpl b/nano/templates/sleeper.tmpl
deleted file mode 100644
index cacf6c83ff5..00000000000
--- a/nano/templates/sleeper.tmpl
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
- {{if data.temp.notice}}
- {{:data.temp.text}}
- {{else}}
- {{:data.temp.text}}
- {{/if}}
-
-
- {{if data.temp.has_buttons}}
-
-
-
- {{/if}}
-
-
-
-
- {{for data.temp.buttons}}
- {{:helper.link(value.name, value.icon, {'temp' : 1, 'temp_action' : value.val}, value.status)}}
- {{/for}}
-
-
-
- {{:helper.link('Clear screen', 'home', {'temp' : 1})}}
- Sleeper Status
- -
- {{if !data.hasOccupant}}
-
-
-
-
-Sleeper Unoccupied
- {{else}}
-
- {{:data.occupant.name}} =>
- {{if data.occupant.stat == 0}}
- Conscious
- {{else data.occupant.stat == 1}}
- Unconscious
- {{else}}
- DEAD
- {{/if}}
-
-
-
-
-
- Health:
- {{if data.occupant.health >= data.occupant.maxHealth}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
- {{else data.occupant.health > 0}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'average')}}
- {{else data.occupant.health >= data.minhealth}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
- {{else}}
- {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'bad alignRight')}}
- {{/if}}
- {{:helper.smoothRound(data.occupant.health)}}
-
-
-
- => Brute Damage:
- {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.bruteLoss)}}
-
-
-
- => Resp. Damage:
- {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.oxyLoss)}}
-
-
-
- => Toxin Damage:
- {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.toxLoss)}}
-
-
-
- => Burn Severity:
- {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}}
- {{:helper.smoothRound(data.occupant.fireLoss)}}
- -
-
-
-
-
- {{if data.occupant.hasBlood}}
-
- Patient Temperature:
- {{if data.occupant.temperatureSuitability == -3}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'bad')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == -2}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == -1}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 0}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'good')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 1}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 2}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'average')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{else data.occupant.temperatureSuitability == 3}}
- {{:helper.displayBar(data.occupant.bodyTemperature, 0, data.occupant.maxTemp, 'bad')}}
- {{:helper.smoothRound(data.occupant.btCelsius)}}°C, {{:helper.smoothRound(data.occupant.btFaren)}}°F
- {{/if}}
- -
-
- Pulse:
{{:data.occupant.pulse}} bpm
-
-
- {{/if}}
- {{/if}}
-Blood Level:
- {{if data.occupant.bloodPercent <= 60}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'bad')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{else data.occupant.bloodPercent <= 90}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'average')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{else}}
- {{:helper.displayBar(data.occupant.bloodLevel, 0, data.occupant.bloodMax, 'good')}}
-
- {{:helper.smoothRound(data.occupant.bloodPercent)}}%, {{:helper.smoothRound(data.occupant.bloodLevel)}}cl
-
- {{/if}}
- Sleeper Operation
-
-
-
- Sleeper Status:
-
-
- {{:helper.link('Eject Occupant', 'arrow-circle-o-down', {'ejectify' : 1}, data.hasOccupant ? null : 'disabled')}}
-
-
-
-
- Dialysis Beaker:
-
-
- {{if data.isBeakerLoaded}}
- {{:helper.smoothRound(data.beakerFreeSpace)}} units of space remaining
- {{else}} - No Dialysis Output Beaker Loaded - {{/if}} -
- - {{else}} - No Dialysis Output Beaker Loaded - {{/if}} -
- {{:helper.link('Eject Beaker', 'eject', {'removebeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
- {{if data.isBeakerLoaded}}
-
-
-
- {{/if}}
-
- {{:helper.link('On', 'power-off', {'togglefilter' : 1}, data.occupant.hasBlood ? (data.dialysis ? 'selected' : null) : 'disabled')}}{{:helper.link('Off', 'close', {'togglefilter' : 1}, data.dialysis ? null : 'selected')}}
-
-
-
-
-
diff --git a/nano/templates/slotmachine.tmpl b/nano/templates/slotmachine.tmpl
deleted file mode 100644
index 29545450a14..00000000000
--- a/nano/templates/slotmachine.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-{{if data.money != null}}
-
- Chemicals:
-
-
- {{for data.chemicals}}
- {{:value.title}}
-
- {{if value.overdosing}}
- {{:helper.displayBar(value.occ_amount, 0, data.maxchem, 'bad')}}
- {{else value.od_warning}}
- {{:helper.displayBar(value.occ_amount, 0, data.maxchem, 'average')}}
- {{else}}
- {{:helper.displayBar(value.occ_amount, 0, data.maxchem, 'good')}}
- {{/if}}
-
-
- {{:helper.smoothRound(value.pretty_amount)}}/{{:data.maxchem}}
- -
-
- {{/for}}
-
-
- {{:helper.link('5', 'gear', {'chemical' : value.id, 'amount' : 5}, (!value.injectable || ((value.occ_amount + 5) > data.maxchem)) ? 'disabled' : null)}}
- {{:helper.link('10', 'gear', {'chemical' : value.id, 'amount' : 10}, (!value.injectable || ((value.occ_amount + 10) > data.maxchem)) ? 'disabled' : null)}}
-
-
-
-
- Auto-eject dead patients:
-
-
- {{:helper.link('On', 'power-off', {'auto_eject_dead_on' : 1}, data.auto_eject_dead ? 'selected' : null)}}{{:helper.link('Off', 'close', {'auto_eject_dead_off' : 0}, data.auto_eject_dead ? null : 'selected')}}
-
-
- {{:data.plays}} players have tried their luck today!
-
-
-
- Credits Remaining:
- {{:helper.string("{1}
", data.money >= 10 ? "" : "bad", helper.smoothRound(data.money))}}
-
-
- {{if data.result}}
-
- Ten credits to play!
-
-
- {{:helper.link('SPIN!', 'refresh', {'ops' : 1}, data.money >= 10 && !data.working ? null : 'disabled')}}
-
-
- {{:data.result}}
-
- {{/if}}
- {{if data.working}}
- Spinning!
- {{/if}}
-{{else}}
-
- Could not scan your card or could not find account!
- Please wear or hold your ID and try again. -
-{{/if}}
diff --git a/nano/templates/smartfridge.tmpl b/nano/templates/smartfridge.tmpl
deleted file mode 100644
index 3c59892486d..00000000000
--- a/nano/templates/smartfridge.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-- Please wear or hold your ID and try again. -
- {{:helper.link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}}
-
-
-
-
-Storage
- {{if data.secure}} - - {{:data.locked == -1 ? "Sec.re ACC_** //):securi_nt.diag=>##'or 1=1'%($..." : "Secure Access: Please have your identification ready."}} - - {{/if}} -
- {{if data.can_dry}}
-
-
- Drying:
-
-
- {{:helper.link('On', 'power-off', {'dryingOn' : 1}, data.drying ? 'selected' : null)}}{{:helper.link('Off', 'close', {'dryingOff' : 1}, data.drying ? null : 'selected')}}
-
- {{/if}}
-
- {{if data.contents}}
- {{for data.contents}}
-
diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl
deleted file mode 100644
index 2657c0f724e..00000000000
--- a/nano/templates/smes.tmpl
+++ /dev/null
@@ -1,89 +0,0 @@
-
- {{:value.display_name}} ({{:value.quantity}} available)
-
- {{/for}}
- {{else}}
- No products loaded.
- {{/if}}
-Vend:
{{:helper.link('x1', 'arrow-circle-down', { "vend" : value.vend, "amount" : 1 }, null, 'statusValue')}}
- {{if value.quantity >= 5}}
- {{:helper.link('x5', 'arrow-circle-down', { "vend" : value.vend, "amount" : 5 }, null, 'statusValue')}}
- {{/if}}
- {{if value.quantity >= 10}}
- {{:helper.link('x10', 'arrow-circle-down', { "vend" : value.vend, "amount" : 10 }, null, 'statusValue')}}
- {{/if}}
- {{if value.quantity >= 25}}
- {{:helper.link('x25', 'arrow-circle-down', { "vend" : value.vend, "amount" : 25 }, null, 'statusValue')}}
- {{/if}}
- {{if value.quantity > 1}}
- {{:helper.link('All', 'arrow-circle-down', { "vend" : value.vend, "amount" : value.quantity }, null, 'statusValue')}}
- {{/if}}
-
-
-
-
- Stored Capacity:
-
-
- {{:helper.displayBar(data.storedCapacity, 0, 100, data.charging ? 'good' : 'average')}}
-
-
- {{:helper.smoothRound(data.storedCapacity)}}%
-
- Input Management
-
-
-
-
- Charge Mode:
-
-
- {{:helper.link('Auto', 'refresh', {'cmode' : 1}, data.chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, data.chargeMode ? null : 'selected')}}
-
- {{if data.charging == 2}}
- [Charging]
- {{else data.charging == 1}}
- [Partially Charging]
- {{else}}
- [Not Charging]
- {{/if}}
-
-
-
-
-
- Input Level:
-
-
- {{:helper.displayBar(data.chargeLevel, 0, data.chargeMax)}}
-
-
- {{:helper.link('MIN', null, {'input' : 'min'}, (data.chargeLevel > 0) ? null : 'disabled')}}
- {{:helper.link('SET', null, {'input' : 'set'}, null)}}
- {{:helper.link('MAX', null, {'input' : 'max'}, (data.chargeLevel < data.chargeMax) ? null : 'disabled')}}
-
- {{:data.chargeLevel}} W
- Output Management
-
-
-
-
- Output Status:
-
-
- {{:helper.link('Online', 'power-off', {'online' : 1}, data.outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, data.outputOnline ? null : 'selected')}}
-
- {{if data.outputting == 2}}
- [Outputting]
- {{else data.outputting == 1}}
- [Stored energy too low]
- {{else}}
- [Not Outputting]
- {{/if}}
-
-
-
-
-
- Output Level:
-
-
- {{:helper.displayBar(data.outputLevel, 0, data.outputMax)}}
-
-
- {{:helper.link('MIN', null, {'output' : 'min'}, (data.outputLevel > 0) ? null : 'disabled')}}
- {{:helper.link('SET', null, {'output' : 'set'}, null)}}
- {{:helper.link('MAX', null, {'output' : 'max'}, (data.outputLevel < data.outputMax) ? null : 'disabled')}}
-
- {{:data.outputLevel}} W
-
-
\ No newline at end of file
diff --git a/nano/templates/solar_control.tmpl b/nano/templates/solar_control.tmpl
deleted file mode 100644
index f4fbf6ea739..00000000000
--- a/nano/templates/solar_control.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- Output Load:
-
-
- {{:helper.displayBar(data.outputLoad, 0, data.outputMax, (data.outputLoad < data.outputLevel) ? 'good' : 'average')}}
-
-
- {{:helper.smoothRound(data.outputLoad)}} W
-
- Status
-
-
-
-
-
-
-
- Generated power:
-
-
- {{:helper.smoothRound(data.generated)}} W
-
-
-
-
- Orientation:
-
-
-
- {{:helper.smoothRound(data.angle)}}° ({{:data.direction}})
-
-
- {{:helper.link('15°', 'minus', {'rate_control' : '1', 'cdir' : '-15'})}}
- {{:helper.link('1°', 'minus', {'rate_control' : '1', 'cdir' : '-1'})}}
- {{:helper.link('1°', 'plus', {'rate_control' : '1', 'cdir' : '1'})}}
- {{:helper.link('15°', 'plus', {'rate_control' : '1', 'cdir' : '15'})}}
- Tracking
-
-
-
-
-
-
-
- Tracker status:
-
-
- {{:helper.link('Off', 'close', {'track' : '0'}, (data.tracking_state == 0) ? 'selected' : '')}}
- {{:helper.link('Timed', 'clock-o', {'track' : '1'}, (data.tracking_state == 1) ? 'selected' : '')}}
- {{if data.connected_tracker}}
- {{:helper.link('Auto', 'signal', {'track' : '2'}, (data.tracking_state == 2) ? 'selected' : '')}}
- {{else}}
- {{:helper.link('Auto', 'signal', null, 'disabled')}}
- {{/if}}
-
-
-
-
- Tracking rate:
-
-
-
- {{:helper.smoothRound(data.tracking_rate)}} deg/h ({{:data.rotating_way}})
-
-
- {{:helper.link('180°', 'minus', {'rate_control' : '1', 'tdir' : '-180'})}}
- {{:helper.link('30°', 'minus', {'rate_control' : '1', 'tdir' : '-30'})}}
- {{:helper.link('1°', 'minus', {'rate_control' : '1', 'tdir' : '-1'})}}
- {{:helper.link('1°', 'plus', {'rate_control' : '1', 'tdir' : '1'})}}
- {{:helper.link('30°', 'plus', {'rate_control' : '1', 'tdir' : '30'})}}
- {{:helper.link('180°', 'plus', {'rate_control' : '1', 'tdir' : '180'})}}
-
-Connected Devices
-
-
-
-
-
-
- Solars panels:
-
-
- {{:data.connected_panels}} connected
-
-
-
-
- Solar tracker:
-
-
-
- {{if data.connected_tracker}}
- Found
- {{else}}
- Not Found
- {{/if}}
-
-
- {{:helper.link('Search for devices', 'refresh', {'search_connected' : '1'})}}
-
diff --git a/nano/templates/song.tmpl b/nano/templates/song.tmpl
deleted file mode 100644
index 28ccae0c923..00000000000
--- a/nano/templates/song.tmpl
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
- Playback
-
- {{:helper.link('New', 'file', {'newsong': 1})}}
- {{:helper.link('Import', 'folder-open', {'import': 1})}}
- {{:helper.link('Play', 'play', {'play': 1}, data.lines.length > 0 ? (data.playing ? 'selected' : null) : 'disabled')}}
- {{:helper.link('Stop', 'stop', {'stop': 1}, !data.playing ? 'selected' : null)}}
-
-
-
- Repeat Song:
- {{:helper.link('-', null, {'repeat' : -10}, data.repeat > 0 && !data.playing ? null : 'disabled')}}
- {{:helper.link('-', null, {'repeat' : -1}, data.repeat > 0 && !data.playing ? null : 'disabled')}}
- {{:data.repeat}}
- {{:helper.link('+', null, {'repeat' : 1}, data.repeat < data.maxRepeat && !data.playing ? null : 'disabled')}}
- {{:helper.link('+', null, {'repeat' : 10}, data.repeat < data.maxRepeat && !data.playing ? null : 'disabled')}}
-
-
-Tempo:
- {{:helper.link('-', null, {'tempo' : 10}, data.tempo < data.maxTempo ? null : 'disabled')}}
- {{:helper.link('-', null, {'tempo' : 1}, data.tempo < data.maxTempo ? null : 'disabled')}}
- {{:helper.round(600 / data.tempo)}} BPM
- {{:helper.link('+', null, {'tempo' : -1}, data.tempo > data.minTempo ? null : 'disabled')}}
- {{:helper.link('+', null, {'tempo' : -10}, data.tempo > data.minTempo ? null : 'disabled')}}
- Editor
-
- {{for data.lines}}
-
-
-
- {{/for}}
-{{:index + 1}}:
-
- {{:helper.link('Edit', 'pencil', {'modifyline': index+1}, data.playing ? 'disabled' : null)}}
- {{:helper.link('Insert', 'arrow-up', {'insertline': index+1}, data.playing ? 'disabled' : null)}}
- {{:helper.link('Delete', 'trash', {'deleteline': index+1}, data.playing ? 'disabled' : null)}}
-
- {{:value}}
-
- {{:helper.link('Add Line', 'arrow-down', {'insertline': data.lines.length + 1}, data.playing ? 'disabled' : null)}}
-
-
-- -
-
\ No newline at end of file
diff --git a/nano/templates/spawners_menu.tmpl b/nano/templates/spawners_menu.tmpl
deleted file mode 100644
index c12490bbb60..00000000000
--- a/nano/templates/spawners_menu.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
- {{:helper.link('Help', data.help ? 'close' : 'question', {'help': 1})}}
-
-
- {{if data.help}}
-
-
- Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).
-
- Every note in a chord will play together, with the chord timed by the tempo as defined above.
-
- Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
-
- By default, every note is natural and in octave 3. Defining a different state for either is remembered for each note.
-
-
-
- Example: C,D,E,F,G,A,B will play a C major scale. -
- After a note has an accidental or octave placed, it will be remembered: C,C4,C#,C3 is C3,C4,C4#,C3# -
- Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B.
- A pause may be denoted by an empty chord: C,E,,C,G.
-
- To make a chord be a different time, end it with /x, where the chord length will be length defined by tempo / x, eg: C,G/2,E/4.
-
- Combined, an example line is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4. -
-
-
- Lines may be up to 50 characters. -
- A song may only contain up to 50 lines. -
-
- {{for data.spawners}}
-
-
diff --git a/nano/templates/supermatter_monitor.tmpl b/nano/templates/supermatter_monitor.tmpl
deleted file mode 100644
index 3bc87984d79..00000000000
--- a/nano/templates/supermatter_monitor.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-{{if data.active}}
- {{:helper.link('Back to Menu', null, {'clear' : 1})}}Mob Spawners
--
-
-
- Core Integrity:
-
-
- {{:helper.displayBar(data.SM_integrity, 0, 100, (data.SM_integrity == 100) ? 'good' : (data.SM_integrity >= 50) ? 'average' : 'bad')}} {{:data.SM_integrity}}%
-
-
- Relative EER:
-
-
- {{if data.SM_power > 300}}
- {{:data.SM_power}} MeV/cm3
- {{else data.SM_power > 150}}
- {{:data.SM_power}} MeV/cm3
- {{else}}
- {{:data.SM_power}} MeV/cm3
- {{/if}}
-
-
- Temperature:
-
-
- {{if data.SM_ambienttemp > 5000}}
- {{:data.SM_ambienttemp}} K
- {{else data.SM_ambienttemp > 4000}}
- {{:data.SM_ambienttemp}} K
- {{else}}
- {{:data.SM_ambienttemp}} K
- {{/if}}
-
-
- Pressure:
-
-
- {{if data.SM_ambientpressure > 10000}}
- {{:data.SM_ambientpressure}} kPa
- {{else data.SM_ambientpressure > 5000}}
- {{:data.SM_ambientpressure}} kPa
- {{else}}
- {{:data.SM_ambientpressure}} kPa
- {{/if}}
-
- -
- Gas Composition:
-
-
-
-
-{{else}}
- {{:helper.link('Refresh', null, {'refresh' : 1})}}
-
-
- O2:
-
-
- {{:data.SM_gas_O2}} %
-
-
- CO2:
-
-
- {{:data.SM_gas_CO2}} %
-
-
- N2:
-
-
- {{:data.SM_gas_N2}} %
-
-
- PL:
-
-
- {{:data.SM_gas_PL}} %
-
-
- OTHER:
-
-
- {{:data.SM_gas_OTHER}} %
-
- - {{for data.supermatters}} -
-
- {{/for}}
-{{/if}}
diff --git a/nano/templates/supply_console.tmpl b/nano/templates/supply_console.tmpl
deleted file mode 100644
index 3402e8982b5..00000000000
--- a/nano/templates/supply_console.tmpl
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
- Area:
-
-
- {{:value.area_name}}
-
-
- Integrity:
-
-
- {{:value.integrity}} %
-
-
- Options:
-
-
- {{:helper.link('View Details', null, {'set' : value.uid})}}
-
-
-
-
- Supply Points:
-
-
- {{:data.points}}
-
-
-
-
- Central Command messages:
-
-
- {{:data.message}}
-
-
-
-
- Shuttle Status:
-
-
- {{if !data.moving && !data.at_station}}
- Docked off-station.
- {{else !data.moving && data.at_station}}
- Docked at the station.
- {{else data.moving}}
-
-Shuttle is en route (ETA: {{:data.timeleft}} minute{{if data.timeleft != 1}}s{{/if}}).
- {{/if}}
-
-
-
- Shuttle Control:
-
-
- {{:helper.link('Call Shuttle', 'arrow-circle-down', data.send, data.moving || data.at_station || !data.can_launch ? 'disabled' : '')}}
- {{:helper.link('Return Shuttle', 'arrow-circle-up', data.send, data.moving || !data.at_station || !data.can_launch ? 'disabled' : '')}}
-
-
-
-
- Supply Crates
-
-
-
-
-
-
-
-
-
- Categories
-
- {{for data.categories}}
-
- {{:helper.link(value.name, 'gear', {'last_viewed_group':value.category}, (data.last_viewed_group==value.category) ? 'linkOn' : '', 'category')}}
-
- {{/for}}
-
-
\ No newline at end of file
diff --git a/nano/templates/tank_dispenser.tmpl b/nano/templates/tank_dispenser.tmpl
deleted file mode 100644
index a634a2dde8e..00000000000
--- a/nano/templates/tank_dispenser.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Supply Orders
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/nano/templates/tanks.tmpl b/nano/templates/tanks.tmpl
deleted file mode 100644
index 2cf12746f01..00000000000
--- a/nano/templates/tanks.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{if data.maskConnected}}
- Dispense:
-
- {{:helper.link('Plasma (' + helper.smoothRound(data.p_tanks) + ')', data.p_tanks ? 'square' : 'square-o', {'plasma' : 1}, data.p_tanks ? null : 'disabled')}}
- {{:helper.link('Oxygen (' + helper.smoothRound(data.o_tanks) + ')', data.o_tanks ? 'square' : 'square-o', {'oxygen' : 1}, data.o_tanks ? null : 'disabled')}}
-
-This tank is connected to a mask.
-{{else}}
- This tank is NOT connected to a mask.
-{{/if}}
-
-
-
-
-
- Tank Pressure:
-
-
- {{:helper.displayBar(data.tankPressure, 0, 1013, (data.tankPressure > 200) ? 'good' : ((data.tankPressure > 100) ? 'average' : 'bad'))}}
-
-
- {{:helper.smoothRound(data.tankPressure)}} kPa
-
-
-
-
-
- Mask Release Pressure:
-
-
- {{:helper.displayBar(data.releasePressure, 0, data.maxReleasePressure, (data.releasePressure >= 23) ? null : ((data.releasePressure >= 17) ? 'average' : 'bad'))}}
-
-
- {{:helper.link('-', null, {'dist_p' : -10}, (data.releasePressure > 0) ? null : 'disabled')}}
- {{:helper.link('-', null, {'dist_p' : -1}, (data.releasePressure > 0) ? null : 'disabled')}}
-
- {{:data.releasePressure}} kPa
- {{:helper.link('+', null, {'dist_p' : 1}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('+', null, {'dist_p' : 10}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('Max', null, {'dist_p' : 'max'}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
- {{:helper.link('Reset', null, {'dist_p' : 'reset'}, (data.releasePressure != data.defaultReleasePressure) ? null : 'disabled')}}
-
-
-
diff --git a/nano/templates/tcomms_core.tmpl b/nano/templates/tcomms_core.tmpl
deleted file mode 100644
index ee7bffd0ed0..00000000000
--- a/nano/templates/tcomms_core.tmpl
+++ /dev/null
@@ -1,189 +0,0 @@
-{{:helper.link('Device Configuration', 'wrench', {'tab' : "CONFIG"}, data.tab == "CONFIG" ? 'selected' : '')}}
-{{:helper.link('Device Links', 'link', {'tab' : "LINKS"}, data.tab == "LINKS" ? 'selected' : '')}}
-{{:helper.link('User Filtering', 'user-times', {'tab' : "FILTER"}, data.tab == "FILTER" ? 'selected' : '')}}
-
-{{if data.ion}}
-
- Mask Release Valve:
-
-
- {{:helper.link('Open', 'unlock', {'stat' : 1}, (!data.maskConnected) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'lock', {'stat' : 1}, data.valveOpen ? null : 'selected')}}
-
-
-ERROR: An Ionspheric overload has occured. Please wait for the machine to reboot. This cannot be manually done.
-
-{{/if}}
-
-{{if data.tab == "CONFIG"}}
- Core Configuration
-Status
-
-
-
- Machine Active:
-
-
- {{:helper.link(data.active ? 'Enabled' : 'Disabled', 'power-off', {'toggle_active' : 1}, null, data.active ? 'selected' : '')}}
-
-
-
-
- Sectors with Telecommunications Signal:
-
-
- {{:data.sectors_available}}
-
- Settings
-
-
-
- Job Announcements:
-
-
- {{:helper.link(data.nttc_toggle_jobs ? 'Enabled' : 'Disabled', 'clipboard', {'nttc_toggle_jobs' : 1}, null, data.nttc_toggle_jobs ? 'selected' : null)}}
-
-
-
-
- Job Departmentalisation:
-
-
- {{:helper.link(data.nttc_toggle_job_color ? 'Enabled' : 'Disabled', 'clipboard', {'nttc_toggle_job_color' : 1}, null, data.nttc_toggle_job_color ? 'selected' : null)}}
-
-
-
-
- Name Departmentalisation:
-
-
- {{:helper.link(data.nttc_toggle_name_color ? 'Enabled' : 'Disabled', 'users', {'nttc_toggle_name_color' : 1}, null, data.nttc_toggle_name_color ? 'selected' : null)}}
-
-
-
-
- Command Amplification:
-
-
- {{:helper.link(data.nttc_toggle_command_bold ? 'Enabled' : 'Disabled', 'volume-up', {'nttc_toggle_command_bold' : 1}, null, data.nttc_toggle_command_bold ? 'selected' : null)}}
-
- Advanced
-
-
-
- Job Announcement Format:
-
-
- {{:helper.link(data.nttc_job_indicator_type ? data.nttc_job_indicator_type : 'Unset', 'pencil', {'nttc_job_indicator_type' : 1}, null, data.nttc_job_indicator_type ? 'selected' : null)}}
-
-
-
-
- Language Conversion:
-
-
- {{:helper.link(data.nttc_setting_language ? data.nttc_setting_language : 'Unset', 'globe', {'nttc_setting_language' : 1}, null, data.nttc_setting_language ? 'selected' : null)}}
-
-
-
-
- Network ID:
-
-
- {{:helper.link(data.network_id ? data.network_id : 'Unset', 'server', {'network_id' : 1}, null, data.network_id ? 'selected' : null)}}
-
- Maintenance
- {{:helper.link('Import Configuration', 'sign-in', {'import' : 1})}} - {{:helper.link('Export Configuration', 'sign-out', {'export' : 1})}} -{{else data.tab == "LINKS"}} - -Connected Devices
-
-
-
- Link Password:
-
-
- {{:helper.link(data.link_password ? data.link_password : 'Unset', 'lock', {'change_password' : 1}, null, data.link_password ? 'selected' : null)}}
-
- -
| Network Address | -Network ID | -Sector | -Status | -Unlink | -
|---|---|---|---|---|
| {{:value.addr}} | -{{:value.net_id}} | -{{:value.sector}} | -{{:value.status ? 'Active' : 'Offline'}} | -{{:helper.link('Unlink', 'unlink', {'unlink' : value.addr}, null, 'infoButton')}} | -
Filtering List
-
-
-
- {{:helper.link('Add User', 'plus', {'add_filter': 1})}}
-
- -
| Name | -Remove | -
|---|---|
| {{:value}} | -{{:helper.link('Remove', 'times', {'remove_filter' : value}, null, 'infoButton')}} | -
Relay Configuration
-
-
-
- Device Active:
-
-
- {{:helper.link(data.active ? 'Enabled' : 'Disabled', 'power-off', {'toggle_active' : 1}, null, data.active ? 'selected' : '')}}
-
-
-
-
- Network ID:
-
-
- {{:helper.link(data.network_id ? data.network_id : 'Unset', 'pencil', {'network_id' : 1}, null, data.network_id ? 'selected' : null)}}
-
-
-
-
-{{if data.linked}}
-
- Link Status:
-
-
- {{if data.linked}}
- Linked
- {{else}}
- Unlinked
- {{/if}}
-
-
-
-
- Linked Core ID:
-
-
- {{:data.linked_core_id}}
-
-
-
-
- Linked Core Address:
-
-
- {{:data.linked_core_addr}}
-
-
-
-
- Hidden Link:
-
-
- {{:helper.link(data.hidden_link ? 'Yes' : 'No', data.hidden_link ? 'eye-slash' : 'eye', {'toggle_hidden_link' : 1}, null, data.hidden_link ? 'selected' : null)}}
-
-
-
-{{else}}
-
-
- Unlink:
-
-
- {{:helper.link('Unlink', 'unlink', {'unlink' : 1}, null, 'redButton')}}
-
- Please select a Core to link to
-| Network Address | -Network ID | -Sector | -Link | -
|---|---|---|---|
| {{:value.addr}} | -{{:value.net_id}} | -{{:value.sector}} | -{{:helper.link('Link', 'link', {'link' : value.addr}, null, 'infoButton')}} | -
Teleporter Status
-{{if !data.powerstation}} -No power station linked.
-{{else !data.teleporterhub}}
- No hub linked.
-{{else}}
-
-
-
-
- Current Regime
- {{:data.regime}}
-
-
- Current Target
- {{:data.target}}{{if data.target != "None"}}{{if data.regime == "Gate"}} Teleporter{{/if}}{{/if}}
-
-
- Calibration
- {{if data.calibrating}}In Progress{{else data.calibrated}}Optimal{{else data.accurate > 2}}Optimal{{else}}Sub-Optimal{{/if}}
-
-
- {{:helper.link('Change regime', 'gear', {'regimeset': 1})}}
- {{:helper.link('Set target', 'gear', {'settarget': 1})}}
-
-
- {{:helper.link('Get target from memory', 'arrow-circle-down', {'lock': 1}, data.locked ? '' : 'disabled')}}
- {{:helper.link('Eject GPS device', 'eject', {'eject': 1}, data.locked ? '' : 'disabled')}}
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/transfer_valve.tmpl b/nano/templates/transfer_valve.tmpl
deleted file mode 100644
index be64b5cc6f4..00000000000
--- a/nano/templates/transfer_valve.tmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{:helper.link('Calibrate hub', 'arrows-alt', {'calibrate': 1}, data.target == 'None' ? 'disabled' : '')}}
-
-
-
-
- Attachment One:
-
-
- {{if data.attachmentOne}}
- {{:data.attachmentOne}}
- {{else}}
- None
- {{/if}}
- {{:helper.link('Remove', 'eject', {'tankone' : 1}, data.attachmentOne ? null : 'disabled')}}
-
-
-
-
-
- Attachment Two:
-
-
- {{if data.attachmentTwo}}
- {{:data.attachmentTwo}}
- {{else}}
- None
- {{/if}}
- {{:helper.link('Remove', 'eject', {'tanktwo' : 1}, data.attachmentTwo ? null : 'disabled')}}
-
-
-
-
-
- Valve Attachment:
-
-
- {{if data.valveAttachment}}
- {{:data.valveAttachment}}
- {{else}}
- None
- {{/if}}
- {{:helper.link('Remove', 'eject', {'rem_device' : 1}, data.valveAttachment ? null : 'disabled')}}
- {{if data.valveAttachment}}
- {{:helper.link('View', 'wrench', {'device' : 1})}}
- {{/if}}
-
-
-
-
diff --git a/nano/templates/turret_control.tmpl b/nano/templates/turret_control.tmpl
deleted file mode 100644
index 50f733ea80f..00000000000
--- a/nano/templates/turret_control.tmpl
+++ /dev/null
@@ -1,72 +0,0 @@
-
- Valve Status:
-
-
- {{:helper.link('Open', 'unlock', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'lock', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? null : 'selected'))}}
-
-
- Behaviour controls are {{:data.locked ? "locked" : "unlocked"}}.
-
--{{if data.access}} - {{if !data.screen}} -
-
- {{if data.accesses}}
-
- Turret Status:
-
-
- {{:helper.link('Enabled', null, {'command' : 'enable', 'value' : 1}, data.enabled ?'redButton' : null)}}
- {{:helper.link('Disabled',null, {'command' : 'enable', 'value' : 0}, !data.enabled ? 'selected' : null)}}
-
-
-
- {{/if}}
- {{if data.lethal_control}}
-
- Required Access:
-
-
- {{:helper.link('Modify', null, {'command' : 'screen', 'value' : 1})}}
-
-
-
- {{/if}}
-
- {{for data.settings}}
-
- Lethal Mode:
-
-
- {{:helper.link('On', null, {'command' : 'lethal', 'value' : 1}, data.lethal ?'redButton' : null)}}
- {{:helper.link('Off',null, {'command' : 'lethal', 'value' : 0}, !data.lethal ? 'selected' : null)}}
-
-
-
- {{/for}}
- {{else}}
-
- {{:value.category}}
-
-
- {{:helper.link('On', null, {'command' : value.setting, 'value' : 1}, value.value ? 'selected' : null)}}
- {{:helper.link('Off',null, {'command' : value.setting, 'value' : 0}, !value.value ? 'selected' : null)}}
-
-
-
-
- Turret Settings:
-
-
- {{:helper.link('Modify', null, {'command' : 'screen', 'value' : 0})}}
-
-
-
-
- Access Type:
-
-
- {{:helper.link('All', null, {'one_access' : 0}, !data.one_access ? 'selected' : null)}}
- {{:helper.link('One', null, {'one_access' : 1}, data.one_access ? 'selected' : null)}}
-
- Select Access
- {{for data.accesses}} - {{:helper.link(value.name, null, {'access' : value.number}, null, value.active ? 'selected' : null)}} - {{/for}} - {{/if}} -{{/if}} diff --git a/nano/templates/vending_machine.tmpl b/nano/templates/vending_machine.tmpl deleted file mode 100644 index 1849e3e51d5..00000000000 --- a/nano/templates/vending_machine.tmpl +++ /dev/null @@ -1,68 +0,0 @@ - - -{{if data.mode == 0}} -Items available
-
- {{for data.products}}
-
-{{if data.coin}}
-
-
- {{empty}}
- No items available!
- {{/for}}
-
- {{if value.price > 0}}
- {{:helper.link('Buy (' + value.price + ')', 'shopping-cart', { "vend" : value.key }, value.amount > 0 ? null : 'disabled')}}
- {{else}}
- {{:helper.link('Vend', 'arrow-circle-down', { "vend" : value.key }, value.amount > 0 ? null : 'disabled')}}
- {{/if}}
-
-
- {{if value.color}}{{:value.name}}
- {{else}}{{:value.name}}
- {{/if}}
- ({{:value.amount ? value.amount : "NONE LEFT"}})
-
- Coin
-
-
-{{/if}}
-{{if data.item_slot == 1}}
-Coin deposited:
- {{:helper.link(data.coin, 'eject', {'remove_coin' : 1})}}
-Item Slot
-
-
-{{/if}}
-{{else data.mode == 1}}
-Item Slot:
- {{if data.inserted_item}}
- {{:helper.link(data.inserted_item, 'eject', {'remove_item' : 1})}}
- {{else}}
- Empty
- {{/if}}
-Item selected
-
-
-{{/if}}
-{{if data.panel}}
-
-
- Item selected:
{{:data.product}}
- Charge:
{{:data.price}}
-
- {{if data.message_err}} {{/if}} {{:data.message}}
-
-
- {{:helper.link('Pay', 'shopping-cart', {'pay' : 1})}}
- {{:helper.link('Cancel', 'arrow-left', {'cancelpurchase' : 1})}}
-
-Maintenance panel
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/wires.tmpl b/nano/templates/wires.tmpl
deleted file mode 100644
index 2702d97d7dc..00000000000
--- a/nano/templates/wires.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-Speaker
{{:helper.link(data.speaker ? 'Enabled' : 'Disabled', 'gear', {'togglevoice' : 1})}}
-
-
- {{for data.wires}}
-
-
-{{if data.status_len}}
- | {{:value.colour_name}} {{if value.index}}({{:value.index}}){{/if}} | -- {{:helper.link(value.cut ? 'Mend' : 'Cut', null, {'action' : 'cut', 'wire' : value.colour})}} - {{:helper.link('Pulse', null, {'action' : 'pulse', 'wire' : value.colour})}} - {{:helper.link(value.attached ? 'Detach' : 'Attach', null, {'action' : 'attach', 'wire' : value.colour})}} - | -
-
-
-{{/if}}
diff --git a/paradise.dme b/paradise.dme
index 5e88b673231..efddfaea144 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -40,6 +40,7 @@
#include "code\__DEFINES\genetics.dm"
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\hydroponics.dm"
+#include "code\__DEFINES\instruments.dm"
#include "code\__DEFINES\inventory.dm"
#include "code\__DEFINES\is_helpers.dm"
#include "code\__DEFINES\job.dm"
@@ -49,6 +50,7 @@
#include "code\__DEFINES\lighting.dm"
#include "code\__DEFINES\logs.dm"
#include "code\__DEFINES\machines.dm"
+#include "code\__DEFINES\martial_arts.dm"
#include "code\__DEFINES\math.dm"
#include "code\__DEFINES\MC.dm"
#include "code\__DEFINES\mecha.dm"
@@ -56,6 +58,7 @@
#include "code\__DEFINES\misc.dm"
#include "code\__DEFINES\mobs.dm"
#include "code\__DEFINES\move_force.dm"
+#include "code\__DEFINES\muzzle_flash.dm"
#include "code\__DEFINES\pda.dm"
#include "code\__DEFINES\pipes.dm"
#include "code\__DEFINES\preferences.dm"
@@ -71,9 +74,11 @@
#include "code\__DEFINES\station_goals.dm"
#include "code\__DEFINES\status_effects.dm"
#include "code\__DEFINES\subsystems.dm"
+#include "code\__DEFINES\tgui.dm"
#include "code\__DEFINES\tools.dm"
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\vv.dm"
+#include "code\__DEFINES\wires.dm"
#include "code\__DEFINES\zlevel.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
@@ -151,6 +156,7 @@
#include "code\_onclick\hud\guardian.dm"
#include "code\_onclick\hud\hud.dm"
#include "code\_onclick\hud\human.dm"
+#include "code\_onclick\hud\map_popups.dm"
#include "code\_onclick\hud\movable_screen_objects.dm"
#include "code\_onclick\hud\other_mobs.dm"
#include "code\_onclick\hud\parallax.dm"
@@ -171,10 +177,6 @@
#include "code\ATMOSPHERICS\components\binary_devices\pump.dm"
#include "code\ATMOSPHERICS\components\binary_devices\valve.dm"
#include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\_omni_extras.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\filter.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\mixer.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\omni_base.dm"
#include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
#include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
#include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"
@@ -215,7 +217,7 @@
#include "code\controllers\subsystem\assets.dm"
#include "code\controllers\subsystem\atoms.dm"
#include "code\controllers\subsystem\changelog.dm"
-#include "code\controllers\subsystem\chat.dm"
+#include "code\controllers\subsystem\cleanup.dm"
#include "code\controllers\subsystem\events.dm"
#include "code\controllers\subsystem\fires.dm"
#include "code\controllers\subsystem\garbage.dm"
@@ -239,6 +241,7 @@
#include "code\controllers\subsystem\parallax.dm"
#include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\shuttles.dm"
+#include "code\controllers\subsystem\sounds.dm"
#include "code\controllers\subsystem\spacedrift.dm"
#include "code\controllers\subsystem\statistics.dm"
#include "code\controllers\subsystem\sun.dm"
@@ -251,6 +254,7 @@
#include "code\controllers\subsystem\weather.dm"
#include "code\controllers\subsystem\processing\dcs.dm"
#include "code\controllers\subsystem\processing\fastprocess.dm"
+#include "code\controllers\subsystem\processing\instruments.dm"
#include "code\controllers\subsystem\processing\obj.dm"
#include "code\controllers\subsystem\processing\processing.dm"
#include "code\controllers\subsystem\tickets\mentor_tickets.dm"
@@ -303,8 +307,10 @@
#include "code\datums\components\label.dm"
#include "code\datums\components\material_container.dm"
#include "code\datums\components\paintable.dm"
+#include "code\datums\components\proximity_monitor.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\spawner.dm"
+#include "code\datums\components\spooky.dm"
#include "code\datums\components\squeak.dm"
#include "code\datums\components\swarming.dm"
#include "code\datums\diseases\_disease.dm"
@@ -728,7 +734,7 @@
#include "code\game\machinery\computer\robot.dm"
#include "code\game\machinery\computer\salvage_ship.dm"
#include "code\game\machinery\computer\security.dm"
-#include "code\game\machinery\computer\skills.dm"
+#include "code\game\machinery\computer\sm_monitor.dm"
#include "code\game\machinery\computer\specops_shuttle.dm"
#include "code\game\machinery\computer\station_alert.dm"
#include "code\game\machinery\computer\store.dm"
@@ -847,6 +853,7 @@
#include "code\game\objects\effects\temporary_visuals\clockcult.dm"
#include "code\game\objects\effects\temporary_visuals\cult.dm"
#include "code\game\objects\effects\temporary_visuals\miscellaneous.dm"
+#include "code\game\objects\effects\temporary_visuals\muzzle_flashes.dm"
#include "code\game\objects\effects\temporary_visuals\temporary_visual.dm"
#include "code\game\objects\items\ashtray.dm"
#include "code\game\objects\items\blueprints.dm"
@@ -878,7 +885,6 @@
#include "code\game\objects\items\devices\flashlight.dm"
#include "code\game\objects\items\devices\floor_painter.dm"
#include "code\game\objects\items\devices\handheld_defib.dm"
-#include "code\game\objects\items\devices\instruments.dm"
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
#include "code\game\objects\items\devices\machineprototype.dm"
@@ -1083,7 +1089,6 @@
#include "code\game\objects\structures\misc.dm"
#include "code\game\objects\structures\mop_bucket.dm"
#include "code\game\objects\structures\morgue.dm"
-#include "code\game\objects\structures\musician.dm"
#include "code\game\objects\structures\noticeboard.dm"
#include "code\game\objects\structures\plasticflaps.dm"
#include "code\game\objects\structures\reflector.dm"
@@ -1243,14 +1248,6 @@
#include "code\modules\admin\verbs\SDQL2\SDQL_2.dm"
#include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm"
#include "code\modules\admin\verbs\SDQL2\useful_procs.dm"
-#include "code\modules\alarm\alarm.dm"
-#include "code\modules\alarm\alarm_handler.dm"
-#include "code\modules\alarm\atmosphere_alarm.dm"
-#include "code\modules\alarm\burglar_alarm.dm"
-#include "code\modules\alarm\camera_alarm.dm"
-#include "code\modules\alarm\fire_alarm.dm"
-#include "code\modules\alarm\motion_alarm.dm"
-#include "code\modules\alarm\power_alarm.dm"
#include "code\modules\antagonists\_common\antag_datum.dm"
#include "code\modules\antagonists\_common\antag_helpers.dm"
#include "code\modules\antagonists\_common\antag_hud.dm"
@@ -1611,6 +1608,25 @@
#include "code\modules\hydroponics\grown\tobacco.dm"
#include "code\modules\hydroponics\grown\tomato.dm"
#include "code\modules\hydroponics\grown\towercap.dm"
+#include "code\modules\instruments\_instrument_data.dm"
+#include "code\modules\instruments\_instrument_key.dm"
+#include "code\modules\instruments\brass.dm"
+#include "code\modules\instruments\chromatic_percussion.dm"
+#include "code\modules\instruments\fun.dm"
+#include "code\modules\instruments\guitar.dm"
+#include "code\modules\instruments\hardcoded.dm"
+#include "code\modules\instruments\organ.dm"
+#include "code\modules\instruments\piano.dm"
+#include "code\modules\instruments\synth_tones.dm"
+#include "code\modules\instruments\objs\items\_instrument.dm"
+#include "code\modules\instruments\objs\items\headphones.dm"
+#include "code\modules\instruments\objs\items\instruments.dm"
+#include "code\modules\instruments\objs\structures\_musician.dm"
+#include "code\modules\instruments\objs\structures\piano.dm"
+#include "code\modules\instruments\songs\_song.dm"
+#include "code\modules\instruments\songs\_song_ui.dm"
+#include "code\modules\instruments\songs\play_legacy.dm"
+#include "code\modules\instruments\songs\play_synthesized.dm"
#include "code\modules\karma\karma.dm"
#include "code\modules\keybindings\bindings_admin.dm"
#include "code\modules\keybindings\bindings_ai.dm"
@@ -1652,7 +1668,28 @@
#include "code\modules\martial_arts\mimejutsu.dm"
#include "code\modules\martial_arts\plasma_fist.dm"
#include "code\modules\martial_arts\sleeping_carp.dm"
-#include "code\modules\martial_arts\wrestleing.dm"
+#include "code\modules\martial_arts\wrestling.dm"
+#include "code\modules\martial_arts\combos\martial_combo.dm"
+#include "code\modules\martial_arts\combos\adminfu\healing_palm.dm"
+#include "code\modules\martial_arts\combos\cqc\consecutive.dm"
+#include "code\modules\martial_arts\combos\cqc\kick.dm"
+#include "code\modules\martial_arts\combos\cqc\pressure.dm"
+#include "code\modules\martial_arts\combos\cqc\restrain.dm"
+#include "code\modules\martial_arts\combos\cqc\slam.dm"
+#include "code\modules\martial_arts\combos\krav_maga\leg_sweep.dm"
+#include "code\modules\martial_arts\combos\krav_maga\lung_punch.dm"
+#include "code\modules\martial_arts\combos\krav_maga\neck_chop.dm"
+#include "code\modules\martial_arts\combos\mimejutsu\mimechucks.dm"
+#include "code\modules\martial_arts\combos\mimejutsu\silent_palm.dm"
+#include "code\modules\martial_arts\combos\mimejutsu\smokebomb.dm"
+#include "code\modules\martial_arts\combos\plasma_fist\plasma_fist.dm"
+#include "code\modules\martial_arts\combos\plasma_fist\throwback.dm"
+#include "code\modules\martial_arts\combos\plasma_fist\tornado_sweep.dm"
+#include "code\modules\martial_arts\combos\sleeping_carp\back_kick.dm"
+#include "code\modules\martial_arts\combos\sleeping_carp\elbow_drop.dm"
+#include "code\modules\martial_arts\combos\sleeping_carp\head_kick.dm"
+#include "code\modules\martial_arts\combos\sleeping_carp\stomach_knee.dm"
+#include "code\modules\martial_arts\combos\sleeping_carp\wrist_wrench.dm"
#include "code\modules\mining\abandonedcrates.dm"
#include "code\modules\mining\fulton.dm"
#include "code\modules\mining\machine_processing.dm"
@@ -2046,51 +2083,6 @@
#include "code\modules\mob\new_player\sprite_accessories\vulpkanin\vulpkanin_head_markings.dm"
#include "code\modules\mob\new_player\sprite_accessories\vulpkanin\vulpkanin_tail_markings.dm"
#include "code\modules\mob\new_player\sprite_accessories\wryn\wryn_face.dm"
-#include "code\modules\modular_computers\laptop_vendor.dm"
-#include "code\modules\modular_computers\computers\item\computer.dm"
-#include "code\modules\modular_computers\computers\item\computer_components.dm"
-#include "code\modules\modular_computers\computers\item\computer_damage.dm"
-#include "code\modules\modular_computers\computers\item\computer_power.dm"
-#include "code\modules\modular_computers\computers\item\computer_ui.dm"
-#include "code\modules\modular_computers\computers\item\laptop.dm"
-#include "code\modules\modular_computers\computers\item\laptop_presets.dm"
-#include "code\modules\modular_computers\computers\item\processor.dm"
-#include "code\modules\modular_computers\computers\item\tablet.dm"
-#include "code\modules\modular_computers\computers\item\tablet_presets.dm"
-#include "code\modules\modular_computers\computers\machinery\console_presets.dm"
-#include "code\modules\modular_computers\computers\machinery\modular_computer.dm"
-#include "code\modules\modular_computers\computers\machinery\modular_console.dm"
-#include "code\modules\modular_computers\file_system\computer_file.dm"
-#include "code\modules\modular_computers\file_system\data.dm"
-#include "code\modules\modular_computers\file_system\program.dm"
-#include "code\modules\modular_computers\file_system\program_events.dm"
-#include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
-#include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm"
-#include "code\modules\modular_computers\file_system\programs\command\card.dm"
-#include "code\modules\modular_computers\file_system\programs\command\comms.dm"
-#include "code\modules\modular_computers\file_system\programs\engineering\alarm.dm"
-#include "code\modules\modular_computers\file_system\programs\engineering\power_monitor.dm"
-#include "code\modules\modular_computers\file_system\programs\engineering\sm_monitor.dm"
-#include "code\modules\modular_computers\file_system\programs\generic\configurator.dm"
-#include "code\modules\modular_computers\file_system\programs\generic\file_browser.dm"
-#include "code\modules\modular_computers\file_system\programs\generic\ntdownloader.dm"
-#include "code\modules\modular_computers\file_system\programs\generic\ntnrc_client.dm"
-#include "code\modules\modular_computers\file_system\programs\generic\nttransfer.dm"
-#include "code\modules\modular_computers\file_system\programs\research\airestorer.dm"
-#include "code\modules\modular_computers\file_system\programs\research\ntmonitor.dm"
-#include "code\modules\modular_computers\hardware\_hardware.dm"
-#include "code\modules\modular_computers\hardware\ai_slot.dm"
-#include "code\modules\modular_computers\hardware\battery_module.dm"
-#include "code\modules\modular_computers\hardware\card_slot.dm"
-#include "code\modules\modular_computers\hardware\CPU.dm"
-#include "code\modules\modular_computers\hardware\hard_drive.dm"
-#include "code\modules\modular_computers\hardware\network_card.dm"
-#include "code\modules\modular_computers\hardware\portable_disk.dm"
-#include "code\modules\modular_computers\hardware\printer.dm"
-#include "code\modules\modular_computers\hardware\recharger.dm"
-#include "code\modules\modular_computers\NTNet\NTNet.dm"
-#include "code\modules\modular_computers\NTNet\NTNet_relay.dm"
-#include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
#include "code\modules\nano\nanoexternal.dm"
#include "code\modules\nano\nanoui.dm"
#include "code\modules\nano\subsystem.dm"
@@ -2106,9 +2098,7 @@
#include "code\modules\nano\interaction\physical.dm"
#include "code\modules\nano\interaction\self.dm"
#include "code\modules\nano\interaction\zlevel.dm"
-#include "code\modules\nano\modules\alarm_monitor.dm"
#include "code\modules\nano\modules\atmos_control.dm"
-#include "code\modules\nano\modules\ert_manager.dm"
#include "code\modules\nano\modules\human_appearance.dm"
#include "code\modules\nano\modules\law_manager.dm"
#include "code\modules\nano\modules\nano_module.dm"
@@ -2313,7 +2303,6 @@
#include "code\modules\research\designs\biogenerator_designs.dm"
#include "code\modules\research\designs\bluespace_designs.dm"
#include "code\modules\research\designs\comp_board_designs.dm"
-#include "code\modules\research\designs\computer_part_designs.dm"
#include "code\modules\research\designs\equipment_designs.dm"
#include "code\modules\research\designs\janitorial_designs.dm"
#include "code\modules\research\designs\machine_designs.dm"
@@ -2447,6 +2436,9 @@
#include "code\modules\tgui\tgui.dm"
#include "code\modules\tgui\modules\_base.dm"
#include "code\modules\tgui\modules\crew_monitor.dm"
+#include "code\modules\tgui\modules\ert_manager.dm"
+#include "code\modules\tgui\plugins\login.dm"
+#include "code\modules\tgui\plugins\modal.dm"
#include "code\modules\tgui\states\admin.dm"
#include "code\modules\tgui\states\always.dm"
#include "code\modules\tgui\states\conscious.dm"
diff --git a/sound/AI/apc_overload.ogg b/sound/AI/apc_overload.ogg
deleted file mode 100644
index ef9357b9eb6..00000000000
Binary files a/sound/AI/apc_overload.ogg and /dev/null differ
diff --git a/sound/AI/apc_short.ogg b/sound/AI/apc_short.ogg
deleted file mode 100644
index 90afc50f6fb..00000000000
Binary files a/sound/AI/apc_short.ogg and /dev/null differ
diff --git a/sound/instruments/banjo/Ab3.ogg b/sound/instruments/banjo/Ab3.ogg
new file mode 100644
index 00000000000..66e263bd615
Binary files /dev/null and b/sound/instruments/banjo/Ab3.ogg differ
diff --git a/sound/instruments/banjo/Ab4.ogg b/sound/instruments/banjo/Ab4.ogg
new file mode 100644
index 00000000000..f003e03233a
Binary files /dev/null and b/sound/instruments/banjo/Ab4.ogg differ
diff --git a/sound/instruments/banjo/Ab5.ogg b/sound/instruments/banjo/Ab5.ogg
new file mode 100644
index 00000000000..c405725208e
Binary files /dev/null and b/sound/instruments/banjo/Ab5.ogg differ
diff --git a/sound/instruments/banjo/An3.ogg b/sound/instruments/banjo/An3.ogg
new file mode 100644
index 00000000000..1700704c9c1
Binary files /dev/null and b/sound/instruments/banjo/An3.ogg differ
diff --git a/sound/instruments/banjo/An4.ogg b/sound/instruments/banjo/An4.ogg
new file mode 100644
index 00000000000..eb7279f869e
Binary files /dev/null and b/sound/instruments/banjo/An4.ogg differ
diff --git a/sound/instruments/banjo/An5.ogg b/sound/instruments/banjo/An5.ogg
new file mode 100644
index 00000000000..d9cf57c0feb
Binary files /dev/null and b/sound/instruments/banjo/An5.ogg differ
diff --git a/sound/instruments/banjo/Bb3.ogg b/sound/instruments/banjo/Bb3.ogg
new file mode 100644
index 00000000000..d3f757c0ace
Binary files /dev/null and b/sound/instruments/banjo/Bb3.ogg differ
diff --git a/sound/instruments/banjo/Bb4.ogg b/sound/instruments/banjo/Bb4.ogg
new file mode 100644
index 00000000000..a9d869091bf
Binary files /dev/null and b/sound/instruments/banjo/Bb4.ogg differ
diff --git a/sound/instruments/banjo/Bb5.ogg b/sound/instruments/banjo/Bb5.ogg
new file mode 100644
index 00000000000..a56e6c25005
Binary files /dev/null and b/sound/instruments/banjo/Bb5.ogg differ
diff --git a/sound/instruments/banjo/Bn2.ogg b/sound/instruments/banjo/Bn2.ogg
new file mode 100644
index 00000000000..3154f974193
Binary files /dev/null and b/sound/instruments/banjo/Bn2.ogg differ
diff --git a/sound/instruments/banjo/Bn3.ogg b/sound/instruments/banjo/Bn3.ogg
new file mode 100644
index 00000000000..6c72ec2fd5a
Binary files /dev/null and b/sound/instruments/banjo/Bn3.ogg differ
diff --git a/sound/instruments/banjo/Bn4.ogg b/sound/instruments/banjo/Bn4.ogg
new file mode 100644
index 00000000000..b0e9a2b3b2f
Binary files /dev/null and b/sound/instruments/banjo/Bn4.ogg differ
diff --git a/sound/instruments/banjo/Bn5.ogg b/sound/instruments/banjo/Bn5.ogg
new file mode 100644
index 00000000000..1b002140b87
Binary files /dev/null and b/sound/instruments/banjo/Bn5.ogg differ
diff --git a/sound/instruments/banjo/Cn3.ogg b/sound/instruments/banjo/Cn3.ogg
new file mode 100644
index 00000000000..6ef414d9d01
Binary files /dev/null and b/sound/instruments/banjo/Cn3.ogg differ
diff --git a/sound/instruments/banjo/Cn4.ogg b/sound/instruments/banjo/Cn4.ogg
new file mode 100644
index 00000000000..4a26a6741db
Binary files /dev/null and b/sound/instruments/banjo/Cn4.ogg differ
diff --git a/sound/instruments/banjo/Cn5.ogg b/sound/instruments/banjo/Cn5.ogg
new file mode 100644
index 00000000000..901ed3bc08b
Binary files /dev/null and b/sound/instruments/banjo/Cn5.ogg differ
diff --git a/sound/instruments/banjo/Cn6.ogg b/sound/instruments/banjo/Cn6.ogg
new file mode 100644
index 00000000000..5cdbbb17cea
Binary files /dev/null and b/sound/instruments/banjo/Cn6.ogg differ
diff --git a/sound/instruments/banjo/Db3.ogg b/sound/instruments/banjo/Db3.ogg
new file mode 100644
index 00000000000..1ebffdf5025
Binary files /dev/null and b/sound/instruments/banjo/Db3.ogg differ
diff --git a/sound/instruments/banjo/Db4.ogg b/sound/instruments/banjo/Db4.ogg
new file mode 100644
index 00000000000..5b939365086
Binary files /dev/null and b/sound/instruments/banjo/Db4.ogg differ
diff --git a/sound/instruments/banjo/Db5.ogg b/sound/instruments/banjo/Db5.ogg
new file mode 100644
index 00000000000..6ee4dde9479
Binary files /dev/null and b/sound/instruments/banjo/Db5.ogg differ
diff --git a/sound/instruments/banjo/Db6.ogg b/sound/instruments/banjo/Db6.ogg
new file mode 100644
index 00000000000..fd73894fda6
Binary files /dev/null and b/sound/instruments/banjo/Db6.ogg differ
diff --git a/sound/instruments/banjo/Dn3.ogg b/sound/instruments/banjo/Dn3.ogg
new file mode 100644
index 00000000000..77491b01b8c
Binary files /dev/null and b/sound/instruments/banjo/Dn3.ogg differ
diff --git a/sound/instruments/banjo/Dn4.ogg b/sound/instruments/banjo/Dn4.ogg
new file mode 100644
index 00000000000..11f68b5a157
Binary files /dev/null and b/sound/instruments/banjo/Dn4.ogg differ
diff --git a/sound/instruments/banjo/Dn5.ogg b/sound/instruments/banjo/Dn5.ogg
new file mode 100644
index 00000000000..2e9ebe49891
Binary files /dev/null and b/sound/instruments/banjo/Dn5.ogg differ
diff --git a/sound/instruments/banjo/Dn6.ogg b/sound/instruments/banjo/Dn6.ogg
new file mode 100644
index 00000000000..89ae62361dc
Binary files /dev/null and b/sound/instruments/banjo/Dn6.ogg differ
diff --git a/sound/instruments/banjo/Eb3.ogg b/sound/instruments/banjo/Eb3.ogg
new file mode 100644
index 00000000000..1d1e43049d2
Binary files /dev/null and b/sound/instruments/banjo/Eb3.ogg differ
diff --git a/sound/instruments/banjo/Eb4.ogg b/sound/instruments/banjo/Eb4.ogg
new file mode 100644
index 00000000000..2722655f5a3
Binary files /dev/null and b/sound/instruments/banjo/Eb4.ogg differ
diff --git a/sound/instruments/banjo/Eb5.ogg b/sound/instruments/banjo/Eb5.ogg
new file mode 100644
index 00000000000..7a109dfdf79
Binary files /dev/null and b/sound/instruments/banjo/Eb5.ogg differ
diff --git a/sound/instruments/banjo/En3.ogg b/sound/instruments/banjo/En3.ogg
new file mode 100644
index 00000000000..4610efdd4f0
Binary files /dev/null and b/sound/instruments/banjo/En3.ogg differ
diff --git a/sound/instruments/banjo/En4.ogg b/sound/instruments/banjo/En4.ogg
new file mode 100644
index 00000000000..64c14daf915
Binary files /dev/null and b/sound/instruments/banjo/En4.ogg differ
diff --git a/sound/instruments/banjo/En5.ogg b/sound/instruments/banjo/En5.ogg
new file mode 100644
index 00000000000..8e0b6c1637e
Binary files /dev/null and b/sound/instruments/banjo/En5.ogg differ
diff --git a/sound/instruments/banjo/Fn3.ogg b/sound/instruments/banjo/Fn3.ogg
new file mode 100644
index 00000000000..5cdc4f13fb3
Binary files /dev/null and b/sound/instruments/banjo/Fn3.ogg differ
diff --git a/sound/instruments/banjo/Fn4.ogg b/sound/instruments/banjo/Fn4.ogg
new file mode 100644
index 00000000000..78d5454f186
Binary files /dev/null and b/sound/instruments/banjo/Fn4.ogg differ
diff --git a/sound/instruments/banjo/Fn5.ogg b/sound/instruments/banjo/Fn5.ogg
new file mode 100644
index 00000000000..b21559b4656
Binary files /dev/null and b/sound/instruments/banjo/Fn5.ogg differ
diff --git a/sound/instruments/banjo/Gb3.ogg b/sound/instruments/banjo/Gb3.ogg
new file mode 100644
index 00000000000..fd055b74717
Binary files /dev/null and b/sound/instruments/banjo/Gb3.ogg differ
diff --git a/sound/instruments/banjo/Gb4.ogg b/sound/instruments/banjo/Gb4.ogg
new file mode 100644
index 00000000000..f2c62510ed0
Binary files /dev/null and b/sound/instruments/banjo/Gb4.ogg differ
diff --git a/sound/instruments/banjo/Gb5.ogg b/sound/instruments/banjo/Gb5.ogg
new file mode 100644
index 00000000000..ab17347912b
Binary files /dev/null and b/sound/instruments/banjo/Gb5.ogg differ
diff --git a/sound/instruments/banjo/Gn3.ogg b/sound/instruments/banjo/Gn3.ogg
new file mode 100644
index 00000000000..ad52ef85c08
Binary files /dev/null and b/sound/instruments/banjo/Gn3.ogg differ
diff --git a/sound/instruments/banjo/Gn4.ogg b/sound/instruments/banjo/Gn4.ogg
new file mode 100644
index 00000000000..2ddb13b86b3
Binary files /dev/null and b/sound/instruments/banjo/Gn4.ogg differ
diff --git a/sound/instruments/banjo/Gn5.ogg b/sound/instruments/banjo/Gn5.ogg
new file mode 100644
index 00000000000..d5a7886c4cf
Binary files /dev/null and b/sound/instruments/banjo/Gn5.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg b/sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg
new file mode 100644
index 00000000000..aaa1e27ab89
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg b/sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg
new file mode 100644
index 00000000000..ce50e76aae6
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg b/sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg
new file mode 100644
index 00000000000..22f34d67592
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg b/sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg
new file mode 100644
index 00000000000..eb5bb7c295e
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg b/sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg
new file mode 100644
index 00000000000..bd299e321ab
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg b/sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg
new file mode 100644
index 00000000000..0519d2d20dd
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg b/sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg
new file mode 100644
index 00000000000..3b969a34b1c
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg b/sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg
new file mode 100644
index 00000000000..75f709c16fe
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg b/sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg
new file mode 100644
index 00000000000..ba347f80034
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg b/sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg
new file mode 100644
index 00000000000..cee89761d0d
Binary files /dev/null and b/sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg
new file mode 100644
index 00000000000..105f7676557
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg
new file mode 100644
index 00000000000..4aa33b6cded
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg
new file mode 100644
index 00000000000..d661e8d7580
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg
new file mode 100644
index 00000000000..bf650f1a6fa
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg
new file mode 100644
index 00000000000..c00f7949b7e
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg
new file mode 100644
index 00000000000..72588e9ca4c
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg
new file mode 100644
index 00000000000..b2a0b445b92
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg b/sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg
new file mode 100644
index 00000000000..ecf6778343b
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg b/sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg
new file mode 100644
index 00000000000..867e9ce00d0
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg b/sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg
new file mode 100644
index 00000000000..446d45993e8
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg b/sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg
new file mode 100644
index 00000000000..54d56400c03
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg
new file mode 100644
index 00000000000..f3770c1f1a0
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg
new file mode 100644
index 00000000000..28954fbb47f
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg
new file mode 100644
index 00000000000..1233f5314a3
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg
new file mode 100644
index 00000000000..00daf331357
Binary files /dev/null and b/sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg b/sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg
new file mode 100644
index 00000000000..13ad54bff00
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg b/sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg
new file mode 100644
index 00000000000..17bf392c4b2
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg b/sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg
new file mode 100644
index 00000000000..feda419a0ad
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg b/sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg
new file mode 100644
index 00000000000..bd088dd850e
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg b/sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg
new file mode 100644
index 00000000000..09cdbeec42c
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg b/sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg
new file mode 100644
index 00000000000..f82c39cee5b
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg b/sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg
new file mode 100644
index 00000000000..23bfd113d6c
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg b/sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg
new file mode 100644
index 00000000000..e5ec38d5ab8
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg
new file mode 100644
index 00000000000..42a6cdfad3c
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg
new file mode 100644
index 00000000000..cd6414c0aa2
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg
new file mode 100644
index 00000000000..e5366018653
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg
new file mode 100644
index 00000000000..60382228374
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg b/sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg
new file mode 100644
index 00000000000..648549d594a
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg b/sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg
new file mode 100644
index 00000000000..01ba59a908c
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg b/sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg
new file mode 100644
index 00000000000..7cfaa8ca72b
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg b/sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg
new file mode 100644
index 00000000000..b4ca49dc047
Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg b/sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg
new file mode 100644
index 00000000000..7c9870a7c3b
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg b/sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg
new file mode 100644
index 00000000000..5723c2edd27
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg b/sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg
new file mode 100644
index 00000000000..329f14f6feb
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg b/sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg
new file mode 100644
index 00000000000..5e8ac69de28
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg b/sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg
new file mode 100644
index 00000000000..ddc44c69c29
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg b/sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg
new file mode 100644
index 00000000000..28557475284
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg b/sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg
new file mode 100644
index 00000000000..906fff5bd8d
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg b/sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg
new file mode 100644
index 00000000000..96d28a7206d
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg b/sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg
new file mode 100644
index 00000000000..9b917b7eb53
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg b/sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg
new file mode 100644
index 00000000000..c68410d6f09
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg b/sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg
new file mode 100644
index 00000000000..df84ba99e8e
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg b/sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg
new file mode 100644
index 00000000000..af8c178efe8
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg
new file mode 100644
index 00000000000..268b41f1fce
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg
new file mode 100644
index 00000000000..04ceb54bfc2
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg
new file mode 100644
index 00000000000..b321983e74f
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg
new file mode 100644
index 00000000000..250a5c08e08
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg
new file mode 100644
index 00000000000..8b1c23007bb
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg
new file mode 100644
index 00000000000..098587183bb
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg
new file mode 100644
index 00000000000..81b60ef4c2f
Binary files /dev/null and b/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg
new file mode 100644
index 00000000000..39e992fbd85
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg
new file mode 100644
index 00000000000..04aa9852815
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg
new file mode 100644
index 00000000000..aff97942e9e
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg
new file mode 100644
index 00000000000..19fd937707a
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg
new file mode 100644
index 00000000000..452e7485be1
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg
new file mode 100644
index 00000000000..66c88185a73
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg
new file mode 100644
index 00000000000..d93c5176ced
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg
new file mode 100644
index 00000000000..fabd90d2e6a
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg
new file mode 100644
index 00000000000..e4cda1487aa
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg
new file mode 100644
index 00000000000..c596994b3eb
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg
new file mode 100644
index 00000000000..d265514e27b
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg
new file mode 100644
index 00000000000..3e17b3f99a6
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg
new file mode 100644
index 00000000000..b57a8a9109a
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg
new file mode 100644
index 00000000000..ce4d9535e84
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg
new file mode 100644
index 00000000000..bb02363fffb
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg
new file mode 100644
index 00000000000..1a532ac8d42
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg
new file mode 100644
index 00000000000..16ff313baa3
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg
new file mode 100644
index 00000000000..04161d2571b
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg
new file mode 100644
index 00000000000..30a3c653a1c
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg
new file mode 100644
index 00000000000..f6bc891506c
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg
new file mode 100644
index 00000000000..ab47f6940c9
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg
new file mode 100644
index 00000000000..5dfb9aa5291
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg
new file mode 100644
index 00000000000..7bc8784207e
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg
new file mode 100644
index 00000000000..185b4d3db64
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg
new file mode 100644
index 00000000000..f358ef0810d
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg
new file mode 100644
index 00000000000..048f9640bfe
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg
new file mode 100644
index 00000000000..f1083d7dcb2
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg
new file mode 100644
index 00000000000..244ebc3d5f2
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg
new file mode 100644
index 00000000000..d3c68d64e9c
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg
new file mode 100644
index 00000000000..2666ee66134
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg
new file mode 100644
index 00000000000..050e463c0d1
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg differ
diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg b/sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg
new file mode 100644
index 00000000000..4793c5b7fd7
Binary files /dev/null and b/sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg differ
diff --git a/sound/instruments/synthesis_samples/tones/Sawtooth.ogg b/sound/instruments/synthesis_samples/tones/Sawtooth.ogg
new file mode 100644
index 00000000000..10b1930a64c
Binary files /dev/null and b/sound/instruments/synthesis_samples/tones/Sawtooth.ogg differ
diff --git a/sound/instruments/synthesis_samples/tones/Sine.ogg b/sound/instruments/synthesis_samples/tones/Sine.ogg
new file mode 100644
index 00000000000..96a09d501b5
Binary files /dev/null and b/sound/instruments/synthesis_samples/tones/Sine.ogg differ
diff --git a/sound/instruments/synthesis_samples/tones/Square.ogg b/sound/instruments/synthesis_samples/tones/Square.ogg
new file mode 100644
index 00000000000..71029c07f95
Binary files /dev/null and b/sound/instruments/synthesis_samples/tones/Square.ogg differ
diff --git a/sound/instruments/violin/Ab1.mid b/sound/instruments/violin/Ab1.mid
new file mode 100644
index 00000000000..b8253364b4e
Binary files /dev/null and b/sound/instruments/violin/Ab1.mid differ
diff --git a/sound/instruments/violin/Ab2.mid b/sound/instruments/violin/Ab2.mid
new file mode 100644
index 00000000000..4cd7f9b55a7
Binary files /dev/null and b/sound/instruments/violin/Ab2.mid differ
diff --git a/sound/instruments/violin/Ab3.mid b/sound/instruments/violin/Ab3.mid
new file mode 100644
index 00000000000..e827cfc635e
Binary files /dev/null and b/sound/instruments/violin/Ab3.mid differ
diff --git a/sound/instruments/violin/Ab4.mid b/sound/instruments/violin/Ab4.mid
new file mode 100644
index 00000000000..57e1f76c976
Binary files /dev/null and b/sound/instruments/violin/Ab4.mid differ
diff --git a/sound/instruments/violin/Ab5.mid b/sound/instruments/violin/Ab5.mid
new file mode 100644
index 00000000000..59e95a6d997
Binary files /dev/null and b/sound/instruments/violin/Ab5.mid differ
diff --git a/sound/instruments/violin/Ab6.mid b/sound/instruments/violin/Ab6.mid
new file mode 100644
index 00000000000..9bd3436287b
Binary files /dev/null and b/sound/instruments/violin/Ab6.mid differ
diff --git a/sound/instruments/violin/Ab7.mid b/sound/instruments/violin/Ab7.mid
new file mode 100644
index 00000000000..3c90af807e2
Binary files /dev/null and b/sound/instruments/violin/Ab7.mid differ
diff --git a/sound/instruments/violin/Ab8.mid b/sound/instruments/violin/Ab8.mid
new file mode 100644
index 00000000000..873d771f2ae
Binary files /dev/null and b/sound/instruments/violin/Ab8.mid differ
diff --git a/sound/instruments/violin/An1.mid b/sound/instruments/violin/An1.mid
new file mode 100644
index 00000000000..d7f8a001d93
Binary files /dev/null and b/sound/instruments/violin/An1.mid differ
diff --git a/sound/instruments/violin/An2.mid b/sound/instruments/violin/An2.mid
new file mode 100644
index 00000000000..2f01800a075
Binary files /dev/null and b/sound/instruments/violin/An2.mid differ
diff --git a/sound/instruments/violin/An3.mid b/sound/instruments/violin/An3.mid
new file mode 100644
index 00000000000..c8ed3cdfa6c
Binary files /dev/null and b/sound/instruments/violin/An3.mid differ
diff --git a/sound/instruments/violin/An4.mid b/sound/instruments/violin/An4.mid
new file mode 100644
index 00000000000..e7984ca7e62
Binary files /dev/null and b/sound/instruments/violin/An4.mid differ
diff --git a/sound/instruments/violin/An5.mid b/sound/instruments/violin/An5.mid
new file mode 100644
index 00000000000..e1fd228f7a9
Binary files /dev/null and b/sound/instruments/violin/An5.mid differ
diff --git a/sound/instruments/violin/An6.mid b/sound/instruments/violin/An6.mid
new file mode 100644
index 00000000000..1c8df6c98e5
Binary files /dev/null and b/sound/instruments/violin/An6.mid differ
diff --git a/sound/instruments/violin/An7.mid b/sound/instruments/violin/An7.mid
new file mode 100644
index 00000000000..2784428daf9
Binary files /dev/null and b/sound/instruments/violin/An7.mid differ
diff --git a/sound/instruments/violin/An8.mid b/sound/instruments/violin/An8.mid
new file mode 100644
index 00000000000..2db2ab70a7d
Binary files /dev/null and b/sound/instruments/violin/An8.mid differ
diff --git a/sound/instruments/violin/Bb1.mid b/sound/instruments/violin/Bb1.mid
new file mode 100644
index 00000000000..693b73f5420
Binary files /dev/null and b/sound/instruments/violin/Bb1.mid differ
diff --git a/sound/instruments/violin/Bb2.mid b/sound/instruments/violin/Bb2.mid
new file mode 100644
index 00000000000..40da5f3da15
Binary files /dev/null and b/sound/instruments/violin/Bb2.mid differ
diff --git a/sound/instruments/violin/Bb3.mid b/sound/instruments/violin/Bb3.mid
new file mode 100644
index 00000000000..5bab6ccd636
Binary files /dev/null and b/sound/instruments/violin/Bb3.mid differ
diff --git a/sound/instruments/violin/Bb4.mid b/sound/instruments/violin/Bb4.mid
new file mode 100644
index 00000000000..dce830448ef
Binary files /dev/null and b/sound/instruments/violin/Bb4.mid differ
diff --git a/sound/instruments/violin/Bb5.mid b/sound/instruments/violin/Bb5.mid
new file mode 100644
index 00000000000..fda796e27b9
Binary files /dev/null and b/sound/instruments/violin/Bb5.mid differ
diff --git a/sound/instruments/violin/Bb6.mid b/sound/instruments/violin/Bb6.mid
new file mode 100644
index 00000000000..9e5da684f43
Binary files /dev/null and b/sound/instruments/violin/Bb6.mid differ
diff --git a/sound/instruments/violin/Bb7.mid b/sound/instruments/violin/Bb7.mid
new file mode 100644
index 00000000000..215c56cbe7e
Binary files /dev/null and b/sound/instruments/violin/Bb7.mid differ
diff --git a/sound/instruments/violin/Bb8.mid b/sound/instruments/violin/Bb8.mid
new file mode 100644
index 00000000000..4b55c34691f
Binary files /dev/null and b/sound/instruments/violin/Bb8.mid differ
diff --git a/sound/instruments/violin/Bn1.mid b/sound/instruments/violin/Bn1.mid
new file mode 100644
index 00000000000..27968b5f9e7
Binary files /dev/null and b/sound/instruments/violin/Bn1.mid differ
diff --git a/sound/instruments/violin/Bn2.mid b/sound/instruments/violin/Bn2.mid
new file mode 100644
index 00000000000..54c9b99d03f
Binary files /dev/null and b/sound/instruments/violin/Bn2.mid differ
diff --git a/sound/instruments/violin/Bn3.mid b/sound/instruments/violin/Bn3.mid
new file mode 100644
index 00000000000..f73476fb7bb
Binary files /dev/null and b/sound/instruments/violin/Bn3.mid differ
diff --git a/sound/instruments/violin/Bn4.mid b/sound/instruments/violin/Bn4.mid
new file mode 100644
index 00000000000..2aa30708a6c
Binary files /dev/null and b/sound/instruments/violin/Bn4.mid differ
diff --git a/sound/instruments/violin/Bn5.mid b/sound/instruments/violin/Bn5.mid
new file mode 100644
index 00000000000..0ebe636b714
Binary files /dev/null and b/sound/instruments/violin/Bn5.mid differ
diff --git a/sound/instruments/violin/Bn6.mid b/sound/instruments/violin/Bn6.mid
new file mode 100644
index 00000000000..3b8e1c217f7
Binary files /dev/null and b/sound/instruments/violin/Bn6.mid differ
diff --git a/sound/instruments/violin/Bn7.mid b/sound/instruments/violin/Bn7.mid
new file mode 100644
index 00000000000..afcb1982a13
Binary files /dev/null and b/sound/instruments/violin/Bn7.mid differ
diff --git a/sound/instruments/violin/Bn8.mid b/sound/instruments/violin/Bn8.mid
new file mode 100644
index 00000000000..3afd469256c
Binary files /dev/null and b/sound/instruments/violin/Bn8.mid differ
diff --git a/sound/instruments/violin/Cn1.mid b/sound/instruments/violin/Cn1.mid
new file mode 100644
index 00000000000..857120f31f4
Binary files /dev/null and b/sound/instruments/violin/Cn1.mid differ
diff --git a/sound/instruments/violin/Cn2.mid b/sound/instruments/violin/Cn2.mid
new file mode 100644
index 00000000000..3ccd6670e87
Binary files /dev/null and b/sound/instruments/violin/Cn2.mid differ
diff --git a/sound/instruments/violin/Cn3.mid b/sound/instruments/violin/Cn3.mid
new file mode 100644
index 00000000000..1851e4f8d27
Binary files /dev/null and b/sound/instruments/violin/Cn3.mid differ
diff --git a/sound/instruments/violin/Cn4.mid b/sound/instruments/violin/Cn4.mid
new file mode 100644
index 00000000000..65e8b0efe4e
Binary files /dev/null and b/sound/instruments/violin/Cn4.mid differ
diff --git a/sound/instruments/violin/Cn5.mid b/sound/instruments/violin/Cn5.mid
new file mode 100644
index 00000000000..544f921e43b
Binary files /dev/null and b/sound/instruments/violin/Cn5.mid differ
diff --git a/sound/instruments/violin/Cn6.mid b/sound/instruments/violin/Cn6.mid
new file mode 100644
index 00000000000..7c78dab2f07
Binary files /dev/null and b/sound/instruments/violin/Cn6.mid differ
diff --git a/sound/instruments/violin/Cn7.mid b/sound/instruments/violin/Cn7.mid
new file mode 100644
index 00000000000..3abe4cde086
Binary files /dev/null and b/sound/instruments/violin/Cn7.mid differ
diff --git a/sound/instruments/violin/Cn8.mid b/sound/instruments/violin/Cn8.mid
new file mode 100644
index 00000000000..06f14081b3b
Binary files /dev/null and b/sound/instruments/violin/Cn8.mid differ
diff --git a/sound/instruments/violin/Cn9.mid b/sound/instruments/violin/Cn9.mid
new file mode 100644
index 00000000000..62f4eef045a
Binary files /dev/null and b/sound/instruments/violin/Cn9.mid differ
diff --git a/sound/instruments/violin/Db1.mid b/sound/instruments/violin/Db1.mid
new file mode 100644
index 00000000000..88dba851452
Binary files /dev/null and b/sound/instruments/violin/Db1.mid differ
diff --git a/sound/instruments/violin/Db2.mid b/sound/instruments/violin/Db2.mid
new file mode 100644
index 00000000000..b510926b45f
Binary files /dev/null and b/sound/instruments/violin/Db2.mid differ
diff --git a/sound/instruments/violin/Db3.mid b/sound/instruments/violin/Db3.mid
new file mode 100644
index 00000000000..9954bbe478a
Binary files /dev/null and b/sound/instruments/violin/Db3.mid differ
diff --git a/sound/instruments/violin/Db4.mid b/sound/instruments/violin/Db4.mid
new file mode 100644
index 00000000000..2c5ff74db0a
Binary files /dev/null and b/sound/instruments/violin/Db4.mid differ
diff --git a/sound/instruments/violin/Db5.mid b/sound/instruments/violin/Db5.mid
new file mode 100644
index 00000000000..e5850a3fd04
Binary files /dev/null and b/sound/instruments/violin/Db5.mid differ
diff --git a/sound/instruments/violin/Db6.mid b/sound/instruments/violin/Db6.mid
new file mode 100644
index 00000000000..217c0ad014c
Binary files /dev/null and b/sound/instruments/violin/Db6.mid differ
diff --git a/sound/instruments/violin/Db7.mid b/sound/instruments/violin/Db7.mid
new file mode 100644
index 00000000000..ec32bdbf904
Binary files /dev/null and b/sound/instruments/violin/Db7.mid differ
diff --git a/sound/instruments/violin/Db8.mid b/sound/instruments/violin/Db8.mid
new file mode 100644
index 00000000000..555bce3db0d
Binary files /dev/null and b/sound/instruments/violin/Db8.mid differ
diff --git a/sound/instruments/violin/Dn1.mid b/sound/instruments/violin/Dn1.mid
new file mode 100644
index 00000000000..92e4e0d9581
Binary files /dev/null and b/sound/instruments/violin/Dn1.mid differ
diff --git a/sound/instruments/violin/Dn2.mid b/sound/instruments/violin/Dn2.mid
new file mode 100644
index 00000000000..34eb9d1db1b
Binary files /dev/null and b/sound/instruments/violin/Dn2.mid differ
diff --git a/sound/instruments/violin/Dn3.mid b/sound/instruments/violin/Dn3.mid
new file mode 100644
index 00000000000..fbd56085aaf
Binary files /dev/null and b/sound/instruments/violin/Dn3.mid differ
diff --git a/sound/instruments/violin/Dn4.mid b/sound/instruments/violin/Dn4.mid
new file mode 100644
index 00000000000..e13c7448292
Binary files /dev/null and b/sound/instruments/violin/Dn4.mid differ
diff --git a/sound/instruments/violin/Dn5.mid b/sound/instruments/violin/Dn5.mid
new file mode 100644
index 00000000000..8fd41e5c6fe
Binary files /dev/null and b/sound/instruments/violin/Dn5.mid differ
diff --git a/sound/instruments/violin/Dn6.mid b/sound/instruments/violin/Dn6.mid
new file mode 100644
index 00000000000..d47329e8f9e
Binary files /dev/null and b/sound/instruments/violin/Dn6.mid differ
diff --git a/sound/instruments/violin/Dn7.mid b/sound/instruments/violin/Dn7.mid
new file mode 100644
index 00000000000..b2496603876
Binary files /dev/null and b/sound/instruments/violin/Dn7.mid differ
diff --git a/sound/instruments/violin/Dn8.mid b/sound/instruments/violin/Dn8.mid
new file mode 100644
index 00000000000..56667a1a86d
Binary files /dev/null and b/sound/instruments/violin/Dn8.mid differ
diff --git a/sound/instruments/violin/Eb1.mid b/sound/instruments/violin/Eb1.mid
new file mode 100644
index 00000000000..829e6fcf185
Binary files /dev/null and b/sound/instruments/violin/Eb1.mid differ
diff --git a/sound/instruments/violin/Eb2.mid b/sound/instruments/violin/Eb2.mid
new file mode 100644
index 00000000000..66029b340cc
Binary files /dev/null and b/sound/instruments/violin/Eb2.mid differ
diff --git a/sound/instruments/violin/Eb3.mid b/sound/instruments/violin/Eb3.mid
new file mode 100644
index 00000000000..c982375941e
Binary files /dev/null and b/sound/instruments/violin/Eb3.mid differ
diff --git a/sound/instruments/violin/Eb4.mid b/sound/instruments/violin/Eb4.mid
new file mode 100644
index 00000000000..016ed4f1edf
Binary files /dev/null and b/sound/instruments/violin/Eb4.mid differ
diff --git a/sound/instruments/violin/Eb5.mid b/sound/instruments/violin/Eb5.mid
new file mode 100644
index 00000000000..ddb511795df
Binary files /dev/null and b/sound/instruments/violin/Eb5.mid differ
diff --git a/sound/instruments/violin/Eb6.mid b/sound/instruments/violin/Eb6.mid
new file mode 100644
index 00000000000..b7242b9ab99
Binary files /dev/null and b/sound/instruments/violin/Eb6.mid differ
diff --git a/sound/instruments/violin/Eb7.mid b/sound/instruments/violin/Eb7.mid
new file mode 100644
index 00000000000..773538340a5
Binary files /dev/null and b/sound/instruments/violin/Eb7.mid differ
diff --git a/sound/instruments/violin/Eb8.mid b/sound/instruments/violin/Eb8.mid
new file mode 100644
index 00000000000..4ad074e173b
Binary files /dev/null and b/sound/instruments/violin/Eb8.mid differ
diff --git a/sound/instruments/violin/En1.mid b/sound/instruments/violin/En1.mid
new file mode 100644
index 00000000000..79ab68df9df
Binary files /dev/null and b/sound/instruments/violin/En1.mid differ
diff --git a/sound/instruments/violin/En2.mid b/sound/instruments/violin/En2.mid
new file mode 100644
index 00000000000..cd61c8d0de5
Binary files /dev/null and b/sound/instruments/violin/En2.mid differ
diff --git a/sound/instruments/violin/En3.mid b/sound/instruments/violin/En3.mid
new file mode 100644
index 00000000000..da5b703d545
Binary files /dev/null and b/sound/instruments/violin/En3.mid differ
diff --git a/sound/instruments/violin/En4.mid b/sound/instruments/violin/En4.mid
new file mode 100644
index 00000000000..f7d3af024ff
Binary files /dev/null and b/sound/instruments/violin/En4.mid differ
diff --git a/sound/instruments/violin/En5.mid b/sound/instruments/violin/En5.mid
new file mode 100644
index 00000000000..d3d353943f9
Binary files /dev/null and b/sound/instruments/violin/En5.mid differ
diff --git a/sound/instruments/violin/En6.mid b/sound/instruments/violin/En6.mid
new file mode 100644
index 00000000000..73eb5b0697d
Binary files /dev/null and b/sound/instruments/violin/En6.mid differ
diff --git a/sound/instruments/violin/En7.mid b/sound/instruments/violin/En7.mid
new file mode 100644
index 00000000000..79a9462c844
Binary files /dev/null and b/sound/instruments/violin/En7.mid differ
diff --git a/sound/instruments/violin/En8.mid b/sound/instruments/violin/En8.mid
new file mode 100644
index 00000000000..88947fc7318
Binary files /dev/null and b/sound/instruments/violin/En8.mid differ
diff --git a/sound/instruments/violin/Fn1.mid b/sound/instruments/violin/Fn1.mid
new file mode 100644
index 00000000000..abe0d4e4051
Binary files /dev/null and b/sound/instruments/violin/Fn1.mid differ
diff --git a/sound/instruments/violin/Fn2.mid b/sound/instruments/violin/Fn2.mid
new file mode 100644
index 00000000000..d245bef3b54
Binary files /dev/null and b/sound/instruments/violin/Fn2.mid differ
diff --git a/sound/instruments/violin/Fn3.mid b/sound/instruments/violin/Fn3.mid
new file mode 100644
index 00000000000..e532e30dac9
Binary files /dev/null and b/sound/instruments/violin/Fn3.mid differ
diff --git a/sound/instruments/violin/Fn4.mid b/sound/instruments/violin/Fn4.mid
new file mode 100644
index 00000000000..47219c72fa2
Binary files /dev/null and b/sound/instruments/violin/Fn4.mid differ
diff --git a/sound/instruments/violin/Fn5.mid b/sound/instruments/violin/Fn5.mid
new file mode 100644
index 00000000000..630d16371d9
Binary files /dev/null and b/sound/instruments/violin/Fn5.mid differ
diff --git a/sound/instruments/violin/Fn6.mid b/sound/instruments/violin/Fn6.mid
new file mode 100644
index 00000000000..08cbc981bdb
Binary files /dev/null and b/sound/instruments/violin/Fn6.mid differ
diff --git a/sound/instruments/violin/Fn7.mid b/sound/instruments/violin/Fn7.mid
new file mode 100644
index 00000000000..6c28c7d272e
Binary files /dev/null and b/sound/instruments/violin/Fn7.mid differ
diff --git a/sound/instruments/violin/Fn8.mid b/sound/instruments/violin/Fn8.mid
new file mode 100644
index 00000000000..2d73762f269
Binary files /dev/null and b/sound/instruments/violin/Fn8.mid differ
diff --git a/sound/instruments/violin/Gb1.mid b/sound/instruments/violin/Gb1.mid
new file mode 100644
index 00000000000..d18668e8911
Binary files /dev/null and b/sound/instruments/violin/Gb1.mid differ
diff --git a/sound/instruments/violin/Gb2.mid b/sound/instruments/violin/Gb2.mid
new file mode 100644
index 00000000000..302f0c6fdc1
Binary files /dev/null and b/sound/instruments/violin/Gb2.mid differ
diff --git a/sound/instruments/violin/Gb3.mid b/sound/instruments/violin/Gb3.mid
new file mode 100644
index 00000000000..1f592fc9039
Binary files /dev/null and b/sound/instruments/violin/Gb3.mid differ
diff --git a/sound/instruments/violin/Gb4.mid b/sound/instruments/violin/Gb4.mid
new file mode 100644
index 00000000000..45854126f98
Binary files /dev/null and b/sound/instruments/violin/Gb4.mid differ
diff --git a/sound/instruments/violin/Gb5.mid b/sound/instruments/violin/Gb5.mid
new file mode 100644
index 00000000000..fb1e1da339a
Binary files /dev/null and b/sound/instruments/violin/Gb5.mid differ
diff --git a/sound/instruments/violin/Gb6.mid b/sound/instruments/violin/Gb6.mid
new file mode 100644
index 00000000000..bfa896bb784
Binary files /dev/null and b/sound/instruments/violin/Gb6.mid differ
diff --git a/sound/instruments/violin/Gb7.mid b/sound/instruments/violin/Gb7.mid
new file mode 100644
index 00000000000..a27763c1d47
Binary files /dev/null and b/sound/instruments/violin/Gb7.mid differ
diff --git a/sound/instruments/violin/Gb8.mid b/sound/instruments/violin/Gb8.mid
new file mode 100644
index 00000000000..aaab80a7276
Binary files /dev/null and b/sound/instruments/violin/Gb8.mid differ
diff --git a/sound/instruments/violin/Gn1.mid b/sound/instruments/violin/Gn1.mid
new file mode 100644
index 00000000000..1df52ab0760
Binary files /dev/null and b/sound/instruments/violin/Gn1.mid differ
diff --git a/sound/instruments/violin/Gn2.mid b/sound/instruments/violin/Gn2.mid
new file mode 100644
index 00000000000..6e0ca383127
Binary files /dev/null and b/sound/instruments/violin/Gn2.mid differ
diff --git a/sound/instruments/violin/Gn3.mid b/sound/instruments/violin/Gn3.mid
new file mode 100644
index 00000000000..bb3e6dedcbf
Binary files /dev/null and b/sound/instruments/violin/Gn3.mid differ
diff --git a/sound/instruments/violin/Gn4.mid b/sound/instruments/violin/Gn4.mid
new file mode 100644
index 00000000000..0c46432afee
Binary files /dev/null and b/sound/instruments/violin/Gn4.mid differ
diff --git a/sound/instruments/violin/Gn5.mid b/sound/instruments/violin/Gn5.mid
new file mode 100644
index 00000000000..f39dcf5e2b9
Binary files /dev/null and b/sound/instruments/violin/Gn5.mid differ
diff --git a/sound/instruments/violin/Gn6.mid b/sound/instruments/violin/Gn6.mid
new file mode 100644
index 00000000000..0efa2259ca1
Binary files /dev/null and b/sound/instruments/violin/Gn6.mid differ
diff --git a/sound/instruments/violin/Gn7.mid b/sound/instruments/violin/Gn7.mid
new file mode 100644
index 00000000000..22fd1b6bcb0
Binary files /dev/null and b/sound/instruments/violin/Gn7.mid differ
diff --git a/sound/instruments/violin/Gn8.mid b/sound/instruments/violin/Gn8.mid
new file mode 100644
index 00000000000..16b7171d627
Binary files /dev/null and b/sound/instruments/violin/Gn8.mid differ
diff --git a/sound/machines/machine_vend.ogg b/sound/machines/machine_vend.ogg
new file mode 100644
index 00000000000..92867a1f3d3
Binary files /dev/null and b/sound/machines/machine_vend.ogg differ
diff --git a/sound/music/thunderdome.ogg b/sound/music/thunderdome.ogg
index 26b18df5e05..82780e416d4 100644
Binary files a/sound/music/thunderdome.ogg and b/sound/music/thunderdome.ogg differ
diff --git a/sound/weapons/banjoslap.ogg b/sound/weapons/banjoslap.ogg
new file mode 100644
index 00000000000..06a86a535dd
Binary files /dev/null and b/sound/weapons/banjoslap.ogg differ
diff --git a/sound/weapons/guitarslam.ogg b/sound/weapons/guitarslam.ogg
new file mode 100644
index 00000000000..4fa53db9404
Binary files /dev/null and b/sound/weapons/guitarslam.ogg differ
diff --git a/sound/weapons/jug_empty_impact.ogg b/sound/weapons/jug_empty_impact.ogg
new file mode 100644
index 00000000000..d78c1c5e554
Binary files /dev/null and b/sound/weapons/jug_empty_impact.ogg differ
diff --git a/sound/weapons/jug_filled_impact.ogg b/sound/weapons/jug_filled_impact.ogg
new file mode 100644
index 00000000000..05e2d364373
Binary files /dev/null and b/sound/weapons/jug_filled_impact.ogg differ
diff --git a/strings/tips.txt b/strings/tips.txt
index 4218e01bbfe..d28943913d3 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -23,7 +23,6 @@ If you find yourself in a fistfight with another player, running away and callin
Different weapons have different strengths. Some weapons, such as spears, floor tiles, and throwing stars, deal more damage when thrown compared to when attacked normally.
Clicking on a tile on harm intent with a glass of water can make a slippery tile, allowing you to slow down your pursuers in a pinch.
When dealing with security, you can often get your sentence negated entirely through cooperation and deception.
-The P2P chat function found on tablet computers allows for a stealthy way to communicate with people.
We were all new once, be patient and guide new players in the right direction.
On most clothing items that go in the exosuit slot, you can put certain small items into your suit storage, such as a spraycan, your emergency oxygen tank, or a flashlight.
Most job-related exosuit clothing can fit job-related items into it. For example, the atmospheric technician's hardsuit/winter coat can hold an RPD, and labcoats can hold most medicine.
@@ -68,7 +67,7 @@ As a Medical Cyborg, you can partially perform surgery, as you cannot replace or
As a Janitor Cyborg, you are the bane of all slaughter demons. Cleaning up blood stains will severely gimp them.
As the Chief Engineer, you can rename areas or create entirely new ones using your station blueprints.
As the Chief Engineer, your hardsuit is significantly better than everybody else's. It has the best features of both engineering and atmospherics hardsuits, boasting nigh-invulnerability to radiation and all atmospheric conditions.
-As the Chief Engineer, the power flow control console in your office will show you APC infos and lets you control them remotely.
+As the Chief Engineer, the power flow control console in your office will show you APC infos and lets you control them remotely.
As an Engineer, you can electrify grilles by placing wire "nodes" beneath them: the big seemingly unconnected bulges from a half completed wiring job. The wire will be need to be connected to an active power source in order to function.
As an Engineer, return to Engineering once in a while to check on the engine and SMES cells. It's always a good idea to make sure containment isn't compromised.
As an Engineer, you can power the station solely with the solar arrays. They will provide just enough electricity to power the station, however their output is still much worse compared to the true engine.
@@ -86,7 +85,7 @@ As the Head of Security, don't let the power go to your head. You may have high
As the Warden, your duty is to be the watchdog of the brig and handler of prisoners when little is happening, and to hand out equipment and weapons to the security officers when a crisis strikes.
As the Warden, keep a close eye on the armory at all times, as it is a favored strike point of nuclear operatives and cocky traitors.
As the Warden, if a prisoner's crimes are heinous enough you can put them in permabrig or the gulag. Make sure to check on them once in a while!
-As the Warden, you can implant criminals you suspect might re-offend with devices that will track their location and allow you to remotely inject them with disabling chemicals.
+As the Warden, you can implant criminals you suspect might re-offend with devices that will track their location and allow you to remotely inject them with disabling chemicals.
As a Security Officer, communicate and coordinate with your fellow officers using the security channel (:s) to avoid confusion.
As a Security Officer, your sechuds or HUDsunglasses let you see crewmates' job assignments, their criminal status, and whether they have a mindshield or not. A flashing green border around their job icon means they are mindshielded.
As a Security Officer, mindshield implants can only prevent someone from being turned into a cultist. It will not de-cult them if they have already been converted.
@@ -98,7 +97,6 @@ As the IAA, try to negotiate with the Warden if sentences seem too high for the
As the IAA, you can try to convince the Captain and Head of Security to hold trials for prisoners in the courtroom.
As the Head of Personnel, you are not higher ranking than other heads of staff, even though you are expected to take the Captain's place first should he go missing. If the situation seems too rough for you, consider allowing another head to become temporary Captain.
As the Head of Personnel, you are just as large a target as the Captain because of the potential power your ID and computer can hand out.
-As the Head of Personnel, consider getting a laptop with an ID slot. It allows you to do your job even when out of your office.
As the Mime, your invisible wall power blocks people as well as projectiles. You can use it in a pinch to delay your pursuer.
As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor.
As the Clown, if you lose your banana peel, you can still slip people with your PDA! Honk!
@@ -178,7 +176,7 @@ As a Swarmer, you can teleport fellow swarmers away if you think they are in dan
As a Ghost, you can double click on just about anything to follow it. Or just warp around!
As a Devil, you gain power for every three souls you control, however you also become more obvious.
As a Devil, as long as you control at least one other soul, you will automatically resurrect, as long as a banishment ritual is not performed.
-At which time a Devil's nameth is spake on the tongue of man, the Devil may appeareth.
+At which time a Devil's nameth is spake on the tongue of man, the Devil may appeareth.
As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!
As a Security Officer, remember that you can attach a sec-lite to your taser!
As a Terror Spider, leave wrapping of corpses to green spiders unless absolutely necessary. They need it to lay eggs!
diff --git a/tgui/packages/tgui/components/Box.js b/tgui/packages/tgui/components/Box.js
index 9d5e71c78a7..ada17f05d55 100644
--- a/tgui/packages/tgui/components/Box.js
+++ b/tgui/packages/tgui/components/Box.js
@@ -68,7 +68,10 @@ const mapColorPropTo = attrName => (style, value) => {
const styleMapperByPropName = {
// Direct mapping
+ display: mapRawPropTo('display'),
position: mapRawPropTo('position'),
+ float: mapRawPropTo('float'),
+ clear: mapRawPropTo('clear'),
overflow: mapRawPropTo('overflow'),
overflowX: mapRawPropTo('overflow-x'),
overflowY: mapRawPropTo('overflow-y'),
@@ -88,6 +91,9 @@ const styleMapperByPropName = {
opacity: mapRawPropTo('opacity'),
textAlign: mapRawPropTo('text-align'),
verticalAlign: mapRawPropTo('vertical-align'),
+ textTransform: mapRawPropTo('text-transform'),
+ wordWrap: mapRawPropTo('word-wrap'),
+ textOverflow: mapRawPropTo('text-overflow'),
// Boolean props
inline: mapBooleanPropTo('display', 'inline-block'),
bold: mapBooleanPropTo('font-weight', 'bold'),
@@ -125,6 +131,18 @@ const styleMapperByPropName = {
color: mapColorPropTo('color'),
textColor: mapColorPropTo('color'),
backgroundColor: mapColorPropTo('background-color'),
+ // Flex props
+ order: mapRawPropTo('order'),
+ flexDirection: mapRawPropTo('flex-direction'),
+ flexGrow: mapRawPropTo('flex-grow'),
+ flexShrink: mapRawPropTo('flex-shrink'),
+ flexWrap: mapRawPropTo('flex-wrap'),
+ flexFlow: mapRawPropTo('flex-flow'),
+ flexBasis: mapRawPropTo('flex-basis'),
+ flex: mapRawPropTo('flex'),
+ alignItems: mapRawPropTo('align-items'),
+ justifyContent: mapRawPropTo('justify-content'),
+ alignSelf: mapRawPropTo('align-self'),
// Utility props
fillPositionedParent: (style, value) => {
if (value) {
@@ -140,6 +158,9 @@ const styleMapperByPropName = {
export const computeBoxProps = props => {
const computedProps = {};
const computedStyles = {};
+ if (props.double) {
+ computedStyles["transform"] = "scale(2);";
+ }
// Compute props
for (let propName of Object.keys(props)) {
if (propName === 'style') {
diff --git a/tgui/packages/tgui/components/Collapsible.js b/tgui/packages/tgui/components/Collapsible.js
index 84af070fe18..080074e48ef 100644
--- a/tgui/packages/tgui/components/Collapsible.js
+++ b/tgui/packages/tgui/components/Collapsible.js
@@ -22,7 +22,7 @@ export class Collapsible extends Component {
...rest
} = props;
return (
-
- {{for data.status}}
-
- {{:value}}
- {{/for}}
-
+ {
as="td"
color={color}
textAlign={textAlign}
+ verticalAlign={verticalAlign}
className={classes([
'LabeledList__cell',
'LabeledList__content',
diff --git a/tgui/packages/tgui/components/Modal.js b/tgui/packages/tgui/components/Modal.js
index 916150de402..125593902b6 100644
--- a/tgui/packages/tgui/components/Modal.js
+++ b/tgui/packages/tgui/components/Modal.js
@@ -6,10 +6,20 @@ export const Modal = props => {
const {
className,
children,
+ onEnter,
...rest
} = props;
+ let handleKeyDown;
+ if (onEnter) {
+ handleKeyDown = e => {
+ if (e.keyCode === 13) {
+ onEnter(e);
+ }
+ };
+ }
return (
-
+
)}
);
diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js
index 20ba00cb759..024278e39b3 100644
--- a/tgui/packages/tgui/constants.js
+++ b/tgui/packages/tgui/constants.js
@@ -54,6 +54,11 @@ export const RADIO_CHANNELS = [
freq: 1213,
color: '#a52a2a',
},
+ {
+ name: 'SyndTeam',
+ freq: 1244,
+ color: '#a52a2a',
+ },
{
name: 'Red Team',
freq: 1215,
@@ -65,8 +70,13 @@ export const RADIO_CHANNELS = [
color: '#3434fd',
},
{
- name: 'CentCom',
- freq: 1337,
+ name: 'Response Team',
+ freq: 1345,
+ color: '#2681a5',
+ },
+ {
+ name: 'Special Ops',
+ freq: 1341,
color: '#2681a5',
},
{
@@ -94,6 +104,11 @@ export const RADIO_CHANNELS = [
freq: 1355,
color: '#57b8f0',
},
+ {
+ name: 'Medical(I)',
+ freq: 1485,
+ color: '#57b8f0',
+ },
{
name: 'Engineering',
freq: 1357,
@@ -104,9 +119,14 @@ export const RADIO_CHANNELS = [
freq: 1359,
color: '#dd3535',
},
+ {
+ name: 'Security(I)',
+ freq: 1475,
+ color: '#dd3535',
+ },
{
name: 'AI Private',
- freq: 1447,
+ freq: 1343,
color: '#d65d95',
},
{
diff --git a/tgui/packages/tgui/index.js b/tgui/packages/tgui/index.js
index 59199f9edbe..45012a7e956 100644
--- a/tgui/packages/tgui/index.js
+++ b/tgui/packages/tgui/index.js
@@ -3,30 +3,30 @@ import 'core-js/es';
import 'core-js/web/immediate';
import 'core-js/web/queue-microtask';
import 'core-js/web/timers';
-import 'regenerator-runtime/runtime';
-import './polyfills/html5shiv';
-import './polyfills/ie8';
-import './polyfills/dom4';
-import './polyfills/css-om';
-import './polyfills/inferno';
-
-// Themes
-import './styles/main.scss';
-import './styles/themes/cardtable.scss';
-import './styles/themes/malfunction.scss';
-import './styles/themes/ntos.scss';
-import './styles/themes/hackerman.scss';
-import './styles/themes/retro.scss';
-import './styles/themes/syndicate.scss';
-
import { loadCSS } from 'fg-loadcss';
import { render } from 'inferno';
+import 'regenerator-runtime/runtime';
import { setupHotReloading } from 'tgui-dev-server/link/client';
import { backendUpdate } from './backend';
import { IS_IE8 } from './byond';
import { setupDrag } from './drag';
import { logger } from './logging';
+import './polyfills/css-om';
+import './polyfills/dom4';
+import './polyfills/html5shiv';
+import './polyfills/ie8';
+import './polyfills/inferno';
import { createStore, StoreProvider } from './store';
+// Themes
+import './styles/main.scss';
+import './styles/themes/cardtable.scss';
+import './styles/themes/hackerman.scss';
+import './styles/themes/malfunction.scss';
+import './styles/themes/ntos.scss';
+import './styles/themes/retro.scss';
+import './styles/themes/syndicate.scss';
+
+
const enteredBundleAt = Date.now();
const store = createStore();
diff --git a/tgui/packages/tgui/interfaces/AICard.js b/tgui/packages/tgui/interfaces/AICard.js
new file mode 100644
index 00000000000..8ffe9906e2c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AICard.js
@@ -0,0 +1,94 @@
+import { useBackend } from "../backend";
+import { Button, ProgressBar, LabeledList, Box, Section } from "../components";
+import { Window } from "../layouts";
+
+export const AICard = (props, context) => {
+ const { act, data } = useBackend(context);
+ if (data.has_ai === 0) {
+ return (
+
+
+
+
+
+
+
+
+ );
+ } else {
+
+ let integrityColor = null; // Handles changing color of the integrity bar
+ if (data.integrity >= 75) { integrityColor = 'green'; }
+ else if (data.integrity >= 25) { integrityColor = 'yellow'; }
+ else { integrityColor = 'red'; }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {!!data.has_laws && (
+
+ {data.laws.map((value, key) => (
+
+ {value}
+
+ ))}
+
+ ) || ( // Else, no laws.
+
+
+ )}
+
+
+
+
+
+
+
+
+
+ act("wipe")} />
+
+
+
+
+
+ );
+ }
+};
diff --git a/tgui/packages/tgui/interfaces/AIFixer.js b/tgui/packages/tgui/interfaces/AIFixer.js
new file mode 100644
index 00000000000..7a7d65101d5
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AIFixer.js
@@ -0,0 +1,110 @@
+import { useBackend } from "../backend";
+import { Button, ProgressBar, Box, LabeledList, Section } from "../components";
+import { Window } from "../layouts";
+
+export const AIFixer = (props, context) => {
+ const { act, data } = useBackend(context);
+ if (data.occupant === null) {
+ return (
+
+
+
+
+
+
+
+
+ );
+ } else {
+
+ let workingAI = null; // If the AI is dead (stat = 2) or isn't existent
+ if (data.stat === 2 || data.stat === null) {
+ workingAI = false;
+ } else {
+ workingAI = true;
+ }
+
+ let integrityColor = null; // Handles changing color of the integrity bar
+ if (data.integrity >= 75) { integrityColor = 'green'; }
+ else if (data.integrity >= 25) { integrityColor = 'yellow'; }
+ else { integrityColor = 'red'; }
+
+ let integrityFull = null; // If integrity >= 100, prevents overchar
+ if (data.integrity >= 100) { integrityFull = true; }
+ else { integrityFull = false; }
+
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ {workingAI ? "Functional" : "Non-Functional"}
+
+
+
+
+
+ {!!data.has_laws && (
+
+ {data.laws.map((value, key) => (
+
+ {value}
+
+ ))}
+
+ ) || ( // Else, no laws.
+
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+ {data.active ? "Reconstruction in progress." : ""}
+
+
+
+
+ );
+ }
+};
diff --git a/tgui/packages/tgui/interfaces/APC.js b/tgui/packages/tgui/interfaces/APC.js
new file mode 100644
index 00000000000..652188a3073
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/APC.js
@@ -0,0 +1,195 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Box, Button, LabeledList, NoticeBox, ProgressBar, Section } from '../components';
+import { Window } from '../layouts';
+import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
+
+export const APC = (props, context) => {
+ return (
+
+
+
+
+ );
+};
+
+const powerStatusMap = {
+ 2: {
+ color: 'good',
+ externalPowerText: 'External Power',
+ chargingText: 'Fully Charged',
+ },
+ 1: {
+ color: 'average',
+ externalPowerText: 'Low External Power',
+ chargingText: 'Charging',
+ },
+ 0: {
+ color: 'bad',
+ externalPowerText: 'No External Power',
+ chargingText: 'Not Charging',
+ },
+};
+
+const malfMap = {
+ 1: {
+ icon: 'terminal',
+ content: 'Override Programming',
+ action: 'hack',
+ },
+ 2: {
+ icon: 'caret-square-down',
+ content: 'Shunt Core Process',
+ action: 'occupy',
+ },
+ 3: {
+ icon: 'caret-square-left',
+ content: 'Return to Main Core',
+ action: 'deoccupy',
+ },
+ 4: {
+ icon: 'caret-square-down',
+ content: 'Shunt Core Process',
+ action: 'occupy',
+ },
+};
+
+const ApcContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const locked = data.locked && !data.siliconUser;
+ const normallyLocked = data.normallyLocked;
+ const externalPowerStatus = powerStatusMap[data.externalPower]
+ || powerStatusMap[0];
+ const chargingStatus = powerStatusMap[data.chargingStatus]
+ || powerStatusMap[0];
+ const channelArray = data.powerChannels || [];
+ const malfStatus = malfMap[data.malfStatus] || malfMap[0];
+ const adjustedCellChange = data.powerCellStatus / 100;
+
+ return (
+
+
+
+ act('breaker')} />
+ )}>
+ [ {externalPowerStatus.externalPowerText} ]
+
+
+
+ act('charge')} />
+ )}>
+ [ {chargingStatus.chargingText} ]
+
+
+
+
+
+ {channelArray.map(channel => {
+ const { topicParams } = channel;
+ return (
+
+ = 2 ? 'good' : 'bad'}>
+ {channel.status >= 2 ? 'On' : 'Off'}
+
+
+ )}>
+ {channel.powerLoad} W
+
+ );
+ })}
+
+ {data.totalLoad} W
+
+
+
+
+ {!!data.malfStatus && (
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AiAirlock.js b/tgui/packages/tgui/interfaces/AiAirlock.js
new file mode 100644
index 00000000000..ee47422d32d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AiAirlock.js
@@ -0,0 +1,202 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Button, LabeledList, Section } from '../components';
+import { Window } from '../layouts';
+
+const dangerMap = {
+ 2: {
+ color: 'good',
+ localStatusText: 'Offline',
+ },
+ 1: {
+ color: 'average',
+ localStatusText: 'Caution',
+ },
+ 0: {
+ color: 'bad',
+ localStatusText: 'Optimal',
+ },
+};
+
+export const AiAirlock = (props, context) => {
+ const { act, data } = useBackend(context);
+ const statusMain = dangerMap[data.power.main] || dangerMap[0];
+ const statusBackup = dangerMap[data.power.backup] || dangerMap[0];
+ const statusElectrify = dangerMap[data.shock] || dangerMap[0];
+ return (
+
+
+
+
+ act('disrupt-main')} />
+ )}>
+ {data.power.main ? 'Online' : 'Offline'}
+ {' '}
+ {(!data.wires.main_power)
+ && '[Wires have been cut!]'
+ || (data.power.main_timeleft > 0
+ && `[${data.power.main_timeleft}s]`)}
+
+ act('disrupt-backup')} />
+ )}>
+ {data.power.backup ? 'Online' : 'Offline'}
+ {' '}
+ {(!data.wires.backup_power)
+ && '[Wires have been cut!]'
+ || (data.power.backup_timeleft > 0
+ && `[${data.power.backup_timeleft}s]`)}
+
+
+
+
+
+
+
+ act('idscan-toggle')} />
+ )}>
+ {!data.wires.id_scanner && '[Wires have been cut!]'}
+
+ act('emergency-toggle')} />
+ )} />
+ act('bolt-toggle')} />
+ )}>
+ {!data.wires.bolts && '[Wires have been cut!]'}
+
+ act('light-toggle')} />
+ )}>
+ {!data.wires.lights && '[Wires have been cut!]'}
+
+ act('safe-toggle')} />
+ )}>
+ {!data.wires.safe && '[Wires have been cut!]'}
+
+ act('speed-toggle')} />
+ )}>
+ {!data.wires.timing && '[Wires have been cut!]'}
+
+ act('open-close')} />
+ )}>
+ {!!(data.locked || data.welded) && (
+
+ [Door is {data.locked ? 'bolted' : ''}
+ {(data.locked && data.welded) ? ' and ' : ''}
+ {data.welded ? 'welded' : ''}!]
+
+ )}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AtmosAlertConsole.js b/tgui/packages/tgui/interfaces/AtmosAlertConsole.js
new file mode 100644
index 00000000000..8db992f61b5
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AtmosAlertConsole.js
@@ -0,0 +1,47 @@
+import { useBackend } from '../backend';
+import { Button, Section } from '../components';
+import { Window } from '../layouts';
+
+export const AtmosAlertConsole = (props, context) => {
+ const { act, data } = useBackend(context);
+ const priorityAlerts = data.priority || [];
+ const minorAlerts = data.minor || [];
+ return (
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AtmosFilter.js b/tgui/packages/tgui/interfaces/AtmosFilter.js
new file mode 100644
index 00000000000..37b99bfed7f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AtmosFilter.js
@@ -0,0 +1,70 @@
+import { useBackend } from "../backend";
+import { Button, Section, NumberInput, LabeledList } from "../components";
+import { Window } from "../layouts";
+
+export const AtmosFilter = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ on,
+ pressure,
+ max_pressure,
+ filter_type,
+ filter_type_list,
+ } = data;
+
+ return (
+
+
+
+
+
+
+
+
+
+ {filter_type_list.map(filter => (
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AtmosMixer.js b/tgui/packages/tgui/interfaces/AtmosMixer.js
new file mode 100644
index 00000000000..66621ed8f78
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AtmosMixer.js
@@ -0,0 +1,109 @@
+import { useBackend } from "../backend";
+import { Button, Section, NumberInput, LabeledList, Flex } from "../components";
+import { Window } from "../layouts";
+
+export const AtmosMixer = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ on,
+ pressure,
+ max_pressure,
+ node1_concentration,
+ node2_concentration,
+ } = data;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+const NodeControls = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ node_name,
+ node_ref,
+ } = props;
+
+ return (
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AtmosPump.js b/tgui/packages/tgui/interfaces/AtmosPump.js
new file mode 100644
index 00000000000..d6b1547dd7a
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AtmosPump.js
@@ -0,0 +1,59 @@
+import { useBackend } from "../backend";
+import { Button, Section, NumberInput, LabeledList } from "../components";
+import { Window } from "../layouts";
+
+export const AtmosPump = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ on,
+ rate,
+ max_rate,
+ gas_unit,
+ step,
+ } = data;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Autolathe.js b/tgui/packages/tgui/interfaces/Autolathe.js
new file mode 100644
index 00000000000..fe9a37871da
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Autolathe.js
@@ -0,0 +1,235 @@
+import { flow } from 'common/fp';
+import { filter, sortBy } from 'common/collections';
+import { useBackend, useSharedState } from "../backend";
+import { Box, Button, Flex, Input, LabeledList, Section, Dropdown } from "../components";
+import { Window } from "../layouts";
+import { createSearch, toTitleCase } from 'common/string';
+
+const canBeMade = (recipe, mavail, gavail, multi) => {
+ if (recipe.requirements === null) {
+ return true;
+ }
+ if ((recipe.requirements["metal"] * multi) > mavail) {
+ return false;
+ }
+ if ((recipe.requirements["glass"] * multi) > gavail) {
+ return false;
+ }
+ return true;
+};
+
+export const Autolathe = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ total_amount,
+ max_amount,
+ metal_amount,
+ glass_amount,
+ busyname,
+ busyamt,
+ showhacked,
+ buildQueue,
+ buildQueueLen,
+ recipes,
+ categories,
+ } = data;
+
+ let [category, setCategory] = useSharedState(context, "category", 0);
+
+ if (category === 0) {
+ category = "Tools";
+ }
+ let metalReadable = metal_amount.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,'); // add thousands seperator
+ let glassReadable = glass_amount.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+ let totalReadable = total_amount.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+
+ const [
+ searchText,
+ setSearchText,
+ ] = useSharedState(context, "search_text", "");
+
+ const testSearch = createSearch(searchText, recipe => recipe.name);
+
+ let buildQueueItems = "";
+ if (buildQueueLen > 0) {
+ buildQueueItems = buildQueue.map((a, i) => {
+ return (
+
+
+ );
+ });
+ }
+
+ const recipesToShow = flow([
+ filter(recipe => (recipe.category.indexOf(category) > -1 || searchText)
+ && (data.showhacked || !recipe.hacked)),
+ searchText && filter(testSearch),
+ sortBy(recipe => recipe.name.toLowerCase()),
+ ])(recipes);
+
+ let rText = "Build";
+ if (searchText) {
+ rText = "Results for: '" + searchText + "':";
+ } else if (category) {
+ rText = "Build (" + category + ")";
+ }
+ const styleLeftDiv = {
+ float: 'left',
+ width: '68%',
+ };
+ const styleRightDiv = {
+ float: 'right',
+ width: '30%',
+ };
+ return (
+
+
+
+
+ );
+};
+
+
diff --git a/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js b/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js
new file mode 100644
index 00000000000..adc5b210aab
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js
@@ -0,0 +1,66 @@
+import { useBackend } from "../backend";
+import { Button, LabeledList, Section, Box, ProgressBar } from "../components";
+import { Window } from "../layouts";
+
+export const BlueSpaceArtilleryControl = (props, context) => {
+ const { act, data } = useBackend(context);
+ let alertStatus;
+ if (data.ready) {
+ alertStatus = (
+
+ Ready
+
+ );
+ } else if (data.reloadtime_text) {
+ alertStatus = (
+
+ {data.reloadtime_text}
+
+ );
+ } else {
+ alertStatus = (
+
+ No cannon connected!
+
+ );
+ }
+ return (
+
+
+
+
+ {data.notice && (
+
+ {data.notice}
+
+ )}
+ {alertStatus}
+
+
+ {data.ready === 1 && !!data.target && (
+
+
+ )}
+ {!data.connected && (
+
+
+ )}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/BodyScanner.js b/tgui/packages/tgui/interfaces/BodyScanner.js
new file mode 100644
index 00000000000..9e24c62900f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/BodyScanner.js
@@ -0,0 +1,433 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { AnimatedNumber, Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, Table, Tooltip } from "../components";
+import { Window } from "../layouts";
+
+const stats = [
+ ['good', 'Alive'],
+ ['average', 'Critical'],
+ ['bad', 'DEAD'],
+];
+
+const abnormalities = [
+ ['hasBorer', 'bad', 'Large growth detected in frontal lobe,'
+ + ' possibly cancerous. Surgical removal is recommended.'],
+ ['hasVirus', 'bad', 'Viral pathogen detected in blood stream.'],
+ ['blind', 'average', 'Cataracts detected.'],
+ ['colourblind', 'average', 'Photoreceptor abnormalities detected.'],
+ ['nearsighted', 'average', 'Retinal misalignment detected.'],
+];
+
+const damages = [
+ ['Respiratory', 'oxyLoss'],
+ ['Brain', 'brainLoss'],
+ ['Toxin', 'toxLoss'],
+ ['Radioactive', 'radLoss'],
+ ['Brute', 'bruteLoss'],
+ ['Genetic', 'cloneLoss'],
+ ['Burn', 'fireLoss'],
+ ['Paralysis', 'paralysis'],
+];
+
+const damageRange = {
+ average: [0.25, 0.5],
+ bad: [0.5, Infinity],
+};
+
+const mapTwoByTwo = (a, c) => {
+ let result = [];
+ for (let i = 0; i < a.length; i += 2) {
+ result.push(c(a[i], a[i + 1], i));
+ }
+ return result;
+};
+
+const reduceOrganStatus = A => {
+ return A.length > 0
+ ? A
+ .filter(s => !!s && s.length > 0)
+ .reduce((a, s) => a === null
+ ? [s]
+ : {a}
{s} , null
+ )
+ : null;
+};
+
+const germStatus = i => {
+ if (i > 100) {
+ if (i < 300) { return "mild infection"; }
+ if (i < 400) { return "mild infection+"; }
+ if (i < 500) { return "mild infection++"; }
+ if (i < 700) { return "acute infection"; }
+ if (i < 800) { return "acute infection+"; }
+ if (i < 900) { return "acute infection++"; }
+ if (i >= 900) { return "septic"; }
+ }
+
+ return "";
+};
+
+export const BodyScanner = (props, context) => {
+ const { data } = useBackend(context);
+ const {
+ occupied,
+ occupant = {},
+ } = data;
+ const body = occupied ? (
+
+
+ {body}
+
+
+ );
+};
+
+const BodyScannerMain = props => {
+ const {
+ occupant,
+ } = props;
+ return (
+
+
+ );
+};
+
+const BodyScannerMainOccupant = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ occupant,
+ } = data;
+ return (
+
+
+
+
+ )}>
+
+
+ {occupant.name}
+
+
+
+
+ {stats[occupant.stat][1]}
+
+
+
+
+ {occupant.implant_len ? (
+
+ {occupant.implant.map(im => im.name).join(', ')}
+
+ ) : (
+
+ None
+
+ )}
+
+
+
+ );
+};
+
+const BodyScannerMainAbnormalities = props => {
+ const {
+ occupant,
+ } = props;
+ if (!(occupant.hasBorer || occupant.blind
+ || occupant.colourblind || occupant.nearsighted
+ || occupant.hasVirus)) {
+ return (
+
+
+ No abnormalities found.
+
+
+ );
+ }
+
+ return (
+
+ {abnormalities.map((a, i) => {
+ if (occupant[a[0]]) {
+ return (
+
+ {a[2]}
+
+ );
+ }
+ })}
+
+ );
+};
+
+const BodyScannerMainDamage = props => {
+ const {
+ occupant,
+ } = props;
+ return (
+
+
+ {mapTwoByTwo(damages, (d1, d2, i) => (
+
+
+ );
+};
+
+const BodyScannerMainDamageBar = props => {
+ return (
+
+ {round(props.value, 0)}
+
+ );
+};
+
+const BodyScannerMainOrgansExternal = props => {
+ if (props.organs.length === 0) {
+ return (
+
+
+ N/A
+
+
+ );
+ }
+
+ return (
+
+
+
+
+ );
+};
+
+const BodyScannerMainOrgansInternal = props => {
+ if (props.organs.length === 0) {
+ return (
+
+
+ N/A
+
+
+ );
+ }
+
+ return (
+
+
+
+
+ );
+};
+
+const BodyScannerEmpty = () => {
+ return (
+
+
+
+
+ No occupant detected. +
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/BrigTimer.js b/tgui/packages/tgui/interfaces/BrigTimer.js
new file mode 100644
index 00000000000..5895b333c9c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/BrigTimer.js
@@ -0,0 +1,123 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Button, LabeledList, Dropdown, Box, Section } from '../components';
+import { Window } from '../layouts';
+
+export const BrigTimer = (props, context) => {
+ const { act, data } = useBackend(context);
+ data.nameText = data.occupant;
+ if (data.timing) {
+ if (data.prisoner_hasrec) {
+ data.nameText = ({data.occupant} );
+ } else {
+ data.nameText = ({data.occupant} );
+ }
+ }
+ let nameIcon = "pencil-alt";
+ if (data.prisoner_name) {
+ if (!data.prisoner_hasrec) {
+ nameIcon = "exclamation-triangle";
+ }
+ }
+ let nameOptions = [];
+ let i = 0;
+ for (i = 0; i < data.spns.length; i++) {
+ nameOptions.push(data.spns[i]);
+ }
+ return (
+
+
+
+
+
+ {data.cell_id}
+
+
+ {data.nameText}
+
+
+ {data.crimes}
+
+
+ {data.brigged_by}
+
+
+ {data.time_set}
+
+
+ {data.time_left}
+
+
+
+
+
+
+
+ {!data.timing && (
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/CameraConsole.js b/tgui/packages/tgui/interfaces/CameraConsole.js
new file mode 100644
index 00000000000..594de52eb2c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CameraConsole.js
@@ -0,0 +1,135 @@
+import { filter, sortBy } from 'common/collections';
+import { flow } from 'common/fp';
+import { classes } from 'common/react';
+import { createSearch } from 'common/string';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from '../backend';
+import { Button, ByondUi, Input, Section } from '../components';
+import { refocusLayout, Window } from '../layouts';
+
+/**
+ * Returns previous and next camera names relative to the currently
+ * active camera.
+ */
+const prevNextCamera = (cameras, activeCamera) => {
+ if (!activeCamera) {
+ return [];
+ }
+ const index = cameras.findIndex(camera => (
+ camera.name === activeCamera.name
+ ));
+ return [
+ cameras[index - 1]?.name,
+ cameras[index + 1]?.name,
+ ];
+};
+
+/**
+ * Camera selector.
+ *
+ * Filters cameras, applies search terms and sorts the alphabetically.
+ */
+const selectCameras = (cameras, searchText = '') => {
+ const testSearch = createSearch(searchText, camera => camera.name);
+ return flow([
+ // Null camera filter
+ filter(camera => camera?.name),
+ // Optional search term
+ searchText && filter(testSearch),
+ // Slightly expensive, but way better than sorting in BYOND
+ sortBy(camera => camera.name),
+ ])(cameras);
+};
+
+export const CameraConsole = (props, context) => {
+ const { act, data, config } = useBackend(context);
+ const { mapRef, activeCamera } = data;
+ const cameras = selectCameras(data.cameras);
+ const [
+ prevCameraName,
+ nextCameraName,
+ ] = prevNextCamera(cameras, activeCamera);
+ return (
+
+
+ );
+};
+
+export const CameraConsoleContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [
+ searchText,
+ setSearchText,
+ ] = useLocalState(context, 'searchText', '');
+ const { activeCamera } = data;
+ const cameras = selectCameras(data.cameras, searchText);
+ return (
+
+ setSearchText(value)} />
+
+ {cameras.map(camera => (
+ // We're not using the component here because performance
+ // would be absolutely abysmal (50+ ms for each re-render).
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Canister.js b/tgui/packages/tgui/interfaces/Canister.js
new file mode 100644
index 00000000000..8c184f71e68
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Canister.js
@@ -0,0 +1,248 @@
+import { toFixed } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { AnimatedNumber, Box, Button, Dropdown, Icon, Knob, LabeledControls, LabeledList, Section, Tooltip } from '../components';
+import { formatSiUnit } from '../format';
+import { Window } from '../layouts';
+
+export const Canister = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ portConnected,
+ tankPressure,
+ releasePressure,
+ defaultReleasePressure,
+ minReleasePressure,
+ maxReleasePressure,
+ valveOpen,
+ name,
+ canLabel,
+ colorContainer,
+ color_index,
+ hasHoldingTank,
+ holdingTank,
+ } = data;
+
+
+ let preset_prim = "";
+ if (color_index["prim"]) {
+ preset_prim = colorContainer.prim.options[color_index["prim"]]["name"];
+ }
+ let preset_sec = "";
+ if (color_index["sec"]) {
+ preset_sec = colorContainer.sec.options[color_index["sec"]]["name"];
+ }
+ let preset_ter = "";
+ if (color_index["ter"]) {
+ preset_ter = colorContainer.ter.options[color_index["ter"]]["name"];
+ }
+ let preset_quart = "";
+ if (color_index["quart"]) {
+ preset_quart
+ = colorContainer.quart.options[color_index["quart"]]["name"];
+ }
+
+ let array_prim = [];
+ let array_sec = [];
+ let array_ter = [];
+ let array_quart = [];
+ let i = 0;
+
+ for (i = 0; i < colorContainer.prim.options.length; i++) {
+ array_prim.push(colorContainer.prim.options[i]["name"]);
+ }
+ for (i = 0; i < colorContainer.sec.options.length; i++) {
+ array_sec.push(colorContainer.sec.options[i]["name"]);
+ }
+ for (i = 0; i < colorContainer.ter.options.length; i++) {
+ array_ter.push(colorContainer.ter.options[i]["name"]);
+ }
+ for (i = 0; i < colorContainer.quart.options.length; i++) {
+ array_quart.push(colorContainer.quart.options[i]["name"]);
+ }
+ let paintSection = "";
+ if (canLabel) {
+ paintSection = (
+
+
+
+ act('recolor',
+ { nc: array_prim.indexOf(value),
+ ctype: "prim" })} />
+
+
+ act('recolor',
+ { nc: array_sec.indexOf(value),
+ ctype: "sec" })} />
+
+
+ act('recolor',
+ { nc: array_ter.indexOf(value),
+ ctype: "ter" })} />
+
+
+ act('recolor',
+ { nc: array_quart.indexOf(value),
+ ctype: "quart" })} />
+
+
+
+ );
+ }
+
+ return (
+
+
+ act('relabel')} />
+ )}>
+
+
+ {
+ if (value < 10000) {
+ return toFixed(value) + ' kPa';
+ }
+ return formatSiUnit(value * 1000, 1, 'Pa');
+ }} />
+
+
+
+ act('pressure', {
+ pressure: value,
+ })} />
+
+
+
+
+
+
+
+
+
+
+ act('eject')} />
+ )}>
+ {!!hasHoldingTank && (
+
+
+ {holdingTank.name}
+
+
+
+
+ )}
+ {!hasHoldingTank && (
+
+ No Holding Tank
+
+ )}
+
+ {paintSection}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/CardComputer.js b/tgui/packages/tgui/interfaces/CardComputer.js
new file mode 100644
index 00000000000..7e460fe1869
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CardComputer.js
@@ -0,0 +1,549 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Button, LabeledList, Box, Section, Table, Tabs } from '../components';
+import { Window } from '../layouts';
+import { AccessList } from './common/AccessList';
+
+export const CardComputer = (props, context) => {
+ const { act, data } = useBackend(context);
+
+
+ let menuBlock = (
+
+ act("mode", { mode: 0 })} >
+ Job Transfers
+
+ {!data.target_dept && (
+ act("mode", { mode: 2 })} >
+ Access Modification
+
+ )}
+ act("mode", { mode: 1 })}>
+ Job Management
+
+ act("mode", { mode: 3 })}>
+ Records
+
+ act("mode", { mode: 4 })}>
+ Department
+
+
+ );
+
+
+ let authBlock = (
+
+
+
+
+
+
+
+
+ );
+
+ let bodyBlock;
+
+ switch (data.mode) {
+ case 0: // job transfer
+ if (!data.authenticated || !data.scan_name) {
+ bodyBlock = (
+
+ Not logged in.
+
+ );
+ } else if (!data.modify_name) {
+ bodyBlock = (
+
+ No card to modify.
+
+ );
+ } else if (data.target_dept) {
+ bodyBlock = (
+
+
+ {!!data.modify_lastlog && (
+
+ {data.modify_lastlog}
+
+ )}
+
+ {data.jobs_dept.map(v => (
+
+
+
+
+
+ {!!data.canterminate && (
+
+
+ )}
+
+
+ );
+ } else {
+ bodyBlock = (
+
+
+
+
+
+
+ {!!data.modify_lastlog && (
+
+ {data.modify_lastlog}
+
+ )}
+
+
+
+
+
+ {data.jobs_top.map(v => (
+
+
+ {data.jobs_engineering.map(v => (
+
+
+ {data.jobs_medical.map(v => (
+
+
+ {data.jobs_science.map(v => (
+
+
+ {data.jobs_security.map(v => (
+
+
+ {data.jobs_service.map(v => (
+
+
+ {data.jobs_supply.map(v => (
+
+
+ {data.jobs_civilian.map(v => (
+
+
+ {data.jobs_karma.map(v => (
+
+ {!!data.iscentcom && (
+
+ {data.jobs_centcom.map(v => (
+
+ )}
+
+
+
+
+
+
+
+
+ {data.card_skins.map(v => (
+
+
+ );
+ }
+ break;
+ case 1: // job slot management
+ if (!data.authenticated || !data.scan_name) {
+ bodyBlock = (
+
+ Not logged in.
+
+ );
+ } else {
+ bodyBlock = (
+
+
+ Next Change Available:
+ {data.cooldown_time ? data.cooldown_time : "Now"}
+
+
+
+
+
+
+
+
+ );
+ }
+ break;
+ case 2: // access change
+ if (!data.authenticated || !data.scan_name) {
+ bodyBlock = (
+
+ Not logged in.
+
+ );
+ } else if (!data.modify_name) {
+ bodyBlock = (
+
+ No card to modify.
+
+ );
+ } else {
+ bodyBlock = (
+ act('set', {
+ access: ref,
+ })}
+ grantAll={() => act('grant_all')}
+ denyAll={() => act('clear_all')}
+ grantDep={ref => act('grant_region', {
+ region: ref,
+ })}
+ denyDep={ref => act('deny_region', {
+ region: ref,
+ })} />
+ );
+ }
+ break;
+ case 3: // records
+ if (!data.authenticated) {
+ bodyBlock = (
+
+ Not logged in.
+
+ );
+ } else if (!data.records.length) {
+ bodyBlock = (
+
+ No records.
+
+ );
+ } else {
+ bodyBlock = (
+ act('wipe_all_logs')} />
+ }>
+
+
+ {!!data.iscentcom && (
+
+
+ )}
+
+ );
+ }
+ break;
+ case 4: // department
+ if (!data.authenticated || !data.scan_name) {
+ bodyBlock = (
+
+ Not logged in.
+
+ );
+ } else {
+ bodyBlock = (
+
+
+
+
+ );
+ }
+ break;
+ default:
+ bodyBlock = (
+
+ ERROR: Unknown Mode.
+
+ );
+ }
+
+ return (
+
+
+ {menuBlock}
+ {authBlock}
+ {bodyBlock}
+
+
+ );
+
+};
diff --git a/tgui/packages/tgui/interfaces/CargoConsole.js b/tgui/packages/tgui/interfaces/CargoConsole.js
new file mode 100644
index 00000000000..a9ae19b5e10
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CargoConsole.js
@@ -0,0 +1,280 @@
+import { flow } from 'common/fp';
+import { Fragment } from 'inferno';
+import { filter, sortBy } from 'common/collections';
+import { useBackend, useSharedState, useLocalState } from "../backend";
+import { Button, LabeledList, Box, AnimatedNumber, Section, Dropdown, Input, Table, Modal } from "../components";
+import { Window } from "../layouts";
+import { LabeledListItem } from "../components/LabeledList";
+import { createSearch, toTitleCase } from 'common/string';
+
+export const CargoConsole = (props, context) => {
+ return (
+
+
+
+
+ );
+};
+
+const ContentsModal = (_properties, context) => {
+ const [
+ contentsModal,
+ setContentsModal,
+ ] = useLocalState(context, 'contentsModal', null);
+
+ const [
+ contentsModalTitle,
+ setContentsModalTitle,
+ ] = useLocalState(context, 'contentsModalTitle', null);
+ if ((contentsModal !== null) && (contentsModalTitle !== null)) {
+ return (
+
+
+ {contentsModal.map(i => (
+ // This needs keying. I hate it.
+
+ - {i}
+
+ ))}
+
+
+
+
+ );
+ } else {
+ return;
+ }
+};
+
+const StatusPane = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ is_public,
+ points,
+ timeleft,
+ moving,
+ at_station,
+ } = data;
+
+
+ // Shuttle status text
+ let statusText;
+ let shuttleButtonText;
+ if (!moving && !at_station) {
+ statusText = "Docked off-station";
+ shuttleButtonText = "Call Shuttle";
+ } else if (!moving && at_station) {
+ statusText = "Docked at the station";
+ shuttleButtonText = "Return Shuttle";
+ } else if (moving) {
+ // Yes I am this fussy that it goes plural
+ shuttleButtonText = "In Transit...";
+ if (timeleft !== 1) {
+ statusText = "Shuttle is en route (ETA: " + timeleft + " minutes)";
+ } else {
+ statusText = "Shuttle is en route (ETA: " + timeleft + " minute)";
+ }
+ }
+
+ return (
+
+
+
+ {points}
+
+
+ {statusText}
+
+ {is_public === 0 && (
+
+
+ )}
+
+
+ );
+};
+
+const CataloguePane = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ categories,
+ supply_packs,
+ } = data;
+
+ const [
+ category,
+ setCategory,
+ ] = useSharedState(context, "category", "Emergency");
+
+ const [
+ searchText,
+ setSearchText,
+ ] = useSharedState(context, "search_text", "");
+
+ const [
+ contentsModal,
+ setContentsModal,
+ ] = useLocalState(context, 'contentsModal', null);
+
+ const [
+ contentsModalTitle,
+ setContentsModalTitle,
+ ] = useLocalState(context, 'contentsModalTitle', null);
+
+ const packSearch = createSearch(searchText, crate => crate.name);
+
+ const cratesToShow = flow([
+ filter(pack => (pack.cat === categories.filter(
+ c => c.name === category)[0].category || searchText)
+ ), searchText && filter(packSearch),
+ sortBy(pack => pack.name.toLowerCase()),
+ ])(supply_packs);
+
+ let titleText = "Crate Catalogue";
+ if (searchText) {
+ titleText = "Results for '" + searchText + "':";
+ } else if (category) {
+ titleText = "Browsing " + category;
+ }
+ return (
+ r.name)}
+ selected={category}
+ onSelected={val => setCategory(val)} />
+ }>
+ setSearchText(v)}
+ mb={1} />
+
+
+ {cratesToShow.map(c => (
+
+
+
+ );
+};
+
+const DetailsPane = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ requests,
+ canapprove,
+ orders,
+ } = data;
+ return (
+
+
+ Requests
+
+ {requests.map(r => (
+
+ Confirmed Orders
+
+ {orders.map(r => (
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js
new file mode 100644
index 00000000000..7a7300fec23
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ChemDispenser.js
@@ -0,0 +1,181 @@
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, LabeledList, ProgressBar, Section } from "../components";
+import { BeakerContents } from "../interfaces/common/BeakerContents";
+import { Window } from "../layouts";
+
+const dispenseAmounts = [1, 5, 10, 20, 30, 50];
+const removeAmounts = [1, 5, 10];
+
+export const ChemDispenser = (props, context) => {
+ return (
+
+
+
+
+ );
+};
+
+const ChemDispenserSettings = (properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ amount,
+ energy,
+ maxEnergy,
+ } = data;
+ return (
+
+
+
+
+ {energy} / {maxEnergy} Units
+
+
+
+
+ {dispenseAmounts.map((a, i) => (
+
+
+ ))}
+
+
+
+
+ );
+};
+
+const ChemDispenserChemicals = (properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ chemicals = [],
+ } = data;
+ const flexFillers = [];
+ for (let i = 0; i < (chemicals.length + 1) % 3; i++) {
+ flexFillers.push(true);
+ }
+ return (
+
+
+ {chemicals.map((c, i) => (
+
+
+ ))}
+ {flexFillers.map((_, i) => (
+
+
+ );
+};
+
+const ChemDispenserBeaker = (properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ isBeakerLoaded,
+ beakerCurrentVolume,
+ beakerMaxVolume,
+ beakerContents = [],
+ } = data;
+ return (
+
+ {!!isBeakerLoaded && (
+
+ {beakerCurrentVolume} / {beakerMaxVolume} units
+
+ )}
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/ChemHeater.js b/tgui/packages/tgui/interfaces/ChemHeater.js
new file mode 100644
index 00000000000..e7ea7a6ace9
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ChemHeater.js
@@ -0,0 +1,106 @@
+import { round, toFixed } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { AnimatedNumber, Box, Button, LabeledList, NumberInput, Section } from "../components";
+import { BeakerContents } from '../interfaces/common/BeakerContents';
+import { Window } from "../layouts";
+
+export const ChemHeater = (_props, _context) => {
+ return (
+
+
+
+
+ );
+};
+
+const ChemHeaterSettings = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ targetTemp,
+ targetTempReached,
+ autoEject,
+ isActive,
+ currentTemp,
+ isBeakerLoaded,
+ } = data;
+ return (
+
+
+ );
+};
+
+const ChemHeaterBeaker = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ isBeakerLoaded,
+ beakerCurrentVolume,
+ beakerMaxVolume,
+ beakerContents,
+ } = data;
+ return (
+
+
+ {beakerCurrentVolume} / {beakerMaxVolume} units
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js
new file mode 100644
index 00000000000..d0a70d2b4ce
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ChemMaster.js
@@ -0,0 +1,408 @@
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, Section } from "../components";
+import { Window } from "../layouts";
+import { BeakerContents } from './common/BeakerContents';
+import { ComplexModal, modalOpen, modalRegisterBodyOverride } from './common/ComplexModal';
+
+const transferAmounts = [1, 5, 10];
+const bottleStyles = [
+ "bottle.png",
+ "small_bottle.png",
+ "wide_bottle.png",
+ "round_bottle.png",
+ "reagent_bottle.png",
+];
+
+const analyzeModalBodyOverride = (modal, context) => {
+ const { act, data } = useBackend(context);
+ const result = modal.args.analysis;
+ return (
+
+
+
+
+ {result.name}
+
+
+ {(result.desc || "").length > 0 ? result.desc : "N/A"}
+
+ {result.blood_type && (
+
+
+ {result.blood_type}
+
+
+ {result.blood_dna}
+
+
+ )}
+ {!data.condi && (
+
+
+
+ );
+};
+
+export const ChemMaster = (props, context) => {
+ const { data } = useBackend(context);
+ const {
+ condi,
+ beaker,
+ beaker_reagents = [],
+ buffer_reagents = [],
+ mode,
+ } = data;
+ return (
+
+
+ 0}
+ />
+ 0}
+ />
+
+
+ );
+};
+
+const ChemMasterBeaker = (props, context) => {
+ const { act } = useBackend(context);
+ const {
+ beaker,
+ beakerReagents,
+ bufferNonEmpty,
+ } = props;
+ return (
+ act('eject')}
+ />
+ :
+ );
+};
+
+const ChemMasterBuffer = (props, context) => {
+ const { act } = useBackend(context);
+ const {
+ mode,
+ bufferReagents = [],
+ } = props;
+ return (
+
+ Transferring to
+
+ );
+};
+
+const ChemMasterProduction = (props, context) => {
+ const { act } = useBackend(context);
+ if (!props.bufferNonEmpty) {
+ return (
+
+
+
+
+ Buffer is empty. +
+
+
+ );
+ }
+
+ return (
+
+ {!props.isCondiment ? (
+
+ );
+};
+
+const ChemMasterProductionChemical = (props, context) => {
+ const { act, data } = useBackend(context);
+ return (
+
+
+
+
+
+
+
+
+ );
+};
+
+const ChemMasterProductionCondiment = (props, context) => {
+ const { act } = useBackend(context);
+ return (
+
+
+ );
+};
+
+const ChemMasterCustomization = (props, context) => {
+ const { act, data } = useBackend(context);
+ if (!data.loaded_pill_bottle) {
+ return (
+
+
+ None loaded.
+
+
+ );
+ }
+
+ return (
+
+
+ );
+};
+
+modalRegisterBodyOverride('analyze', analyzeModalBodyOverride);
diff --git a/tgui/packages/tgui/interfaces/CloningConsole.js b/tgui/packages/tgui/interfaces/CloningConsole.js
new file mode 100644
index 00000000000..4b23f36cfc5
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CloningConsole.js
@@ -0,0 +1,461 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, NoticeBox, ProgressBar, Section, Tabs } from "../components";
+import { COLORS } from '../constants';
+import { ComplexModal, modalRegisterBodyOverride } from '../interfaces/common/ComplexModal';
+import { Window } from "../layouts";
+
+const viewRecordModalBodyOverride = (modal, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ activerecord,
+ realname,
+ health,
+ unidentity,
+ strucenzymes,
+ } = modal.args;
+ const damages = health.split(' - ');
+ return (
+
+
+
+ {realname}
+
+
+ {damages.length > 1 ? (
+
+
+ {damages[0]}
+
+ |
+
+ {damages[2]}
+
+ |
+
+ {damages[3]}
+
+ |
+
+ {damages[1]}
+
+
+ ) : (
+
+ Unknown
+
+ )}
+
+
+ {unidentity}
+
+
+ {strucenzymes}
+
+
+ act('disk', {
+ option: 'load',
+ })}
+ />
+
+
+
+
+
+ );
+};
+
+export const CloningConsole = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ menu,
+ } = data;
+ modalRegisterBodyOverride('view_rec', viewRecordModalBodyOverride);
+ return (
+
+
+
+
+
+
+ );
+};
+
+const CloningConsoleNavigation = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ menu,
+ } = data;
+ return (
+
+ act('menu', {
+ num: 1,
+ })}>
+ Main
+
+ act('menu', {
+ num: 2,
+ })}>
+ Records
+
+
+ );
+};
+
+const CloningConsoleBody = (props, context) => {
+ const { data } = useBackend(context);
+ const {
+ menu,
+ } = data;
+ let body;
+ if (menu === 1) {
+ body =
+
+
+ Scanner Lock:
+
+
+ }>
+
+
+ {loading ? (
+
+
+ ) : (
+
+ {scantemp.text}
+
+ )}
+
+ {!!can_brainscan && (
+
+
+ )}
+
+
+ }>
+
+ {capacityPercent >= 100 && 'Fully Charged'
+ || inputting && 'Charging'
+ || 'Not Charging'}
+
+
+
+
+
+
+
+ formatPower(value * POWER_MUL, 1)}
+ onChange={(e, value) => act('input', {
+ target: value * POWER_MUL,
+ })} />
+
+
+
+
+
+
+ {formatPower(inputAvailable)}
+
+
+
+
+
+ act('tryoutput')}>
+ {outputAttempt ? 'On' : 'Off'}
+
+ }>
+
+ {outputting
+ ? 'Sending'
+ : charge > 0
+ ? 'Not Sending'
+ : 'No Charge'}
+
+
+
+
+
+
+
+ formatPower(value * POWER_MUL, 1)}
+ onChange={(e, value) => act('output', {
+ target: value * POWER_MUL,
+ })} />
+
+
+
+
+
+
+ {formatPower(outputUsed)}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/SolarControl.js b/tgui/packages/tgui/interfaces/SolarControl.js
new file mode 100644
index 00000000000..39687492cff
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/SolarControl.js
@@ -0,0 +1,142 @@
+import { useBackend } from '../backend';
+import { Box, Button, Grid, LabeledList, NumberInput, ProgressBar, Section } from '../components';
+import { Window } from '../layouts';
+
+export const SolarControl = (props, context) => {
+ const { act, data } = useBackend(context);
+ const TRACKER_OFF = 0;
+ const TRACKER_TIMED = 1;
+ const TRACKER_AUTO = 2;
+ const {
+ generated,
+ generated_ratio,
+ tracking_state,
+ tracking_rate,
+ connected_panels,
+ connected_tracker,
+ cdir,
+ direction,
+ rotating_direction,
+ } = data;
+ return (
+
+
+ act('refresh')} />
+ )}>
+
+
+
+
+ {connected_tracker ? 'OK' : 'N/A'}
+
+ 0 ? 'good' : 'bad'}>
+ {connected_panels}
+
+
+
+
+
+
+
+ {generated + ' W'}
+
+
+
+ {cdir}° ({direction})
+
+
+ {(tracking_state === TRACKER_AUTO
+ && Automated
+ )}
+ {(tracking_state === TRACKER_TIMED
+ && {tracking_rate}°/h ({rotating_direction})
+ )}
+ {(tracking_state === TRACKER_OFF
+ && Tracker offline
+ )}
+
+
+
+
+
+
+
+
+ {tracking_state !== TRACKER_AUTO
+ && act('cdir', { cdir })}
+ />}
+ {(tracking_state === TRACKER_AUTO
+ && Automated
+ )}
+
+
+
+
+ {(tracking_state === TRACKER_TIMED
+ && {
+ const sign = Math.sign(tracking_rate) > 0 ? '+' : '-';
+ return sign + Math.abs(tracking_rate);
+ }}
+ onDrag={(e, tdir) => act('tdir', { tdir })}
+ />)}
+ {(tracking_state === TRACKER_OFF
+ && Tracker offline
+ )}
+ {(tracking_state === TRACKER_AUTO
+ && Automated
+ )}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/SpawnersMenu.js b/tgui/packages/tgui/interfaces/SpawnersMenu.js
new file mode 100644
index 00000000000..63e9d9fa5ba
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/SpawnersMenu.js
@@ -0,0 +1,66 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Box, Button, Section } from '../components';
+import { Window } from '../layouts';
+
+export const SpawnersMenu = (props, context) => {
+ const { act, data } = useBackend(context);
+ const spawners = data.spawners || [];
+ return (
+
+
+
+ {spawners.map(spawner => (
+
+
+ ))}
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/StationAlertConsole.js b/tgui/packages/tgui/interfaces/StationAlertConsole.js
new file mode 100644
index 00000000000..504467f9850
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/StationAlertConsole.js
@@ -0,0 +1,68 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Section } from '../components';
+import { Window } from '../layouts';
+
+export const StationAlertConsole = () => {
+ return (
+
+
+
+
+ );
+};
+
+export const StationAlertConsoleContent = (props, context) => {
+ const { data } = useBackend(context);
+ const categories = data.alarms || [];
+ const fire = categories['Fire'] || [];
+ const atmos = categories['Atmosphere'] || [];
+ const power = categories['Power'] || [];
+ return (
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/SupermatterMonitor.js b/tgui/packages/tgui/interfaces/SupermatterMonitor.js
new file mode 100644
index 00000000000..26e0aedef66
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/SupermatterMonitor.js
@@ -0,0 +1,157 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Section, Box, Button, Table, LabeledList, ProgressBar } from '../components';
+import { Window } from '../layouts';
+import { TableRow, TableCell } from '../components/Table';
+
+export const SupermatterMonitor = (props, context) => {
+ const { act, data } = useBackend(context);
+ if (data.active === 0) {
+ return
+
+ act("refresh")}
+ />
+ }>
+
+ {data.supermatters.length === 0 ? (
+
+
+ )}
+
+
+
+
+ );
+};
+
+const SupermatterMonitorDataView = (props, context) => {
+ const { act, data } = useBackend(context);
+ return (
+
+
+ act("back")}
+ />
+ }>
+
+
+
+ {data.SM_integrity}%
+
+
+
+
+ {data.SM_power} MeV/cm3
+
+
+
+
+ {data.SM_ambienttemp} K
+
+
+
+
+ {data.SM_ambientpressure} kPa
+
+
+
+
+
+
+
+ {data.SM_gas_O2}%
+
+
+ {data.SM_gas_CO2}%
+
+
+ {data.SM_gas_N2}%
+
+
+ {data.SM_gas_PL}%
+
+
+ {data.SM_gas_OTHER}%
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Tank.js b/tgui/packages/tgui/interfaces/Tank.js
new file mode 100644
index 00000000000..7ecc6b26107
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Tank.js
@@ -0,0 +1,81 @@
+import { useBackend } from '../backend';
+import { Button, LabeledList, NumberInput, ProgressBar, Section, Tooltip } from '../components';
+import { Window } from '../layouts';
+
+export const Tank = (props, context) => {
+ const { act, data } = useBackend(context);
+ let maskStatus;
+ if (!data.has_mask) {
+ maskStatus = (
+
+ No Mask Equipped
+
+ );
+ } else {
+ maskStatus = (
+
+
+ );
+ }
+ return (
+
+
+
+
+
+
+ {data.tankPressure + ' kPa'}
+
+
+
+
+ {maskStatus}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/TankDispenser.js b/tgui/packages/tgui/interfaces/TankDispenser.js
new file mode 100644
index 00000000000..ee30b9a5649
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/TankDispenser.js
@@ -0,0 +1,33 @@
+import { useBackend } from "../backend";
+import { Button, LabeledList, Box, AnimatedNumber, Section } from "../components";
+import { Window } from "../layouts";
+
+export const TankDispenser = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ o_tanks,
+ p_tanks,
+ } = data;
+ return (
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/TcommsCore.js b/tgui/packages/tgui/interfaces/TcommsCore.js
new file mode 100644
index 00000000000..f1ffae7a8a6
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/TcommsCore.js
@@ -0,0 +1,304 @@
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from "../backend";
+import { Button, LabeledList, Box, Section, NoticeBox, Tabs, Icon, Table } from "../components";
+import { Window } from "../layouts";
+
+export const TcommsCore = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ ion,
+ } = data;
+ const [tabIndex, setTabIndex] = useLocalState(context, 'tabIndex', 0);
+
+ const PickTab = index => {
+ switch (index) {
+ case 0:
+ return
+
+ {ion === 1 && (
+
+ setTabIndex(0)}>
+
+ setTabIndex(1)}>
+
+ setTabIndex(2)}>
+
+
+ {PickTab(tabIndex)}
+
+
+ );
+};
+
+const IonBanner = () => {
+ // This entire thing renders on one line
+ // Its just split in here to get past
+ // the 80 char line limit
+ return (
+
+ ERROR: An Ionospheric overload has occured.
+ Please wait for the machine to reboot.
+ This cannot be manually done.
+
+ );
+};
+
+const ConfigPage = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ active,
+ sectors_available,
+ nttc_toggle_jobs,
+ nttc_toggle_job_color,
+ nttc_toggle_name_color,
+ nttc_toggle_command_bold,
+ nttc_job_indicator_type,
+ nttc_setting_language,
+ network_id,
+ } = data;
+ return (
+
+
+
+
+
+
+ {sectors_available}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+const LinkagePage = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ link_password,
+ relay_entries,
+ } = data;
+ return (
+
+
+
+
+
+
+
+
+
+ );
+};
+
+const FilteringPage = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ filtered_users,
+ } = data;
+ return (
+ act("add_filter")}
+ />
+ }>
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/TcommsRelay.js b/tgui/packages/tgui/interfaces/TcommsRelay.js
new file mode 100644
index 00000000000..6c449af749c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/TcommsRelay.js
@@ -0,0 +1,141 @@
+import { useBackend, useLocalState } from "../backend";
+import { Button, LabeledList, Box, AnimatedNumber, Section, NoticeBox, Tabs, Icon, Table } from "../components";
+import { Window } from "../layouts";
+
+export const TcommsRelay = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ linked,
+ active,
+ network_id,
+ } = data;
+
+ return (
+
+
+
+
+
+
+
+
+
+ {linked === 1 ? (
+
+ Linked
+
+ ) : (
+
+ Unlinked
+
+ )}
+
+
+
+ {linked === 1 ? (
+
+
+ );
+};
+
+const LinkedView = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ linked_core_id,
+ linked_core_addr,
+ hidden_link,
+ } = data;
+ return (
+
+
+
+ {linked_core_id}
+
+
+ {linked_core_addr}
+
+
+
+
+
+
+
+ );
+};
+
+const UnlinkedView = (_properties, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ cores,
+ } = data;
+ return (
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Teleporter.js b/tgui/packages/tgui/interfaces/Teleporter.js
new file mode 100644
index 00000000000..8bdff77017a
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Teleporter.js
@@ -0,0 +1,167 @@
+import { useBackend } from '../backend';
+import { Box, Button, LabeledList, Section, Grid, Dropdown, Flex } from '../components';
+import { Window } from '../layouts';
+import { GridColumn } from '../components/Grid';
+
+export const Teleporter = (props, context) => {
+ const { act, data } = useBackend(context);
+ let targetsTeleport = data.targetsTeleport ? data.targetsTeleport : {};
+ const REGIME_TELEPORT = 0;
+ const REGIME_GATE = 1;
+ const REGIME_GPS = 2;
+ const {
+ calibrated,
+ calibrating,
+ powerstation,
+ regime,
+ teleporterhub,
+ target,
+ locked,
+ } = data;
+ return (
+
+
+ {(!powerstation || !teleporterhub)
+ && (
+
+ {teleporterhub}
+ {!powerstation
+ && (
+ Powerstation not linked
+ )}
+ {powerstation && !teleporterhub
+ && (
+ Teleporter hub not linked
+ )}
+
+ )}
+ {(powerstation && teleporterhub)
+ && (
+
+
+
+
+
+
+
+
+ {/* The duplication of the dropdowns is due to the
+ updates of selected not affecting the state
+ of the dropdown */}
+ {regime === REGIME_TELEPORT && (
+ act('settarget',
+ {
+ x: targetsTeleport[val]["x"],
+ y: targetsTeleport[val]["y"],
+ z: targetsTeleport[val]["z"],
+ })} />
+ )}
+ {regime === REGIME_GATE && (
+ act('settarget',
+ {
+ x: targetsTeleport[val]["x"],
+ y: targetsTeleport[val]["y"],
+ z: targetsTeleport[val]["z"],
+ })} />
+ )}
+ {regime === REGIME_GPS && (
+
+ {target}
+
+ )}
+
+
+ {target !== 'None'
+ && (
+
+
+ {calibrating
+ && (
+
+ In Progress
+
+ ) || (calibrated
+ && (
+
+ Optimal
+
+ ) || (
+
+ Sub-Optimal
+
+ ))}
+
+
+
+
+
+
+ )}
+ {target === 'None'
+ && (
+
+ No target set
+
+ )}
+
+
+
+ )}
+ {!!(locked && powerstation && teleporterhub && regime === REGIME_GPS)
+ && (
+
+
+
+
+ )}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/TransferValve.js b/tgui/packages/tgui/interfaces/TransferValve.js
new file mode 100644
index 00000000000..d8e8fa09cc9
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/TransferValve.js
@@ -0,0 +1,91 @@
+import { useBackend } from '../backend';
+import { Button, LabeledList, NoticeBox, Section } from '../components';
+import { Window } from '../layouts';
+
+export const TransferValve = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ tank_one,
+ tank_two,
+ attached_device,
+ valve,
+ } = data;
+ return (
+
+
+
+
+
+
+
+
+ act('device')} />
+ )}>
+
+ {attached_device ? (
+
+
+ ) : (
+
+ Attach Assembly
+
+ )}
+
+
+
+
+ {tank_one ? (
+
+
+ ) : (
+
+ Attach Tank
+
+ )}
+
+
+
+
+ {tank_two ? (
+
+
+ ) : (
+
+ Attach Tank
+
+ )}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Vending.js b/tgui/packages/tgui/interfaces/Vending.js
new file mode 100644
index 00000000000..cffadfcb1cf
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Vending.js
@@ -0,0 +1,191 @@
+import { classes } from 'common/react';
+import { useBackend } from '../backend';
+import { Box, Button, Section, Table } from '../components';
+import { Window } from '../layouts';
+
+const VendingRow = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ product,
+ productStock,
+ productImage,
+ } = props;
+ const {
+ chargesMoney,
+ user,
+ userMoney,
+ vend_ready,
+ coin_name,
+ inserted_item_name,
+ } = data;
+ const free = (
+ !chargesMoney
+ || product.price === 0
+ );
+ let buttonText = "ERROR!";
+ let rowIcon = "";
+ if (product.req_coin) {
+ buttonText = "COIN";
+ rowIcon = "circle";
+ } else if (free) {
+ buttonText = "FREE";
+ rowIcon = "arrow-circle-down";
+ } else {
+ buttonText = product.price;
+ rowIcon = "shopping-cart";
+ }
+ let buttonDisabled = (
+ !vend_ready
+ || (!coin_name && product.req_coin)
+ || productStock === 0
+ || (!free && product.price > userMoney)
+ );
+ return (
+
+
+ 
+
+
+ {product.name}
+
+
+
+ {productStock} in stock
+
+
+
+
+
+ );
+};
+
+export const Vending = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ user,
+ guestNotice,
+ userMoney,
+ chargesMoney,
+ product_records = [],
+ coin_records = [],
+ hidden_records = [],
+ stock,
+ vend_ready,
+ coin_name,
+ inserted_item_name,
+ panel_open,
+ speaker,
+ imagelist,
+ } = data;
+ let inventory;
+
+ inventory = [
+ ...product_records,
+ ...coin_records,
+ ];
+ if (data.extended_inventory) {
+ inventory = [
+ ...inventory,
+ ...hidden_records,
+ ];
+ }
+ // Just in case we still have undefined values in the list
+ inventory = inventory.filter(item => !!item);
+ return (
+
+
+ {!!chargesMoney && (
+
+ {user && (
+
+ Welcome, {user.name},
+ {' '}
+ {user.job || 'Unemployed'}!
+
+ Your balance is {userMoney} credits. +
+ ) || (
+
+ {guestNotice}
+
+ )}
+
+ )}
+ {!!coin_name && (
+ act('remove_coin', {})} />
+ )}>
+
+ {coin_name}
+
+
+ )}
+ {!!inserted_item_name && (
+ act('eject_item', {})} />
+ )}>
+
+ {inserted_item_name}
+
+
+ )}
+ {!!panel_open && (
+
+
+ )}
+
+
+ {inventory.map(product => (
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Wires.js b/tgui/packages/tgui/interfaces/Wires.js
new file mode 100644
index 00000000000..c41be4de3d6
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Wires.js
@@ -0,0 +1,71 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Box, Button, LabeledList, Section } from '../components';
+import { Window } from '../layouts';
+
+export const Wires = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const wires = data.wires || [];
+ const statuses = data.status || [];
+
+ return (
+
+
+
+
+
+
+ {wires.map(wire => (
+
+
+ ))}
+
+
+
+ {!!statuses.length && (
+
+ {statuses.map(status => (
+
+ {status}
+
+ ))}
+
+ )}
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/common/AccessList.js b/tgui/packages/tgui/interfaces/common/AccessList.js
new file mode 100644
index 00000000000..1a077027dc3
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/common/AccessList.js
@@ -0,0 +1,132 @@
+import { sortBy } from 'common/collections';
+import { Fragment } from 'inferno';
+import { useLocalState } from '../../backend';
+import { Button, Flex, Grid, Section, Tabs } from '../../components';
+
+const diffMap = {
+ 0: {
+ icon: 'times-circle',
+ color: 'bad',
+ },
+ 1: {
+ icon: 'stop-circle',
+ color: null,
+ },
+ 2: {
+ icon: 'check-circle',
+ color: 'good',
+ },
+};
+
+export const AccessList = (props, context) => {
+ const {
+ accesses = [],
+ selectedList = [],
+ accessMod,
+ grantAll,
+ denyAll,
+ grantDep,
+ denyDep,
+ } = props;
+ const [
+ selectedAccessName,
+ setSelectedAccessName,
+ ] = useLocalState(context, 'accessName', accesses[0]?.name);
+ const selectedAccess = accesses
+ .find(access => access.name === selectedAccessName);
+ const selectedAccessEntries = sortBy(
+ entry => entry.desc,
+ )(selectedAccess?.accesses || []);
+
+ const checkAccessIcon = accesses => {
+ let oneAccess = false;
+ let oneInaccess = false;
+ for (let element of accesses) {
+ if (selectedList.includes(element.ref)) {
+ oneAccess = true;
+ }
+ else {
+ oneInaccess = true;
+ }
+ }
+ if (!oneAccess && oneInaccess) {
+ return 0;
+ }
+ else if (oneAccess && oneInaccess) {
+ return 1;
+ }
+ else {
+ return 2;
+ }
+ };
+
+ return (
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/common/BeakerContents.js b/tgui/packages/tgui/interfaces/common/BeakerContents.js
new file mode 100644
index 00000000000..93d8a39a890
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/common/BeakerContents.js
@@ -0,0 +1,53 @@
+import { Box } from '../../components';
+const PropTypes = require('prop-types');
+
+const formatUnits = a => a + ' unit' + (a === 1 ? '' : 's');
+
+/**
+ * Displays a beaker's contents
+ * @property {object} props
+ */
+export const BeakerContents = props => {
+ const { beakerLoaded, beakerContents = [], buttons } = props;
+ return (
+
+ {!beakerLoaded && (
+
+ No beaker loaded.
+
+ ) || beakerContents.length === 0 && (
+
+ Beaker is empty.
+
+ )}
+ {beakerContents.map((chemical, i) => (
+
+
+ {formatUnits(chemical.volume)} of {chemical.name}
+
+ {!!buttons && (
+
+ {buttons(chemical, i)}
+
+ )}
+
+ ))}
+
+ );
+};
+
+BeakerContents.propTypes = {
+ /**
+ * Whether there is a loaded beaker or not
+ */
+ beakerLoaded: PropTypes.bool,
+ /**
+ * The reagents in the beaker
+ */
+ beakerContents: PropTypes.array,
+ /**
+ * The buttons to display next to each reagent line
+ */
+ buttons: PropTypes.arrayOf(PropTypes.element),
+};
diff --git a/tgui/packages/tgui/interfaces/common/ComplexModal.js b/tgui/packages/tgui/interfaces/common/ComplexModal.js
new file mode 100644
index 00000000000..0bc6804752c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/common/ComplexModal.js
@@ -0,0 +1,199 @@
+import { useBackend } from "../../backend";
+import { Box, Button, Dropdown, Flex, Input, Modal } from '../../components';
+
+let bodyOverrides = {};
+
+/**
+ * Sends a call to BYOND to open a modal
+ * @param {any} context The React context
+ * @param {string} id The identifier of the modal
+ * @param {object=} args The arguments to pass to the modal
+ */
+export const modalOpen = (context, id, args) => {
+ const { act, data } = useBackend(context);
+ const newArgs = Object.assign(data.modal ? data.modal.args : {}, args || {});
+
+ act('modal_open', {
+ id: id,
+ arguments: JSON.stringify(newArgs),
+ });
+};
+
+/**
+ * Registers an override for any modal with the given id
+ * @param {string} id The identifier of the modal
+ * @param {function} bodyOverride The override function that returns the
+ * modal contents
+ */
+export const modalRegisterBodyOverride = (id, bodyOverride) => {
+ bodyOverrides[id] = bodyOverride;
+};
+
+const modalAnswer = (context, id, answer, args) => {
+ const { act, data } = useBackend(context);
+ if (!data.modal) {
+ return;
+ }
+
+ const newArgs = Object.assign(data.modal.args || {}, args || {});
+ act('modal_answer', {
+ id: id,
+ answer: answer,
+ arguments: JSON.stringify(newArgs),
+ });
+};
+
+const modalClose = (context, id) => {
+ const { act } = useBackend(context);
+ act('modal_close', {
+ id: id,
+ });
+};
+
+/**
+ * Displays a modal and its actions. Passed data must have a valid modal field
+ *
+ * **A valid modal field contains:**
+ *
+ * `id` — The identifier of the modal.
+ * Used for server-client communication and overriding
+ *
+ * `text` — The text of the modal
+ *
+ * `type` — The type of the modal:
+ * `message`, `input`, `choice`, `bento` and `boolean`.
+ * Overriden by a body override registered to the identifier if applicable.
+ * Defaults to `message` if not found
+ * @param {object} props
+ * @param {object} context
+ */
+export const ComplexModal = (props, context) => {
+ const { data } = useBackend(context);
+ if (!data.modal) {
+ return;
+ }
+
+ const {
+ id,
+ text,
+ type,
+ } = data.modal;
+
+ let modalOnEnter;
+ let modalBody;
+ let modalFooter = (
+
{displayElement}
)}
diff --git a/tgui/packages/tgui/components/LabeledList.js b/tgui/packages/tgui/components/LabeledList.js
index e2b515014a2..43dbd0d5a32 100644
--- a/tgui/packages/tgui/components/LabeledList.js
+++ b/tgui/packages/tgui/components/LabeledList.js
@@ -20,6 +20,7 @@ export const LabeledListItem = props => {
labelColor = 'label',
color,
textAlign,
+ verticalAlign,
buttons,
content,
children,
@@ -33,6 +34,7 @@ export const LabeledListItem = props => {
{
- const { config } = useBackend(context);
- const { onClick } = props;
- return (
-
-
- );
+const pauseEvent = e => {
+ if (e.stopPropagation) { e.stopPropagation(); }
+ if (e.preventDefault) { e.preventDefault(); }
+ e.cancelBubble = true;
+ e.returnValue = false;
+ return false;
};
-const NanoMapMarker = props => {
+export class NanoMap extends Component {
+ constructor(props) {
+ super(props);
+
+ // Auto center based on window size
+ const Xcenter = (window.innerWidth / 2) - 256;
+ const Ycenter = (window.innerHeight / 2) - 256;
+
+ this.state = {
+ offsetX: 128,
+ offsetY: 48,
+ transform: 'none',
+ dragging: false,
+ originX: null,
+ originY: null,
+ zoom: 1,
+ };
+
+ // Dragging
+ this.handleDragStart = e => {
+ this.ref = e.target;
+ this.setState({
+ dragging: false,
+ originX: e.screenX,
+ originY: e.screenY,
+ });
+ document.addEventListener('mousemove', this.handleDragMove);
+ document.addEventListener('mouseup', this.handleDragEnd);
+ pauseEvent(e);
+ };
+
+ this.handleDragMove = e => {
+ this.setState(prevState => {
+ const state = { ...prevState };
+ const newOffsetX = e.screenX - state.originX;
+ const newOffsetY = e.screenY - state.originY;
+ if (prevState.dragging) {
+ state.offsetX += newOffsetX;
+ state.offsetY += newOffsetY;
+ state.originX = e.screenX;
+ state.originY = e.screenY;
+ } else {
+ state.dragging = true;
+ }
+ return state;
+ });
+ pauseEvent(e);
+ };
+
+ this.handleDragEnd = e => {
+ this.setState({
+ dragging: false,
+ originX: null,
+ originY: null,
+ });
+ document.removeEventListener('mousemove', this.handleDragMove);
+ document.removeEventListener('mouseup', this.handleDragEnd);
+ pauseEvent(e);
+ };
+
+ this.handleZoom = (_e, value) => {
+ this.setState(state => {
+ const newZoom = Math.min(Math.max(value, 1), 8);
+ let zoomDiff = (newZoom - state.zoom) * 1.5;
+ state.zoom = newZoom;
+ state.offsetX = state.offsetX - 262 * zoomDiff;
+ state.offsetY = state.offsetY - 256 * zoomDiff;
+ if (props.onZoom) {
+ props.onZoom(state.zoom);
+ }
+ return state;
+ });
+ };
+
+ }
+
+ render() {
+ const { config } = useBackend(this.context);
+ const { dragging, offsetX, offsetY, zoom = 1 } = this.state;
+ const { children } = this.props;
+
+ const mapUrl = config.map + "_nanomap_z1.png";
+ const mapSize = (510 * zoom) + 'px';
+ const newStyle = {
+ width: mapSize,
+ height: mapSize,
+ "margin-top": offsetY + "px",
+ "margin-left": offsetX + "px",
+ "overflow": "hidden",
+ "position": "relative",
+ "background-image": "url(" + mapUrl + ")",
+ "background-size": "cover",
+ "background-repeat": "no-repeat",
+ "text-align": "center",
+ "cursor": dragging ? "move" : "auto",
+ };
+
+ return (
+
+
+
+ {children}
+
+
+
+ );
+ }
+}
+
+const NanoMapMarker = (props, context) => {
const {
x,
y,
+ zoom = 1,
icon,
tooltip,
color,
} = props;
+ const rx = ((x * 2 * zoom) - zoom) - 3;
+ const ry = ((y * 2 * zoom) - zoom) - 3;
return (
-
-
+
+
+
+ v + "x"}
+ value={props.zoom}
+ onDrag={(e, v) => props.onZoom(e, v)}
+ />
+
+
+
+ );
+};
+
+NanoMap.Zoomer = NanoMapZoomer;
diff --git a/tgui/packages/tgui/components/Section.js b/tgui/packages/tgui/components/Section.js
index a9e60a54d98..5c0d9dd4748 100644
--- a/tgui/packages/tgui/components/Section.js
+++ b/tgui/packages/tgui/components/Section.js
@@ -8,7 +8,10 @@ export const Section = props => {
level = 1,
buttons,
content,
+ stretchContents,
+ noTopPadding,
children,
+ scrollable,
...rest
} = props;
const hasTitle = !isFalsy(title) || !isFalsy(buttons);
@@ -18,6 +21,7 @@ export const Section = props => {
className={classes([
'Section',
'Section--level--' + level,
+ props.flexGrow && 'Section--flex',
className,
])}
{...rest}>
@@ -32,10 +36,14 @@ export const Section = props => {
)}
{hasContent && (
-
+
+
+
);
};
NanoMap.Marker = NanoMapMarker;
+
+const NanoMapZoomer = (props, context) => {
+ return (
+
+
{content}
{children}
-
+ No AI detected.
+{data.name}
+{data.flushing === 1 ? "Wipe of AI in progress..." : ""}
+No laws detected.
+No artificial intelligence detected.
+{data.occupant}
+No laws detected.
+-
+ {priorityAlerts.length === 0 && (
+
- + No Priority Alerts + + )} + {priorityAlerts.map(alert => ( +
- + + ))} + {minorAlerts.length === 0 && ( +
- + No Minor Alerts + + )} + {minorAlerts.map(alert => ( +
- + + ))} +
+ setCategory(val)} />
+ }>
+ setSearchText(v)}
+ mb={1} />
+ {recipesToShow.map(recipe => (
+
+
+ 
+
+ {recipe.max_multiplier >= 10 && (
+
+ )}
+ {recipe.max_multiplier >= 25 && (
+
+ )}
+ {recipe.max_multiplier > 25 && (
+
+ )}
+
+
+ {recipe.requirements && (
+ Object
+ .keys(recipe.requirements)
+ .map(mat => toTitleCase(mat)
+ + ": " + recipe.requirements[mat])
+ .join(", ")
+ ) || (
+
+ No resources required.
+
+ )}
+
+
+ ))}
+
+
+
+
+
+
+ {metalReadable}
+
+
+ {glassReadable}
+
+
+ {totalReadable}
+
+
+ {data.fill_percent}% Full
+
+
+
+
+
+ {busyname ? busyname : "Nothing"}
+
+
+
+ {buildQueueItems}
+
+
+
+
+
+ {s}
+ No occupant detected. +
+
+
+
+
+
+
+ Camera:
+ {activeCamera
+ && activeCamera.name
+ || '—'}
+
+
+
+ {
+ refocusLayout();
+ act('switch_camera', {
+ name: camera.name,
+ });
+ }}>
+ {camera.name}
+
+ ))}
+ {contentsModalTitle} contents:
+ Buffer is empty. +
-
+ {fire.length === 0 && (
+
- + Systems Nominal + + )} + {fire.map(alert => ( +
- + {alert} + + ))} +
-
+ {atmos.length === 0 && (
+
- + Systems Nominal + + )} + {atmos.map(alert => ( +
- + {alert} + + ))} +
-
+ {power.length === 0 && (
+
- + Systems Nominal + + )} + {power.map(alert => ( +
- + {alert} + + ))} +
No shards detected
+ ) : ( ++ Your balance is {userMoney} credits. +