mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Added lids for bottles and beakers.
Click on vessel in hand to put lid on / take it off. Lids prevent use of syringes and spilling.
This commit is contained in:
@@ -43,8 +43,23 @@
|
|||||||
usr << "\blue [R.volume] units of [R.name]"
|
usr << "\blue [R.volume] units of [R.name]"
|
||||||
else
|
else
|
||||||
usr << "\blue Nothing."
|
usr << "\blue Nothing."
|
||||||
|
if (!is_open_container())
|
||||||
|
usr << "\blue Airtight lid seals it completely."
|
||||||
|
|
||||||
|
attack_self()
|
||||||
|
..()
|
||||||
|
if (is_open_container())
|
||||||
|
usr << "<span class = 'notice'>You put the lid on \the [src]."
|
||||||
|
flags ^= OPENCONTAINER
|
||||||
|
else
|
||||||
|
usr << "<span class = 'notice'>You take the lid off \the [src]."
|
||||||
|
flags |= OPENCONTAINER
|
||||||
|
update_icon()
|
||||||
|
|
||||||
afterattack(obj/target, mob/user , flag)
|
afterattack(obj/target, mob/user , flag)
|
||||||
|
if (!is_open_container())
|
||||||
|
return
|
||||||
|
|
||||||
for(var/type in src.can_be_placed_into)
|
for(var/type in src.can_be_placed_into)
|
||||||
if(istype(target, type))
|
if(istype(target, type))
|
||||||
return
|
return
|
||||||
@@ -149,6 +164,10 @@
|
|||||||
filling.icon += mix_color_from_reagents(reagents.reagent_list)
|
filling.icon += mix_color_from_reagents(reagents.reagent_list)
|
||||||
overlays += filling
|
overlays += filling
|
||||||
|
|
||||||
|
if (!is_open_container())
|
||||||
|
var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
|
||||||
|
overlays += lid
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/glass/beaker/large
|
/obj/item/weapon/reagent_containers/glass/beaker/large
|
||||||
name = "large beaker"
|
name = "large beaker"
|
||||||
desc = "A large beaker. Can hold up to 100 units."
|
desc = "A large beaker. Can hold up to 100 units."
|
||||||
|
|||||||
@@ -17,6 +17,13 @@
|
|||||||
if(!icon_state)
|
if(!icon_state)
|
||||||
icon_state = "bottle[rand(1,20)]"
|
icon_state = "bottle[rand(1,20)]"
|
||||||
|
|
||||||
|
update_icon()
|
||||||
|
overlays.Cut()
|
||||||
|
|
||||||
|
if (!is_open_container())
|
||||||
|
var/image/lid = image(icon, src, "lid_bottle")
|
||||||
|
overlays += lid
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
|
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
|
||||||
name = "inaprovaline bottle"
|
name = "inaprovaline bottle"
|
||||||
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
|
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
|
||||||
|
|||||||
@@ -58,6 +58,13 @@ Stuff which is in development and not yet visible to players or just code relate
|
|||||||
should be listed in the changelog upon commit though. Thanks. -->
|
should be listed in the changelog upon commit though. Thanks. -->
|
||||||
|
|
||||||
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
||||||
|
<div class='commit sansserif'>
|
||||||
|
<h2 class='date'>26th May 2013</h2>
|
||||||
|
<h3 class='author'>Chinsky updated:</h3>
|
||||||
|
<ul class='changes bgimages16'>
|
||||||
|
<li class='rscadd'>Lids! Click beaker/bottle in hand to put them on/off. Prevent spilling</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="commit sansserif">
|
<div class="commit sansserif">
|
||||||
<h2 class="date">25th May 2013</h2>
|
<h2 class="date">25th May 2013</h2>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 30 KiB |
Reference in New Issue
Block a user