Structure istype define

2017-09-30 23:31:37 -03:00
parent aaa2a214cb
commit fd7c9110ca
10 changed files with 25 additions and 15 deletions
@@ -83,8 +83,16 @@
 	. = . && (vic.loc != tar.loc)

 /mob/Collide(atom/A)
+<<<<<<< HEAD
 	. = ..()
 	if(force_moving && force_moving.allow_climbing && istype(A, /obj/structure))
 		var/obj/structure/S = A
 		if(S.climbable)
 			S.do_climb(src)
+=======
+	. = ..()
+	if(force_moving && force_moving.allow_climbing && isstructure(A))
+		var/obj/structure/S = A
+		if(S.climbable)
+			S.do_climb(src)
+>>>>>>> 7d0f936... Merge pull request #31138 from KorPhaeron/isstructure