From 4cedeee7e068823c22d6cdfe9963bbfb5c77386d Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 5 Apr 2022 21:17:53 -0700 Subject: [PATCH] powder that makes you say yes --- code/game/objects/random/misc.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 88354cd751..fc82ed9283 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1031,11 +1031,7 @@ /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green, /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark, /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal) //CHOMPedit: deleted talon mug -======= - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon) /obj/random/donkpocketbox name = "Random Donk-pocket Box" @@ -1051,4 +1047,3 @@ /obj/item/weapon/storage/box/donkpockets/honk, /obj/item/weapon/storage/box/donkpockets/gondola, /obj/item/weapon/storage/box/donkpockets/berry) ->>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets