Merge branch 'development' into map-development

This commit is contained in:
skull132
2017-05-03 21:04:38 +03:00
committed by GitHub
35 changed files with 353 additions and 75 deletions
+1 -1
View File
@@ -1585,7 +1585,7 @@
else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob))
removed_paths += dirty_path
continue
else if(ispath(path, /obj/item/weapon/gun/energy/pulse_rifle))
else if(ispath(path, /obj/item/weapon/gun/energy/pulse))
if(!check_rights(R_FUN,0))
removed_paths += dirty_path
continue