Merge Conflict thingy

code/__DEFINES/typeids.dm

@@ -0,0 +1,6 @@
+//Byond type ids
+#define TYPEID_NULL "0"
+#define TYPEID_NORMAL_LIST "f"
+//helper macros
+#define GET_TYPEID(ref) ( ( (lentext(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, lentext(ref) - 6) ) )
+#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST)

code/__DEFINES/vv.dm

@@ -0,0 +1,21 @@
+#define VV_NUM "Number"
+#define VV_TEXT "Text"
+#define VV_MESSAGE "Mutiline Text"
+#define VV_ICON "Icon"
+#define VV_ATOM_REFERENCE "Atom Reference"
+#define VV_DATUM_REFERENCE "Datum Reference"
+#define VV_MOB_REFERENCE "Mob Reference"
+#define VV_CLIENT "Client"
+#define VV_ATOM_TYPE "Atom Typepath"
+#define VV_DATUM_TYPE "Datum Typepath"
+#define VV_TYPE "Custom Typepath"
+#define VV_MATRIX "Matrix"
+#define VV_FILE "File"
+#define VV_LIST "List"
+#define VV_NEW_ATOM "New Atom"
+#define VV_NEW_DATUM "New Datum"
+#define VV_NEW_TYPE "New Custom Typepath"
+#define VV_NEW_LIST "New List"
+#define VV_NULL "NULL"
+#define VV_RESTORE_DEFAULT "Restore to Default"
+#define VV_MARKED_DATUM "Marked Datum"

code/__HELPERS/lists.dm

@@ -654,3 +654,28 @@ proc/dd_sortedObjectList(list/incoming)
 
 // LAZYING PT 2: THE LAZENING
 #define LAZYREINITLIST(L) LAZYCLEARLIST(L); LAZYINITLIST(L);
+
+
+//same, but returns nothing and acts on list in place
+/proc/shuffle_inplace(list/L)
+	if(!L)
+		return
+
+	for(var/i=1, i<L.len, ++i)
+		L.Swap(i,rand(i,L.len))
+
+//Return a list with no duplicate entries
+/proc/uniqueList(list/L)
+	. = list()
+	for(var/i in L)
+		. |= i
+
+//same, but returns nothing and acts on list in place (also handles associated values properly)
+/proc/uniqueList_inplace(list/L)
+	var/temp = L.Copy()
+	L.len = 0
+	for(var/key in temp)
+		if(isnum(key))
+			L |= key
+		else
+			L[key] = temp[key]

code/__HELPERS/type2type.dm

@@ -328,3 +328,40 @@
 	var/e = matrix_list[5]
 	var/f = matrix_list[6]
 	return matrix(a, b, c, d, e, f)
+
+
+//This is a weird one:
+//It returns a list of all var names found in the string
+//These vars must be in the [var_name] format
+//It's only a proc because it's used in more than one place
+
+//Takes a string and a datum
+//The string is well, obviously the string being checked
+//The datum is used as a source for var names, to check validity
+//Otherwise every single word could technically be a variable!
+/proc/string2listofvars(var/t_string, var/datum/var_source)
+	if(!t_string || !var_source)
+		return list()
+
+	. = list()
+
+	var/var_found = findtext(t_string, "\[") //Not the actual variables, just a generic "should we even bother" check
+	if(var_found)
+		//Find var names
+
+		// "A dog said hi [name]!"
+		// splittext() --> list("A dog said hi ","name]!"
+		// jointext() --> "A dog said hi name]!"
+		// splittext() --> list("A","dog","said","hi","name]!")
+
+		t_string = replacetext(t_string, "\[", "\[ ")//Necessary to resolve "word[var_name]" scenarios
+		var/list/list_value = splittext(t_string, "\[")
+		var/intermediate_stage = jointext(list_value, null)
+
+		list_value = splittext(intermediate_stage, " ")
+		for(var/value in list_value)
+			if(findtext(value, "]"))
+				value = splittext(value, "]") //"name]!" --> list("name","!")
+				for(var/A in value)
+					if(var_source.vars.Find(A))
+						. += A

code/__HELPERS/unique_ids.dm

@@ -32,6 +32,7 @@ var/global/next_unique_datum_id = 1
 		unique_datum_id = "\ref[src]_[next_unique_datum_id++]"
 	return unique_datum_id
 
+
 /proc/locateUID(uid)
 	if(!istext(uid))
 		return null

code/__HELPERS/unsorted.dm

@@ -1730,53 +1730,81 @@ var/mob/dview/dview_mob = new
 				closest_atom = A
 	return closest_atom
 
-/proc/pick_closest_path(value)
-	var/list/matches = get_fancy_list_of_types()
-	if(!isnull(value) && value!="")
+/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
+	if(value == FALSE) //nothing should be calling us with a number, so this is safe
+		value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
+		if(isnull(value))
+			return
+	value = trim(value)
+	if(!isnull(value) && value != "")
 		matches = filter_fancy_list(matches, value)
 
-	if(matches.len==0)
+	if(matches.len == 0)
 		return
 
 	var/chosen
-	if(matches.len==1)
+	if(matches.len == 1)
 		chosen = matches[1]
 	else
-		chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
+		chosen = input("Select a type", "Pick Type", matches[1]) as null|anything in matches
 		if(!chosen)
 			return
 	chosen = matches[chosen]
 	return chosen
 
+/proc/make_types_fancy(var/list/types)
+	if(ispath(types))
+		types = list(types)
+	. = list()
+	for(var/type in types)
+		var/typename = "[type]"
+		var/static/list/TYPES_SHORTCUTS = list(
+			/obj/effect/decal/cleanable = "CLEANABLE",
+			/obj/item/device/radio/headset = "HEADSET",
+			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
+			/obj/item/weapon/book/manual = "MANUAL",
+			/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+			/obj/item/weapon/reagent_containers/food = "FOOD",
+			/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
+			/obj/item/weapon = "WEAPON",
+			/obj/machinery/atmospherics = "ATMOS_MECH",
+			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
+			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
+			/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
+			/obj/item/organ = "ORGAN",
+			/obj/item = "ITEM",
+			/obj/machinery = "MACHINERY",
+			/obj/effect = "EFFECT",
+			/obj = "O",
+			/datum = "D",
+			/turf/simulated/floor = "FLOOR",
+			/turf/simulated/wall = "WALL",
+			/turf = "T",
+			/mob/living/carbon = "CARBON",
+			/mob/living/simple_animal = "SIMPLE",
+			/mob/living = "LIVING",
+			/mob = "M"
+		)
+		for(var/tn in TYPES_SHORTCUTS)
+			if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/")
+				typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
+				break
+		.[typename] = type
 
