Pill bottle update (#7121)

shamelessly stolen from bay, clicking pillbottles in hand will allow you to pour one out into your offhand.
This commit is contained in:
alsoandanswer
2019-10-10 16:35:33 +03:00
committed by Erki
parent 0cc463a918
commit 5b72c2a074
2 changed files with 61 additions and 0 deletions
@@ -151,6 +151,26 @@
drop_sound = 'sound/items/drop/pillbottle.ogg'
max_storage_space = 16
/obj/item/weapon/storage/pill_bottle/attack_self(mob/living/user)
if(user.get_inactive_hand())
to_chat(user, span("notice","You need an empty hand to take something out."))
return
if(contents.len)
var/obj/item/I = contents[1]
if(!remove_from_storage(I,user))
return
if(user.put_in_inactive_hand(I))
to_chat(user, span("notice","You take \the [I] out of \the [src]."))
if(iscarbon(user))
var/mob/living/carbon/C = user
C.swap_hand()
else
I.dropInto(loc)
to_chat(user, span("notice","You fumble around with \the [src] and drop \the [I] on the floor."))
else
to_chat(user, span("warning","\The [src] is empty."))
/obj/item/weapon/storage/pill_bottle/antitox
name = "bottle of Dylovene pills"
desc = "Contains pills used to counter toxins."
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "You can take a pill from pillbottle by using it."