cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some bad Destroy()s (#17511)

Browse Source 
* Fixes some bad Destroy()s

Fixes some bad destroys on request of Kash, will need checking over that I've not misunderstood the instructions! This is all I had time to look through for now. Checked around 200-ish files.

* The rest of them

Found a quick way to look through them all

* Update chicken.dm

* fix that

* don't abuse destroy

* .

* move this up

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
SatinIsle
2025-04-12 00:15:42 +02:00
committed by GitHub
co-authored by Kashargul
parent 03ea0f928d
commit 94e61bdfc0
57 changed files with 74 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks_events.dm
+1 -1
View File
@@ -43,7 +43,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
/obj/effect/landmark/event_trigger/Destroy()
if(event_triggers[creator_ckey])
event_triggers[creator_ckey] -= src
..()
. = ..()
/obj/effect/landmark/event_trigger/Crossed(var/atom/movable/AM)
if(!isliving(AM))
code/game/objects/effects/prop/columnblast.dm
+7 -13
View File
@@ -4,34 +4,27 @@
desc = "Oh shit!"
icon_state = "pool"
icon = 'icons/effects/64x64.dmi'
time_to_die = 0.7 SECONDS
pixel_x = -16
/obj/effect/temporary_effect/eruption/New(var/turf/T, var/ttd = 10 SECONDS, var/newcolor)
/obj/effect/temporary_effect/eruption/Initialize(mapload, var/ttd = 10 SECONDS, var/newcolor)
if(ttd)
time_to_die = ttd
time_to_die += ttd
addtimer(CALLBACK(src, PROC_REF(on_eruption), get_turf(src)), time_to_die - 0.2 SECONDS, TIMER_DELETE_ME)
if(newcolor)
color = newcolor
..()
/obj/effect/temporary_effect/eruption/Initialize(mapload)
. = ..()
flick("[icon_state]_create",src)
/obj/effect/temporary_effect/eruption/Destroy()
var/turf/T = get_turf(src)
flick("[icon_state]_erupt",src)
spawn(5)
if(on_eruption(T))
spawn(2)
..()
/obj/effect/temporary_effect/eruption/proc/on_eruption(var/turf/Target) // Override for specific functions, as below.
flick("[icon_state]_erupt",src)
return TRUE
/obj/effect/temporary_effect/eruption/testing/on_eruption(var/turf/Target)
flick("[icon_state]_erupt",src)
if(Target)
new /obj/effect/explosion(Target)
return TRUE
@@ -44,6 +37,7 @@
desc = "A bubbling pool of fire!"
/obj/effect/temporary_effect/eruption/flamestrike/on_eruption(var/turf/Target)
flick("[icon_state]_erupt",src)
if(Target)
Target.hotspot_expose(1000, 50, 1)