-var/list/TYPES_SHORTCUTS = list(
-	/obj/effect/decal/cleanable = "CLEANABLE",
-	/obj/item/device/radio/headset = "HEADSET",
-	/obj/item/clothing/head/helmet/space = "SPESSHELMET",
-	/obj/item/weapon/book/manual = "MANUAL",
-	/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
-	/obj/item/weapon/reagent_containers/food = "FOOD",
-	/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
-	/obj/machinery/atmospherics = "ATMOS",
-	/obj/machinery/portable_atmospherics = "PORT_ATMOS",
-//	/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/missile_rack = "MECHA_MISSILE_RACK",
-	/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
-//	/obj/item/organ/internal = "ORGAN_INT",
-)
 
-var/global/list/g_fancy_list_of_types = null
-/proc/get_fancy_list_of_types()
-	if(isnull(g_fancy_list_of_types)) //init
-		var/list/temp = sortList(subtypesof(/atom) - typesof(/area) - /atom/movable)
-		g_fancy_list_of_types = new(temp.len)
-		for(var/type in temp)
-			var/typename = "[type]"
-			for(var/tn in TYPES_SHORTCUTS)
-				if(copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
-					typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
-					break
-			g_fancy_list_of_types[typename] = type
-	return g_fancy_list_of_types
+/proc/get_fancy_list_of_atom_types()
+	var/static/list/pre_generated_list
+	if(!pre_generated_list) //init
+		pre_generated_list = make_types_fancy(typesof(/atom))
+	return pre_generated_list
+
+
+/proc/get_fancy_list_of_datum_types()
+	var/static/list/pre_generated_list
+	if(!pre_generated_list) //init
+		pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom)))
+	return pre_generated_list
+
 
 /proc/filter_fancy_list(list/L, filter as text)
 	var/list/matches = new

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/atoms.dm

@@ -616,7 +616,20 @@ var/list/blood_splatter_icons = list()
 /atom/proc/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
 	return
 
-/atom/on_varedit(modified_var)
+/atom/vv_edit_var(var_name, var_value)
 	if(!Debug2)
 		admin_spawned = TRUE
-	..()
+	. = ..()
+	switch(var_name)
+		if("light_power", "light_range", "light_color")
+			update_light()
+
+
+/atom/vv_get_dropdown()
+	. = ..()
+	var/turf/curturf = get_turf(src)
+	if(curturf)
+		.["Jump to turf"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
+	.["Add reagent"] = "?_src_=vars;addreagent=[UID()]"
+	.["Trigger explosion"] = "?_src_=vars;explode=[UID()]"
+	.["Trigger EM pulse"] = "?_src_=vars;emp=[UID()]"

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/biodegrade.dm

@@ -0,0 +1,82 @@
+/obj/effect/proc_holder/changeling/biodegrade
+	name = "Biodegrade"
+	desc = "Dissolves restraints or other objects preventing free movement."
+	helptext = "This is obvious to nearby people, and can destroy standard restraints and closets."
+	chemical_cost = 30 //High cost to prevent spam
+	dna_cost = 2
+	req_human = 1
+
+/obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
+	var/used = FALSE // only one form of shackles removed per use
+	if(!user.restrained() && !istype(user.loc, /obj/structure/closet) && !istype(user.loc, /obj/structure/spider/cocoon))
+		to_chat(user, "<span class='warning'>We are already free!</span>")
+		return FALSE
+
+	if(user.handcuffed)
+		var/obj/O = user.get_item_by_slot(slot_handcuffed)
+		if(!istype(O))
+			return FALSE
+		user.visible_message("<span class='warning'>[user] vomits a glob of acid on \his [O]!</span>", \
+			"<span class='warning'>We vomit acidic ooze onto our restraints!</span>")
+		addtimer(src, "dissolve_handcuffs", 30, FALSE, user, O)
+		used = TRUE
+
+	if(user.wear_suit && user.wear_suit.breakouttime && !used)
+		var/obj/item/clothing/suit/S = user.get_item_by_slot(slot_wear_suit)
+		if(!istype(S))
+			return FALSE
+		user.visible_message("<span class='warning'>[user] vomits a glob of acid across the front of \his [S]!</span>", \
+			"<span class='warning'>We vomit acidic ooze onto our straight jacket!</span>")
+		addtimer(src, "dissolve_straightjacket", 30, FALSE, user, S)
+		used = TRUE
+
+
+	if(istype(user.loc, /obj/structure/closet) && !used)
+		var/obj/structure/closet/C = user.loc
+		if(!istype(C))
+			return FALSE
+		C.visible_message("<span class='warning'>[C]'s hinges suddenly begin to melt and run!</span>")
+		to_chat(user, "<span class='warning'>We vomit acidic goop onto the interior of [C]!</span>")
+		addtimer(src, "open_closet", 70, FALSE, user, C)
+		used = TRUE
+
+	if(istype(user.loc, /obj/structure/spider/cocoon) && !used)
+		var/obj/structure/spider/cocoon/C = user.loc
+		if(!istype(C))
+			return FALSE
+		C.visible_message("<span class='warning'>[src] shifts and starts to fall apart!</span>")
+		to_chat(user, "<span class='warning'>We secrete acidic enzymes from our skin and begin melting our cocoon...</span>")
+		addtimer(src, "dissolve_cocoon", 25, FALSE, user, C) //Very short because it's just webs
+		used = TRUE
+
+	if(used)
+		feedback_add_details("changeling_powers","BD")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O)
+	if(O && user.handcuffed == O)
+		user.unEquip(O)
+		O.visible_message("<span class='warning'>[O] dissolves into a puddle of sizzling goop.</span>")
+		O.forceMove(get_turf(user))
+		qdel(O)
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S)
+	if(S && user.wear_suit == S)
+		user.unEquip(S)
+		S.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")
+		S.forceMove(get_turf(user))
+		qdel(S)
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/open_closet(mob/living/carbon/human/user, obj/structure/closet/C)
+	if(C && user.loc == C)
+		C.visible_message("<span class='warning'>[C]'s door breaks and opens!</span>")
+		C.welded = FALSE
+		C.locked = FALSE
+		C.broken = TRUE
+		C.open()
+		to_chat(user, "<span class='warning'>We open the container restraining us!</span>")
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_cocoon(mob/living/carbon/human/user, obj/structure/spider/cocoon/C)
+	if(C && user.loc == C)
+		qdel(C) //The cocoon's destroy will move the changeling outside of it without interference
+		to_chat(user, "<span class='warning'>We dissolve the cocoon!</span>")

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/cult/runes.dm

