Merge branch 'master' into biodegrade

# Conflicts:
#	paradise.dme

code/controllers/configuration.dm

@@ -50,6 +50,8 @@
 	var/humans_need_surnames = 0
 	var/allow_random_events = 0			// enables random events mid-round when set to 1
 	var/allow_ai = 1					// allow ai job
+	var/forbid_secborg = 0				// disallow secborg module to be chosen.
+	var/forbid_peaceborg = 0			// disallow peacekeeper module to be chosen.
 	var/hostedby = null
 	var/respawn = 0
 	var/guest_jobban = 1
@@ -334,6 +336,12 @@
 				if("allow_ai")
 					config.allow_ai = 1
 
+				if("disable_secborg")
+					forbid_secborg = 1
+
+				if("disable_peaceborg")
+					forbid_peaceborg = 1
+
 //				if("authentication")
 //					config.enable_authentication = 1
 

code/datums/uplink_item.dm

@@ -863,6 +863,7 @@ var/list/uplink_items = list()
 	reference = "NNSSS"
 	cost = 4 //but they aren't
 	gamemodes = list(/datum/game_mode/nuclear)
+	excludefrom = list()
 
 /datum/uplink_item/stealthy_tools/agent_card
 	name = "Agent ID Card"

code/game/gamemodes/changeling/changeling.dm

@@ -1,3 +1,7 @@
+#define LING_FAKEDEATH_TIME					400 //40 seconds
+#define LING_DEAD_GENETICDAMAGE_HEAL_CAP	50	//The lowest value of geneticdamage handle_changeling() can take it to while dead.
+#define LING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
+
 var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")
 
 /datum/game_mode
@@ -253,9 +257,14 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	else
 		changelingID = "[honorific] [rand(1,999)]"
 
-/datum/changeling/proc/regenerate()
-	chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage)
-	geneticdamage = max(0, geneticdamage-1)
+/datum/changeling/proc/regenerate(mob/living/carbon/the_ling)
+	if(istype(the_ling))
+		if(the_ling.stat == DEAD)
+			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5))
+			geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1)
+		else //not dead? no chem/geneticdamage caps.
+			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage)
+			geneticdamage = max(0, geneticdamage-1)
 
 /datum/changeling/proc/GetDNA(dna_owner)
 	for(var/datum/dna/DNA in (absorbed_dna + protected_dna))

code/game/gamemodes/changeling/changeling_power.dm

@@ -15,6 +15,7 @@
 	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
 	var/genetic_damage = 0 // genetic damage caused by using the sting. Nothing to do with cloneloss.
 	var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet.
+	var/always_keep = 0 // important for abilities like regenerate that screw you if you lose them.
 
 /obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user)
 	return

code/game/gamemodes/changeling/evolution_menu.dm

@@ -407,7 +407,7 @@ var/list/sting_paths
 			mind.changeling.changeling_speak = 0
 			mind.changeling.reset()
 			for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
-				if(p.dna_cost == 0 && keep_free_powers)
+				if((p.dna_cost == 0 && keep_free_powers) || p.always_keep)
 					continue
 				mind.changeling.purchasedpowers -= p
 				p.on_refund(src)

code/game/gamemodes/changeling/powers/absorb.dm

@@ -1,5 +1,3 @@
-#define LING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
-
 /obj/effect/proc_holder/changeling/absorbDNA
 	name = "Absorb DNA"
 	desc = "Absorb the DNA of our victim."

code/game/gamemodes/changeling/powers/chameleon_skin.dm

@@ -0,0 +1,27 @@
+/obj/effect/proc_holder/changeling/chameleon_skin
+	name = "Chameleon Skin"
+	desc = "Our skin pigmentation rapidly changes to suit our current environment."
+	helptext = "Allows us to become invisible after a few seconds of standing still. Can be toggled on and off."
+	dna_cost = 2
+	chemical_cost = 25
+	req_human = 1
+
+/obj/effect/proc_holder/changeling/chameleon_skin/sting_action(mob/user)
+	var/mob/living/carbon/human/H = user //SHOULD always be human, because req_human = 1
+	if(!istype(H)) // req_human could be done in can_sting stuff.
+		return
+	if(H.dna.GetSEState(CHAMELEONBLOCK))
+		H.dna.SetSEState(CHAMELEONBLOCK, 0)
+		genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+	else
+		H.dna.SetSEState(CHAMELEONBLOCK, 1)
+		genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+
+	feedback_add_details("changeling_powers","CS")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/chameleon_skin/on_refund(mob/user)
+	var/mob/living/carbon/C = user
+	if(C.dna.GetSEState(CHAMELEONBLOCK))
+		C.dna.SetSEState(CHAMELEONBLOCK, 0)
+		genemutcheck(C, CHAMELEONBLOCK, null, MUTCHK_FORCED)

code/game/gamemodes/changeling/powers/fakedeath.dm

@@ -7,30 +7,31 @@
 	req_stat = DEAD
 	max_genetic_damage = 100
 
-
 //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
 /obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user)
 
 	to_chat(user, "<span class='notice'>We begin our stasis, preparing energy to arise once more.</span>")
-
 	if(user.stat != DEAD)
 		user.emote("deathgasp")
 		user.timeofdeath = world.time
