cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-05 22:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes anomalies not spawning right (#22474)

Browse Source 
* fix broken anomalies

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Luc
2023-09-18 22:34:31 -04:00
committed by GitHub
parent fe3e6a20e3
commit 28e052d4ec
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/events/anomaly_event.dm
View File

@@ -15,26 +15,27 @@
target_turf = find_targets(TRUE)
/datum/event/anomaly/proc/find_targets(warn_on_fail = FALSE)
var/turf/target
for(var/tries in 0 to TURF_FIND_TRIES)
impact_area = findEventArea()
if(!impact_area)
if(warn_on_fail)
CRASH("No valid areas for anomaly found.")
else
return
stack_trace("No valid areas for anomaly found.")
kill()
return
var/list/candidate_turfs = get_area_turfs(impact_area)
while(length(candidate_turfs))
var/turf/candidate = pick_n_take(candidate_turfs)
if(!is_blocked_turf(candidate,TRUE))
target = candidate
target_turf = candidate
break
if(target_turf)
break
if(!target_turf)
CRASH("Anomaly: Unable to find a valid turf to spawn the anomaly. Last area tried: [impact_area] - [impact_area.type]")
stack_trace("Anomaly: Unable to find a valid turf to spawn the anomaly. Last area tried: [impact_area] - [impact_area.type]")
kill()
return
return target
return target_turf
/datum/event/anomaly/announce(false_alarm)
var/area/target = false_alarm ? findEventArea() : impact_area