shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update drinkingglass.dm

Browse Source
This commit is contained in:
deathride58
2017-11-24 18:00:44 -05:00
committed by GitHub
parent c43591982a
commit 44fb7ccdb7
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
-6
View File
@@ -74,15 +74,9 @@
desc = "A shot glass - the universal symbol for bad decisions." desc = "A shot glass - the universal symbol for bad decisions."
return return
<<<<<<< HEAD
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/New()
..()
on_reagent_change()
=======
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize() /obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize()
. = ..() . = ..()
on_reagent_change(ADD_REAGENT) on_reagent_change(ADD_REAGENT)
>>>>>>> 73b25d7... Refactor on_reagent_change to pass through the change type (#32805)
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
name = "Soda Water" name = "Soda Water"