Skip to content

Commit

Permalink
Fix barbed wire affecting ghosts (goonstation#21111)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeWaka authored Oct 19, 2024
1 parent 6dd5661 commit 6e8cbf5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/datums/gamemodes/pod_wars/pw_misc_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -858,13 +858,16 @@ ABSTRACT_TYPE(/obj/deployable_turret/pod_wars)
target.TakeDamageAccountArmor("All", rand(1,2), 0, 0, DAMAGE_CUT)

Crossed(atom/movable/mover)
. = ..()
// This change prevents ghosts from being affected by barbed wire
if (HAS_ATOM_PROPERTY(mover, PROP_ATOM_FLOATING))
return
if(ismob(mover))
var/mob/M = mover
if(M.m_intent != "walk")
pokey(M, 98)
else
pokey(M, 30)
. = ..()

//barricade deployer

Expand Down

0 comments on commit 6e8cbf5

Please sign in to comment.