bugfixes

code/game/objects/items/weapons/RSF.dm

@@ -138,10 +138,13 @@ RSF
 		toxin = 0
 
 /obj/item/weapon/cookiesynth/attack_self(mob/user)
-	if(isrobot(user)&&!toxin)
+	var/mob/living/silicon/robot/P = null
+	if(isrobot(user))
+		P = user
+	if(emagged&&!toxin)
 		toxin = 1
 		user << "Cookie Synthesizer Hacked"
-	else if(emagged&&!toxin)
+	else if(P.emagged&&!toxin)
 		toxin = 1
 		user << "Cookie Synthesizer Hacked"
 	else

code/modules/reagents/reagent_containers/borghydro.dm

@@ -210,21 +210,10 @@ Borg Shaker
 
 /obj/item/weapon/reagent_containers/borghypo/peace
 	name = "Peace Hypospray"
-	volume = 20
-	recharge_time = 3
-	reagent_ids = list("dizzysolution","tiresolution")
 
-/obj/item/weapon/reagent_containers/borghypo/peace/attack_self(mob/user)
-	var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids]
-	if(!chosen_reagent)
-		return
-	mode = chosen_reagent
-	playsound(loc, 'sound/effects/pop.ogg', 50, 0)
-	var/datum/reagent/S = chemical_reagents_list[reagent_ids[mode]]
-	user << "<span class='notice'>[src] is now dispensing '[S.name]'.</span>"
-	return
+	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","tirizine","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
+	reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")