Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227

[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
parent 609ccb554c cb6400deba
commit ed6c0b042e
13 changed files with 72 additions and 24 deletions
@@ -34,9 +34,6 @@ Clown
 		/obj/item/weapon/stamp/clown = 1,
 		/obj/item/weapon/reagent_containers/spray/waterflower = 1,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
-		/obj/item/device/megaphone/clown = 1,
-		/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,
-		/obj/item/weapon/pneumatic_cannon/pie = 1
 		)

 	implants = list(/obj/item/weapon/implant/sad_trombone)