Resolve merge

This commit is contained in:
Aronai Sieyes
2021-06-07 00:57:50 -04:00
parent 97abfd0549
commit e952a30a42
3 changed files with 0 additions and 973 deletions
-9
View File
@@ -130,15 +130,6 @@
invisibility = 101
return 1
/obj/effect/landmark/forbidden_level
delete_me = 1
/obj/effect/landmark/forbidden_level/Initialize()
. = ..()
if(using_map)
using_map.secret_levels |= z
else
log_error("[type] mapped in but no using_map")
//Costume spawner landmarks
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears