Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881

[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
This commit is contained in:
deathride58
2018-01-26 15:50:38 +00:00
committed by GitHub
@@ -225,13 +225,13 @@ Borg Shaker
/obj/item/reagent_containers/borghypo/peace
name = "Peace Hypospray"
reagent_ids = list("dizzysolution","tiresolution")
reagent_ids = list("dizzysolution","tiresolution","pax")
accepts_reagent_upgrades = FALSE
/obj/item/reagent_containers/borghypo/peace/hacked
desc = "Everything's peaceful in death!"
icon_state = "borghypo_s"
reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
reagent_ids = list("dizzysolution","tiresolution","pax","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
accepts_reagent_upgrades = FALSE
/obj/item/reagent_containers/borghypo/epi