Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pill bottle emptying bugfix #7357

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Pill bottle emptying bugfix #7357

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
108a9ae
Ignores pill bottles on attack self
SpypigDev Oct 22, 2024
378535e
aye aye Boss
SpypigDev Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/game/objects/items/storage/storage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,9 @@ W is always an item. stop_warning prevents messaging. user may be null.**/
/obj/item/storage/attack_self(mob/user)
..()

if(!istype(loc, /obj/item/storage/pill_bottle))
return FALSE

//Clicking on itself will empty it, if it has contents and the verb to do that. Contents but no verb means nothing happens.
if(length(contents))
empty(user)
Expand Down
Loading