@@ -636,17 +636,17 @@ var/list/teleport_runes = list()
 		log_game("Raise Dead rune failed - no catalyst corpse")
 		return
 	mob_to_sacrifice = input(user, "Choose a corpse to sacrifice.", "Corpse to Sacrifice") as null|anything in potential_sacrifice_mobs
-	if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !mob_to_revive || !mob_to_sacrifice || rune_in_use)
+	if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !mob_to_sacrifice || rune_in_use)
 		return
 	for(var/mob/living/M in T.contents)
 		if(M.stat == DEAD)
 			potential_revive_mobs.Add(M)
 	if(!potential_revive_mobs.len)
 		to_chat(user, "<span class='cultitalic'>There is no eligible revival target on the rune!</span>")
-		log_game("Raise Dead rune failed - no corpse to revived")
+		log_game("Raise Dead rune failed - no corpse to revive")
 		return
 	mob_to_revive = input(user, "Choose a corpse to revive.", "Corpse to Revive") as null|anything in potential_revive_mobs
-	if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use)
+	if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use || !mob_to_revive)
 		return
 	if(!in_range(mob_to_sacrifice,src))
 		to_chat(user, "<span class='cultitalic'>The sacrificial target has been moved!</span>")

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -40,6 +40,10 @@
 	if(be_swarmer == "No")
 		return
 
+	if(jobban_isbanned(user, "Syndicate"))
+		to_chat(user, "<span class='warning'>You are banned from antagonists!</span>")
+		return
+
 	if(crit_fail)//in case it depowers while ghost is looking at yes/no
 		to_chat(user, "<span class='warning'>This swarmer shell is completely depowered. You cannot activate it.</span>")
 		return

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/computer/HolodeckControl.dm

@@ -439,7 +439,7 @@
 	name = "Holographic Energy Sword"
 	desc = "This looks like a real energy sword!"
 	icon_state = "sword0"
-	hitsound = "sound/weapons/blade1.ogg"
+	hitsound = "swing_hit"
 	force = 3.0
 	throw_speed = 1
 	throw_range = 5
@@ -468,12 +468,14 @@
 	if(active)
 		force = 30
 		icon_state = "sword[item_color]"
+		hitsound = "sound/weapons/blade1.ogg"
 		w_class = WEIGHT_CLASS_BULKY
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>[src] is now active.</span>")
 	else
 		force = 3
 		icon_state = "sword0"
+		hitsound = "swing_hit"
 		w_class = WEIGHT_CLASS_SMALL
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")

code/game/machinery/computer/buildandrepair.dm

@@ -44,6 +44,24 @@
 	name = "Circuit board (Camera Monitor)"
 	build_path = /obj/machinery/computer/security
 	origin_tech = "programming=2;combat=2"
+
+/obj/item/weapon/circuitboard/camera/telescreen
+	name = "Circuit board (Telescreen)"
+	build_path = /obj/machinery/computer/security/telescreen
+/obj/item/weapon/circuitboard/camera/telescreen/entertainment
+	name = "Circuit board (Entertainment Monitor)"
+	build_path = /obj/machinery/computer/security/telescreen/entertainment
+/obj/item/weapon/circuitboard/camera/wooden_tv
+	name = "Circuit board (Wooden TV)"
+	build_path = /obj/machinery/computer/security/wooden_tv
+/obj/item/weapon/circuitboard/camera/mining
+	name = "Circuit board (Outpost Camera Monitor)"
+	build_path = /obj/machinery/computer/security/mining
+/obj/item/weapon/circuitboard/camera/engineering
+	name = "Circuit board (Engineering Camera Monitor)"
+	build_path = /obj/machinery/computer/security/engineering
+
+
 /obj/item/weapon/circuitboard/xenobiology
 	name = "Circuit board (Xenobiology Console)"
 	build_path = /obj/machinery/computer/camera_advanced/xenobio

code/game/machinery/computer/camera.dm

@@ -87,6 +87,25 @@
 	else
 		..()
 
+/obj/machinery/computer/security/telescreen/attackby(obj/item/I, mob/user, params)
+	if(ismultitool(I))
+		var/direction = input(user, "Which direction?", "Select direction!") as null|anything in list("North", "East", "South", "West", "Centre")
+		if(!direction || !Adjacent(user))
+			return
+		pixel_x = 0
+		pixel_y = 0
+		switch(direction)
+			if("North")
+				pixel_y = 32
+			if("East")
+				pixel_x = 32
+			if("South")
+				pixel_y = -32
+			if("West")
+				pixel_x = -32
+	else
+		..()
+
 /obj/machinery/computer/security/emag_act(user as mob)
 	if(!emagged)
 		emagged = 1
@@ -293,39 +312,36 @@
 
 // Other computer monitors.
 /obj/machinery/computer/security/telescreen
-	name = "\improper Telescreen"
+	name = "telescreen"
 	desc = "Used for watching camera networks."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "telescreen"
+	icon_state = "telescreen_console"
+	icon_screen = "telescreen"
+	icon_keyboard = null
 	light_range_on = 0
-	network = list("SS13")
 	density = 0
-
-/obj/machinery/computer/security/telescreen/update_icon()
-	icon_state = initial(icon_state)
-	if(stat & BROKEN)
-		icon_state += "b"
-	return
+	circuit = /obj/item/weapon/circuitboard/camera/telescreen
 
 /obj/machinery/computer/security/telescreen/entertainment
 	name = "entertainment monitor"
 	desc = "Damn, they better have Paradise TV on these things."
-	icon = 'icons/obj/status_display.dmi'
-	icon_state = "entertainment"
+	icon_state = "entertainment_console"
+	icon_screen = "entertainment"
 	light_color = "#FFEEDB"
 	light_range_on = 0
 	network = list("news")
 	luminosity = 0
+	circuit = /obj/item/weapon/circuitboard/camera/telescreen/entertainment
 
 /obj/machinery/computer/security/wooden_tv
 	name = "security camera monitor"
-	desc = "An old TV hooked into the stations camera network."
+	desc = "An old TV hooked into the station's camera network."
 	icon_state = "television"
 	icon_keyboard = null
 	icon_screen = "detective_tv"
 	light_color = "#3848B3"
 	light_power_on = 0.5
 	network = list("SS13")
+	circuit = /obj/item/weapon/circuitboard/camera/wooden_tv
 
 /obj/machinery/computer/security/mining
 	name = "outpost camera monitor"
@@ -334,6 +350,7 @@
 	icon_screen = "mining"
 	light_color = "#F9BBFC"
 	network = list("Mining Outpost")