-
 	user.status_flags |= FAKEDEATH		//play dead
 	user.update_canmove()
 
-	spawn(800)
-		if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
-			to_chat(user, "<span class='notice'>We are ready to regenerate.</span>")
-			user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
-
+	addtimer(src, "ready_to_regenerate", LING_FAKEDEATH_TIME, FALSE, user)
 	feedback_add_details("changeling_powers","FD")
 	return 1
 
+/obj/effect/proc_holder/changeling/fakedeath/proc/ready_to_regenerate(mob/user)
+	if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
+		to_chat(user, "<span class='notice'>We are ready to regenerate.</span>")
+		user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
+
 /obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user)
 	if(user.status_flags & FAKEDEATH)
+		to_chat(user, "<span class='warning'>We are already regenerating.</span>")
 		return
-	if(!user.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
-		return
+	if(!user.stat)//Confirmation for living changelings if they want to fake their death
+		switch(alert("Are we sure we wish to fake our death?",,"Yes","No"))
+			if("No")
+				return
 	return ..()

code/game/gamemodes/changeling/powers/fleshmend.dm

@@ -2,22 +2,54 @@
 	name = "Fleshmend"
 	desc = "Our flesh rapidly regenerates, healing our wounds."
 	helptext = "Heals a moderate amount of damage over a short period of time. Can be used while unconscious."
-	chemical_cost = 25
+	chemical_cost = 20
 	dna_cost = 2
 	req_stat = UNCONSCIOUS
+	var/recent_uses = 1 //The factor of which the healing should be divided by
+	var/healing_ticks = 10
+	// The ideal total healing amount,
+	// divided by healing_ticks to get heal/tick
+	var/total_healing = 100
+
+/obj/effect/proc_holder/changeling/fleshmend/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/effect/proc_holder/changeling/fleshmend/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/proc_holder/changeling/fleshmend/process()
+	if(recent_uses > 1)
+		recent_uses = max(1, recent_uses - (1 / healing_ticks))
 
 //Starts healing you every second for 10 seconds. Can be used whilst unconscious.
 /obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user)
 	to_chat(user, "<span class='notice'>We begin to heal rapidly.</span>")
+	if(recent_uses > 1)
+		to_chat(user, "<span class='warning'>Our healing's effectiveness is reduced \
+			by quick repeated use!</span>")
+
+	recent_uses++
+	addtimer(src, "fleshmend", 0, FALSE, user)
+	feedback_add_details("changeling_powers","RR")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/fleshmend/proc/fleshmend(mob/living/user)
+
+	// The healing itself - doesn't heal toxin damage
+	// (that's anatomic panacea) and the effectiveness decreases with
+	// each use in a short timespan
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		H.restore_blood()
 		H.shock_stage = 0
-	spawn(0)
-		for(var/i = 0, i<10,i++)
-			user.heal_overall_damage(10, 10)
-			user.adjustOxyLoss(-10)
-			sleep(10)
-
-	feedback_add_details("changeling_powers","RR")
-	return 1
+	for(var/i in 1 to healing_ticks)
+		if(user)
+			var/healpertick = -(total_healing / healing_ticks)
+			user.heal_overall_damage((-healpertick/recent_uses), (-healpertick/recent_uses))
+			user.adjustOxyLoss(healpertick/recent_uses)
+			user.blood_volume += 30
+			user.updatehealth()
+		else
+			break
+		sleep(10)

code/game/gamemodes/changeling/powers/mutations.dm

@@ -167,7 +167,7 @@
 			user.visible_message("<span class='warning'>[user] jams [src] into the airlock and starts prying it open!</span>", "<span class='warning'>We start forcing the airlock open.</span>", \
 			"<span class='italics'>You hear a metal screeching sound.</span>")
 			playsound(A, 'sound/machines/airlock_alien_prying.ogg', 150, 1)
-			if(!do_after(user, 150, target = A))
+			if(!do_after(user, 100, target = A))
 				return
 
 		//user.say("Heeeeeeeeeerrre's Johnny!")

code/game/gamemodes/changeling/powers/panacea.dm

@@ -1,6 +1,6 @@
 /obj/effect/proc_holder/changeling/panacea
 	name = "Anatomic Panacea"
-	desc = "Expels impurifications from our form; curing diseases, removing toxins and radiation, and resetting our genetic code completely."
+	desc = "Expels impurifications from our form; curing diseases, removing parasites, sobering us, purging toxins and radiation, and resetting our genetic code completely."
 	helptext = "Can be used while unconscious."
 	chemical_cost = 20
 	dna_cost = 1
@@ -30,6 +30,8 @@
 	user.reagents.add_reagent("mutadone", 10)
 	user.reagents.add_reagent("potass_iodide", 10)
 	user.reagents.add_reagent("charcoal", 20)
+	user.reagents.add_reagent("antihol", 10)
+	user.reagents.add_reagent("mannitol", 25)
 
 	for(var/thing in user.viruses)
 		var/datum/disease/D = thing

code/game/gamemodes/changeling/powers/revive.dm

@@ -2,6 +2,7 @@
 	name = "Regenerate"
 	desc = "We regenerate, healing all damage from our form."
 	req_stat = DEAD
