cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

JSON Logging Refactor (#18252)

Browse Source 
* First pass

* fixes

* more fixes

* num2hex length changes

* pass 2

* fixed warning

* looc log fix

* .

* update tgui

* .

* .

* .

* .

* perttier

* cleanup

* .

* .

* fix token

* no

* .

* .

* .

* ,

* modsay eventsay

* .

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Selis
2025-09-11 17:28:20 +02:00
committed by GitHub
co-authored by Kashargul
parent 67fa43bd5a
commit b0f0f4685f
403 changed files with 4013 additions and 2309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/blueprints_vr.dm
+1 -1
View File
@@ -452,7 +452,7 @@
//I personally think adding walls to an area is a big deal, so this is commented out.
//BEGIN ESOTERIC BULLSHIT
//log_debug("Origin: [origin.c_airblock(checkT)] SourceT: [sourceT.c_airblock(checkT)] 0=NB 1=AB 2=ZB, 3=B")
//to_chat(world, "Origin: [origin.c_airblock(checkT)] SourceT: [sourceT.c_airblock(checkT)] 0=NB 1=AB 2=ZB, 3=B")
/*
if(origin.c_airblock(checkT)) //If everything breaks and it doesn't want to work, turn on the above debug and check this line. C.L. 0 = not blocked.
continue
code/game/objects/items/devices/communicator/UI_tgui.dm
+1 -1
View File
@@ -381,7 +381,7 @@
if(text)
exonet.send_message(their_address, "text", text)
im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text))
log_pda("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", ui.user)
ui.user.log_talk("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", LOG_PDA)
var/obj/item/communicator/comm = exonet.get_atom_from_address(their_address)
to_chat(ui.user, span_notice("[icon2html(src, ui.user.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], <b>\"[text]\"</b> (<a href='byond://?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)"))
for(var/mob/M in GLOB.player_list)
code/game/objects/items/devices/communicator/messaging.dm
+2 -2
View File
@@ -107,7 +107,7 @@
if(message)
exonet.send_message(comm.exonet.address, "text", message)
im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message))
log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr)
usr.client.mob.log_talk("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", LOG_PDA)
to_chat(usr, span_notice("[icon2html(src,usr.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], <b>\"[message]\"</b> (<a href='byond://?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)"))
// Verb: text_communicator()
@@ -159,7 +159,7 @@
to_chat(src, span_notice("You have sent '[text_message]' to [chosen_communicator]."))
exonet_messages.Add(span_bold("To [chosen_communicator]:") + "<br>[text_message]")
log_pda("(DCOMM: [src]) sent \"[text_message]\" to [chosen_communicator]", src)
log_talk("(DCOMM: [src]) sent \"[text_message]\" to [chosen_communicator]", LOG_PDA)
for(var/mob/M in GLOB.player_list)
if(M.stat == DEAD && M.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears))
if(isnewplayer(M) || M.forbid_seeing_deadchat)
code/game/objects/items/devices/radio/encryptionkey.dm
+55
View File
@@ -133,3 +133,58 @@
/obj/item/encryptionkey/ent
name = "entertainment encryption key"
channels = list(CHANNEL_ENTERTAINMENT = 1)
/obj/item/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/captain
name = "site manager's encryption key"
icon_state = "cap_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/rd
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SCIENCE = 1)
/obj/item/encryptionkey/ert
channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/omni //Literally only for the admin intercoms
channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/pathfinder
name = "pathfinder's encryption key"
icon_state = "com_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/qm
name = "quartermaster's encryption key"
icon_state = "qm_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SUPPLY = 1)
/obj/item/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "cypherkey"
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/explorer
name = "away team's encryption key"
icon_state = "rob_cypherkey"
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/sar
name = "fm's encryption key"
icon_state = "med_cypherkey"
channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/talon
channels = list(CHANNEL_TALON = 1)
code/game/objects/items/devices/radio/encryptionkey_vr.dm
-54
View File
@@ -1,54 +0,0 @@
/obj/item/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/captain
name = "site manager's encryption key"
icon_state = "cap_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/heads/rd
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SCIENCE = 1)
/obj/item/encryptionkey/ert
channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/omni //Literally only for the admin intercoms
channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/pathfinder
name = "pathfinder's encryption key"
icon_state = "com_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/qm
name = "quartermaster's encryption key"
icon_state = "qm_cypherkey"
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SUPPLY = 1)
/obj/item/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "cypherkey"
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/explorer
name = "away team's encryption key"
icon_state = "rob_cypherkey"
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/sar
name = "fm's encryption key"
icon_state = "med_cypherkey"
channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1)
/obj/item/encryptionkey/talon
channels = list(CHANNEL_TALON = 1)
code/game/objects/items/devices/radio/jammer.dm
+15
View File
@@ -119,3 +119,18 @@ GLOBAL_LIST_EMPTY(active_radio_jammers)
cut_overlays()
add_overlay("jammer_overlay_[overlay_percent]")
last_overlay_percent = overlay_percent
//Unlimited use, unlimited range jammer for admins. Turn it on, drop it somewhere, it works.
/obj/item/radio_jammer/admin
jam_range = 255
tick_cost = 0
/proc/is_vore_jammed(var/obj/radio)
var/atom/current = radio
while(current.loc)
if(isbelly(current.loc))
var/obj/belly/B = current.loc
if(B.mode_flags & DM_FLAG_JAMSENSORS)
return TRUE
current = current.loc
return FALSE
code/game/objects/items/devices/radio/jammer_vr.dm
-14
View File
@@ -1,14 +0,0 @@
//Unlimited use, unlimited range jammer for admins. Turn it on, drop it somewhere, it works.
/obj/item/radio_jammer/admin
jam_range = 255
tick_cost = 0
/proc/is_vore_jammed(var/obj/radio)
var/atom/current = radio
while(current.loc)
if(isbelly(current.loc))
var/obj/belly/B = current.loc
if(B.mode_flags & DM_FLAG_JAMSENSORS)
return TRUE
current = current.loc
return FALSE
code/game/objects/items/devices/radio/radio.dm
+34 -2
View File
@@ -82,7 +82,7 @@
AIO.link_radio(src)
break
if(!bs_tx_weakref)
testing("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
log_mapping("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
if(bs_rx_preload_id)
var/found = 0
@@ -100,7 +100,7 @@
found = 1
break
if(!found)
testing("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
log_mapping("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
/obj/item/radio/Destroy()
qdel(wires)
@@ -818,3 +818,35 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
bs_rx_preload_id = "Broadcaster A" //Recveive from a transmitter
#undef CANBROADCAST_INNERBOX
/obj/item/radio/phone
subspace_transmission = TRUE
canhear_range = 0
adhoc_fallback = TRUE
/obj/item/radio/emergency
name = "Medbay Emergency Radio Link"
icon_state = "med_walkietalkie"
frequency = MED_I_FREQ
subspace_transmission = TRUE
adhoc_fallback = TRUE
/obj/item/radio/emergency/Initialize(mapload)
. = ..()
internal_channels = GLOB.default_medbay_channels.Copy()
/obj/item/bluespaceradio/tether_prelinked
name = "bluespace radio (tether)"
handset = /obj/item/radio/bluespacehandset/linked/tether_prelinked
/obj/item/radio/bluespacehandset/linked/tether_prelinked
bs_tx_preload_id = "tether_rx" //Transmit to a receiver
bs_rx_preload_id = "tether_tx" //Recveive from a transmitter
/obj/item/bluespaceradio/talon_prelinked
name = "bluespace radio (talon)"
handset = /obj/item/radio/bluespacehandset/linked/talon_prelinked
/obj/item/radio/bluespacehandset/linked/talon_prelinked
bs_tx_preload_id = "talon_aio" //Transmit to a receiver
bs_rx_preload_id = "talon_aio" //Recveive from a transmitter
code/game/objects/items/devices/radio/radio_vr.dm
-33
View File
@@ -1,33 +0,0 @@
/obj/item/radio/phone
subspace_transmission = TRUE
canhear_range = 0
adhoc_fallback = TRUE
/obj/item/radio/emergency
name = "Medbay Emergency Radio Link"
icon_state = "med_walkietalkie"
frequency = MED_I_FREQ
subspace_transmission = TRUE
adhoc_fallback = TRUE
/obj/item/radio/emergency/Initialize(mapload)
. = ..()
internal_channels = GLOB.default_medbay_channels.Copy()
/obj/item/bluespaceradio/tether_prelinked
name = "bluespace radio (tether)"
handset = /obj/item/radio/bluespacehandset/linked/tether_prelinked
/obj/item/radio/bluespacehandset/linked/tether_prelinked
bs_tx_preload_id = "tether_rx" //Transmit to a receiver
bs_rx_preload_id = "tether_tx" //Recveive from a transmitter
/obj/item/bluespaceradio/talon_prelinked
name = "bluespace radio (talon)"
handset = /obj/item/radio/bluespacehandset/linked/talon_prelinked
/obj/item/radio/bluespacehandset/linked/talon_prelinked
bs_tx_preload_id = "talon_aio" //Transmit to a receiver
bs_rx_preload_id = "talon_aio" //Recveive from a transmitter
code/game/objects/items/devices/transfer_valve.dm
+1 -1
View File
@@ -61,7 +61,7 @@
return
var/atom/movable/AM = WF.resolve()
if(isnull(AM))
log_debug("DEBUG: HasProximity called without reference on [src].")
log_runtime("DEBUG: HasProximity called without reference on [src].")
attached_device?.HasProximity(T, WF, old_loc)
/obj/item/transfer_valve/Moved(old_loc, direction, forced)
code/game/objects/items/devices/uplink_random_lists.dm
+1 -1
View File
@@ -114,5 +114,5 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
/proc/debug_uplink_item_assoc_list()
for(var/key in uplink.items_assoc)
to_world("[key] - [uplink.items_assoc[key]]")
to_chat(world, "[key] - [uplink.items_assoc[key]]")
#endif
code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
+1 -1
View File
@@ -22,7 +22,7 @@
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(prob(10+extra_delay))
set_light(10, 10, "#[num2hex(rand(64,255))][num2hex(rand(64,255))][num2hex(rand(64,255))]")
set_light(10, 10, "#[num2hex(rand(64,255), 2)][num2hex(rand(64,255), 2)][num2hex(rand(64,255), 2)]")
addtimer(CALLBACK(src, PROC_REF(grenade_blast)), 10, TIMER_DELETE_ME)
/obj/item/grenade/anti_photon/proc/grenade_blast()
code/game/objects/items/weapons/tanks/tanks.dm
+3 -3
View File
@@ -444,7 +444,7 @@ var/list/global/tank_gauge_cache = list()
else if(pressure > TANK_RUPTURE_PRESSURE)
#ifdef FIREDBG
log_debug(span_warning("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]"))
log_world(span_warning("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]"))
#endif
air_contents.react()
@@ -504,7 +504,7 @@ var/list/global/tank_gauge_cache = list()
playsound(src, 'sound/effects/spray.ogg', 10, 1, -3)
leaking = 1
#ifdef FIREDBG
log_debug(span_warning("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]"))
log_world(span_warning("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]"))
#endif
@@ -662,7 +662,7 @@ var/list/global/tank_gauge_cache = list()
return
var/atom/movable/AM = WF.resolve()
if(isnull(AM))
log_debug("DEBUG: HasProximity called without reference on [src].")
log_runtime("DEBUG: HasProximity called without reference on [src].")
return
assembly?.HasProximity(T, WF, old_loc)