+	circuit = /obj/item/weapon/circuitboard/camera/mining
 
 /obj/machinery/computer/security/engineering
 	name = "engineering camera monitor"
@@ -342,3 +359,4 @@
 	icon_screen = "engie_cams"
 	light_color = "#FAC54B"
 	network = list("Power Alarms","Atmosphere Alarms","Fire Alarms")
+	circuit = /obj/item/weapon/circuitboard/camera/engineering

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/machinery/doors/door.dm

@@ -76,8 +76,13 @@
 		var/mob/living/M = AM
 		if(world.time - M.last_bumped <= 10) return	//Can bump-open one airlock per second. This is to prevent shock spam.
 		M.last_bumped = world.time
-		if(!M.restrained() && M.mob_size > MOB_SIZE_SMALL)
-			bumpopen(M)
+		if(!M.restrained())
+			if(M.mob_size > MOB_SIZE_SMALL)
+				bumpopen(M)
+			else if(ispet(M))
+				var/mob/living/simple_animal/A = AM
+				if(A.collar)
+					bumpopen(M)
 		return
 
 	if(istype(AM, /obj/mecha))

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/devices/scanners.dm

@@ -363,7 +363,7 @@ REAGENT SCANNER
 	return
 
 /obj/item/device/mass_spectrometer
-	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample. Inject sample with syringe."
 	name = "mass-spectrometer"
 	icon_state = "spectrometer"
 	item_state = "analyzer"
@@ -377,7 +377,7 @@ REAGENT SCANNER
 	origin_tech = "magnets=2;biotech=1;plasmatech=2"
 	var/details = 0
 	var/datatoprint = ""
-	var/scanning = 1
+	var/scanning = TRUE
 	actions_types = list(/datum/action/item_action/print_report)
 
 /obj/item/device/mass_spectrometer/New()
@@ -400,8 +400,8 @@ REAGENT SCANNER
 		var/list/blood_traces = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
 			if(R.id != "blood")
-				reagents.clear_reagents()
 				to_chat(user, "<span class='warning'>The sample was contaminated! Please insert another sample.</span>")
+				reagents.clear_reagents()
 				return
 			else
 				blood_traces = params2list(R.data["trace_chem"])
@@ -412,7 +412,9 @@ REAGENT SCANNER
 				dat += "[R] ([blood_traces[R]] units) "
 			else
 				dat += "[R] "
-		to_chat(user, "[dat]")
+		to_chat(user, "Analysis completed. Chemicals found: [dat]")
+		scanning = FALSE
+		datatoprint = dat
 		reagents.clear_reagents()
 	return
 
@@ -424,6 +426,7 @@ REAGENT SCANNER
 
 /obj/item/device/mass_spectrometer/proc/print_report()
 	if(!scanning)
+		scanning = TRUE
 		usr.visible_message("<span class='warning'>[src] rattles and prints out a sheet of paper.</span>")
 		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 		sleep(50)
@@ -437,7 +440,6 @@ REAGENT SCANNER
 			M.put_in_hands(P)
 			to_chat(M, "<span class='notice'>Report printed. Log cleared.<span>")
 			datatoprint = ""
-			scanning = 1
 	else
 		to_chat(usr, "<span class='notice'>[src] has no logs or is already in use.</span>")
 

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
 
@@ -15,8 +16,9 @@
 			playsound(M, 'sound/weapons/Genhit.ogg', 50, 1)
 			return 0
 
-	if(!user.cell.use(charge_cost))
-		return
+	if(isrobot(user))
+		if(!user.cell.use(charge_cost))
+			return
 
 	user.do_attack_animation(M)
 	M.Weaken(5)
@@ -34,3 +36,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/power_cells.dm

@@ -28,13 +28,14 @@
 	processing_objects.Remove(src)
 	return ..()
 
-/obj/item/weapon/stock_parts/cell/on_varedit(modified_var)
-	if(modified_var == "self_recharge")
-		if(self_recharge)
-			processing_objects.Add(src)
-		else
-			processing_objects.Remove(src)
-	..()
+/obj/item/weapon/stock_parts/cell/vv_edit_var(var_name, var_value)
+	switch(var_name)
+		if("self_recharge")
+			if(var_value)
+				processing_objects.Add(src)
+			else
+				processing_objects.Remove(src)
+	. = ..()
 
 /obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
 	to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</span>")

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/objs.dm

