cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

515 Compatibility (#19636)

Browse Source 
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
This commit is contained in:
S34N
2022-11-08 23:08:40 +00:00
committed by GitHub
parent 2e7e556383
commit 667dd5d4ac
378 changed files with 928 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+8 -8
View File
@@ -202,7 +202,7 @@
stat |= MAINT
constructed = TRUE
update_icon()
addtimer(CALLBACK(src, .proc/update), 5)
addtimer(CALLBACK(src, PROC_REF(update)), 5)
/obj/machinery/power/apc/Destroy()
SStgui.close_uis(wires)
@@ -259,7 +259,7 @@
set_light(1, LIGHTING_MINIMUM_POWER)
addtimer(CALLBACK(src, .proc/update), 5)
addtimer(CALLBACK(src, PROC_REF(update)), 5)
/obj/machinery/power/apc/examine(mob/user)
. = ..()
@@ -906,7 +906,7 @@
deltimer(emergency_power_timer)
emergency_power_timer = null
else
emergency_power_timer = addtimer(CALLBACK(src, .proc/turn_emergency_power_off), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
emergency_power_timer = addtimer(CALLBACK(src, PROC_REF(turn_emergency_power_off)), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
// if(area.name == "AI Chamber")
// spawn(10)
// to_chat(world, " [area.name] [area.power_equip]")
@@ -914,7 +914,7 @@
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
emergency_power_timer = addtimer(CALLBACK(src, .proc/turn_emergency_power_off), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
emergency_power_timer = addtimer(CALLBACK(src, PROC_REF(turn_emergency_power_off)), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
// if(area.name == "AI Chamber")
// to_chat(world, "[area.power_equip]")
area.power_change()
@@ -922,7 +922,7 @@
/obj/machinery/power/apc/proc/turn_emergency_power_off()
emergency_power = FALSE
for(var/obj/machinery/light/L in area)
INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE)
/obj/machinery/power/apc/proc/can_use(mob/user, loud = 0) //used by attack_hand() and Topic()
if(user.can_admin_interact())
@@ -1017,7 +1017,7 @@
update()
if("overload")
if(usr.has_unlimited_silicon_privilege)
INVOKE_ASYNC(src, /obj/machinery/power/apc.proc/overload_lighting)
INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/power/apc, overload_lighting))
if("hack")
if(get_malf_status(usr))
malfhack(usr)
@@ -1030,7 +1030,7 @@
if("emergency_lighting")
emergency_lights = !emergency_lights
for(var/obj/machinery/light/L in area)
INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE)
CHECK_TICK
/obj/machinery/power/apc/proc/toggle_breaker()
@@ -1051,7 +1051,7 @@
return
to_chat(malf, "Beginning override of APC systems. This takes some time, and you can only hack one APC at a time.")
malf.malfhack = src
malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE)
malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai, malfhacked), src), 600, TIMER_STOPPABLE)
var/obj/screen/alert/hackingapc/A
A = malf.throw_alert("hackingapc", /obj/screen/alert/hackingapc)
A.target = src
code/modules/power/cable.dm
+1 -1
View File
@@ -464,7 +464,7 @@ By design, d1 is the smallest direction and d2 is the highest
// queue it to rebuild
SSmachines.deferred_powernet_rebuilds += O
// addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
// addtimer(CALLBACK(O, PROC_REF(auto_propogate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
// Disconnect machines connected to nodes
if(d1 == 0) // if we cut a node (O-X) cable
code/modules/power/lighting.dm
+5 -5
View File
@@ -330,7 +330,7 @@
_turn_on(trigger, play_sound)
else if(!turning_on)
turning_on = TRUE
addtimer(CALLBACK(src, .proc/_turn_on, trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER))
addtimer(CALLBACK(src, PROC_REF(_turn_on), trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER))
else if(!turned_off())
set_emergency_lights()
else // Turning off
@@ -592,12 +592,12 @@
emergency_mode = TRUE
set_light(3, 1.7, bulb_emergency_colour)
update_icon()
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/update, override = TRUE)
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(update), override = TRUE)
/obj/machinery/light/proc/emergency_lights_off(area/current_area, obj/machinery/power/apc/current_apc)
set_light(0, 0, 0) //you, sir, are off!
if(current_apc)
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/update, override = TRUE)
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(update), override = TRUE)
/obj/machinery/light/flicker(amount = rand(20, 30))
if(flickering)
@@ -607,7 +607,7 @@
return FALSE
flickering = TRUE
INVOKE_ASYNC(src, /obj/machinery/light/.proc/flicker_event, amount)
INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/light, flicker_event), amount)
return TRUE
@@ -946,7 +946,7 @@
extinguished = TRUE
emergency_mode = FALSE
no_emergency = TRUE
addtimer(CALLBACK(src, .proc/enable_emergency_lighting), 5 MINUTES, TIMER_UNIQUE|TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(enable_emergency_lighting)), 5 MINUTES, TIMER_UNIQUE|TIMER_OVERRIDE)
visible_message("<span class='danger'>[src] flickers and falls dark.</span>")
update(FALSE)
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -309,7 +309,7 @@ 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.
INVOKE_ASYNC(src, .proc/admin_alert)
INVOKE_ASYNC(src, PROC_REF(admin_alert))
/obj/machinery/field/generator/proc/admin_alert()
var/temp = TRUE //stops spam
code/modules/power/singularity/narsie.dm
+2 -2
View File
@@ -48,8 +48,8 @@
var/image/alert_overlay = image('icons/effects/cult_effects.dmi', "ghostalertsie")
notify_ghosts("[name] has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action = NOTIFY_ATTACK)
INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
addtimer(CALLBACK(src, .proc/call_shuttle), 7 SECONDS)
INVOKE_ASYNC(src, PROC_REF(narsie_spawn_animation))
addtimer(CALLBACK(src, PROC_REF(call_shuttle)), 7 SECONDS)
/obj/singularity/narsie/large/proc/call_shuttle()
SSshuttle.emergency.request(null, 0.3)
code/modules/power/singularity/particle_accelerator/particle.dm
+4 -4
View File
@@ -23,9 +23,9 @@
/obj/effect/accelerated_particle/Initialize(loc)
. = ..()
addtimer(CALLBACK(src, .proc/propagate), 1)
RegisterSignal(src, COMSIG_CROSSED_MOVABLE, .proc/try_irradiate)
RegisterSignal(src, COMSIG_MOVABLE_CROSSED, .proc/try_irradiate)
addtimer(CALLBACK(src, PROC_REF(propagate)), 1)
RegisterSignal(src, COMSIG_CROSSED_MOVABLE, PROC_REF(try_irradiate))
RegisterSignal(src, COMSIG_MOVABLE_CROSSED, PROC_REF(try_irradiate))
QDEL_IN(src, movement_range)
/obj/effect/accelerated_particle/proc/try_irradiate(src, atom/A)
@@ -53,6 +53,6 @@
return
/obj/effect/accelerated_particle/proc/propagate()
addtimer(CALLBACK(src, .proc/propagate), 1)
addtimer(CALLBACK(src, PROC_REF(propagate)), 1)
if(!step(src,dir))
forceMove(get_step(src, dir))
code/modules/power/tesla/coil.dm
+1 -1
View File
@@ -92,7 +92,7 @@
//don't lose arc power when it's not connected to anything
//please place tesla coils all around the station to maximize effectiveness
being_shocked = TRUE
addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS)
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 1 SECONDS)
zap_buckle_check(power)
if(zap_flags & ZAP_GENERATES_POWER) //I don't want no tesla revolver making 8GW you hear
return power / 2
code/modules/power/tesla/energy_ball.dm
+4 -4
View File
@@ -35,9 +35,9 @@
/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
miniball = is_miniball
RegisterSignal(src, COMSIG_ATOM_ORBIT_BEGIN, .proc/on_start_orbit)
RegisterSignal(src, COMSIG_ATOM_ORBIT_STOP, .proc/on_stop_orbit)
RegisterSignal(parent_energy_ball, COMSIG_PARENT_QDELETING, .proc/on_parent_delete)
RegisterSignal(src, COMSIG_ATOM_ORBIT_BEGIN, PROC_REF(on_start_orbit))
RegisterSignal(src, COMSIG_ATOM_ORBIT_STOP, PROC_REF(on_stop_orbit))
RegisterSignal(parent_energy_ball, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_delete))
. = ..()
if(!is_miniball)
set_light(10, 7, "#5e5edd")
@@ -126,7 +126,7 @@
energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30, channel = CHANNEL_ENGINE)
addtimer(CALLBACK(src, .proc/new_mini_ball), 100)
addtimer(CALLBACK(src, PROC_REF(new_mini_ball)), 100)
else if(energy < energy_to_lower && length(orbiting_balls))
energy_to_raise = energy_to_raise / 1.25