Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-06-03 12:31:48 +01:00
68 changed files with 1990 additions and 435 deletions

View File

@@ -162,7 +162,8 @@
/obj/item/projectile/arc/radioactive
name = "radiation blast"
icon_state = "green_pellet"
icon_scale = 2
icon_scale_x = 2
icon_scale_y = 2
var/rad_power = 50
/obj/item/projectile/arc/radioactive/on_impact(turf/T)