cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes firing pins not dropping when holding a gun (#48454)

Browse Source 
* Fixes firing pins not dropping when holding a gun

* words

* fix
This commit is contained in:
ShizCalev
2019-12-31 09:23:34 -05:00
committed by Emmett Gaines
parent a80094a5de
commit b988eddb3a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/pins.dm
View File

@@ -23,10 +23,14 @@
if(proximity_flag)
if(istype(target, /obj/item/gun))
var/obj/item/gun/G = target
if(G.pin && (force_replace || G.pin.pin_removeable))
G.pin.forceMove(get_turf(G))
G.pin.gun_remove(user)
to_chat(user, "<span class='notice'>You remove [G]'s old pin.</span>")
var/obj/item/firing_pin/old_pin = G.pin
if(old_pin && (force_replace || old_pin.pin_removeable))
to_chat(user, "<span class='notice'>You remove [old_pin] from [G].</span>")
if(Adjacent(user))
user.put_in_hands(old_pin)
else
old_pin.forceMove(G.drop_location())
old_pin.gun_remove(user)
if(!G.pin)
if(!user.temporarilyRemoveItemFromInventory(src))