cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 AnturK
parent 8fa8436f54
commit 0e2ee4f5b6
7 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/projectile/bullets/shotgun.dm
View File

@@ -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()
. = ..()