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

safepick

Browse Source 
more safepick
This commit is contained in:
xxalpha
2016-01-18 05:46:44 +00:00
parent a2ecfc0fc4
commit 577488e0d8
10 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/anomaly.dm
+1 -1
View File
@@ -26,7 +26,7 @@
priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert")
/datum/round_event/anomaly/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/flux(T)
code/modules/events/anomaly_bluespace.dm
+2 -2
View File
@@ -15,14 +15,14 @@
/datum/round_event/anomaly/anomaly_bluespace/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/bluespace(T)
/datum/round_event/anomaly/anomaly_bluespace/end()
if(newAnomaly.loc)//If it hasn't been neutralized, it's time to warp half the station away jeez
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
// Calculate new position (searches through beacons in world)
var/obj/item/device/radio/beacon/chosen
code/modules/events/anomaly_flux.dm
+1 -1
View File
@@ -15,7 +15,7 @@
/datum/round_event/anomaly/anomaly_flux/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/flux(T)
code/modules/events/anomaly_grav.dm
+1 -1
View File
@@ -14,6 +14,6 @@
priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
/datum/round_event/anomaly/anomaly_grav/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/grav(T)
code/modules/events/anomaly_pyro.dm
+1 -1
View File
@@ -14,7 +14,7 @@
priority_announce("Pyroclastic anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
/datum/round_event/anomaly/anomaly_pyro/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/pyro(T)
code/modules/events/anomaly_vortex.dm
+1 -1
View File
@@ -14,6 +14,6 @@
priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")
/datum/round_event/anomaly/anomaly_vortex/start()
var/turf/T = pick(get_area_turfs(impact_area))
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
newAnomaly = new /obj/effect/anomaly/bhole(T)