@@ -310,4 +310,8 @@ a {
 			Item.fire_act() //Set them on fire, too
 
 /obj/proc/on_mob_move(dir, mob/user)
-	return
+	return
+
+/obj/vv_get_dropdown()
+	. = ..()
+	.["Delete all of type"] = "?_src_=vars;delall=[UID()]"

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

@@ -8,6 +8,8 @@
 	var/icon_opened = "open"
 	var/opened = 0
 	var/welded = 0
+	var/locked = 0
+	var/broken = 0
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
 	var/lastbang

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

@@ -11,7 +11,7 @@
 	var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
 	opened = 1
 	var/hitstaken = 0
-	var/locked = 1
+	locked = 1
 	var/smashed = 0
 
 	attackby(var/obj/item/O as obj, var/mob/living/user as mob)  //Marker -Agouri

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

@@ -22,6 +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"
+
+/obj/structure/closet/secure_closet/roboticist/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/secure/secure_closets.dm

@@ -5,8 +5,8 @@
 	icon_state = "secure1"
 	density = 1
 	opened = 0
-	var/locked = 1
-	var/broken = 0
+	locked = 1
+	broken = 0
 	var/large = 1
 	icon_closed = "secure"
 	var/icon_locked = "secure1"

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
 
@@ -240,8 +242,8 @@
 	var/greenlight = "securecrateg"
 	var/sparks = "securecratesparks"
 	var/emag = "securecrateemag"
-	var/broken = 0
-	var/locked = 1
+	broken = 0
+	locked = 1
 	health = 1000
 
 /obj/structure/closet/crate/secure/update_icon()

code/modules/admin/holder2.dm

@@ -100,3 +100,9 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
 			return 0
 		return 1
 	return 0
+
+/datum/admins/vv_edit_var(var_name, var_value)
+	return FALSE // no admin abuse
+
+/datum/admins/can_vv_delete()
+	return FALSE // don't break shit either

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -89,8 +89,12 @@
 
 				if("delete")
 					for(var/d in objs)
-						if(!datum_is_forbidden(d))
-							qdel(d)
+						if(istype(d, /datum))
+							var/datum/D = d
+							if(!D.can_vv_delete())
+								to_chat(usr, "[D] rejected your deletion")
+								continue
+						qdel(d)
 
 				if("select")
 					var/text = ""
@@ -118,9 +122,6 @@
 					if("set" in query_tree)
 						var/list/set_list = query_tree["set"]
 						for(var/d in objs)
-							// Forbid explicitly modifying an admin datum's vars
-							if(datum_is_forbidden(d))
-								return
 							for(var/list/sets in set_list)
 								var/datum/temp = d
 								var/i = 0
@@ -128,11 +129,10 @@
 									if(++i == sets.len)
 										if(istype(temp, /turf) && (v == "x" || v == "y" || v == "z"))
 											continue
-										if(!datum_is_forbidden(temp.vars[v]))
-											return
-										temp.vars[v] = SDQL_expression(d, set_list[sets])
+										if(!temp.vv_edit_var(v, SDQL_expression(d, set_list[sets])))
+											to_chat(usr, "[temp] rejected your varedit.")
 										break
-									if(temp.vars.Find(v) && (istype(temp.vars[v], /datum) || istype(temp.vars[v], /client)) && !datum_is_forbidden(temp.vars[v]))
+									if(temp.vars.Find(v) && (istype(temp.vars[v], /datum) || istype(temp.vars[v], /client)))
 										temp = temp.vars[v]
 									else
 										break
@@ -440,11 +440,6 @@
 	for(var/arg in arguments)
 		new_args[++new_args.len] = SDQL_expression(source, arg)
 
-	for(var/p in forbidden_varedit_object_types)
-		if(istype(object, p))
-			to_chat(usr, "<span class='warning'>It is forbidden to run this object's procs.</span>")
-			return
-
 	if(object == world) // Global proc.
 		procname = "/proc/[procname]"
 		return call(procname)(arglist(new_args))

code/modules/admin/verbs/massmodvar.dm

@@ -22,360 +22,251 @@
 	src.massmodify_variables(A, var_name, method)
 	feedback_add_details("admin_verb","MEV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-
-/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0)
-	if(!check_rights(R_VAREDIT))	return
-
-	var/list/locked = list("vars", "key", "ckey", "client")
-
-	for(var/p in forbidden_varedit_object_types)
-		if( istype(O,p) )
-			to_chat(usr, "<span class='danger'>It is forbidden to edit this object's variables.</span>")
-			return
-
-	var/list/names = list()
-	for(var/V in O.vars)
-		names += V
-
-	names = sortList(names)
+/client/proc/massmodify_variables(datum/O, var_name = "", method = 0)
+	if(!check_rights(R_VAREDIT))
+		return
+	if(!istype(O))
+		return
 
 	var/variable = ""
-
 	if(!var_name)
-		variable = input("Which var?","Var") as null|anything in names
+		var/list/names = list()
+		for(var/V in O.vars)
+			names += V
+
+		names = sortList(names)
+
+		variable = input("Which var?", "Var") as null|anything in names
 	else
 		variable = var_name
 
-	if(!variable)	return
+	if(!variable || !O.can_vv_get(variable))
+		return
 	var/default
 	var/var_value = O.vars[variable]
-	var/dir
 
-	if(variable == "holder" || (variable in locked))
-		if(!check_rights(R_DEBUG))	return
+	if(variable in VVckey_edit)
+		to_chat(src, "It's forbidden to mass-modify ckeys. It'll crash everyone's client you dummy.")
+		return
+	if(variable in VVlocked)
+		if(!check_rights(R_DEBUG))
+			return
+	if(variable in VVicon_edit_lock)
+		if(!check_rights(R_EVENT | R_DEBUG))
+			return
+	if(variable in VVpixelmovement)
+		if(!check_rights(R_DEBUG))
+			return
+		var/prompt = alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
+		if(prompt != "Continue")
+			return
 
-	if(isnull(var_value))
-		to_chat(usr, "Unable to determine variable type.")
-
-	else if(isnum(var_value))
-		to_chat(usr, "Variable appears to be <b>NUM</b>.")
-		default = "num"
-		dir = 1
-
-	else if(istext(var_value))
-		to_chat(usr, "Variable appears to be <b>TEXT</b>.")
-		default = "text"
-
-	else if(isloc(var_value))
-		to_chat(usr, "Variable appears to be <b>REFERENCE</b>.")
-		default = "reference"
-
-	else if(isicon(var_value))
-		to_chat(usr, "Variable appears to be <b>ICON</b>.")
-		var_value = "[bicon(var_value)]"
-		default = "icon"
-
-	else if(istype(var_value,/atom) || istype(var_value,/datum))
-		to_chat(usr, "Variable appears to be <b>TYPE</b>.")
-		default = "type"
-
-	else if(istype(var_value,/list))
-		to_chat(usr, "Variable appears to be <b>LIST</b>.")
-		default = "list"
-
-	else if(istype(var_value,/client))
-		to_chat(usr, "Variable appears to be <b>CLIENT</b>.")
-		default = "cancel"
+	default = vv_get_class(var_value)
 
+	if(isnull(default))
+		to_chat(src, "Unable to determine variable type.")
 	else
-		to_chat(usr, "Variable appears to be <b>FILE</b>.")
-		default = "file"
+		to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.")
 
-	to_chat(usr, "Variable contains: [var_value]")
-	if(dir)
-		switch(var_value)
-			if(1)
-				dir = "NORTH"
-			if(2)
-				dir = "SOUTH"
-			if(4)
-				dir = "EAST"
-			if(8)
-				dir = "WEST"
-			if(5)
-				dir = "NORTHEAST"
-			if(6)
-				dir = "SOUTHEAST"
-			if(9)
-				dir = "NORTHWEST"
-			if(10)
-				dir = "SOUTHWEST"
-			else
-				dir = null
-		if(dir)
-			to_chat(usr, "If a direction, direction is: [dir]")
+	to_chat(src, "Variable contains: [var_value]")
 
-	var/class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
-		"num","type","icon","file","edit referenced object","restore to default")
+	if(default == VV_NUM)
+		var/dir_text = ""
+		if(dir < 0 && dir < 16)
+			if(dir & 1)
+				dir_text += "NORTH"
+			if(dir & 2)
+				dir_text += "SOUTH"
+			if(dir & 4)
+				dir_text += "EAST"
+			if(dir & 8)
+				dir_text += "WEST"
 
-	if(!class)
+		if(dir_text)
+			to_chat(src, "If a direction, direction is: [dir_text]")
+
+	var/value = vv_get_value(default_class = default)
+	var/new_value = value["value"]
+	var/class = value["class"]
+
+	if(!class || !new_value == null && class != VV_NULL)
 		return
 
