Merge remote-tracking branch 'upstream/master' into brass

This commit is contained in:
SabreML
2021-08-04 19:32:12 +01:00
699 changed files with 32075 additions and 47550 deletions
@@ -354,3 +354,12 @@
/obj/effect/temp_visual/impact_effect/ion
icon_state = "shieldsparkles"
duration = 6
/obj/effect/temp_visual/bsg_kaboom
name = "bluespace explosion"
icon = 'icons/effects/96x96.dmi'
icon_state = "explosionfast"
color = "blue"
pixel_x = -32
pixel_y = -32
duration = 42