Merge pull request #31809 from ShizCalev/helper-cleanup

Cleans up some istypes not using helpers
This commit is contained in:
Leo
2017-10-17 22:20:42 -02:00
committed by CitadelStationBot
parent 9691c9130f
commit 28656d3347
18 changed files with 26 additions and 24 deletions
+1 -1
View File
@@ -206,7 +206,7 @@
continue
if(extended_safety_checks)
if(istype(F, /turf/open/lava)) //chasms aren't /floor, and so are pre-filtered
if(islava(F)) //chasms aren't /floor, and so are pre-filtered
var/turf/open/lava/L = F
if(!L.is_safe())
continue
+1 -1
View File
@@ -261,7 +261,7 @@
var/turf/next = get_step(ridden, direction)
var/turf/current = get_turf(ridden)
if(istype(next, /turf/open/lava) || istype(current, /turf/open/lava)) //We can move from land to lava, or lava to land, but not from land to land
if(islava(next) || islava(current)) //We can move from land to lava, or lava to land, but not from land to land
..()
else
to_chat(user, "Boats don't go on land!")