-	var/original_name
+	if(class == VV_MESSAGE)
+		class = VV_TEXT
 
-	if(!istype(O, /atom))
-		original_name = "\ref[O] ([O])"
-	else
-		original_name = O:name
+	if(value["type"])
+		class = VV_NEW_TYPE
+
+	var/original_name = "[O]"
+
+	var/rejected = 0
+	var/accepted = 0
 
 	switch(class)
+		if(VV_RESTORE_DEFAULT)
+			to_chat(src, "Finding items...")
+			var/list/items = get_all_of_type(O.type, method)
+			to_chat(src, "Changing [items.len] items...")
+			for(var/thing in items)
+				if(!thing)
+					continue
+				var/datum/D = thing
+				if(D.vv_edit_var(variable, initial(D.vars[variable])) != FALSE)
+					accepted++
+				else
+					rejected++
+				CHECK_TICK
 
-		if("restore to default")
-			O.vars[variable] = initial(O.vars[variable])
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							M.vars[variable] = O.vars[variable]
-							M.on_varedit(variable)
+		if(VV_TEXT)
+			var/list/varsvars = vv_parse_text(O, new_value)
+			var/pre_processing = new_value
+			var/unique
+			if(varsvars && varsvars.len)
+				unique = alert(usr, "Process vars unique to each instance, or same for all?", "Variable Association", "Unique", "Same")
+				if(unique == "Unique")
+					unique = TRUE
+				else
+					unique = FALSE
+					for(var/V in varsvars)
+						new_value = replacetext(new_value,"\[[V]]","[O.vars[V]]")
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-							A.on_varedit(variable)
+			to_chat(src, "Finding items...")
+			var/list/items = get_all_of_type(O.type, method)
+			to_chat(src, "Changing [items.len] items...")
+			for(var/thing in items)
+				if(!thing)
+					continue
+				var/datum/D = thing
+				if(unique)
+					new_value = pre_processing
+					for(var/V in varsvars)
+						new_value = replacetext(new_value,"\[[V]]","[D.vars[V]]")
 
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-							A.on_varedit(variable)
+				if(D.vv_edit_var(variable, new_value) != FALSE)
+					accepted++
+				else
+					rejected++
+				CHECK_TICK
 
+		if(VV_NEW_TYPE)
+			var/many = alert(src, "Create only one [value["type"]] and assign each or a new one for each thing", "How Many", "One", "Many", "Cancel")
+			if(many == "Cancel")
+				return
+			if(many == "Many")
+				many = TRUE
 			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							M.vars[variable] = O.vars[variable]
-							M.on_varedit(variable)
+				many = FALSE
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-							A.on_varedit(variable)
+			var/type = value["type"]
+			to_chat(src, "Finding items...")
+			var/list/items = get_all_of_type(O.type, method)
+			to_chat(src, "Changing [items.len] items...")
+			for(var/thing in items)
+				if(!thing)
+					continue
+				var/datum/D = thing
+				if(many && !new_value)
+					new_value = new type()
 
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-							A.on_varedit(variable)
+				if(D.vv_edit_var(variable, new_value) != FALSE)
+					accepted++
+				else
+					rejected++
+				new_value = null
+				CHECK_TICK
 
-		if("edit referenced object")
-			return .(O.vars[variable])
+		else
+			to_chat(src, "Finding items...")
+			var/list/items = get_all_of_type(O.type, method)
+			to_chat(src, "Changing [items.len] items...")
+			for(var/thing in items)
+				if(!thing)
+					continue
+				var/datum/D = thing
+				if(D.vv_edit_var(variable, new_value) != FALSE)
+					accepted++
+				else
+					rejected++
+				CHECK_TICK
 
-		if("text")
-			var/new_value = input("Enter new text:","Text",O.vars[variable]) as message|null
-			if(new_value == null) return
-			O.vars[variable] = new_value
 
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							M.vars[variable] = O.vars[variable]
+	var/count = rejected+accepted
+	if(!count)
+		to_chat(src, "No objects found")
+		return
+	if(!accepted)
+		to_chat(src, "Every object rejected your edit")
+		return
+	if(rejected)
+		to_chat(src, "[rejected] out of [count] objects rejected your edit")
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
+	log_to_dd("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])")
+	log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)")
+	message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)")
 
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							M.vars[variable] = O.vars[variable]
+/proc/get_all_of_type(var/T, subtypes = TRUE)
+	var/list/typecache = list()
+	typecache[T] = 1
+	if(subtypes)
+		typecache = typecacheof(typecache)
+	. = list()
+	if(ispath(T, /mob))
+		for(var/mob/thing in mob_list)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
+	else if(ispath(T, /obj/machinery/door))
+		for(var/obj/machinery/door/thing in airlocks)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
+	else if(ispath(T, /obj/machinery))
+		for(var/obj/machinery/thing in machines)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-		if("num")
-			var/new_value = input("Enter new number:","Num",\
-					O.vars[variable]) as num|null
-			if(new_value == null) return
+	else if(ispath(T, /obj))
+		for(var/obj/thing in world)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-			if(variable=="light_range")
-				O.set_light(new_value)
-			else
-				O.vars[variable] = new_value
+	else if(ispath(T, /atom/movable))
+		for(var/atom/movable/thing in world)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							if(variable=="light_range")
-								M.set_light(new_value)
-							else
-								M.vars[variable] = O.vars[variable]
+	else if(ispath(T, /turf))
+		for(var/turf/thing in world)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							if(variable=="light_range")
-								A.set_light(new_value)
-							else
-								A.vars[variable] = O.vars[variable]
+	else if(ispath(T, /atom))
+		for(var/atom/thing in world)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							if(variable=="light_range")
-								A.set_light(new_value)
-							else
-								A.vars[variable] = O.vars[variable]
+	else if(ispath(T, /client))
+		for(var/client/thing in clients)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							if(variable=="light_range")
-								M.set_light(new_value)
-							else
-								M.vars[variable] = O.vars[variable]
+	else if(ispath(T, /datum))
+		for(var/datum/thing)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK
 
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							if(variable=="light_range")
-								A.set_light(new_value)
-							else
-								A.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							if(variable=="light_range")
-								A.set_light(new_value)
-							else
-								A.vars[variable] = O.vars[variable]
-
-		if("type")
-			var/new_value
-			new_value = input("Enter type:","Type",O.vars[variable]) as null|anything in typesof(/obj,/mob,/area,/turf)
-			if(new_value == null) return
-			O.vars[variable] = new_value
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-		if("file")
-			var/new_value = input("Pick file:","File",O.vars[variable]) as null|file
-			if(new_value == null) return
-			O.vars[variable] = new_value
-
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O.type, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O.type, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O.type, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O.type, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-		if("icon")
-			var/new_value = input("Pick icon:","Icon",O.vars[variable]) as null|icon
-			if(new_value == null) return
-			O.vars[variable] = new_value
-			if(method)
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if( istype(M , O.type) )
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if( istype(A , O.type) )
-							A.vars[variable] = O.vars[variable]
-
-			else
-				if(istype(O, /mob))
-					for(var/mob/M in mob_list)
-						if(M.type == O.type)
-							M.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /obj))
-					for(var/obj/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-				else if(istype(O, /turf))
-					for(var/turf/A in world)
-						if(A.type == O.type)
-							A.vars[variable] = O.vars[variable]
-
-	log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
-	message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
+	else
+		for(var/datum/thing in world)
+			if(typecache[thing.type])
+				. += thing
+			CHECK_TICK

code/modules/admin/verbs/randomverbs.dm

@@ -61,7 +61,7 @@
 	if(usr)
 		if(usr.client)
 			if(usr.client.holder)
-				to_chat(M, "<b>old You hear a voice in your head... <i>[msg]</i></b>")
+				to_chat(M, "<b>You hear a voice in your head... <i>[msg]</i></b>")
 
 	log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
 	message_admins("<span class='boldnotice'>SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]</span>", 1)
@@ -588,22 +588,30 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
-/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in view())
+/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in view())
 	set category = "Admin"
 	set name = "Delete"
 
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
-		log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
-		message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
+	admin_delete(A)
+
+/client/proc/admin_delete(datum/D)
+	if(istype(D) && !D.can_vv_delete())
+		to_chat(src, "[D] rejected your deletion")
+		return
+	var/atom/A = D
+	var/coords = istype(A) ? "at ([A.x], [A.y], [A.z])" : ""
+	if(alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", "Yes", "No") == "Yes")
+		log_admin("[key_name(usr)] deleted [D][coords]")
+		message_admins("[key_name_admin(usr)] deleted [D][coords]", 1)
 		feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		if(istype(O, /turf))
-			var/turf/T = O
+		if(isturf(D))
+			var/turf/T = D
 			T.ChangeTurf(/turf/space)
-			return
-		qdel(O)
+		else
+			qdel(D)
 
 /client/proc/cmd_admin_list_open_jobs()
 	set category = "Admin"

code/modules/clothing/shoes/miscellaneous.dm

@@ -181,7 +181,7 @@
 		if((!silence_steps || shoe_sound) && TR.use(4))
 			silence_steps = 1
 			shoe_sound = null
-			to_chat(user, "You tape the soles of [src] to silence their footsteps.")
+			to_chat(user, "You tape the soles of [src] to silence your footsteps.")
 	else
 		return ..()
 

code/modules/clothing/spacesuits/hardsuit.dm

@@ -321,7 +321,7 @@
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user)
 	on = !on
 	if(on)