+	always_keep = 1
 
 //Revive from regenerative stasis
 /obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user)

code/game/gamemodes/nations/nations.dm

@@ -135,7 +135,7 @@ datum/game_mode/nations
 		AI.show_laws()
 		for(var/mob/living/silicon/robot/R in AI.connected_robots)
 			var/obj/item/device/mmi/oldmmi = R.mmi
-			R.change_mob_type(/mob/living/silicon/robot/peacekeeper, null, null, 1, 1 )
+			R.change_mob_type(/mob/living/silicon/robot/nations, null, null, 1, 1 )
 			R.lawsync()
 			R.show_laws()
 			qdel(oldmmi)

code/game/gamemodes/objective.dm

@@ -1,6 +1,6 @@
 var/global/list/all_objectives = list()
 
-var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datum/theft_objective/steal - /datum/theft_objective/number
+var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datum/theft_objective/steal - /datum/theft_objective/number - /datum/theft_objective/unique
 
 /datum/objective
 	var/datum/mind/owner = null			//Who owns the objective.

code/game/gamemodes/steal_items.dm

@@ -6,8 +6,8 @@
 #define THEFT_FLAG_UNIQUE 2
 
 /datum/theft_objective
-	var/name = ""
-	var/typepath=/atom
+	var/name = "this objective is impossible, yell at a coder"
+	var/typepath=/obj/effect/debugging
 	var/list/protected_jobs = list()
 	var/list/altitems = list()
 	var/flags = 0

code/game/machinery/cryopod.dm

@@ -24,10 +24,23 @@
 	var/list/frozen_crew = list()
 	var/list/frozen_items = list()
 
+	// Used for containing rare items traitors need to steal, so it's not
+	// game-over if they get iced
+	var/list/objective_items = list()
+	// A cache of theft datums so you don't have to re-create them for
+	// each item check
+	var/list/theft_cache = list()
+
 	var/storage_type = "crewmembers"
 	var/storage_name = "Cryogenic Oversight Control"
 	var/allow_items = 1
 
+
+/obj/machinery/computer/cryopod/New()
+	..()
+	for(var/T in potential_theft_objectives)
+		theft_cache += new T
+
 /obj/machinery/computer/cryopod/attack_ai()
 	attack_hand()
 
@@ -101,8 +114,7 @@
 
 		visible_message("<span class='notice'>The console beeps happily as it disgorges \the [I].</span>")
 
-		I.forceMove(get_turf(src))
-		frozen_items -= I
+		dispense_item(I)
 
 	else if(href_list["allitems"])
 		if(!allowed(user))
@@ -117,12 +129,31 @@
 		visible_message("<span class='notice'>The console beeps happily as it disgorges the desired objects.</span>")
 
 		for(var/obj/item/I in frozen_items)
-			I.forceMove(get_turf(src))
-			frozen_items -= I
+			dispense_item(I)
 
 	updateUsrDialog()
 	return
 
