cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +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/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