-		to_chat(user, "<span class='notice'>You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.</span>")
+		to_chat(user, "<span class='notice'>You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed.</span>")
 		name = initial(name)
 		desc = initial(desc)
 		set_light(brightness_on)
@@ -365,7 +365,7 @@
 /obj/item/clothing/suit/space/hardsuit/syndi/attack_self(mob/user)
 	on = !on
 	if(on)
-		to_chat(user, "<span class='notice'>You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.</span>")
+		to_chat(user, "<span class='notice'>You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed.</span>")
 		name = "blood-red hardsuit"
 		desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
 		slowdown = 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/food_and_drinks/drinks/drinks/shotglass.dm

@@ -1,5 +1,3 @@
-#define SHOT_FLAME_TEMPERATURE	700
-
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
 	name = "shot glass"
 	desc = "No glasses were shot in the making of this glass."
@@ -79,7 +77,7 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/attackby(obj/item/W)
 	..()
-	if(is_hot(W) >= 600)
+	if(is_hot(W))
 		fire_act()
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/attack_hand(mob/user, pickupfireoverride = TRUE)

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

@@ -76,6 +76,12 @@
 			else								//Everyone else fails, skip the emote attempt
 				return
 
+		if("creaks", "creak")
+			if(species.name == "Diona") //Only Dionas can Creaks.
+				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm'
+			else								//Everyone else fails, skip the emote attempt
+				return
+
 		if("hiss", "hisses")
 			if(species.name == "Unathi") //Only Unathi can hiss.
 				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm'
@@ -170,6 +176,13 @@
 			playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
 			m_type = 2
 
+		if("creaks", "creak")
+			var/M = handle_emote_param(param)
+
+			message = "<B>[src]</B> creaks[M ? " at [M]" : ""]."
+			playsound(loc, 'sound/voice/dionatalk1.ogg', 50, 0) //Credit https://www.youtube.com/watch?v=ufnvlRjsOTI [0:13 - 0:16]
+			m_type = 2
+
 		if("hiss", "hisses")
 			var/M = handle_emote_param(param)
 
@@ -826,6 +839,8 @@
 					emotelist += "\nUnathi specific emotes :- hiss(es)"
 				if("Vulpkanin")
 					emotelist += "\nVulpkanin specific emotes :- growl(s)-none/mob, howl(s)-none/mob"
+				if("Diona")
+					emotelist += "\nDiona specific emotes :- creak(s)"
 
 			if (species.name == "Slime People")
 				emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob"

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

@@ -2033,7 +2033,21 @@
 
 	..()
 
-mob/living/carbon/human/get_taste_sensitivity()
+
+/mob/living/carbon/human/vv_get_dropdown()
+	. = ..()
+	. += "---"
+	.["Set Species"] = "?_src_=vars;setspecies=[UID()]"
+	.["Make AI"] = "?_src_=vars;makeai=[UID()]"
+	.["Make Mask of Nar'sie"] = "?_src_=vars;makemask=[UID()]"
+	.["Make cyborg"] = "?_src_=vars;makerobot=[UID()]"
+	.["Make monkey"] = "?_src_=vars;makemonkey=[UID()]"
+	.["Make alien"] = "?_src_=vars;makealien=[UID()]"
+	.["Make slime"] = "?_src_=vars;makeslime=[UID()]"
+	.["Make superhero"] = "?_src_=vars;makesuper=[UID()]"
+	. += "---"
+
+/mob/living/carbon/human/get_taste_sensitivity()
 	if(species)
 		return species.taste_sensitivity
 	else

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/human/species/station.dm

@@ -771,6 +771,8 @@
 	path = /mob/living/carbon/human/diona
 	default_language = "Galactic Common"
 	language = "Rootspeak"
