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

Beach Unsimulated Removal (#15476)

Browse Source
This commit is contained in:
Fox McCloud
2021-02-13 22:29:00 +00:00
committed by GitHub
parent 70a130ee61
commit 9bf63badbf
11 changed files with 1310 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/poolcontroller.dm
+3 -3
View File
@@ -39,8 +39,8 @@
var/turf/simulated/floor/beach/water/W = T
W.linkedcontroller = src
linkedturfs += T
else if(istype(T, /turf/unsimulated/beach/water))
var/turf/unsimulated/beach/water/W = T
else if(istype(T, /turf/simulated/floor/beach/away/water))
var/turf/simulated/floor/beach/away/water/W = T
W.linkedcontroller = src
linkedturfs += T
@@ -76,7 +76,7 @@
/obj/machinery/poolcontroller/proc/processMob()
for(var/M in mobinpool) //They're already typecasted when entering the turf
// Following two are sanity check. If the mob is no longer in the pool for whatever reason (Looking at you teleport), remove them
if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/unsimulated/beach/water)) // Water component when?
if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/simulated/floor/beach/away/water)) // Water component when?
mobinpool -= M
continue
handleTemp(M) //handles pool temp effects on the swimmers