cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a runtime with empty turf lists on hallucinations (#26285)

Browse Source
This commit is contained in:
Luc
2024-07-25 15:44:03 +00:00
committed by GitHub
parent d66aaa0240
commit 07200a4a1c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hallucinations/effects/moderate.dm
+12 -3
View File
@@ -344,7 +344,10 @@
/obj/effect/hallucination/stunprodding/Initialize(mapload, mob/living/carbon/target)
. = ..()
var/turf/T = pick(RANGE_TURFS(15, target))
var/list/possible_turfs = RANGE_TURFS(15, target)
if(!length(possible_turfs))
return INITIALIZE_HINT_QDEL
var/turf/T = pick(possible_turfs)
target.playsound_local(T, 'sound/weapons/egloves.ogg', 25, TRUE)
target.playsound_local(T, get_sfx("bodyfall"), 25, TRUE)
target.playsound_local(T, "sparks", 50, TRUE)
@@ -366,7 +369,10 @@
/obj/effect/hallucination/energy_sword/Initialize(mapload, mob/living/carbon/target)
. = ..()
var/turf/T = pick(RANGE_TURFS(15, target))
var/list/possible_turfs = RANGE_TURFS(15, target)
if(!length(possible_turfs))
return INITIALIZE_HINT_QDEL
var/turf/T = pick(possible_turfs)
forceMove(T)
target.playsound_local(T, 'sound/weapons/saberon.ogg', 20, TRUE)
@@ -398,7 +404,10 @@
/obj/effect/hallucination/gunfire/Initialize(mapload, mob/living/carbon/target)
. = ..()
var/turf/T = pick(RANGE_TURFS(15, target))
var/list/possible_turfs = RANGE_TURFS(15, target)
if(!length(possible_turfs))
return INITIALIZE_HINT_QDEL
var/turf/T = pick(possible_turfs)
forceMove(T)
var/gun_sound = pick('sound/weapons/gunshots/gunshot_pistol.ogg', 'sound/weapons/gunshots/gunshot_strong.ogg')