cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 15:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8810 from Spookerton/spkrtn/cng/macro-changes-for-micro-reasons

Browse Source 
fix up a bunch of macro cruft
This commit is contained in:
Atermonera
2022-11-05 11:19:38 -08:00
committed by GitHub
parent 8b8ccd583c b0a6851e0f
commit 24068ba2eb
47 changed files with 120 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/view_variables/mass_edit_variables.dm
+1 -1
View File
@@ -193,7 +193,7 @@
if (rejected)
to_chat(src, "[rejected] out of [count] objects rejected your edit")
log_world("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])")
to_world_log("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])")
log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)")
message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)")
code/modules/admin/view_variables/modify_variables.dm
+7 -7
View File
@@ -105,7 +105,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (O.vv_edit_var(objectvar, L) == FALSE)
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: ADDED=[var_value]")
to_world_log("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: ADDED=[var_value]")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
@@ -148,7 +148,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (!O.vv_edit_var(objectvar, L))
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR NULLS")
to_world_log("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR NULLS")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR NULLS")
message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: CLEAR NULLS")
return
@@ -158,7 +158,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (!O.vv_edit_var(objectvar, L))
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR DUPES")
to_world_log("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR DUPES")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR DUPES")
message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: CLEAR DUPES")
return
@@ -168,7 +168,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (!O.vv_edit_var(objectvar, L))
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [O.type] [objectvar]: SHUFFLE")
to_world_log("### ListVarEdit by [src]: [O.type] [objectvar]: SHUFFLE")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: SHUFFLE")
message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: SHUFFLE")
return
@@ -251,7 +251,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (O.vv_edit_var(objectvar, L))
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]")
to_world_log("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]")
return
@@ -272,7 +272,7 @@ GLOBAL_PROTECT(VVpixelmovement)
if (O.vv_edit_var(objectvar, L) == FALSE)
to_chat(src, "Your edit was rejected by the object.")
return
log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: [original_var]=[new_var]")
to_world_log("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: [original_var]=[new_var]")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]")
@@ -389,7 +389,7 @@ GLOBAL_PROTECT(VVpixelmovement)
to_chat(src, "Your edit was rejected by the object.")
return
vv_update_display(O, "varedited", VV_MSG_EDITED)
log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]")
to_world_log("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]")
log_admin("[key_name(src)] modified [original_name]'s [variable] from [html_encode("[var_value]")] to [html_encode("[var_new]")]")
var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]"
message_admins(msg)
code/modules/admin/view_variables/topic_list.dm
+5 -5
View File
@@ -14,19 +14,19 @@
if (prompt != "Yes")
return
target.Cut(target_index, target_index+1)
log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
to_world_log("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]")
message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]")
if(href_list[VV_HK_LIST_ADD])
mod_list_add(target, null, "list", "contents")
if(href_list[VV_HK_LIST_ERASE_DUPES])
uniqueList_inplace(target)
log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
to_world_log("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
log_admin("[key_name(src)] modified list's contents: CLEAR DUPES")
message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES")
if(href_list[VV_HK_LIST_ERASE_NULLS])
listclearnulls(target)
log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
to_world_log("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
log_admin("[key_name(src)] modified list's contents: CLEAR NULLS")
message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS")
if(href_list[VV_HK_LIST_SET_LENGTH])
@@ -34,11 +34,11 @@
if (value["class"] != VV_NUM || value["value"] > max(5000, target.len)) //safety - would rather someone not put an extra 0 and erase the server's memory lmao.
return
target.len = value["value"]
log_world("### ListVarEdit by [src]: /list len: [target.len]")
to_world_log("### ListVarEdit by [src]: /list len: [target.len]")
log_admin("[key_name(src)] modified list's len: [target.len]")
message_admins("[key_name_admin(src)] modified list's len: [target.len]")
if(href_list[VV_HK_LIST_SHUFFLE])
shuffle_inplace(target)
log_world("### ListVarEdit by [src]: /list contents: SHUFFLE")
to_world_log("### ListVarEdit by [src]: /list contents: SHUFFLE")
log_admin("[key_name(src)] modified list's contents: SHUFFLE")
message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE")
code/modules/antagonist/antagonist_create.dm
+1 -1
View File
@@ -101,7 +101,7 @@
/datum/antagonist/proc/greet(var/datum/mind/player)
// Makes it harder to miss if you're alt-tabbed or not paying attention.
if(antag_sound)
SEND_SOUND(player.current, sound(antag_sound))
sound_to(player.current, sound(antag_sound))
window_flash(player.current.client)
// Basic intro text.
code/modules/assembly/infrared.dm
+6 -6
View File
@@ -39,7 +39,7 @@
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
QDEL_LIST_NULL(i_beams)
QDEL_NULL_LIST(i_beams)
return on
/obj/item/assembly/infra/update_icon()
@@ -54,7 +54,7 @@
/obj/item/assembly/infra/process()
if(!on && i_beams)
QDEL_LIST_NULL(i_beams)
QDEL_NULL_LIST(i_beams)
return
if(!i_beams && secured && (istype(loc, /turf) || (holder && istype(holder.loc, /turf))))
@@ -74,7 +74,7 @@
I.visible = visible
/obj/item/assembly/infra/attack_hand()
QDEL_LIST_NULL(i_beams)
QDEL_NULL_LIST(i_beams)
..()
/obj/item/assembly/infra/Move()
@@ -84,19 +84,19 @@
/obj/item/assembly/infra/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
QDEL_LIST_NULL(i_beams)
QDEL_NULL_LIST(i_beams)
/obj/item/assembly/infra/holder_movement()
if(!holder)
return FALSE
QDEL_LIST_NULL(i_beams)
QDEL_NULL_LIST(i_beams)
return TRUE
/obj/item/assembly/infra/proc/trigger_beam()
if(!process_cooldown())
return FALSE
pulse(0)
QDEL_LIST_NULL(i_beams) //They will get recreated next process() if the situation is still appropriate
QDEL_NULL_LIST(i_beams) //They will get recreated next process() if the situation is still appropriate
if(!holder)
visible_message("[bicon(src)] *beep* *beep*")
code/modules/asset_cache/asset_cache_item.dm
+1 -1
View File
@@ -17,7 +17,7 @@
md5 = md5(fcopy_rsc(file))
if (!md5)
CRASH("invalid asset sent to asset cache")
log_world("asset cache unexpected success of second fcopy_rsc")
to_world_log("asset cache unexpected success of second fcopy_rsc")
src.name = name
url = name
resource = file
code/modules/client/client procs.dm
+2 -2
View File
@@ -393,7 +393,7 @@
/client/proc/findJoinDate()
var/list/http = world.Export("http://byond.com/members/[ckey]?format=text")
if(!http)
log_world("Failed to connect to byond age check for [ckey]")
to_world_log("Failed to connect to byond age check for [ckey]")
return
var/F = file2text(http["CONTENT"])
if(F)
@@ -424,7 +424,7 @@
winset(src, null, "outputwindow.htmloutput.is-visible=false;outputwindow.oldoutput.is-visible=false;outputwindow.chatloadlabel.is-visible=true")
//The hard way
qdel_null(src.chatOutput)
QDEL_NULL(src.chatOutput)
chatOutput = new /datum/chatOutput(src) //veechat
chatOutput.send_resources()
spawn()
code/modules/client/preference_setup/loadout/loadout.dm
+5 -5
View File
@@ -47,18 +47,18 @@ var/global/list/gear_datums = list()
var/current_tab = "General"
/datum/category_item/player_setup_item/loadout/load_character(var/savefile/S)
from_file(S["gear_list"], pref.gear_list)
from_file(S["gear_slot"], pref.gear_slot)
from_save(S["gear_list"], pref.gear_list)
from_save(S["gear_slot"], pref.gear_slot)
if(pref.gear_list!=null && pref.gear_slot!=null)
pref.gear = pref.gear_list["[pref.gear_slot]"]
else
from_file(S["gear"], pref.gear)
from_save(S["gear"], pref.gear)
pref.gear_slot = 1
/datum/category_item/player_setup_item/loadout/save_character(var/savefile/S)
pref.gear_list["[pref.gear_slot]"] = pref.gear
to_file(S["gear_list"], pref.gear_list)
to_file(S["gear_slot"], pref.gear_slot)
to_save(S["gear_list"], pref.gear_list)
to_save(S["gear_slot"], pref.gear_slot)
/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
. = list()
code/modules/client/preference_setup/occupation/occupation.dm
+1 -1
View File
@@ -256,7 +256,7 @@
else if(href_list["job_wiki"])
var/rank = href_list["job_wiki"]
open_link(user,"[config.wikiurl][rank]")
send_link(user,"[config.wikiurl][rank]")
return ..()
code/modules/gamemaster/event2/events/command/raise_funds.dm
+1 -1
View File
@@ -94,4 +94,4 @@
/datum/event2/event/raise_funds/proc/send_command_report(title, message)
post_comm_message(title, message)
to_world(span("danger", "New [using_map.company_name] Update available at all communication consoles."))
SEND_SOUND(world, 'sound/AI/commandreport.ogg')
sound_to(world, 'sound/AI/commandreport.ogg')
code/modules/holomap/mapper.dm
+1 -1
View File
@@ -112,7 +112,7 @@
map_image_cache.Cut()
icon_image_cache.Cut()
qdel_null(extras_holder)
QDEL_NULL(extras_holder)
return ..()
code/modules/integrated_electronics/subtypes/output.dm
+1 -1
View File
@@ -502,7 +502,7 @@
QDEL_NULL(hologram)
// holo_beam.End()
// qdel_null(holo_beam)
// QDEL_NULL(holo_beam)
power_draw_idle = 0
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -962,7 +962,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
throw_alert("\ref[source]_notify_revive", /obj/screen/alert/notify_cloning, new_master = source)
to_chat(src, "<span class='ghostalert'><a href=?src=[REF(src)];reenter=1>(Click to re-enter)</a></span>")
if(sound)
SEND_SOUND(src, sound(sound))
sound_to(src, sound(sound))
/mob/observer/dead/verb/respawn()
set name = "Respawn"
code/modules/mob/living/silicon/laws.dm
+1 -1
View File
@@ -81,7 +81,7 @@
if((last_law_notification + 1 SECOND) > world.time)
return
last_law_notification = world.time
SEND_SOUND(src, 'sound/machines/defib_success.ogg')
sound_to(src, 'sound/machines/defib_success.ogg')
window_flash(client)
to_chat(src, span("warning", message))
code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
+1 -1
View File
@@ -59,7 +59,7 @@
return ..()
/mob/living/simple_mob/mechanical/mecha/Destroy()
qdel_null(sparks)
QDEL_NULL(sparks)
return ..()
/mob/living/simple_mob/mechanical/mecha/death()
code/modules/mob/mob_planes.dm
+1 -1
View File
@@ -50,7 +50,7 @@
/datum/plane_holder/Destroy()
my_mob = null
QDEL_LIST_NULL(plane_masters) //Goodbye my children, be free
QDEL_NULL_LIST(plane_masters) //Goodbye my children, be free
return ..()
/datum/plane_holder/proc/set_vis(var/which = null, var/state = FALSE)
code/modules/modular_computers/file_system/news_article.dm
+2 -2
View File
@@ -9,9 +9,9 @@
var/archived // Set to 1 for older stuff
var/cover //filename of cover.
/datum/computer_file/data/news_article/New(var/load_from_file = 0)
/datum/computer_file/data/news_article/New(var/load_file = 0)
..()
if(server_file_path && load_from_file)
if(server_file_path && load_file)
stored_data = file2text(server_file_path)
calculate_size()
code/modules/modular_computers/hardware/battery_module.dm
+1 -1
View File
@@ -71,7 +71,7 @@
. = ..()
/obj/item/computer_hardware/battery_module/Destroy()
qdel_null(battery)
QDEL_NULL(battery)
return ..()
/obj/item/computer_hardware/battery_module/proc/charge_to_full()
code/modules/persistence/datum/persistence_datum.dm
+1 -1
View File
@@ -112,7 +112,7 @@
to_store[++to_store.len] = CompileEntry(thing)
if(to_store.len)
to_file(file(filename), json_encode(to_store))
text2file(json_encode(to_store), filename)
/datum/persistent/proc/RemoveValue(var/atom/value)
qdel(value)
code/modules/projectiles/guns/launcher/bows.dm
+1 -1
View File
@@ -154,7 +154,7 @@
/obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user)
if(istype(bolt, /obj/item/arrow/energy)) // Let's not delete a Real Arrow^tm
qdel_null(bolt)
QDEL_NULL(bolt)
update_icon()
else
. = ..()
code/modules/shieldgen/shield_gen.dm
+1 -1
View File
@@ -44,7 +44,7 @@
return ..()
/obj/machinery/shield_gen/Destroy()
QDEL_LIST_NULL(field)
QDEL_NULL_LIST(field)
return ..()
/obj/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user)
code/modules/vchat/vchat_client.dm
+2 -2
View File
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(vchatFiles, list(
))
// The to_chat() macro calls this proc
/proc/__to_chat(var/target, var/message)
/proc/__to_vchat(var/target, var/message)
// First do logging in database
if(isclient(target))
var/client/C = target
@@ -369,7 +369,7 @@ var/global/to_chat_src
if(!C)
return // No client? No care.
else if(C.chatOutput.broken)
DIRECT_OUTPUT(C, original_message)
to_target(C, original_message)
return
else if(!C.chatOutput.loaded)
return // If not loaded yet, do nothing and history-sending on load will get it.
code/modules/vchat/vchat_db.dm
+4 -4
View File
@@ -24,7 +24,7 @@ GLOBAL_DATUM(vchatdb, /database)
//For INSERT/CREATE/DELETE, etc that return a RowsAffected.
/proc/vchat_exec_update(var/query)
if(!check_vchat())
log_world("There's no vchat database open but you tried to query it with: [query]")
to_world_log("There's no vchat database open but you tried to query it with: [query]")
return FALSE
//Solidify our query
@@ -35,7 +35,7 @@ GLOBAL_DATUM(vchatdb, /database)
//Handle errors
if(q.Error())
log_world("Query \"[islist(query)?query[1]:query]\" ended in error [q.ErrorMsg()]")
to_world_log("Query \"[islist(query)?query[1]:query]\" ended in error [q.ErrorMsg()]")
return FALSE
return q.RowsAffected()
@@ -43,7 +43,7 @@ GLOBAL_DATUM(vchatdb, /database)
//For SELECT, that return results.
/proc/vchat_exec_query(var/query)
if(!check_vchat())
log_world("There's no vchat database open but you tried to query it!")
to_world_log("There's no vchat database open but you tried to query it!")
return FALSE
//Solidify our query
@@ -54,7 +54,7 @@ GLOBAL_DATUM(vchatdb, /database)
//Handle errors
if(q.Error())
log_world("Query \"[islist(query)?query[1]:query]\" ended in error [q.ErrorMsg()]")
to_world_log("Query \"[islist(query)?query[1]:query]\" ended in error [q.ErrorMsg()]")
return FALSE
//Return any results