Removes peacekeepers

This commit is contained in:
Kyep
2017-10-20 10:23:07 -07:00
parent 8dbed0ede4
commit b519615e18
11 changed files with 2 additions and 347 deletions
@@ -1132,30 +1132,3 @@
M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you
playsound(M, "sparks", 50, 1)
..()
/datum/reagent/peaceborg/confuse
name = "Dizzying Solution"
id = "dizzysolution"
description = "Makes the target off balance and dizzy"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
M.AdjustConfused(3, bound_lower = 0, bound_upper = 5)
M.AdjustDizzy(3, bound_lower = 0, bound_upper = 5)
if(prob(20))
to_chat(M, "<span class='warning'>You feel confused and disorientated.</span>")
..()
/datum/reagent/peaceborg/tire
name = "Tiring Solution"
id = "tiresolution"
description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
var/healthcomp = (M.maxHealth - M.health)
if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)
if(prob(30))
to_chat(M, "<span class='warning'>You feel like you should sit down and take a rest...</span>")
..()
@@ -33,15 +33,6 @@
reagent_ids = list("syndicate_nanites", "potass_iodide", "ether")
bypass_protection = 1
/obj/item/weapon/reagent_containers/borghypo/peace
name = "Peace Hypospray"
reagent_ids = list("dizzysolution","tiresolution")
/obj/item/weapon/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")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
for(var/R in reagent_ids)