cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Donk-pockets

Browse Source
This commit is contained in:
Casey
2022-04-05 22:11:48 -04:00
committed by CHOMPStation2
parent 0dd44e94bf
commit 61ea8e3f3d
16 changed files with 203 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/random/misc.dm
View File

@@ -1031,4 +1031,24 @@
/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"
desc = "This is a random Donk-pocket Box."
icon = 'icons/obj/boxes.dmi'
icon_state = "donkpocket_spawner"
/obj/random/donkpocketbox/item_to_spawn()
return pick(/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/storage/box/donkpockets/spicy,
/obj/item/weapon/storage/box/donkpockets/teriyaki,
/obj/item/weapon/storage/box/donkpockets/pizza,
/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