cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138

Browse Source 
[MIRROR] Structure istype define
This commit is contained in:
LetterJay
2017-10-01 16:20:56 -04:00
committed by GitHub
parent b2a01d688d 6572781b63
commit e572d2e529
10 changed files with 106 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/magic.dm
View File

@@ -295,7 +295,7 @@
..()
/atom/proc/animate_atom_living(var/mob/living/owner = null)
if((isitem(src) || istype(src, /obj/structure)) && !is_type_in_list(src, GLOB.protected_objects))
if((isitem(src) || isstructure(src)) && !is_type_in_list(src, GLOB.protected_objects))
if(istype(src, /obj/structure/statue/petrified))
var/obj/structure/statue/petrified/P = src
if(P.petrified_mob)