Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00
parent ea9b3622fd 6963275d45
commit 0758204515
172 changed files with 6336 additions and 4958 deletions
@@ -511,6 +511,8 @@
 	new /obj/item/storage/box/syringes(src)
 	new /obj/item/ammo_box/foambox/riot(src)
 	new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
+	if(prob(5))
+		new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src)

 /obj/item/storage/backpack/duffelbag/syndie/c4/PopulateContents()
 	for(var/i in 1 to 10)