+/obj/machinery/computer/cryopod/proc/dispense_item(obj/item/I)
+	if(!(I in frozen_items))
+		return
+	I.forceMove(get_turf(src))
+	objective_items -= I
+	frozen_items -= I
+
+/obj/machinery/computer/cryopod/emag_act(mob/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(!objective_items.len)
+		visible_message("<span class='warning'>The console buzzes in an annoyed manner.</span>")
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
+		return
+	visible_message("<span class='warning'>The console sparks, and some items fall out!</span>")
+	var/datum/effect/system/spark_spread/sparks = new
+	sparks.set_up(5, 1, src)
+	sparks.start()
+	for(var/obj/item/I in objective_items)
+		dispense_item(I)
+
 /obj/item/weapon/circuitboard/cryopodcontrol
 	name = "Circuit board (Cryogenic Oversight Console)"
 	build_path = "/obj/machinery/computer/cryopod"
@@ -275,6 +306,19 @@
 
 			despawn_occupant()
 
+#define CRYO_DESTROY 0
+#define CRYO_PRESERVE 1
+#define CRYO_OBJECTIVE 2
+
+/obj/machinery/cryopod/proc/should_preserve_item(obj/item/I)
+	for(var/datum/theft_objective/T in control_computer.theft_cache)
+		if(istype(I, T.typepath) && T.check_special_completion(I))
+			return CRYO_OBJECTIVE
+	for(var/T in preserve_items)
+		if(istype(I, T) && !(I.type in do_not_preserve_items))
+			return CRYO_PRESERVE
+	return CRYO_DESTROY
+
 // This function can not be undone; do not call this unless you are sure
 // Also make sure there is a valid control computer
 /obj/machinery/cryopod/proc/despawn_occupant()
@@ -284,12 +328,7 @@
 		W.forceMove(src)
 
 		if(W.contents.len) //Make sure we catch anything not handled by qdel() on the items.
-			var/preserve = null
-			for(var/T in preserve_items)
-				if(istype(W,T))
-					preserve = 1
-					break
-			if(preserve) // Don't remove the contents of things that need preservation
+			if(should_preserve_item(W) != CRYO_DESTROY) // Don't remove the contents of things that need preservation
 				continue
 			for(var/obj/item/O in W.contents)
 				if(istype(O,/obj/item/weapon/tank)) //Stop eating pockets, you fuck!
@@ -307,26 +346,22 @@
 	items -= announce // or the autosay radio.
 
 	for(var/obj/item/W in items)
-
-		var/preserve = null
-		for(var/T in preserve_items)
-			if(istype(W,T) && !(W in do_not_preserve_items))
-				preserve = 1
-				break
-
 		if(istype(W,/obj/item/device/pda))
 			var/obj/item/device/pda/P = W
 			QDEL_NULL(P.id)
 			qdel(P)
+			continue
 
-		if(!preserve)
+		var/preserve = should_preserve_item(W)
+		if(preserve == CRYO_DESTROY)
 			qdel(W)
+		else if(control_computer && control_computer.allow_items)
+			control_computer.frozen_items += W
+			if(preserve == CRYO_OBJECTIVE)
+				control_computer.objective_items += W
+			W.loc = null
 		else
-			if(control_computer && control_computer.allow_items)
-				control_computer.frozen_items += W
-				W.loc = null
-			else
-				W.forceMove(loc)
+			W.forceMove(loc)
 
 	// Skip past any cult sacrifice objective using this person
 	if(GAMEMODE_IS_CULT && is_sacrifice_target(occupant.mind))
@@ -422,6 +457,9 @@
 	QDEL_NULL(occupant)
 	name = initial(name)
 
+#undef CRYO_DESTROY
+#undef CRYO_PRESERVE
+#undef CRYO_OBJECTIVE
 
 /obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
 
@@ -727,4 +765,4 @@
 		if(target_cryopod.check_occupant_allowed(person_to_cryo))
 			target_cryopod.take_occupant(person_to_cryo, 1)
 			return 1
-	return 0
+	return 0

code/game/mecha/equipment/weapons/weapons.dm

@@ -482,6 +482,7 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bola
 	name = "PCMK-6 Bola Launcher"
 	icon_state = "mecha_bola"
+	origin_tech = "combat=4;engineering=4"
 	projectile = /obj/item/weapon/restraints/legcuffs/bola
 	fire_sound = 'sound/weapons/whip.ogg'
 	projectiles = 10

code/game/objects/items/robot/robot_items.dm

@@ -1,10 +1,11 @@
 /**********************************************************************
 						Cyborg Spec Items
 ***********************************************************************/
-//Might want to move this into several files later but for now it works here
+/obj/item/borg
+	icon = 'icons/mob/robot_items.dmi'
+
 /obj/item/borg/stun
-	name = "electrified arm"
-	icon = 'icons/obj/items.dmi'
+	name = "electrically-charged arm"
 	icon_state = "elecarm"
 	var/charge_cost = 30
 
@@ -34,3 +35,198 @@
 	name = "Overdrive"
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "shock"
+
+#define BORG_HUG 0
+#define BORG_HUG_SUPER 1
+#define BORG_HUG_SHOCK 2
+#define BORG_HUG_CRUSH 3
+
+/obj/item/borg/cyborghug
+	name = "Hugging Module"
+	icon_state = "hugmodule"
+	desc = "For when a someone really needs a hug."
+	var/mode = BORG_HUG //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
+	var/ccooldown = 0
+	var/scooldown = 0
+	var/shockallowed = FALSE//Can it be a stunarm when emagged. Only PK borgs get this by default.
+	var/boop = FALSE
+
+/obj/item/borg/cyborghug/attack_self(mob/living/user)
+	if(isrobot(user))
+		var/mob/living/silicon/robot/P = user
+		if(P.emagged && shockallowed)
+			if(mode < BORG_HUG_CRUSH)
+				mode++
+			else
+				mode = BORG_HUG
+		else if(mode < BORG_HUG_SUPER)
+			mode++
+		else
+			mode = BORG_HUG
+	switch(mode)
+		if(BORG_HUG)
+			to_chat(user, "<span class='notice'>Power reset. Hugs!</span>")
+		if(BORG_HUG_SUPER)
+			to_chat(user, "<span class='notice'>Power increased!</span>")
+		if(BORG_HUG_SHOCK)
+			to_chat(user, "<span class='warning'>BZZT. Electrifying arms...</span>")
+		if(BORG_HUG_CRUSH)
+			to_chat(user, "<span class='warning'>ERROR: ARM ACTUATORS OVERLOADED.</span>")
+
+/obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user)
+	if(M == user)
+		return
+	switch(mode)
+		if(BORG_HUG)
+			if(M.health >= config.health_threshold_crit)
+				if(user.zone_sel.selecting == "head")
+					user.visible_message("<span class='notice'>[user] playfully boops [M] on the head!</span>", \
+									"<span class='notice'>You playfully boop [M] on the head!</span>")
+					user.do_attack_animation(M)
+					playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+				else if(ishuman(M))
+					if(M.lying)
+						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
+										"<span class='notice'>You shake [M] trying to get \him up!</span>")
+					else
+						user.visible_message("<span class='notice'>[user] hugs [M] to make \him feel better!</span>", \
+								"<span class='notice'>You hug [M] to make \him feel better!</span>")
+					if(M.resting)
+						M.resting = FALSE
+						M.update_canmove()
+				else
+					user.visible_message("<span class='notice'>[user] pets [M]!</span>", \
+							"<span class='notice'>You pet [M]!</span>")
+				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+		if(BORG_HUG_SUPER)
+			if(M.health >= config.health_threshold_crit)
+				if(ishuman(M))
+					if(M.lying)
+						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
+										"<span class='notice'>You shake [M] trying to get \him up!</span>")
+					else if(user.zone_sel.selecting == "head")
+						user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
+										"<span class='warning'>You bop [M] on the head!</span>")
+						user.do_attack_animation(M)
+					else
+						user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
+								"<span class='warning'>You hug [M] firmly to make \him feel better! [M] looks uncomfortable...</span>")
+					if(M.resting)
+						M.resting = FALSE
+						M.update_canmove()
+				else
+					user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
+							"<span class='warning'>You bop [M] on the head!</span>")
+				playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+		if(BORG_HUG_SHOCK)
+			if(!scooldown)
+				if(M.health >= config.health_threshold_crit)
+					if(ishuman(M))
+						M.electrocute_act(5, "[user]", safety = 1)
+						user.visible_message("<span class='userdanger'>[user] electrocutes [M] with their touch!</span>", \
+							"<span class='danger'>You electrocute [M] with your touch!</span>")
+						M.update_canmove()
+					else
+						if(!isrobot(M))
+							M.adjustFireLoss(10)
+							user.visible_message("<span class='userdanger'>[user] shocks [M]!</span>", \
+								"<span class='danger'>You shock [M]!</span>")
+						else
+							user.visible_message("<span class='userdanger'>[user] shocks [M]. It does not seem to have an effect</span>", \
+								"<span class='danger'>You shock [M] to no effect.</span>")
+					playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
+					user.cell.charge -= 500
+					scooldown = TRUE
+					spawn(20)
+						scooldown = FALSE
+		if(BORG_HUG_CRUSH)
+			if(!ccooldown)
+				if(M.health >= config.health_threshold_crit)
+					if(ishuman(M))
+						user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
+							"<span class='danger'>You crush [M] in your grip!</span>")
+					else
+						user.visible_message("<span class='userdanger'>[user] crushes [M]!</span>", \
+								"<span class='danger'>You crush [M]!</span>")
+					playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1)
+					M.adjustBruteLoss(15)
+					user.cell.charge -= 300
+					ccooldown = TRUE
+					spawn(10)
+						ccooldown = FALSE
+
+#undef BORG_HUG
+#undef BORG_HUG_SUPER
+#undef BORG_HUG_SHOCK
+#undef BORG_HUG_CRUSH
+
+/obj/item/borg/cyborghug/peacekeeper
+	shockallowed = TRUE
+
+/obj/item/device/harmalarm
+	name = "Sonic Harm Prevention Tool"
+	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
+	icon_state = "megaphone"
+	var/cooldown = 0
+	var/emagged = FALSE
+
+/obj/item/device/harmalarm/emag_act(mob/user)
+	emagged = !emagged
+	if(emagged)
+		to_chat(user, "<span class='warning'>You short out the safeties on the [src]!</span>")
+	else
+		to_chat(user, "<span class='warning'>You reset the safeties on the [src]!</span>")
+
+/obj/item/device/harmalarm/attack_self(mob/user)
+	var/safety = !emagged
+	if(cooldown > world.time)
+		to_chat(user, "<span class='warning'>The device is still recharging!</span>")
+		return
+
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		if(R.cell.charge < 1200)
+			to_chat(user, "<span class='warning'>You don't have enough charge to do this!</span>")
+			return
+		R.cell.charge -= 1000
+		if(R.emagged)
+			safety = FALSE
+
+	if(safety)
+		user.visible_message("<span class='danger'>[user] blares out a near-deafening siren from its speakers!</span>")
+		for(var/mob/living/carbon/M in get_mobs_in_view(9, user))
+			if(!M.check_ear_prot())
+				M.AdjustConfused(6)
+				to_chat(M, "<span class='userdanger'>The siren pierces your hearing!</span>")
+		audible_message("<span class='biggerdanger'>HUMAN HARM</span>")
+		playsound(get_turf(src), 'sound/AI/harmalarm.ogg', 70, 3)
+		cooldown = world.time + 200
+		log_game("[key_name(user)] used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
+		if(isrobot(user))
+			var/mob/living/silicon/robot/R = user
+			if(R.connected_ai)
+				to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
+
+		return
+
+	user.audible_message("<span class='biggerdanger'>BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT</span>")
+	for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user))
+		if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
+			continue
+		var/earsafety = FALSE
+		if(H.check_ear_prot())
+			earsafety = TRUE
+
+		if(earsafety)
+			H.AdjustConfused(5)
+			H.AdjustStuttering(10)
+			H.Jitter(10)
+		else
+			H.Weaken(2)
+			H.AdjustConfused(10)
+			H.AdjustStuttering(15)
+			H.Jitter(25)
+
+	playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
+	cooldown = world.time + 600
+	log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")

