cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-04-05 21:17:53 -07:00
committed by GitHub
parent 61ea8e3f3d
commit 4cedeee7e0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/misc.dm
-5
View File
@@ -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