cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Possessed sword no longer deletes itself if trying to catch it with full hands (#18543)

Browse Source 
* Update holy_weapons.dm

* Update code/game/objects/items/holy_weapons.dm

Co-authored-by: Manatee <74586965+MajManatee@users.noreply.github.com>

* Update code/game/objects/items/holy_weapons.dm

Co-authored-by: Manatee <74586965+MajManatee@users.noreply.github.com>

* fix manatee

---------

Co-authored-by: Manatee <74586965+MajManatee@users.noreply.github.com>
This commit is contained in:
Molti
2023-04-22 14:41:05 -05:00
committed by GitHub
parent d337ecb21e
commit da34ce7d5d
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/items/holy_weapons.dm
View File

@@ -909,8 +909,13 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
if(isliving(hit_atom))//only transform if it doesn't hit a person
var/mob/living/target = hit_atom
if(owner && target == owner)
owner.put_in_active_hand(src)
visible_message("[owner] catches the flying [src] out of the air!")
var/caught = owner.put_in_hands(src)
if(caught)
visible_message("[owner] catches the flying [src] out of the air!")
else
playsound(target, 'sound/weapons/rapierhit.ogg', 30, 1, -1)
owner.take_overall_damage(5)
visible_message("[src] smacks [owner] in the face as [owner.p_they()] try to catch it with [owner.p_their()] hands full!")
else if(possessed)
transform = initial(transform)//to reset rotation for when it drops to the ground
blade = new /mob/living/simple_animal/nullrod(get_turf(src))
@@ -1019,11 +1024,16 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
if(isliving(hit_atom))
var/mob/living/target = hit_atom
if(sword?.owner && target == sword.owner)
sword.owner.put_in_active_hand(sword)
var/caught = sword.owner.put_in_hands(sword)
mind.transfer_to(sword.soul)
sword.walking = FALSE
visible_message("[sword.owner] catches the flying blade out of the air!")
qdel(src)
if(caught)
visible_message("[sword.owner] catches the flying blade out of the air!")
else
playsound(target, 'sound/weapons/rapierhit.ogg', 30, 1, -1)
sword.owner.take_overall_damage(5)
visible_message("The flying blade smacks [sword.owner] in the face as [sword.owner.p_they()] try to catch it with [sword.owner.p_their()] hands full!")
else
..()