cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 15:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensures retail scanners work with drinks

Browse Source
This commit is contained in:
Yoshax
2016-06-09 17:08:07 +01:00
parent 289f3577ce
commit 52f8c6a344
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm
View File

@@ -68,6 +68,7 @@
icon_state = base_icon
/obj/item/weapon/reagent_containers/food/drinks/glass2/on_reagent_change()
..()
update_icon()
/obj/item/weapon/reagent_containers/food/drinks/glass2/proc/can_add_extra(obj/item/weapon/glass_extra/GE)

8
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -11,7 +11,13 @@
volume = 50
/obj/item/weapon/reagent_containers/food/drinks/on_reagent_change()
return
if (reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
if(R.price_tag)
price_tag = R.price_tag
else
price_tag = null
return
/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob)
if(!is_open_container())

6
code/modules/reagents/reagent_containers/food/drinks/cup.dm
View File

@@ -7,6 +7,7 @@
center_of_mass = list("x"=16, "y"=16)
/obj/item/weapon/reagent_containers/food/drinks/cup/on_reagent_change()
..()
if (reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -30,11 +31,6 @@
else
center_of_mass = list("x"=16, "y"=16)
if(R.price_tag)
price_tag = R.price_tag
else
price_tag = null
else
icon_state = "cup_empty"
name = "coffee cup"