cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Singularity hammer fix (#47438)

Browse Source
This commit is contained in:
Arkatos1
2019-10-30 10:02:45 +01:00
committed by Rob Bailey
parent 7a72782d8c
commit 4ef7301a63
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/singularityhammer.dm
+5 -5
View File
@@ -13,18 +13,18 @@
throwforce = 15
throw_range = 1
w_class = WEIGHT_CLASS_HUGE
var/charged = 5
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
force_string = "LORD SINGULOTH HIMSELF"
var/charged = 5
/obj/item/twohanded/singularityhammer/New()
..()
/obj/item/twohanded/singularityhammer/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
/obj/item/twohanded/singularityhammer/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
. = ..()
/obj/item/twohanded/singularityhammer/process()
if(charged < 5)
@@ -41,7 +41,7 @@
var/atom/movable/A = X
if(A == wielder)
continue
if(A && !A.anchored && !ishuman(X))
if(A && !A.anchored && !ishuman(X) && !isobserver(X))
step_towards(A,pull)
step_towards(A,pull)
step_towards(A,pull)