Fixing conflicts

This commit is contained in:
Qustinnus
2017-07-19 11:19:52 +02:00
parent 58e5aa91da
commit 2312ff09be
14 changed files with 110 additions and 4 deletions
@@ -46,7 +46,7 @@
/obj/item/trash/cheesie = 1,
/obj/item/trash/candy = 1,
/obj/item/trash/chips = 1,
/obj/item/trash/deadmouse = 1,
/obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1,
/obj/item/trash/pistachios = 1,
/obj/item/trash/plate = 1,
/obj/item/trash/popcorn = 1,
@@ -548,6 +548,24 @@
beakers += B1
beakers += B2
/obj/item/weapon/grenade/chem_grenade/pukonium
name = "pukonium grenade"
desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave."
stage = READY
/obj/item/weapon/grenade/chem_grenade/pukonium/New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("pukonium", 60)
B1.reagents.add_reagent("potassium", 40)
B2.reagents.add_reagent("phosphorus", 40)
B2.reagents.add_reagent("sugar", 40)
beakers += B1
beakers += B2
#undef EMPTY
#undef WIRED
#undef READY