code/game/objects/items/toys.dm

@@ -1397,7 +1397,7 @@ obj/item/toy/cards/deck/syndicate/black
 			is_empty = 1
 			playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
 			user.visible_message("<span class='danger'>The [src] goes off!</span>")
-			M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot would to the head.")
+			M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot wound to the head.")
 			M.death()
 	else
 		user.visible_message("<span class='danger'>[user] lowers the [src] from their head.</span>")

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

@@ -232,3 +232,76 @@ RSF
 				to_chat(user, "The RSF now holds [matter]/30 fabrication-units.")
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
+
+/obj/item/weapon/cookiesynth
+	name = "\improper Cookie Synthesizer"
+	desc = "A self-recharging device used to rapidly deploy cookies."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "rcd"
+	var/matter = 10
+	var/toxin = FALSE
+	var/cooldown = 0
+	var/cooldowndelay = 10
+	var/emagged = FALSE
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/weapon/cookiesynth/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
+
+/obj/item/weapon/cookiesynth/attackby()
+	return
+
+/obj/item/weapon/cookiesynth/emag_act(mob/user)
+	emagged = !emagged
+	if(emagged)
+		to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
+	else
+		to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
+		toxin = FALSE
+
+/obj/item/weapon/cookiesynth/attack_self(mob/user)
+	var/mob/living/silicon/robot/P = null
+	if(isrobot(user))
+		P = user
+	if(emagged && !toxin)
+		toxin = TRUE
+		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
+	else if(P.emagged && !toxin)
+		toxin = TRUE
+		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
+	else
+		toxin = FALSE
+		to_chat(user, "<span class='notice'>Cookie Synthesizer Reset.</span>")
+
+/obj/item/weapon/cookiesynth/process()
+	if(matter < 10)
+		matter++
+
+/obj/item/weapon/cookiesynth/afterattack(atom/A, mob/user, proximity)
+	if(cooldown > world.time)
+		return
+	if(!proximity)
+		return
+	if(!(istype(A, /obj/structure/table) || isfloorturf(A)))
+		return
+	if(matter < 1)
+		to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
+		return
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		if(!R.cell || R.cell.charge < 400)
+			to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
+			return
+	var/turf/T = get_turf(A)
+	playsound(loc, 'sound/machines/click.ogg', 10, 1)
+	to_chat(user, "Fabricating Cookie..")
+	var/obj/item/weapon/reagent_containers/food/snacks/cookie/S = new /obj/item/weapon/reagent_containers/food/snacks/cookie(T)
+	if(toxin)
+		S.reagents.add_reagent("pancuronium", 2.4)
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		R.cell.charge -= 100
+	else
+		matter--
+	cooldown = world.time + cooldowndelay

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

