Fix indentations (#17481)

* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
This commit is contained in:
Fluffy
2023-10-05 12:15:58 +02:00
committed by GitHub
parent 032853824d
commit 4538e2a7cc
471 changed files with 2670 additions and 2597 deletions
@@ -1,96 +1,96 @@
// Container for all essesal state for NTRC message while it's proccessed
/datum/ntnet_message
var/mob/user
var/datum/computer_file/program/chat_client/client
var/datum/ntnet_user/nuser
var/play_sound = FALSE
var/mob/user
var/datum/computer_file/program/chat_client/client
var/datum/ntnet_user/nuser
var/play_sound = FALSE
/datum/ntnet_message/New(var/datum/computer_file/program/chat_client/Pr = null, var/mob/user = null)
if(user)
src.user = user
if(Pr)
client = Pr
nuser = Pr.my_user
if(user)
src.user = user
if(Pr)
client = Pr
nuser = Pr.my_user
// Should be sanitized
/datum/ntnet_message/proc/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
return FALSE
return FALSE
/datum/ntnet_message/proc/format_admin_log(var/datum/ntnet_conversation/Conv)
return FALSE
return FALSE
// Should be sanitized
/datum/ntnet_message/proc/format_ntnet_log(var/datum/ntnet_conversation/Conv)
return FALSE
return FALSE
/datum/ntnet_message/proc/format_chat_log(var/datum/ntnet_conversation/Conv)
return FALSE
return FALSE
/datum/ntnet_message/message
play_sound = TRUE
var/message = ""
play_sound = TRUE
var/message = ""
/datum/ntnet_message/message/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = "<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i>:</b> [sanitize(message)] (<a href='byond://?src=\ref[Cl]&Reply=\ref[Conv]'>Reply</a>)"
. = "<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i>:</b> [sanitize(message)] (<a href='byond://?src=\ref[Cl]&Reply=\ref[Conv]'>Reply</a>)"
/datum/ntnet_message/message/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] [nuser.username]: [message]"
. = "[worldtime2text()] [nuser.username]: [message]"
/datum/ntnet_message/message/format_admin_log(var/datum/ntnet_conversation/Conv)
. = message
. = message
/datum/ntnet_message/message/format_ntnet_log(var/datum/ntnet_conversation/Conv)
. = "[sanitize(Conv.get_title())] [nuser.username]: [sanitize(message)]"
. = "[sanitize(Conv.get_title())] [nuser.username]: [sanitize(message)]"
/datum/ntnet_message/join/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has entered the chat.</b>")
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has entered the chat.</b>")
/datum/ntnet_message/join/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has entered the chat."
. = "[worldtime2text()] -!- [nuser.username] has entered the chat."
/datum/ntnet_message/leave/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has left the chat.</b>")
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has left the chat.</b>")
/datum/ntnet_message/leave/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has left the chat."
. = "[worldtime2text()] -!- [nuser.username] has left the chat."
/datum/ntnet_message/new_op/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has become operator."
. = "[worldtime2text()] -!- [nuser.username] has become operator."
/datum/ntnet_message/new_title
var/title = ""
var/title = ""
/datum/ntnet_message/new_title/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has changed channel title from [Conv.get_title()] to [title]"
. = "[worldtime2text()] -!- [nuser.username] has changed channel title from [Conv.get_title()] to [title]"
/datum/ntnet_message/new_title/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has changed the channel title to <i>[sanitize(title)].</i></b>")
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has changed the channel title to <i>[sanitize(title)].</i></b>")
/datum/ntnet_message/kick
var/datum/ntnet_user/target
var/datum/ntnet_user/target
/datum/ntnet_message/kick/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has kicked [target.username] from conversation."
. = "[worldtime2text()] -!- [nuser.username] has kicked [target.username] from conversation."
/datum/ntnet_message/kick/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has kicked <i>[target.username]</i> from conversation.</b>")
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has kicked <i>[target.username]</i> from conversation.</b>")
/datum/ntnet_message/direct/format_chat_log(var/datum/ntnet_conversation/Conv)
. = "[worldtime2text()] -!- [nuser.username] has opened direct conversation."
. = "[worldtime2text()] -!- [nuser.username] has opened direct conversation."
/datum/ntnet_message/direct/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl)
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has opened direct conversation with you.</b>")
. = FONT_SMALL("<b>([sanitize(Conv.get_title(Cl))]) <i>[nuser.username]</i> has opened direct conversation with you.</b>")
@@ -15,7 +15,7 @@
/datum/ntnet/proc/begin_direct(var/datum/computer_file/program/chat_client/Cl, var/datum/ntnet_user/target)
if(!istype(Cl) || !istype(Cl.my_user) || !istype(target) || istype(Cl.my_user.dm_channels[target], /datum/ntnet_conversation))
return
var/datum/ntnet_conversation/Conv = new()
Conv.direct = TRUE
Conv.users.Add(Cl.my_user)
@@ -23,6 +23,6 @@
target.dm_channels[Cl.my_user] = Conv
Cl.my_user.dm_channels[target] = Conv
var/datum/ntnet_message/direct/msg = new(Cl)
Conv.process_message(msg)
@@ -1,16 +1,16 @@
/datum/ntnet_user
var/username
var/list/channels = list()
var/list/dm_channels = list()
var/list/clients = list()
var/username
var/list/channels = list()
var/list/dm_channels = list()
var/list/clients = list()
/datum/ntnet_user/New()
. = ..()
ntnet_global.chat_users.Add(src)
. = ..()
ntnet_global.chat_users.Add(src)
/datum/ntnet_user/Destroy(force)
. = ..()
ntnet_global.chat_users.Remove(src)
. = ..()
ntnet_global.chat_users.Remove(src)
/datum/ntnet_user/proc/generateUsernameIdCard(var/obj/item/card/id/card)
if(!card)
@@ -70,10 +70,10 @@
..()
/obj/machinery/ntnet_relay/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "NTNetRelay")
ui.open()
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "NTNetRelay")
ui.open()
/obj/machinery/ntnet_relay/ui_data(mob/user)
var/list/data = list()
@@ -504,23 +504,23 @@
// A late init operation called in SSshuttle for ship computers and holopads, used to attach the thing to the right ship.
/obj/item/modular_computer/proc/attempt_hook_up(var/obj/effect/overmap/visitable/sector)
SHOULD_CALL_PARENT(TRUE)
if(!istype(sector))
return FALSE
if(sector.check_ownership(src))
linked = sector
return TRUE
return FALSE
SHOULD_CALL_PARENT(TRUE)
if(!istype(sector))
return FALSE
if(sector.check_ownership(src))
linked = sector
return TRUE
return FALSE
/obj/item/modular_computer/proc/sync_linked()
var/obj/effect/overmap/visitable/sector = map_sectors["[z]"]
if(!sector)
return
return attempt_hook_up_recursive(sector)
var/obj/effect/overmap/visitable/sector = map_sectors["[z]"]
if(!sector)
return
return attempt_hook_up_recursive(sector)
/obj/item/modular_computer/proc/attempt_hook_up_recursive(var/obj/effect/overmap/visitable/sector)
if(attempt_hook_up(sector))
return sector
for(var/obj/effect/overmap/visitable/candidate in sector)
if((. = .(candidate)))
return
if(attempt_hook_up(sector))
return sector
for(var/obj/effect/overmap/visitable/candidate in sector)
if((. = .(candidate)))
return
@@ -36,7 +36,7 @@
/datum/computer_file/program/proc/service_enable()
return service_activate()
// Is called when program service is being deactivated without
// Is called when program service is being deactivated without
/datum/computer_file/program/proc/service_disable()
return service_deactivate()
@@ -68,4 +68,4 @@
if(background)
computer.output_error(FONT_SMALL(SPAN_WARNING("Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error")))
else
computer.output_error(FONT_SMALL(SPAN_WARNING("NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.")))
computer.output_error(FONT_SMALL(SPAN_WARNING("NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.")))
@@ -14,7 +14,7 @@
/datum/computer_file/program/away_manifest/ui_data(mob/user)
var/list/data = list()
if(active_record)
data["active_record"] = list(
"name" = active_record.name,
@@ -32,29 +32,29 @@
data["shuttle_manifest"] = allshuttles
data["active_record"] = null
return data
/datum/computer_file/program/away_manifest/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
switch(action)
if("am_menu")
. = TRUE
active_record = null
SStgui.update_uis(computer)
if("editentry")
for(var/datum/record/shuttle_manifest/m in SSrecords.shuttle_manifests)
if(m.id == text2num(params["editentry"]))
active_record = m
break
if("back")
. = TRUE
active_record = null
SStgui.update_uis(computer)
//Check ID for command/mining/research access to edit
if(!istype(usr))
return
@@ -62,7 +62,7 @@
if(!istype(I) || !I.registered_name || issilicon(usr) || (!(access_heads in I.access) && !(access_research in I.access) && !(access_mining in I.access)))
to_chat(usr, SPAN_WARNING("Authentication error: Unable to locate ID with appropriate access to allow this operation."))
return
switch(action)
if("addentry")
. = TRUE
@@ -71,19 +71,19 @@
m.name = "Unknown"
m.shuttle = "Unknown"
active_record = m
if("saveentry")
. = TRUE
SSrecords.update_record(active_record)
active_record = null
SStgui.update_uis(computer)
if("deleteentry")
. = TRUE
SSrecords.remove_record(active_record)
active_record = null
SStgui.update_uis(computer)
if("editentryname")
. = TRUE
var/names = list()
@@ -94,7 +94,7 @@
if(!newname)
return
active_record.name = newname
if("editentrynamecustom")
. = TRUE
var/newname = sanitize(input("Please enter name.") as null|text)
@@ -109,4 +109,3 @@
if(!newshuttle)
return
active_record.shuttle = newshuttle
@@ -1,46 +1,46 @@
/datum/computer_file/program/scanner
size = 2
program_type = PROGRAM_SERVICE
available_on_ntnet = FALSE
usage_flags = PROGRAM_ALL_HANDHELD
var/mode = null
size = 2
program_type = PROGRAM_SERVICE
available_on_ntnet = FALSE
usage_flags = PROGRAM_ALL_HANDHELD
var/mode = null
/datum/computer_file/program/scanner/service_activate()
. = ..()
if(!computer.scan_mode)
computer.scan_mode = mode
return TRUE
else
computer.visible_message(SPAN_WARNING("Cannot activate [filedesc]: Another scanner is already active!"))
return FALSE
. = ..()
if(!computer.scan_mode)
computer.scan_mode = mode
return TRUE
else
computer.visible_message(SPAN_WARNING("Cannot activate [filedesc]: Another scanner is already active!"))
return FALSE
/datum/computer_file/program/scanner/service_deactivate()
. = ..()
computer.scan_mode = null
. = ..()
computer.scan_mode = null
/datum/computer_file/program/scanner/medical
filename = "med_scanner"
filedesc = "Medical Analyzer"
extended_desc = "A scanning suite capable of detecting major medical problems in individuals."
available_on_ntnet = TRUE
required_access_run = access_medical
required_access_download = access_medical
mode = SCANNER_MEDICAL
filename = "med_scanner"
filedesc = "Medical Analyzer"
extended_desc = "A scanning suite capable of detecting major medical problems in individuals."
available_on_ntnet = TRUE
required_access_run = access_medical
required_access_download = access_medical
mode = SCANNER_MEDICAL
/datum/computer_file/program/scanner/science
filename = "sci_scanner"
filedesc = "Reagent Analyzer"
extended_desc = "A scanning suite capable of detecting active chemical reagents."
available_on_ntnet = TRUE
required_access_run = access_research
required_access_download = access_research
mode = SCANNER_REAGENT
filename = "sci_scanner"
filedesc = "Reagent Analyzer"
extended_desc = "A scanning suite capable of detecting active chemical reagents."
available_on_ntnet = TRUE
required_access_run = access_research
required_access_download = access_research
mode = SCANNER_REAGENT
/datum/computer_file/program/scanner/gas
filename = "gas_scanner"
filedesc = "Gas Analyzer"
extended_desc = "A scanning suite capable of detecting and parsing gaseous conditions within a closed atmospheric system."
available_on_ntnet = TRUE
required_access_run = list(access_atmospherics, access_research)
required_access_download = list(access_atmospherics, access_research)
mode = SCANNER_GAS
filename = "gas_scanner"
filedesc = "Gas Analyzer"
extended_desc = "A scanning suite capable of detecting and parsing gaseous conditions within a closed atmospheric system."
available_on_ntnet = TRUE
required_access_run = list(access_atmospherics, access_research)
required_access_download = list(access_atmospherics, access_research)
mode = SCANNER_GAS
@@ -12,7 +12,7 @@
if(!istype(computer, /obj/item/modular_computer/silicon))
return FALSE
var/obj/item/modular_computer/silicon/true_computer = computer
if(!istype(true_computer.computer_host, /mob/living/silicon/pai))
return FALSE
@@ -32,4 +32,4 @@
return
var/mob/living/silicon/pai/host = true_computer.computer_host
host.toggle_flashlight()
host.toggle_flashlight()
+19 -19
View File
@@ -1,26 +1,26 @@
/obj/item/computer_hardware/flashlight
name = "flashlight"
desc = "A small pen-sized flashlight used to illuminate a small area."
icon = 'icons/obj/lighting.dmi'
icon_state = "headlights"
power_usage = 50
enabled = FALSE
critical = FALSE
var/range = 2
var/power = 1
var/flashlight_color = LIGHT_COLOR_HALOGEN
name = "flashlight"
desc = "A small pen-sized flashlight used to illuminate a small area."
icon = 'icons/obj/lighting.dmi'
icon_state = "headlights"
power_usage = 50
enabled = FALSE
critical = FALSE
var/range = 2
var/power = 1
var/flashlight_color = LIGHT_COLOR_HALOGEN
/obj/item/computer_hardware/flashlight/enable()
. = ..()
if(parent_computer)
parent_computer.set_light(range, power, flashlight_color)
. = ..()
if(parent_computer)
parent_computer.set_light(range, power, flashlight_color)
/obj/item/computer_hardware/flashlight/disable()
. = ..()
if(parent_computer)
parent_computer.set_light(initial(parent_computer.light_range), initial(parent_computer.light_power), flashlight_color)
. = ..()
if(parent_computer)
parent_computer.set_light(initial(parent_computer.light_range), initial(parent_computer.light_power), flashlight_color)
/obj/item/computer_hardware/flashlight/proc/tweak_brightness(var/new_power)
. = power = Clamp(0, new_power, 1)
if(parent_computer && enabled)
parent_computer.set_light(range, power, flashlight_color)
. = power = Clamp(0, new_power, 1)
if(parent_computer && enabled)
parent_computer.set_light(range, power, flashlight_color)