From f2d75f1439d0cf50f6f3bb7312190addb205629c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 25 Jan 2018 22:49:29 -0500 Subject: [PATCH] Merge pull request #34881 from Robustin/paxPK Adds Pax to the Peacekeeper Borg's "Peace Hypospray" --- code/modules/reagents/reagent_containers/borghydro.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index e736c344db..faa56c4fba 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -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