cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

Browse Source 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
Leshana
2018-04-15 14:19:36 -04:00
parent 700c902d14 337e5e7436
commit b5cf8383f6
59 changed files with 1608 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/simple_doors.dm
+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
..()