+	speech_sounds = list('sound/voice/dionatalk1.ogg') //Credit https://www.youtube.com/watch?v=ufnvlRjsOTI [0:13 - 0:16]
+	speech_chance = 20
 	unarmed_type = /datum/unarmed_attack/diona
 	//primitive_form = "Nymph"
 	slowdown = 5

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/mob/living/update_status.dm

@@ -97,8 +97,9 @@
 /mob/living/proc/update_stamina()
 	return
 
-/mob/living/on_varedit(modified_var)
-	switch(modified_var)
+/mob/living/vv_edit_var(var_name, var_value)
+	. = ..()
+	switch(var_name)
 		if("weakened")
 			SetWeakened(weakened)
 		if("stunned")
@@ -120,5 +121,4 @@
 		if("maxHealth")
 			updatehealth()
 		if("resize")
-			update_transform()
-	..()
+			update_transform()

code/modules/mob/mob.dm

@@ -684,7 +684,7 @@ var/list/slot_equipment_priority = list( \
 	set src in usr
 	if(usr != src)
 		to_chat(usr, "No.")
-	var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null
+	var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance.","Flavor Text",html_decode(flavor_text)) as message|null
 
 	if(msg != null)
 		msg = copytext(msg, 1, MAX_MESSAGE_LEN)
@@ -1237,3 +1237,31 @@ var/list/slot_equipment_priority = list( \
 
 	attack_log += new_log
 	last_log = world.timeofday
+
+/mob/vv_get_dropdown()
+	. = ..()
+	.["Show player panel"] = "?_src_=vars;mob_player_panel=[UID()]"
+
+	.["Give Spell"] = "?_src_=vars;give_spell=[UID()]"
+	.["Give Disease"] = "?_src_=vars;give_disease=[UID()]"
+	.["Toggle Godmode"] = "?_src_=vars;godmode=[UID()]"
+	.["Toggle Build Mode"] = "?_src_=vars;build_mode=[UID()]"
+
+	.["Make 2spooky"] = "?_src_=vars;make_skeleton=[UID()]"
+
+	.["Assume Direct Control"] = "?_src_=vars;direct_control=[UID()]"
+	.["Offer Control to Ghosts"] = "?_src_=vars;offer_control=[UID()]"
+	.["Drop Everything"] = "?_src_=vars;drop_everything=[UID()]"
+
+	.["Regenerate Icons"] = "?_src_=vars;regenerateicons=[UID()]"
+	.["Add Language"] = "?_src_=vars;addlanguage=[UID()]"
+	.["Remove Language"] = "?_src_=vars;remlanguage=[UID()]"
+	.["Add Organ"] = "?_src_=vars;addorgan=[UID()]"
+	.["Remove Organ"] = "?_src_=vars;remorgan=[UID()]"
+
+	.["Fix NanoUI"] = "?_src_=vars;fix_nano=[UID()]"
+
+	.["Add Verb"] = "?_src_=vars;addverb=[UID()]"
+	.["Remove Verb"] = "?_src_=vars;remverb=[UID()]"
+
+	.["Gib"] = "?_src_=vars;gib=[UID()]"

code/modules/mob/new_player/new_player.dm

@@ -65,14 +65,6 @@
 	return
 
 /mob/new_player/Stat()
-	..()
-	if((!ticker) || ticker.current_state == GAME_STATE_PREGAME)
-		statpanel("Lobby") // First tab during pre-game.
-
-	statpanel("Status")
-	if(client.statpanel == "Status" && ticker)
-		if(ticker.current_state != GAME_STATE_PREGAME)
-			stat(null, "Station Time: [worldtime2text()]")
 	statpanel("Lobby")
 	if(client.statpanel=="Lobby" && ticker)
 		if(ticker.hide_mode)
@@ -101,6 +93,14 @@
 				if(player.ready)
 					totalPlayersReady++
 
+	..()
+
+	statpanel("Status")
+	if(client.statpanel == "Status" && ticker)
+		if(ticker.current_state != GAME_STATE_PREGAME)
+			stat(null, "Station Time: [worldtime2text()]")
+
+
 /mob/new_player/Topic(href, href_list[])
 	if(!client)	return 0
 

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/projectiles/guns/energy.dm

@@ -163,13 +163,14 @@
 		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
 		return (OXYLOSS)
 
-/obj/item/weapon/gun/energy/on_varedit(modified_var)
-	if(modified_var == "selfcharge")
-		if(selfcharge)
-			processing_objects.Add(src)
-		else
-			processing_objects.Remove(src)
-	..()
+/obj/item/weapon/gun/energy/vv_edit_var(var_name, var_value)
+	switch(var_name)
+		if("selfcharge")
+			if(var_value)
+				processing_objects.Add(src)
+			else
+				processing_objects.Remove(src)
+	. = ..()
 
 /obj/item/weapon/gun/energy/proc/robocharge()
 	if(isrobot(loc))

code/modules/reagents/chemistry/reagents/alcohol.dm

@@ -604,13 +604,13 @@
 /datum/reagent/consumable/ethanol/manhattan_proj
 	name = "Manhattan Project"
 	id = "manhattan_proj"
-	description = "A scienitst's drink of choice, for pondering ways to blow up the station."
+	description = "A scientist's drink of choice, for pondering ways to blow up the station."
 	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "proj_manhattanglass"
 	drink_name = "Manhattan Project"
-	drink_desc = "A scienitst drink of choice, for thinking how to blow up the station."
+	drink_desc = "A scientist's drink of choice, for thinking how to blow up the station."
 	taste_message = "bitter alcohol"
 
 /datum/reagent/consumable/ethanol/whiskeysoda

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

code/modules/research/message_server.dm

@@ -140,6 +140,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 	variable = param_variable
 	value = param_value
 
+/datum/feedback_variable/vv_edit_var(var_name, var_value)
+	return FALSE // come on guys don't break the stats
+
 /datum/feedback_variable/proc/inc(var/num = 1)
 	if(isnum(value))
 		value += num
@@ -189,6 +192,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 
 var/obj/machinery/blackbox_recorder/blackbox
 
+//TODO: kill whoever designed this cancer
 /obj/machinery/blackbox_recorder
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "blackbox"
@@ -314,6 +318,9 @@ var/obj/machinery/blackbox_recorder/blackbox
 		var/DBQuery/query_insert = dbcon.NewQuery(sql)
 		query_insert.Execute()
 
+/obj/machinery/blackbox_recorder/vv_edit_var(var_name, var_value)
+	return FALSE // don't fuck with the stupid blackbox shit
+
 
 proc/feedback_set(var/variable,var/value)
 	if(!blackbox) return