Skip to content

Commit

Permalink
[MIRROR] Makes highlander layer hoisting code actually work (#1776)
Browse files Browse the repository at this point in the history
* Makes highlander layer hoisting code actually work (#82388)

Whoops

* Makes highlander layer hoisting code actually work

---------

Co-authored-by: LemonInTheDark <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Apr 3, 2024
1 parent 6875b7d commit 4f957c0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/highlander/process()
if(ishuman(loc))
var/mob/living/carbon/human/holder = loc
layer = ABOVE_ALL_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS)
holder.layer = ABOVE_ALL_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS)
ADD_TRAIT(holder, TRAIT_NOBLOOD, HIGHLANDER_TRAIT) //AND WE WON'T BLEED OUT LIKE COWARDS
else
if(!(flags_1 & ADMIN_SPAWNED_1))
Expand Down Expand Up @@ -285,7 +285,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
return INITIALIZE_HINT_QDEL

/obj/item/claymore/highlander/robot/process()
layer = ABOVE_ALL_MOB_LAYER
loc.layer = ABOVE_ALL_MOB_LAYER

/obj/item/katana
name = "katana"
Expand Down

0 comments on commit 4f957c0

Please sign in to comment.