Merge pull request #3452 from VOREStation/aro-sync-04122018

Polaris Sync 04-12-2018
This commit is contained in:
Aronai Sieyes
2018-04-18 14:04:27 -04:00
committed by GitHub
60 changed files with 1609 additions and 305 deletions
+11 -1
View File
@@ -198,4 +198,14 @@
..(newloc, MAT_SIFWOOD)
/obj/structure/simple_door/resin/New(var/newloc,var/material_name)
..(newloc, "resin")
..(newloc, "resin")
/obj/structure/simple_door/cult/New(var/newloc,var/material_name)
..(newloc, "cult")
/obj/structure/simple_door/cult/TryToSwitchState(atom/user)
if(isliving(user))
var/mob/living/L = user
if(!iscultist(L) && !istype(L, /mob/living/simple_animal/construct))
return
..()