Merge branch 'master' into mirror-38933

This commit is contained in:
kevinz000
2018-07-14 15:26:49 -07:00
committed by GitHub
1555 changed files with 162517 additions and 36374 deletions
@@ -15,7 +15,7 @@
icon_state = "impact_omni"
/obj/effect/projectile/impact/xray
name = "xray impact"
name = "\improper X-ray impact"
icon_state = "impact_xray"
/obj/effect/projectile/impact/pulse