Applies what my mom taught me about conflict resolution

This commit is contained in:
Dave
2019-03-01 18:51:04 -05:00
committed by Unknown
140 changed files with 2769 additions and 833 deletions
@@ -460,6 +460,19 @@
return ..()
/obj/item/storage/bag/tray/cookies_tray
var/cookie = /obj/item/reagent_containers/food/snacks/cookie
/obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot!
..()
for(var/i in 1 to 6)
var/obj/item/C = new cookie(src)
handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned
rebuild_overlays()
/obj/item/storage/bag/tray/cookies_tray/sugarcookie
cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
/*
* Chemistry bag
*/