")
- t = replacetext(t, "\[td\]", "| ")
- t = replacetext(t, "\[cell\]", " | ")
- t = replacetext(t, "\[tab\]", " ")
-
- t = parsemarkdown_basic(t)
-
- return t
-
-/datum/computer_file/program/filemanager/proc/prepare_printjob(t) // 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 = parse_tags(t)
-
- t = replacetext(t, regex("(?:%s(?:ign)|%f(?:ield))(?=\\s|$)", "ig"), "")
-
- return t
+ return TRUE
/datum/computer_file/program/filemanager/ui_data(mob/user)
var/list/data = get_header_data()
@@ -192,41 +73,28 @@
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"] = parse_tags(file.stored_data)
- data["filename"] = "[file.filename].[file.filetype]"
+ if(!computer || !HDD)
+ data["error"] = "I/O ERROR: Unable to access hard drive."
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(
+ var/list/files = list()
+ for(var/datum/computer_file/F in HDD.stored_files)
+ files += list(list(
+ "name" = F.filename,
+ "type" = F.filetype,
+ "size" = F.size,
+ "undeletable" = F.undeletable
+ ))
+ data["files"] = files
+ if(RHDD)
+ data["usbconnected"] = TRUE
+ var/list/usbfiles = list()
+ for(var/datum/computer_file/F in RHDD.stored_files)
+ usbfiles += list(list(
"name" = F.filename,
"type" = F.filetype,
"size" = F.size,
"undeletable" = F.undeletable
- )))
- 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
- )))
- data["usbfiles"] = usbfiles
+ ))
+ data["usbfiles"] = usbfiles
return data
diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
index 80c014bd03..352f13f305 100644
--- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
@@ -115,49 +115,50 @@
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["downloading"] = !!downloaded_file
+ data["error"] = downloaderror || FALSE
+
+ // Download running. Wait please..
+ if(downloaded_file)
data["downloadname"] = downloaded_file.filename
data["downloaddesc"] = downloaded_file.filedesc
data["downloadsize"] = downloaded_file.size
data["downloadspeed"] = download_netspeed
data["downloadcompletion"] = round(download_completion, 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 SSnetworks.station_network.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) || hard_drive.find_file_by_name(P.filename))
- continue
- all_entries.Add(list(list(
+
+ 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 SSnetworks.station_network.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) || hard_drive.find_file_by_name(P.filename))
+ continue
+ all_entries.Add(list(list(
"filename" = P.filename,
"filedesc" = P.filedesc,
"fileinfo" = P.extended_desc,
"compatibility" = check_compatibility(P),
- "size" = P.size
- )))
- data["hackedavailable"] = 0
- if(computer.obj_flags & EMAGGED) // If we are running on emagged computer we have access to some "bonus" software
- var/list/hacked_programs[0]
- for(var/S in SSnetworks.station_network.available_antag_software)
- var/datum/computer_file/program/P = S
- if(hard_drive.find_file_by_name(P.filename))
- continue
- data["hackedavailable"] = 1
- hacked_programs.Add(list(list(
+ "size" = P.size,
+ )))
+ data["hackedavailable"] = FALSE
+ if(computer.obj_flags & EMAGGED) // If we are running on emagged computer we have access to some "bonus" software
+ var/list/hacked_programs[0]
+ for(var/S in SSnetworks.station_network.available_antag_software)
+ var/datum/computer_file/program/P = S
+ if(hard_drive.find_file_by_name(P.filename))
+ continue
+ data["hackedavailable"] = TRUE
+ hacked_programs.Add(list(list(
"filename" = P.filename,
"filedesc" = P.filedesc,
"fileinfo" = P.extended_desc,
- "size" = P.size
- )))
- data["hacked_programs"] = hacked_programs
+ "size" = P.size,
+ )))
+ data["hacked_programs"] = hacked_programs
- data["downloadable_programs"] = all_entries
+ data["downloadable_programs"] = all_entries
return data
diff --git a/code/modules/modular_computers/file_system/programs/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
index 656c7614ab..7d6d89f32c 100644
--- a/code/modules/modular_computers/file_system/programs/ntmonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
@@ -4,58 +4,48 @@
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
+ requires_ntnet = TRUE
required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM.
available_on_ntnet = TRUE
tgui_id = "NtosNetMonitor"
/datum/computer_file/program/ntnetmonitor/ui_act(action, params)
if(..())
- return 1
+ return
switch(action)
if("resetIDS")
- . = 1
if(SSnetworks.station_network)
SSnetworks.station_network.resetIDS()
- return 1
+ return TRUE
if("toggleIDS")
- . = 1
if(SSnetworks.station_network)
SSnetworks.station_network.toggleIDS()
- return 1
+ return TRUE
if("toggleWireless")
- . = 1
if(!SSnetworks.station_network)
- return 1
+ return
// NTNet is disabled. Enabling can be done without user prompt
if(SSnetworks.station_network.setting_disabled)
- SSnetworks.station_network.setting_disabled = 0
- return 1
+ SSnetworks.station_network.setting_disabled = FALSE
+ return TRUE
- // 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")
- SSnetworks.station_network.setting_disabled = 1
- return 1
+ SSnetworks.station_network.setting_disabled = TRUE
+ return TRUE
if("purgelogs")
- . = 1
if(SSnetworks.station_network)
SSnetworks.station_network.purge_logs()
+ return TRUE
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]):"))
+ var/logcount = params["new_number"]
if(SSnetworks.station_network)
SSnetworks.station_network.update_max_log_count(logcount)
+ return TRUE
if("toggle_function")
- . = 1
if(!SSnetworks.station_network)
- return 1
+ return
SSnetworks.station_network.toggle_function(text2num(params["id"]))
+ return TRUE
/datum/computer_file/program/ntnetmonitor/ui_data(mob/user)
if(!SSnetworks.station_network)
@@ -73,6 +63,8 @@
data["config_systemcontrol"] = SSnetworks.station_network.setting_systemcontrol
data["ntnetlogs"] = list()
+ data["minlogs"] = MIN_NTNET_LOGS
+ data["maxlogs"] = MAX_NTNET_LOGS
for(var/i in SSnetworks.station_network.logs)
data["ntnetlogs"] += list(list("entry" = i))
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index 0c30319c2a..d78ed9239e 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -81,13 +81,13 @@
if(air.total_moles())
for(var/gasid in air.gases)
gasdata.Add(list(list(
- "name"= GLOB.meta_gas_names[gasid],
- "amount" = round(100*air.gases[gasid]/air.total_moles(),0.01))))
+ "name"= air.gases[gasid][GAS_META][META_GAS_NAME],
+ "amount" = round(100*air.gases[gasid][MOLES]/air.total_moles(),0.01))))
else
for(var/gasid in air.gases)
gasdata.Add(list(list(
- "name"= GLOB.meta_gas_names[gasid],
+ "name"= air.gases[gasid][GAS_META][META_GAS_NAME],
"amount" = 0)))
data["gases"] = gasdata
diff --git a/code/modules/ruins/spaceruin_code/TheDerelict.dm b/code/modules/ruins/spaceruin_code/TheDerelict.dm
index 2e2765b1a9..e69e8ed3e7 100644
--- a/code/modules/ruins/spaceruin_code/TheDerelict.dm
+++ b/code/modules/ruins/spaceruin_code/TheDerelict.dm
@@ -167,6 +167,7 @@
// So drones can teach borgs and AI dronespeak. For best effect, combine with mother drone lawset.
+
/obj/item/dronespeak_manual
name = "dronespeak manual"
desc = "The book's cover reads: \"Understanding Dronespeak - An exercise in futility.\""
@@ -180,7 +181,7 @@
to_chat(user, "You start skimming through [src], but you already know dronespeak.")
else
to_chat(user, "You start skimming through [src], and suddenly the drone chittering makes sense.")
- user.grant_language(/datum/language/drone, TRUE, TRUE, LANGUAGE_MIND)
+ user.grant_language(/datum/language/drone, TRUE, TRUE)
return
if(user.has_language(/datum/language/drone))
@@ -201,7 +202,7 @@
M.visible_message("[user] beats [M] over the head with [src]!", "[user] beats you over the head with [src]!", "You hear smacking.")
else
M.visible_message("[user] teaches [M] by beating [M.p_them()] over the head with [src]!", "As [user] hits you with [src], chitters resonate in your mind.", "You hear smacking.")
- M.grant_language(/datum/language/drone, TRUE, TRUE, LANGUAGE_MIND)
+ M.grant_language(/datum/language/drone, TRUE, TRUE)
return
/obj/structure/fluff/oldturret
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index fed256e98c..301ab24f98 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -105,10 +105,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
message_admins("[ADMIN_LOOKUPFLW(triggerer)] triggered and [ADMIN_LOOKUPFLW(confirmer)] confirmed event [event]")
var/area/A1 = get_area(triggerer)
- deadchat_broadcast(" triggered [event] at [A1.name].", "[triggerer]", triggerer, message_type=DEADCHAT_ANNOUNCEMENT)
+ deadchat_broadcast(" triggered [event] at [A1.name].", "[triggerer]", triggerer)
var/area/A2 = get_area(confirmer)
- deadchat_broadcast(" confirmed [event] at [A2.name].", "[confirmer]", confirmer, message_type=DEADCHAT_ANNOUNCEMENT)
+ deadchat_broadcast(" confirmed [event] at [A2.name].", "[confirmer]", confirmer)
switch(event)
if(KEYCARD_RED_ALERT)
set_security_level(SEC_LEVEL_RED)
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index 3ba2198b35..a44bb179f0 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -5,369 +5,3 @@
Two roads diverged in a wood, and I,\n\
I took the one less traveled by,\n\
And that has made all the difference."
-
- icon = 'icons/obj/machines/shuttle_manipulator.dmi'
- icon_state = "holograph_on"
-
- density = TRUE
-
- // UI state variables
- var/datum/map_template/shuttle/selected
-
- var/obj/docking_port/mobile/existing_shuttle
-
- var/obj/docking_port/mobile/preview_shuttle
- var/datum/map_template/shuttle/preview_template
-
-/obj/machinery/shuttle_manipulator/Initialize()
- . = ..()
- update_icon()
- SSshuttle.manipulator = src
-
-/obj/machinery/shuttle_manipulator/Destroy(force)
- if(!force)
- . = QDEL_HINT_LETMELIVE
- else
- SSshuttle.manipulator = null
- . = ..()
-
-/obj/machinery/shuttle_manipulator/update_overlays()
- . = ..()
- var/mutable_appearance/hologram_projection = mutable_appearance(icon, "hologram_on")
- hologram_projection.pixel_y = 22
- var/mutable_appearance/hologram_ship = mutable_appearance(icon, "hologram_whiteship")
- hologram_ship.pixel_y = 27
- . += hologram_projection
- . += hologram_ship
-
-/obj/machinery/shuttle_manipulator/can_interact(mob/user)
- // Only admins can use this, but they can use it from anywhere
- return user.client && check_rights_for(user.client, R_ADMIN)
-
-/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "shuttle_manipulator", name, 800, 600, master_ui, state)
- ui.open()
-
-/proc/shuttlemode2str(mode)
- switch(mode)
- if(SHUTTLE_IDLE)
- . = "idle"
- if(SHUTTLE_IGNITING)
- . = "engines charging"
- if(SHUTTLE_RECALL)
- . = "recalled"
- if(SHUTTLE_CALL)
- . = "called"
- if(SHUTTLE_DOCKED)
- . = "docked"
- if(SHUTTLE_STRANDED)
- . = "stranded"
- if(SHUTTLE_ESCAPE)
- . = "escape"
- if(SHUTTLE_ENDGAME)
- . = "endgame"
- if(!.)
- CRASH("shuttlemode2str(): invalid mode [mode]")
-
-
-/obj/machinery/shuttle_manipulator/ui_data(mob/user)
- var/list/data = list()
- data["tabs"] = list("Status", "Templates", "Modification")
-
- // Templates panel
- data["templates"] = list()
- var/list/templates = data["templates"]
- data["templates_tabs"] = list()
- data["selected"] = list()
-
- for(var/shuttle_id in SSmapping.shuttle_templates)
- var/datum/map_template/shuttle/S = SSmapping.shuttle_templates[shuttle_id]
-
- if(!templates[S.port_id])
- data["templates_tabs"] += S.port_id
- templates[S.port_id] = list(
- "port_id" = S.port_id,
- "templates" = list())
-
- var/list/L = list()
- L["name"] = S.name
- L["shuttle_id"] = S.shuttle_id
- L["port_id"] = S.port_id
- L["description"] = S.description
- L["admin_notes"] = S.admin_notes
-
- if(selected == S)
- data["selected"] = L
-
- templates[S.port_id]["templates"] += list(L)
-
- data["templates_tabs"] = sortList(data["templates_tabs"])
-
- data["existing_shuttle"] = null
-
- // Status panel
- data["shuttles"] = list()
- for(var/i in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = i
- var/timeleft = M.timeLeft(1)
- var/list/L = list()
- L["name"] = M.name
- L["id"] = M.id
- L["timer"] = M.timer
- L["timeleft"] = M.getTimerStr()
- if (timeleft > 1 HOURS)
- L["timeleft"] = "Infinity"
- L["can_fast_travel"] = M.timer && timeleft >= 50
- L["can_fly"] = TRUE
- if(istype(M, /obj/docking_port/mobile/emergency))
- L["can_fly"] = FALSE
- else if(!M.destination)
- L["can_fast_travel"] = FALSE
- if (M.mode != SHUTTLE_IDLE)
- L["mode"] = capitalize(shuttlemode2str(M.mode))
- L["status"] = M.getDbgStatusText()
- if(M == existing_shuttle)
- data["existing_shuttle"] = L
-
- data["shuttles"] += list(L)
-
- return data
-
-/obj/machinery/shuttle_manipulator/ui_act(action, params)
- if(..())
- return
-
- var/mob/user = usr
-
- // Preload some common parameters
- var/shuttle_id = params["shuttle_id"]
- var/datum/map_template/shuttle/S = SSmapping.shuttle_templates[shuttle_id]
-
- switch(action)
- if("select_template")
- if(S)
- existing_shuttle = SSshuttle.getShuttle(S.port_id)
- selected = S
- . = TRUE
- if("jump_to")
- if(params["type"] == "mobile")
- for(var/i in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = i
- if(M.id == params["id"])
- user.forceMove(get_turf(M))
- . = TRUE
- break
-
- if("fly")
- for(var/i in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = i
- if(M.id == params["id"])
- . = TRUE
- M.admin_fly_shuttle(user)
- break
-
- if("fast_travel")
- for(var/i in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = i
- if(M.id == params["id"] && M.timer && M.timeLeft(1) >= 50)
- M.setTimer(50)
- . = TRUE
- message_admins("[key_name_admin(usr)] fast travelled [M]")
- log_admin("[key_name(usr)] fast travelled [M]")
- SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[M.name]")
- break
-
- if("preview")
- if(S)
- . = TRUE
- unload_preview()
- load_template(S)
- if(preview_shuttle)
- preview_template = S
- user.forceMove(get_turf(preview_shuttle))
- if("load")
- if(existing_shuttle == SSshuttle.backup_shuttle)
- // TODO make the load button disabled
- WARNING("The shuttle that the selected shuttle will replace \
- is the backup shuttle. Backup shuttle is required to be \
- intact for round sanity.")
- else if(S)
- . = TRUE
- // If successful, returns the mobile docking port
- var/obj/docking_port/mobile/mdp = action_load(S)
- if(mdp)
- user.forceMove(get_turf(mdp))
- message_admins("[key_name_admin(usr)] loaded [mdp] with the shuttle manipulator.")
- log_admin("[key_name(usr)] loaded [mdp] with the shuttle manipulator.")
- SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[mdp.name]")
-
- update_icon()
-
-/obj/machinery/shuttle_manipulator/proc/action_load(datum/map_template/shuttle/loading_template, obj/docking_port/stationary/destination_port)
- // Check for an existing preview
- if(preview_shuttle && (loading_template != preview_template))
- preview_shuttle.jumpToNullSpace()
- preview_shuttle = null
- preview_template = null
-
- if(!preview_shuttle)
- if(load_template(loading_template))
- preview_shuttle.linkup(loading_template, destination_port)
- preview_template = loading_template
-
- // get the existing shuttle information, if any
- var/timer = 0
- var/mode = SHUTTLE_IDLE
- var/obj/docking_port/stationary/D
-
- if(istype(destination_port))
- D = destination_port
- else if(existing_shuttle)
- timer = existing_shuttle.timer
- mode = existing_shuttle.mode
- D = existing_shuttle.get_docked()
-
- if(!D)
- CRASH("No dock found for preview shuttle ([preview_template.name]), aborting.")
-
- var/result = preview_shuttle.canDock(D)
- // truthy value means that it cannot dock for some reason
- // but we can ignore the someone else docked error because we'll
- // be moving into their place shortly
- if((result != SHUTTLE_CAN_DOCK) && (result != SHUTTLE_SOMEONE_ELSE_DOCKED))
- WARNING("Template shuttle [preview_shuttle] cannot dock at [D] ([result]).")
- return
-
- if(existing_shuttle)
- existing_shuttle.jumpToNullSpace()
-
- var/list/force_memory = preview_shuttle.movement_force
- preview_shuttle.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
- preview_shuttle.initiate_docking(D)
- preview_shuttle.movement_force = force_memory
-
- . = preview_shuttle
-
- // Shuttle state involves a mode and a timer based on world.time, so
- // plugging the existing shuttles old values in works fine.
- preview_shuttle.timer = timer
- preview_shuttle.mode = mode
-
- preview_shuttle.register()
-
- // TODO indicate to the user that success happened, rather than just
- // blanking the modification tab
- preview_shuttle = null
- preview_template = null
- existing_shuttle = null
- selected = null
-
-/obj/machinery/shuttle_manipulator/proc/load_template(datum/map_template/shuttle/S)
- . = FALSE
- // load shuttle template, centred at shuttle import landmark,
- var/turf/landmark_turf = get_turf(locate(/obj/effect/landmark/shuttle_import) in GLOB.landmarks_list)
- S.load(landmark_turf, centered = TRUE, register = FALSE)
-
- var/affected = S.get_affected_turfs(landmark_turf, centered=TRUE)
-
- var/found = 0
- // Search the turfs for docking ports
- // - We need to find the mobile docking port because that is the heart of
- // the shuttle.
- // - We need to check that no additional ports have slipped in from the
- // template, because that causes unintended behaviour.
- for(var/T in affected)
- for(var/obj/docking_port/P in T)
- if(istype(P, /obj/docking_port/mobile))
- found++
- if(found > 1)
- qdel(P, force=TRUE)
- log_world("Map warning: Shuttle Template [S.mappath] has multiple mobile docking ports.")
- else
- preview_shuttle = P
- if(istype(P, /obj/docking_port/stationary))
- log_world("Map warning: Shuttle Template [S.mappath] has a stationary docking port.")
- if(!found)
- var/msg = "load_template(): Shuttle Template [S.mappath] has no mobile docking port. Aborting import."
- for(var/T in affected)
- var/turf/T0 = T
- T0.empty()
-
- message_admins(msg)
- WARNING(msg)
- return
- //Everything fine
- S.on_bought()
- return TRUE
-
-/obj/machinery/shuttle_manipulator/proc/unload_preview()
- if(preview_shuttle)
- preview_shuttle.jumpToNullSpace()
- preview_shuttle = null
-
-/obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user)
- var/list/options = list()
-
- for(var/port in SSshuttle.stationary)
- if (istype(port, /obj/docking_port/stationary/transit))
- continue // please don't do this
- var/obj/docking_port/stationary/S = port
- if (canDock(S) == SHUTTLE_CAN_DOCK)
- options[S.name || S.id] = S
-
- options += "--------"
- options += "Infinite Transit"
- options += "Delete Shuttle"
- options += "Into The Sunset (delete & greentext 'escape')"
-
- var/selection = input(user, "Select where to fly [name || id]:", "Fly Shuttle") as null|anything in options
- if(!selection)
- return
-
- switch(selection)
- if("Infinite Transit")
- destination = null
- mode = SHUTTLE_IGNITING
- setTimer(ignitionTime)
-
- if("Delete Shuttle")
- if(alert(user, "Really delete [name || id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
- return
- jumpToNullSpace()
-
- if("Into The Sunset (delete & greentext 'escape')")
- if(alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
- return
- intoTheSunset()
-
- else
- if(options[selection])
- request(options[selection])
-
-/obj/docking_port/mobile/emergency/admin_fly_shuttle(mob/user)
- return // use the existing verbs for this
-
-/obj/docking_port/mobile/arrivals/admin_fly_shuttle(mob/user)
- switch(alert(user, "Would you like to fly the arrivals shuttle once or change its destination?", "Fly Shuttle", "Fly", "Retarget", "Cancel"))
- if("Cancel")
- return
- if("Fly")
- return ..()
-
- var/list/options = list()
-
- for(var/port in SSshuttle.stationary)
- if (istype(port, /obj/docking_port/stationary/transit))
- continue // please don't do this
- var/obj/docking_port/stationary/S = port
- if (canDock(S) == SHUTTLE_CAN_DOCK)
- options[S.name || S.id] = S
-
- var/selection = input(user, "Select the new arrivals destination:", "Fly Shuttle") as null|anything in options
- if(!selection)
- return
- target_dock = options[selection]
- if(!QDELETED(target_dock))
- destination = target_dock
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 2c466564ff..5de6b8ca06 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -194,10 +194,10 @@
roundstart_template = SSmapping.shuttle_templates[sid]
if(!roundstart_template)
- CRASH("Invalid path ([roundstart_template]) passed to docking port.")
+ CRASH("Invalid path ([sid]/[roundstart_template]) passed to docking port.")
if(roundstart_template)
- SSshuttle.manipulator.action_load(roundstart_template, src)
+ SSshuttle.action_load(roundstart_template, src)
//returns first-found touching shuttleport
/obj/docking_port/stationary/get_docked()
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 5ddbd81b25..e626b98815 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -111,7 +111,7 @@
return UI_DISABLED
return UI_CLOSE // Otherwise, we got nothing.
-/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()
diff --git a/icons/UI_Icons/Arcade/boss1.gif b/icons/UI_Icons/Arcade/boss1.gif
new file mode 100644
index 0000000000..4730ac0021
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss1.gif differ
diff --git a/icons/UI_Icons/Arcade/boss2.gif b/icons/UI_Icons/Arcade/boss2.gif
new file mode 100644
index 0000000000..d95fd84f0e
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss2.gif differ
diff --git a/icons/UI_Icons/Arcade/boss3.gif b/icons/UI_Icons/Arcade/boss3.gif
new file mode 100644
index 0000000000..e97056998a
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss3.gif differ
diff --git a/icons/UI_Icons/Arcade/boss4.gif b/icons/UI_Icons/Arcade/boss4.gif
new file mode 100644
index 0000000000..6695b6cfbf
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss4.gif differ
diff --git a/icons/UI_Icons/Arcade/boss5.gif b/icons/UI_Icons/Arcade/boss5.gif
new file mode 100644
index 0000000000..a827fb8c4e
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss5.gif differ
diff --git a/icons/UI_Icons/Arcade/boss6.gif b/icons/UI_Icons/Arcade/boss6.gif
new file mode 100644
index 0000000000..7a926cf89d
Binary files /dev/null and b/icons/UI_Icons/Arcade/boss6.gif differ
diff --git a/tgstation.dme b/tgstation.dme
index 9fbcad85c8..be80aeb64a 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1050,6 +1050,7 @@
#include "code\game\objects\items\stacks\rods.dm"
#include "code\game\objects\items\stacks\stack.dm"
#include "code\game\objects\items\stacks\telecrystal.dm"
+#include "code\game\objects\items\stacks\tickets.dm"
#include "code\game\objects\items\stacks\wrap.dm"
#include "code\game\objects\items\stacks\sheets\glass.dm"
#include "code\game\objects\items\stacks\sheets\leather.dm"
|