cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51750 from ivanmixo/wallet_fix

Browse Source 
Fixes the wallet alt-click so you can't take your ID out while unconscious or in soft crit
This commit is contained in:
ShizCalev
2020-06-30 18:54:29 -04:00
committed by GitHub
parent dfbb4c79a0 4e666f1325
commit 2f2b9a5285
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/storage/concrete/wallet.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/component/storage/concrete/wallet/on_alt_click(datum/source, mob/user)
if(!isliving(user) || !user.CanReach(parent))
if(!isliving(user) || !user.CanReach(parent) || user.incapacitated())
return
if(locked)
to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
code/datums/components/storage/storage.dm
+9 -11
View File
@@ -780,7 +780,7 @@
return hide_from(target)
/datum/component/storage/proc/on_alt_click(datum/source, mob/user)
if(!isliving(user) || !user.CanReach(parent))
if(!isliving(user) || !user.CanReach(parent) || user.incapacitated())
return
if(locked)
to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
@@ -793,17 +793,15 @@
playsound(A, "rustle", 50, TRUE, -5)
return
if(!user.incapacitated())
var/obj/item/I = locate() in real_location()
if(!I)
return
A.add_fingerprint(user)
remove_from_storage(I, get_turf(user))
if(!user.put_in_hands(I))
to_chat(user, "<span class='notice'>You fumble for [I] and it falls on the floor.</span>")
return
user.visible_message("<span class='warning'>[user] draws [I] from [parent]!</span>", "<span class='notice'>You draw [I] from [parent].</span>")
var/obj/item/I = locate() in real_location()
if(!I)
return
A.add_fingerprint(user)
remove_from_storage(I, get_turf(user))
if(!user.put_in_hands(I))
to_chat(user, "<span class='notice'>You fumble for [I] and it falls on the floor.</span>")
return
user.visible_message("<span class='warning'>[user] draws [I] from [parent]!</span>", "<span class='notice'>You draw [I] from [parent].</span>")
/datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source)
gather_mode_switch(source.owner)