@@ -77,6 +77,10 @@
 /obj/item/weapon/defibrillator/ui_action_click()
 	toggle_paddles()
 
+/obj/item/weapon/defibrillator/CtrlClick()
+	if(ishuman(usr) && Adjacent(usr))
+		toggle_paddles()
+
 /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W

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

@@ -39,7 +39,7 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
-	materials = list(MAT_METAL = 30000, MAT_GLASS = 5000)
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/system/spark_spread/spark_system
 	var/lastused

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -22,7 +22,28 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/shoes/sandal/white(src)
 
+/obj/structure/closet/secure_closet/roboticist
+	name = "roboticist's locker"
+	req_access = list(access_robotics)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureresoff"
 
+	New()
+		..()
+		new /obj/item/weapon/storage/backpack(src)
+		new /obj/item/weapon/storage/backpack(src)
+		new /obj/item/weapon/storage/backpack/satchel_norm(src)
+		new /obj/item/weapon/storage/backpack/satchel_norm(src)
+		new /obj/item/weapon/storage/backpack/duffel(src)
+		new /obj/item/weapon/storage/backpack/duffel(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
 
 /obj/structure/closet/secure_closet/RD
 	name = "research director's locker"

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -310,14 +310,10 @@
 
 /obj/structure/closet/wardrobe/robotics_black/New()
 	..()
-	new /obj/item/clothing/glasses/hud/diagnostic(src)
-	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist/skirt(src)
 	new /obj/item/clothing/under/rank/roboticist/skirt(src)
-	new /obj/item/clothing/suit/storage/labcoat(src)
-	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/gloves/fingerless(src)

code/game/objects/structures/crates_lockers/crates.dm

@@ -44,8 +44,10 @@
 				return 2
 
 	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
-	for(var/obj/O in src)
-		O.forceMove(loc)
+	for(var/obj/O in src) //Objects
+		O.forceMove(loc)
+	for(var/mob/M in src) //Mobs
+		M.forceMove(loc)
 	icon_state = icon_opened
 	src.opened = 1
 

code/modules/customitems/item_defines.dm

@@ -308,8 +308,35 @@
 	user.update_inv_wear_suit()
 	qdel(src)
 
+/obj/item/device/fluff/fei_gasmask_kit //Fei Hazelwood: Tariq Yon-Dale
+	name = "gas mask conversion kit"
+	desc = "A gas mask conversion kit."
+	icon_state = "modkit"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/device/fluff/fei_gasmask_kit/afterattack(atom/target, mob/user, proximity)
+	if(!proximity || !ishuman(user) || user.incapacitated())
+		return
+
+	if(istype(target, /obj/item/clothing/mask/gas) && !istype(target, /obj/item/clothing/mask/gas/welding))
+		to_chat(user, "<span class='notice'>You modify the appearance of [target].</span>")
+		var/obj/item/clothing/mask/gas/M = target
+		M.name = "Prescription Gas Mask"
+		M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words “Property of Yon-Dale” can be seen on the inner band."
+		M.icon = 'icons/obj/custom_items.dmi'
+		M.icon_state = "gas_tariq"
+		M.species_fit = list("Vulpkanin")
+		M.sprite_sheets = list(
+			"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
+			)
+		user.update_icons()
+		qdel(src)
+		return
+
+	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
+
 /obj/item/device/fluff/desolate_baton_kit //DesolateG: Michael Smith
-	name = "stun baton converstion kit"
+	name = "stun baton conversion kit"
 	desc = "Some sci-fi looking parts for a stun baton."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "scifikit"
@@ -742,6 +769,17 @@
 	species_fit = null
 	sprite_sheets = null
 
+/obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper
+	name = "Jack's vest"
+	desc = "A rugged leather vest with a tag labelled \"President\"."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "jacksvest"
+	ignore_suitadjust = TRUE
+	actions_types = list()
+	adjust_flavour = null
+	species_fit = null
+	sprite_sheets = null
+
 /obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen
 	name = "Nano Fibre Jacket"
 	desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials."

code/modules/mob/living/carbon/human/life.dm

@@ -932,7 +932,7 @@
 /mob/living/carbon/human/handle_changeling()
 	if(mind)
 		if(mind.changeling)
-			mind.changeling.regenerate()
+			mind.changeling.regenerate(src)
 			if(hud_used)
 				hud_used.lingchemdisplay.invisibility = 0
 				hud_used.lingchemdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#dd66dd'>[round(mind.changeling.chem_charges)]</font></div>"

code/modules/mob/living/carbon/life.dm

@@ -12,8 +12,8 @@
 		handle_blood()
 		for(var/obj/item/organ/internal/O in internal_organs)
 			O.on_life()
-		handle_changeling()
 
+	handle_changeling()
 	handle_wetness()
 
 	// Increase germ_level regularly

code/modules/mob/living/carbon/superheroes.dm

@@ -175,6 +175,7 @@
 			return
 		if(target.mind.assigned_role != "Civilian")
 			to_chat(user, "<span class='warning'>You can only recruit Civilians.</span>")
+			return
 		if(recruiting)
 			to_chat(user, "<span class='danger'>You are already recruiting!</span>")
 			charge_counter = charge_max

code/modules/mob/living/silicon/robot/robot.dm

@@ -262,14 +262,18 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
+	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service")
+	if(!config.forbid_secborg)
+		modules += "Security"
+	if(!config.forbid_peaceborg)
+		modules += "Peacekeeper"
 	if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
 		to_chat(src, "<span class='warning'>Crisis mode active. Combat module available.</span>")
-		modules+="Combat"
+		modules += "Combat"
 	if(ticker && ticker.mode && ticker.mode.name == "nations")
 		var/datum/game_mode/nations/N = ticker.mode
 		if(N.kickoff)
-			modules = list("Peacekeeper")
+			modules = list("Nations")
 	if(mmi != null && mmi.alien)
 		modules = "Hunter"
 	modtype = input("Please, select a module!", "Robot", null, null) as null|anything in modules
@@ -336,6 +340,11 @@ var/list/robot_verbs_default = list(
 			module_sprites["Noble-SEC"] = "Noble-SEC"
 			status_flags &= ~CANPUSH
 
+		if("Peacekeeper")
+			module = new /obj/item/weapon/robot_module/peacekeeper(src)
+			module_sprites["Peacekeeper"] = "peace"
+			status_flags &= ~CANPUSH
+
 		if("Engineering")
 			module = new /obj/item/weapon/robot_module/engineering(src)
 			module.channels = list("Engineering" = 1)
@@ -362,8 +371,8 @@ var/list/robot_verbs_default = list(
 			module.channels = list("Security" = 1)
 			icon_state =  "droidcombat"
 
-		if("Peacekeeper")
-			module = new /obj/item/weapon/robot_module/peacekeeper(src)
+		if("Nations")
+			module = new /obj/item/weapon/robot_module/nations(src)
 			module.channels = list()
 			icon_state = "droidpeace"
 
@@ -388,7 +397,7 @@ var/list/robot_verbs_default = list(
 	feedback_inc("cyborg_[lowertext(modtype)]",1)
 	rename_character(real_name, get_default_name())
 
-	if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Peacekeeper")
+	if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Peacekeeper" || modtype == "Nations")
 		status_flags &= ~CANPUSH
 
 	choose_icon(6,module_sprites)
@@ -958,7 +967,7 @@ var/list/robot_verbs_default = list(
 		else
 			overlays += "[panelprefix]-openpanel -c"
 
-	var/combat = list("Combat","Peacekeeper")
+	var/combat = list("Combat","Nations")
 	if(modtype in combat)
 		if(base_icon == "")
 			base_icon = icon_state
@@ -1437,15 +1446,15 @@ var/list/robot_verbs_default = list(
 	radio.config(module.channels)
 	notify_ai(2)
 
-/mob/living/silicon/robot/peacekeeper
+/mob/living/silicon/robot/nations
 	base_icon = "droidpeace"
 	icon_state = "droidpeace"
-	modtype = "Peacekeeper"
-	designation = "Peacekeeper"
+	modtype = "Nations"
+	designation = "Nations"
 
-/mob/living/silicon/robot/peacekeeper/init()
+/mob/living/silicon/robot/nations/init()
 	..()
-	module = new /obj/item/weapon/robot_module/peacekeeper(src)
+	module = new /obj/item/weapon/robot_module/nations(src)
 	//languages
 	module.add_languages(src)
 	//subsystems

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -189,6 +189,7 @@
 /obj/item/weapon/robot_module/engineering/New()
 	..()
 	modules += new /obj/item/weapon/rcd/borg(src)
+	modules += new /obj/item/weapon/rpd(src)
 	modules += new /obj/item/weapon/extinguisher(src)
 	modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
 	modules += new /obj/item/weapon/screwdriver/cyborg(src)
@@ -228,6 +229,22 @@
 
 	fix_modules()
 
+/obj/item/weapon/robot_module/peacekeeper
+	name = "peacekeeping robot module"
+	module_type = "Standard"
+
+/obj/item/weapon/robot_module/peacekeeper/New()
+	..()
+	modules += new /obj/item/weapon/cookiesynth(src)
+	modules += new /obj/item/device/harmalarm(src)
+	modules += new /obj/item/weapon/reagent_containers/borghypo/peace(src)
+	modules += new /obj/item/taperoll/police(src)
+	modules += new /obj/item/borg/cyborghug/peacekeeper(src)
+	modules += new /obj/item/weapon/extinguisher(src)
+	emag = new /obj/item/weapon/reagent_containers/borghypo/peace/hacked(src)
+
+	fix_modules()
+
 /obj/item/weapon/robot_module/janitor
 	name = "janitorial robot module"
 	module_type = "Janitor"
@@ -413,11 +430,11 @@
 
 	fix_modules()
 
-/obj/item/weapon/robot_module/peacekeeper
-	name = "peacekeeper robot module"
+/obj/item/weapon/robot_module/nations
+	name = "nations robot module"
 	module_type = "Malf"
 
-/obj/item/weapon/robot_module/peacekeeper/New()
+/obj/item/weapon/robot_module/nations/New()
 	..()
 	modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src)
 	modules += new /obj/item/weapon/gun/energy/gun/cyborg(src)
@@ -482,6 +499,7 @@
 	modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
 	modules += new /obj/item/weapon/soap(src)
 	modules += new /obj/item/device/t_scanner(src)
+	modules += new /obj/item/weapon/rpd(src)
 
 	emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
 

code/modules/power/lighting.dm

@@ -428,7 +428,7 @@
 // if hands aren't protected and the light is on, burn the player
 
 /obj/machinery/light/attack_hand(mob/user)
-
+	user.changeNext_move(CLICK_CD_MELEE)
 	add_fingerprint(user)
 
 	if(status == LIGHT_EMPTY)

code/modules/power/turbine.dm

@@ -156,7 +156,7 @@
 
 // RPM function to include compression friction - be advised that too low/high of a compfriction value can make things screwy
 
-	rpm = max(0, rpm - (rpm*rpm)/(COMPFRICTION/efficiency))
+	rpm = max(0, rpm - (rpm*rpm)/(COMPFRICTION*efficiency))
 
 
 	if(starter && !(stat & NOPOWER))

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -1132,3 +1132,30 @@
 		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>")
+	..()

code/modules/reagents/reagent_containers/borghydro.dm

@@ -33,6 +33,15 @@
 	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)

code/modules/reagents/reagent_dispenser.dm

@@ -253,6 +253,14 @@
 	explosion(loc, 0, 3, 5, 7, 10)
 	qdel(src)
 
+/obj/structure/reagent_dispensers/beerkeg/nuke
+	name = "Nanotrasen-brand nuclear fission explosive"
+	desc = "One of the more successful achievements of the Nanotrasen Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap\
+	to produce and devestatingly effective. Signs explain that though this is just a model, every Nanotrasen station is equipped with one, just in case. \
+	All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "nuclearbomb0"
+
 /obj/structure/reagent_dispensers/virusfood
 	name = "virus food dispenser"
 	desc = "A dispenser of low-potency virus mutagenic."

code/modules/research/designs/autolathe_designs.dm

@@ -608,6 +608,14 @@
 	build_path = /obj/item/weapon/rcd
 	category = list("hacked", "Construction")
 
+/datum/design/rpd
+	name = "Rapid Pipe Dispenser (RPD)"
+	id = "rpd"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
+	build_path = /obj/item/weapon/rpd
+	category = list("hacked", "Construction")
+
 /datum/design/rcl
 	name = "Rapid Cable Layer"
 	id = "rcl"

code/modules/research/designs/mechfabricator_designs.dm

@@ -984,7 +984,7 @@
 /datum/design/mech_immolator
 	name = "Exosuit Weapon (ZFI Immolation Beam Gun)"
 	desc = "Allows for the construction of ZFI Immolation Beam Gun."
-	id = "mech_tesla"
+	id = "mech_immolator"
 	build_type = MECHFAB
 	req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator