Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)

* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
This commit is contained in:
vuonojenmustaturska
2018-04-18 17:32:35 +03:00
committed by CitadelStationBot
parent f98040513a
commit 32fe9d4fd6
7 changed files with 23 additions and 9 deletions
@@ -1,7 +1,7 @@
/obj/item/projectile/bullet/shotgun_slug
name = "12g shotgun slug"
damage = 60
/obj/item/projectile/bullet/shotgun_slug/tengauge
name = "10g shotgun slug"
damage = 72.5
@@ -42,7 +42,7 @@
if(ismovableatom(target))
var/atom/movable/M = target
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.throw_at(throw_target, 3, 2)
M.safe_throw_at(throw_target, 3, 2)
/obj/item/projectile/bullet/shotgun_meteorslug/Initialize()
. = ..()