cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: golem ship no longer hears ash storm in space (#24058)

Browse Source 
* fix: golem ship doesn't hear ash storm in space

* existence check and getDockedId helper
This commit is contained in:
warriorstar-orion
2024-02-06 15:06:24 -05:00
committed by GitHub
parent 6d1b41c0ba
commit e0f998f917
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/weather/weather_types/ash_storm.dm
+5 -3
View File
@@ -32,9 +32,7 @@
/datum/weather/ash_storm/proc/is_shuttle_docked(shuttleId, dockId)
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
var/obj/docking_port/stationary/S = M.get_docked()
return S.id == dockId
return M && M.getDockedId() == dockId
/datum/weather/ash_storm/proc/update_eligible_areas()
var/list/inside_areas = list()
@@ -52,6 +50,10 @@
if(!laborShuttleDocked)
eligible_areas -= get_areas(/area/shuttle/siberia)
var/golemShuttleOnPlanet = is_shuttle_docked("freegolem", "freegolem_lavaland")
if(!golemShuttleOnPlanet)
eligible_areas -= get_areas(/area/shuttle/freegolem)
for(var/i in 1 to eligible_areas.len)
var/area/place = eligible_areas[i]
if(place.outdoors)