Merge remote-tracking branch 'upstream/master' into the-p-o-o-l

_maps/map_files/BoxStation/BoxStation.dmm

@@ -49303,6 +49303,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctv" = (
@@ -49328,6 +49329,7 @@
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctx" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "cty" = (
@@ -49335,6 +49337,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctz" = (
@@ -49388,6 +49391,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctH" = (
@@ -49412,6 +49416,7 @@
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctJ" = (
@@ -49455,6 +49460,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctQ" = (
@@ -49490,6 +49496,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctT" = (
@@ -49500,6 +49507,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ctU" = (

code/__DEFINES/combat.dm

@@ -159,6 +159,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define EXPLODE_DEVASTATE 1
 #define EXPLODE_HEAVY 2
 #define EXPLODE_LIGHT 3
+#define EXPLODE_GIB_THRESHOLD 50
 
 #define EMP_HEAVY 1
 #define EMP_LIGHT 2

code/__DEFINES/construction.dm

@@ -111,3 +111,6 @@
 #define RCD_WINDOWGRILLE 4
 #define RCD_MACHINE 8
 #define RCD_COMPUTER 16
+
+#define RCD_UPGRADE_FRAMES 1
+#define RCD_UPGRADE_SIMPLE_CIRCUITS 2

code/__HELPERS/_cit_helpers.dm

@@ -121,6 +121,17 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		flavor_text = sanitize(new_flavor)
 		to_chat(src, "Your flavor text has been updated.")
 
+//Flavor Text
+/mob/living/carbon/human/verb/set_flavor_2()
+	set name = "Set Temporary Flavor Text"
+	set desc = "Sets a description of your character's current appearance. Use this for emotions, poses etc."
+	set category = "IC"
+
+	var/new_flavor = input(src, "Enter your new temporary flavor text:", "Temporary flavor text", null) as message|null
+	if(!isnull(new_flavor))
+		flavor_text_2 = sanitize(new_flavor)
+		to_chat(src, "Your temporary flavor text has been updated.")
+
 //LOOC toggles
 /client/verb/listen_looc()
 	set name = "Show/Hide LOOC"

code/datums/wires/airlock.dm

@@ -85,6 +85,8 @@
 					INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open)
 				else
 					INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close)
+			else
+				holder.visible_message("<span class='notice'>You hear a a grinding noise coming from the airlock.</span>")
 		if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
 			if(!A.locked)
 				A.bolt()

code/game/machinery/Sleeper.dm

@@ -373,7 +373,7 @@
 /obj/machinery/sleeper/syndie/Initialize()
 	. = ..()
 	component_parts = list()
-	component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+	component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
 	component_parts += new /obj/item/stock_parts/manipulator/pico(null)
 	component_parts += new /obj/item/stack/sheet/glass(null)
@@ -384,7 +384,7 @@
 /obj/machinery/sleeper/syndie/fullupgrade/Initialize()
 	. = ..()
 	component_parts = list()
-	component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+	component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
 	component_parts += new /obj/item/stock_parts/manipulator/femto(null)
 	component_parts += new /obj/item/stack/sheet/glass(null)

code/game/machinery/doors/airlock.dm

@@ -1408,6 +1408,9 @@
 /obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
 		if(RCD_DECONSTRUCT)
+			if(security_level != AIRLOCK_SECURITY_NONE && the_rcd.canRturf != TRUE)
+				to_chat(user, "<span class='notice'>[src]'s reinforcement needs to be removed first.</span>")
+				return FALSE
 			return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32)
 	return FALSE
 

code/game/machinery/doors/firedoor.dm

@@ -450,6 +450,21 @@
 				return
 	return ..()
 
+/obj/structure/firelock_frame/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+	if((constructionStep == CONSTRUCTION_NOCIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+		return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+	return FALSE
+
+/obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+	switch(passed_mode)
+		if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+			user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+			"<span class='notice'>You adapt a firelock circuit and slot it into the assembly.</span>")
+			constructionStep = CONSTRUCTION_GUTTED
+			update_icon()
+			return TRUE
+	return FALSE
+
 /obj/structure/firelock_frame/heavy
 	name = "heavy firelock frame"
 	reinforced = TRUE

code/game/machinery/firealarm.dm

@@ -256,6 +256,21 @@
 					return
 	return ..()
 
+/obj/machinery/firealarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+	if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+		return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+	return FALSE
+
+/obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+	switch(passed_mode)
+		if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+			user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+			"<span class='notice'>You adapt a fire alarm circuit and slot it into the assembly.</span>")
+			buildstage = 1
+			update_icon()
+			return TRUE
+	return FALSE
+
 /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(.) //damage received

code/game/objects/effects/effect_system/effects_other.dm

@@ -104,15 +104,4 @@
 	if(explosion_message)
 		location.visible_message("<span class='danger'>The solution violently explodes!</span>", \
 								"<span class='italics'>You hear an explosion!</span>")
-	if (amount < 1)
-		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-		s.set_up(2, 1, location)
-		s.start()
-
-		for(var/mob/living/L in viewers(1, location))
-			if(prob(50 * amount))
-				to_chat(L, "<span class='danger'>The explosion knocks you down.</span>")
-				L.Knockdown(rand(20,100))
-		return
-	else
 	dyn_explosion(location, amount, flashing_factor)

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -453,3 +453,44 @@
 	randomdir = FALSE
 	duration = 30
 	pixel_x = -24
+
+/obj/effect/constructing_effect
+	icon = 'icons/effects/effects_rcd.dmi'
+	icon_state = ""
+	layer = ABOVE_ALL_MOB_LAYER
+	anchored = TRUE
+	var/status = 0
+	var/delay = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+/obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status)
+	. = ..()
+	status = rcd_status
+	delay = rcd_delay
+	if (status == RCD_DECONSTRUCT)
+		addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
+		delay -= 11
+		icon_state = "rcd_end_reverse"
+	else
+		update_icon()
+
+/obj/effect/constructing_effect/update_icon()
+	icon_state = "rcd"
+	if (delay < 10)
+		icon_state += "_shortest"
+	else if (delay < 20)
+		icon_state += "_shorter"
+	else if (delay < 37)
+		icon_state += "_short"
+	if (status == RCD_DECONSTRUCT)
+		icon_state += "_reverse"
+
+/obj/effect/constructing_effect/proc/end_animation()
+	if (status == RCD_DECONSTRUCT)
+		qdel(src)
+	else
+		icon_state = "rcd_end"
+		addtimer(CALLBACK(src, .proc/end), 15)
+
+/obj/effect/constructing_effect/proc/end()
+	qdel(src)

code/game/objects/items/RCD.dm

@@ -47,7 +47,11 @@ RLD
 
 /obj/item/construction/examine(mob/user)
 	. = ..()
-	. += "\A [src]. It currently holds [matter]/[max_matter] matter-units."
+	. += "It currently holds [matter]/[max_matter] matter-units."
+	if(upgrade & RCD_UPGRADE_FRAMES)
+		. += "It contains the design for machine frames, computer frames and deconstruction."
+	if(upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)
+		. += "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells."
 
 /obj/item/construction/Destroy()
 	QDEL_NULL(spark_system)
@@ -85,7 +89,9 @@ RLD
 		to_chat(user, "<span class='notice'>[src] now holds [matter]/[max_matter] matter-units.</span>")
 	else if(istype(W, /obj/item/rcd_upgrade))
 		to_chat(user, "<span class='notice'>You upgrade the RCD with the [W]!</span>")
-		upgrade = TRUE
+		var/obj/item/rcd_upgrade/rcd_up = W
+		if(!(upgrade & rcd_up.upgrade))
+			upgrade |= rcd_up.upgrade
 			playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 			qdel(W)
 	else
@@ -116,10 +122,10 @@ RLD
 	if(matter < amount)
 		if(user)
 			to_chat(user, no_ammo_message)
-		return 0
+		return FALSE
 	matter -= amount
 	update_icon()
-	return 1
+	return TRUE
 
 /obj/item/construction/proc/checkResource(amount, mob/user)
 	. = matter >= amount
@@ -439,18 +445,22 @@ RLD
 	var/list/rcd_results = A.rcd_vals(user, src)
 	if(!rcd_results)
 		return FALSE
+	var/delay = rcd_results["delay"] * delay_mod
+	var/obj/effect/constructing_effect/rcd_effect = new(get_turf(A), delay, src.mode)
 	var/turf/the_turf = get_turf(A)
 	var/turf_coords = "[COORD(the_turf)]"
 	investigate_log("[user] is attempting to use [src] on [A] (loc [turf_coords] at [the_turf]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
-	if(do_after(user, rcd_results["delay"] * delay_mod, target = A))
+	if(do_after(user, delay, target = A))
 		if(checkResource(rcd_results["cost"], user))
 			var/atom/cached = A
 			if(A.rcd_act(user, src, rcd_results["mode"]))
+				rcd_effect.end_animation()
 				useResource(rcd_results["cost"], user)
 				activate()
 				investigate_log("[user] used [src] on [cached] (loc [turf_coords] at [the_turf]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
 				playsound(src, 'sound/machines/click.ogg', 50, 1)
 				return TRUE
+	qdel(rcd_effect)
 
 /obj/item/construction/rcd/Initialize()
 	. = ..()
@@ -467,7 +477,7 @@ RLD
 		"Grilles & Windows" = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"),
 		"Floors & Walls" = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
 	)
-	if(upgrade)
+	if(upgrade & RCD_UPGRADE_FRAMES)
 		choices += list(
 		"Deconstruct" = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"),
 		"Machine Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "machine"),
@@ -593,6 +603,7 @@ RLD
 	energyfactor = 66
 
 /obj/item/construction/rcd/loaded
+	materials = list(MAT_METAL=48000, MAT_GLASS=32000)
 	matter = 160
 
 /obj/item/construction/rcd/loaded/upgraded
@@ -825,9 +836,18 @@ RLD
 
 /obj/item/rcd_upgrade
 	name = "RCD advanced design disk"
-	desc = "It contains the design for machine frames, computer frames, and deconstruction."
+	desc = "It seems to be empty."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "datadisk3"
+	var/upgrade
+
+/obj/item/rcd_upgrade/frames
+	desc = "It contains the design for machine frames, computer frames and deconstruction."
+	upgrade = RCD_UPGRADE_FRAMES
+
+/obj/item/rcd_upgrade/simple_circuits
+	desc = "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells."
+	upgrade = RCD_UPGRADE_SIMPLE_CIRCUITS
 
 #undef GLOW_MODE
 #undef LIGHT_MODE

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -7,6 +7,10 @@
 		/obj/item/stack/cable_coil = 1,
 		/obj/item/stack/sheet/glass = 2)
 
+/obj/item/circuitboard/machine/sleeper/syndie
+	name = "Syndicate Sleeper (Machine Board)"
+	build_path = /obj/machinery/sleeper/syndie
+
 /obj/item/circuitboard/machine/vr_sleeper
 	name = "VR Sleeper (Machine Board)"
 	build_path = /obj/machinery/vr_sleeper

code/game/objects/items/devices/doorCharge.dm

@@ -16,14 +16,14 @@
 
 /obj/item/doorCharge/ex_act(severity, target)
 	switch(severity)
-		if(1)
+		if(EXPLODE_DEVASTATE)
 			visible_message("<span class='warning'>[src] detonates!</span>")
 			explosion(src.loc,0,2,1,flame_range = 4)
 			qdel(src)
-		if(2)
+		if(EXPLODE_HEAVY)
 			if(prob(50))
 				ex_act(EXPLODE_DEVASTATE)
-		if(3)
+		if(EXPLODE_LIGHT)
 			if(prob(25))
 				ex_act(EXPLODE_DEVASTATE)
 

code/game/objects/items/devices/forcefieldprojector.dm

@@ -10,7 +10,7 @@
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	materials = list(MAT_METAL=250, MAT_GLASS=500)
-	var/max_shield_integrity = 250
+	var/max_shield_integrity = 100
 	var/shield_integrity = 250
 	var/max_fields = 3
 	var/list/current_fields
@@ -87,7 +87,7 @@
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	resistance_flags = INDESTRUCTIBLE
 	CanAtmosPass = ATMOS_PASS_DENSITY
-	armor = list("melee" = 0, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	armor = list("melee" = 0, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	var/obj/item/forcefield_projector/generator
 
 /obj/structure/projected_forcefield/Initialize(mapload, obj/item/forcefield_projector/origin)

code/game/objects/items/extinguisher.dm

@@ -65,7 +65,7 @@
 	icon_state = "foam_extinguisher0"
 	//item_state = "foam_extinguisher" needs sprite
 	dog_fashion = null
-	chem = "firefighting_foam"
+	chem = /datum/reagent/firefighting_foam
 	tanktype = /obj/structure/reagent_dispensers/foamtank
 	sprite_name = "foam_extinguisher"
 	precision = TRUE

code/game/objects/items/grenades/plastic.dm

@@ -62,7 +62,7 @@
 			location = get_turf(target)
 			target.cut_overlay(plastic_overlay, TRUE)
 			if(!ismob(target) || full_damage_on_mobs)
-				target.ex_act(2, target)
+				target.ex_act(EXPLODE_HEAVY, target)
 	else
 		location = get_turf(src)
 	if(location)

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

@@ -886,7 +886,7 @@
 				else
 					O.anchored = initial(O.anchored)
 			else
-				to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of eight objects!</span>")
+				to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of [cargo_capacity] objects!</span>")
 		else
 			to_chat(user, "<span class='warning'>[target] is firmly secured!</span>")
 
@@ -899,6 +899,12 @@
 	user.visible_message("[user] unloads [chosen_cargo] from its cargo.")
 	playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
 
+/obj/item/cyborg_clamp/Destroy()
+	for(var/atom/movable/target in cargo)
+		target.forceMove(get_turf(src))
+	playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
+	return ..()
+
 /obj/item/card/id/miningborg
 	name = "mining point card"
 	desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points."

code/game/objects/items/stacks/sheets/mineral.dm

@@ -331,30 +331,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	recipes = GLOB.plastitanium_recipes
 	. = ..()
 
-
-/*
- * Snow
- */
-/obj/item/stack/sheet/mineral/snow
-	name = "snow"
-	icon_state = "sheet-snow"
-	item_state = "sheet-snow"
-	singular_name = "snow block"
-	force = 1
-	throwforce = 2
-	grind_results = list(/datum/reagent/consumable/ice = 20)
-	merge_type = /obj/item/stack/sheet/mineral/snow
-
-GLOBAL_LIST_INIT(snow_recipes, list ( \
-	new/datum/stack_recipe("Snow Wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
-	))
-
-/obj/item/stack/sheet/mineral/snow/Initialize(mapload, new_amount, merge = TRUE)
-	recipes = GLOB.snow_recipes
-	. = ..()
-
 /****************************** Others ****************************/
 
 /*
@@ -386,6 +362,29 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 	novariants = TRUE
 	merge_type = /obj/item/stack/sheet/mineral/mythril
 
+/*
+ * Snow
+ */
+/obj/item/stack/sheet/mineral/snow
+	name = "snow"
+	icon_state = "sheet-snow"
+	item_state = "sheet-snow"
+	singular_name = "snow block"
+	force = 1
+	throwforce = 2
+	grind_results = list(/datum/reagent/consumable/ice = 20)
+	merge_type = /obj/item/stack/sheet/mineral/snow
+
+GLOBAL_LIST_INIT(snow_recipes, list ( \
+	new/datum/stack_recipe("Snow Wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
+	))
+
+/obj/item/stack/sheet/mineral/snow/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.snow_recipes
+	. = ..()
+
 /*
  * Alien Alloy
  */

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -3,13 +3,18 @@
  * Metal
  * Plasteel
  * Wood
+ * Bamboo
  * Cloth
- * Plastic
+ * Silk
+ * Durathread
  * Cardboard
- * Paper Frames
  * Runed Metal (cult)
  * Brass (clockwork cult)
  * Bronze (bake brass)
+ * Gems
+ * Bones
+ * Plastic
+ * Paper Frames
  * Cotton/Duracotton
  */
 
@@ -240,7 +245,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	novariants = TRUE
 	grind_results = list(/datum/reagent/carbon = 20)
 
-
 /obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there.
 	// Taken from /obj/item/stack/rods/attackby in [rods.dm]
 	if(W.get_sharpness())
@@ -302,7 +306,6 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
 	recipes = GLOB.bamboo_recipes
 	return ..()
 
-
 /*
  * Cloth
  */
@@ -356,6 +359,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 /obj/item/stack/sheet/cloth/thirty
 	amount = 30
 
+/*
+ * Silk
+ */
 /obj/item/stack/sheet/silk
 	name = "silk"
 	desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms"
@@ -369,7 +375,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 //	recipes = GLOB.silk_recipes
 //	return ..()
 
-//Durathread fuck slash-asterisk comments
+/*
+ * Durathread
+ */
 	GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
@@ -392,8 +400,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	recipes = GLOB.durathread_recipes
 	return ..()
 
-
-
 /*
  * Cardboard
  */
@@ -487,7 +493,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	else
 		. = ..()
 
-
 /*
  * Runed Metal
  */
@@ -712,6 +717,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	item_state = "sheet-plastic"
 	materials = list(MAT_PLASTIC=MINERAL_MATERIAL_AMOUNT)
 	throwforce = 7
+	grind_results = list(/datum/reagent/glitter/white = 60)
 	merge_type = /obj/item/stack/sheet/plastic
 
 /obj/item/stack/sheet/plastic/fifty
@@ -748,7 +754,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
 /obj/item/stack/sheet/paperframes/fifty
 	amount = 50
 
-
 //durathread and cotton raw
 /obj/item/stack/sheet/cotton
 	name = "raw cotton bundle"

code/game/turfs/simulated/floor.dm

@@ -263,7 +263,7 @@
 			A.autoclose = TRUE
 			return TRUE
 		if(RCD_DECONSTRUCT)
-			if(ScrapeAway(flags = CHANGETURF_INHERIT_AIR) == src)
+			if(!ScrapeAway(flags = CHANGETURF_INHERIT_AIR))
 				return FALSE
 			to_chat(user, "<span class='notice'>You deconstruct [src].</span>")
 			return TRUE

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

@@ -95,6 +95,10 @@
 
 	Don't crash the server, OK?
 
+	"UPDATE /mob/living/carbon/monkey SET #null = forceMove(usr.loc)"
+
+	Writing "#null" in front of the "=" will call the proc and discard the return value.
+
 	A quick recommendation: before you run something like a DELETE or another query.. Run it through SELECT
 	first.
 	You'd rather not gib every player on accident.
@@ -740,6 +744,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
 		var/datum/temp = d
 		var/i = 0
 		for(var/v in sets)
+			if(v == "#null")
+				SDQL_expression(d, set_list[sets])
+				break
 			if(++i == sets.len)
 				if(superuser)
 					if(temp.vars.Find(v))

code/modules/antagonists/devil/true_devil/_true_devil.dm

@@ -197,11 +197,11 @@
 	if(!ascended)
 		var/b_loss
 		switch (severity)
-			if (1)
+			if (EXPLODE_DEVASTATE)
 				b_loss = 500
-			if (2)
+			if (EXPLODE_HEAVY)
 				b_loss = 150
-			if(3)
+			if(EXPLODE_LIGHT)
 				b_loss = 30
 		if(has_bane(BANE_LIGHT))
 			b_loss *=2

code/modules/atmospherics/machinery/airalarm.dm

@@ -822,6 +822,21 @@
 
 	return ..()
 
+/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+	if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+		return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+	return FALSE
+
+/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+	switch(passed_mode)
+		if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+			user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+			"<span class='notice'>You adapt an air alarm circuit and slot it into the assembly.</span>")
+			buildstage = 1
+			update_icon()
+			return TRUE
+	return FALSE
+
 /obj/machinery/airalarm/AltClick(mob/user)
 	. = ..()
 	if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc))

code/modules/food_and_drinks/food/snacks_other.dm

@@ -615,7 +615,7 @@
 	name = "marshmallow"
 	desc = "A marshmallow filled with fluffy marshmallow fluff."
 	icon_state = "marshmallow"
-	list_reagents = list("sugar" = 5, "nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
 	filling_color = "#fafafa"
 	w_class = WEIGHT_CLASS_TINY
 	tastes = list("marshmallow" = 2)

code/modules/mob/living/carbon/alien/alien_defense.dm

@@ -107,15 +107,15 @@ In all, this is a lot like the monkey code. /N
 		return
 	..()
 	switch (severity)
-		if (1)
+		if (EXPLODE_DEVASTATE)
 			gib()
 			return
 
-		if (2)
+		if (EXPLODE_HEAVY)
 			take_overall_damage(60, 60)
 			adjustEarDamage(30,120)
 
-		if(3)
+		if(EXPLODE_LIGHT)
 			take_overall_damage(30,0)
 			if(prob(50))
 				Unconscious(20)

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

@@ -392,6 +392,13 @@
 			. += "...?"
 		else
 			. += "[print_flavor_text()]"
+	if(print_flavor_text_2())
+		if(get_visible_name() == "Unknown")	//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
+			. += "...?"
+		else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either.
+			. += "...?"
+		else
+			. += "[print_flavor_text_2()]"
 	. += "*---------*</span>"
 
 /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!

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

@@ -326,38 +326,49 @@
 	..()
 	if (!severity)
 		return
-	var/b_loss = 0
-	var/f_loss = 0
-	var/bomb_armor = max(0,(100-getarmor(null, "bomb"))/100)
+	var/brute_loss = 0
+	var/burn_loss = 0
+	var/bomb_armor = getarmor(null, "bomb")
+
+	//200 max knockdown for EXPLODE_HEAVY
+	//160 max knockdown for EXPLODE_LIGHT
 
 	switch (severity)
-		if (1)
-			if(bomb_armor)
-				b_loss = (350*bomb_armor)+150
-				var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
-				throw_at(throw_target, 200, 4)
-				damage_clothes(400*bomb_armor, BRUTE, "bomb")
-			else
-				damage_clothes(400,BRUTE,"bomb")
+		if (EXPLODE_DEVASTATE)
+			if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD
+				for(var/I in contents)
+					var/atom/A = I
+					A.ex_act(severity)
 				gib()
 				return
+			else
+				brute_loss = 500
+				var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
+				throw_at(throw_target, 200, 4)
+				damage_clothes(400 - bomb_armor, BRUTE, "bomb")
 
-		if (2)
-			b_loss = 60*bomb_armor
-			f_loss = 60*bomb_armor
-			damage_clothes(200*bomb_armor, BRUTE, "bomb")
+		if (EXPLODE_HEAVY)
+			brute_loss = 60
+			burn_loss = 60
+			if(bomb_armor)
+				brute_loss = 30*(2 - round(bomb_armor*0.01, 0.05))
+				burn_loss = brute_loss				//damage gets reduced from 120 to up to 60 combined brute+burn
+			damage_clothes(200 - bomb_armor, BRUTE, "bomb")
 			if (!istype(ears, /obj/item/clothing/ears/earmuffs))
 				adjustEarDamage(30, 120)
-			Unconscious(200*bomb_armor)
+			Unconscious(20)							//short amount of time for follow up attacks against elusive enemies like wizards
+			Knockdown(200 - (bomb_armor * 1.6)) 	//between ~4 and ~20 seconds of knockdown depending on bomb armor
 
-		if(3)
-			b_loss = 30*bomb_armor
+		if(EXPLODE_LIGHT)
+			brute_loss = 30
+			if(bomb_armor)
+				brute_loss = 15*(2 - round(bomb_armor*0.01, 0.05))
 			damage_clothes(max(50 - bomb_armor, 0), BRUTE, "bomb")
 			if (!istype(ears, /obj/item/clothing/ears/earmuffs))
 				adjustEarDamage(15,60)
-			Unconscious(100*bomb_armor)
+			Knockdown(160 - (bomb_armor * 1.6))		//100 bomb armor will prevent knockdown altogether
 
-	take_overall_damage(b_loss,f_loss)
+	take_overall_damage(brute_loss,burn_loss)
 
 	//attempt to dismember bodyparts
 	if(severity <= 2 || !bomb_armor)

code/modules/mob/living/carbon/monkey/monkey_defense.dm

@@ -189,18 +189,18 @@
 	..()
 
 	switch (severity)
-		if (1)
+		if (EXPLODE_DEVASTATE)
 			gib()
 			return
 
-		if (2)
+		if (EXPLODE_HEAVY)
 			take_overall_damage(60, 60)
 			damage_clothes(200, BRUTE, "bomb")
 			adjustEarDamage(30, 120)
 			if(prob(70))
 				Unconscious(200)
 
-		if(3)
+		if(EXPLODE_LIGHT)
 			take_overall_damage(30, 0)
 			damage_clothes(50, BRUTE, "bomb")
 			adjustEarDamage(15,60)

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

@@ -835,7 +835,7 @@
 
 /obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
-	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "Blade")
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "Blade", "Vale")
 	if(!borg_icon)
 		return FALSE
 	switch(borg_icon)
@@ -868,6 +868,11 @@
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "bladesleeper"
 			dogborg = TRUE
+		if("Vale")
+			cyborg_base_icon = "valemine"
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			sleeper_overlay = "valeminesleeper"
+			dogborg = TRUE
 	return ..()
 
 /obj/item/robot_module/syndicate

code/modules/mob/living/simple_animal/animal_defense.dm

@@ -122,19 +122,19 @@
 	..()
 	var/bomb_armor = getarmor(null, "bomb")
 	switch (severity)
-		if (1)
+		if (EXPLODE_DEVASTATE)
 			if(prob(bomb_armor))
 				adjustBruteLoss(500)
 			else
 				gib()
 				return
-		if (2)
+		if (EXPLODE_HEAVY)
 			var/bloss = 60
 			if(prob(bomb_armor))
 				bloss = bloss / 1.5
 			adjustBruteLoss(bloss)
 
-		if(3)
+		if(EXPLODE_LIGHT)
 			var/bloss = 30
 			if(prob(bomb_armor))
 				bloss = bloss / 1.5

code/modules/mob/living/simple_animal/friendly/bumbles.dm

@@ -0,0 +1,48 @@
+/mob/living/simple_animal/pet/bumbles
+	name = "Bumbles"
+	desc = "Bumbles, the very humble bumblebee."
+	icon_state = "bumbles"
+	icon_living = "bumbles"
+	icon_dead = "bumbles_dead"
+	turns_per_move = 1
+	response_help = "shoos"
+	response_disarm = "brushes aside"
+	response_harm = "squashes"
+	speak_emote = list("bzzzs")
+	maxHealth = 100
+	health = 100
+	harm_intent_damage = 1
+	friendly = "bzzs"
+	density = FALSE
+	movement_type = FLYING
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	ventcrawler = VENTCRAWLER_ALWAYS
+	mob_size = MOB_SIZE_TINY
+	mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
+	gold_core_spawnable = FRIENDLY_SPAWN
+	verb_say = "bzzs"
+	verb_ask = "bzzs inquisitively"
+	verb_exclaim = "bzzs intensely"
+	verb_yell = "bzzs intensely"
+
+/mob/living/simple_animal/pet/bumbles/Initialize()
+	. = ..()
+	verbs += /mob/living/proc/lay_down
+
+/mob/living/simple_animal/pet/bumbles/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/wuv, "bzzs!")
+
+/mob/living/simple_animal/pet/bumbles/update_canmove()
+	..()
+	if(client && stat != DEAD)
+		if (resting)
+			icon_state = "[icon_living]_rest"
+			collar_type = "[initial(collar_type)]_rest"
+		else
+			icon_state = "[icon_living]"
+			collar_type = "[initial(collar_type)]"
+	regenerate_icons()
+
+/mob/living/simple_animal/pet/bumbles/bee_friendly()
+	return TRUE //treaty signed at the Beeneeva convention

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -103,13 +103,13 @@
 
 /mob/living/simple_animal/hostile/megafauna/ex_act(severity, target)
 	switch (severity)
-		if (1)
+		if (EXPLODE_DEVASTATE)
 			adjustBruteLoss(250)
 
-		if (2)
+		if (EXPLODE_HEAVY)
 			adjustBruteLoss(100)
 
-		if(3)
+		if(EXPLODE_LIGHT)
 			adjustBruteLoss(50)
 
 /mob/living/simple_animal/hostile/megafauna/proc/SetRecoveryTime(buffer_time)

code/modules/mob/say_vr.dm

@@ -3,6 +3,7 @@
 //////////////////////////////////////////////////////
 /mob
 	var/flavor_text = "" //tired of fucking double checking this
+	var/flavor_text_2 = ""
 
 /mob/proc/update_flavor_text()
 	set src in usr
@@ -16,6 +17,19 @@
 
 		flavor_text = msg
 
+/mob/proc/update_flavor_text_2()
+	set src in usr
+	if(usr != src)
+		to_chat(usr, "No.")
+	var/msg = stripped_multiline_input(usr, "Set the temporary flavor text in your 'examine' verb. This should be used only for things pertaining to the current round!", "Short-Term Flavor Text", html_decode(flavor_text_2), MAX_MESSAGE_LEN*2, TRUE)
+
+	if(!isnull(msg))
+		msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+		msg = html_encode(msg)
+
+		flavor_text_2 = msg
+
+
 /mob/proc/warn_flavor_changed()
 	if(flavor_text && flavor_text != "") // don't spam people that don't use it!
 		to_chat(src, "<h2 class='alert'>OOC Warning:</h2>")
@@ -30,6 +44,16 @@
 		else
 			return "<span class='notice'>[html_encode(copytext(msg, 1, 37))]... <a href='?src=[REF(src)];flavor_more=1'>More...</span></a>"
 
+/mob/proc/print_flavor_text_2()
+	if(flavor_text && flavor_text != "")
+		// We are decoding and then encoding to not only get correct amount of characters, but also to prevent partial escaping characters being shown.
+		var/msg = html_decode(replacetext(flavor_text_2, "\n", " "))
+		if(length(msg) <= 40)
+			return "<span class='notice'>[html_encode(msg)]</span>"
+		else
+			return "<span class='notice'>[html_encode(copytext(msg, 1, 37))]... <a href='?src=[REF(src)];flavor_more=1'>More...</span></a>"
+
+
 /mob/proc/get_top_level_mob()
 	if(istype(src.loc,/mob)&&src.loc!=src)
 		var/mob/M=src.loc

code/modules/power/apc.dm

@@ -701,6 +701,52 @@
 	else
 		return ..()
 
+/obj/machinery/power/apc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+	if(the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)
+		if(!has_electronics)
+			if(stat & BROKEN)
+				to_chat(user, "<span class='warning'>[src]'s frame is too damaged to support a circuit.</span>")
+				return FALSE
+			return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+		else if(!cell)
+			if(stat & MAINT)
+				to_chat(user, "<span class='warning'>There's no connector for a power cell.</span>")
+				return FALSE
+			return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 50, "cost" = 10) //16 for a wall
+		else
+			to_chat(user, "<span class='warning'>[src] has both electronics and a cell.</span>")
+			return FALSE
+	return FALSE
+
+/obj/machinery/power/apc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+	switch(passed_mode)
+		if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+			if(!has_electronics)
+				if(stat & BROKEN)
+					to_chat(user, "<span class='warning'>[src]'s frame is too damaged to support a circuit.</span>")
+					return
+				user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+				"<span class='notice'>You adapt a power control board and click it into place in [src]'s guts.</span>")
+				has_electronics = TRUE
+				locked = TRUE
+				return TRUE
+			else if(!cell)
+				if(stat & MAINT)
+					to_chat(user, "<span class='warning'>There's no connector for a power cell.</span>")
+					return FALSE
+				var/obj/item/stock_parts/cell/crap/empty/C = new(src)
+				C.forceMove(src)
+				cell = C
+				chargecount = 0
+				user.visible_message("<span class='notice'>[user] fabricates a weak power cell and places it into [src].</span>", \
+				"<span class='warning'>Your [the_rcd.name] whirrs with strain as you create a weak power cell and place it into [src]!</span>")
+				update_icon()
+				return TRUE
+			else
+				to_chat(user, "<span class='warning'>[src] has both electronics and a cell.</span>")
+				return FALSE
+	return FALSE
+
 /obj/machinery/power/apc/AltClick(mob/user)
 	. = ..()
 	if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc))

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -92,8 +92,15 @@
 
 /obj/machinery/chem_dispenser/Initialize()
 	. = ..()
-	for(var/list/L in list(dispensable_reagents, emagged_reagents, upgrade_reagents, upgrade_reagents2, upgrade_reagents3))
-		L = sortList(L, /proc/cmp_reagents_asc)
+	if(emagged_reagents)
+		emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents)
+		upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents2)
+		upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
+	if(upgrade_reagents3)
+		upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
+	dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
 	update_icon()
 
 /obj/machinery/chem_dispenser/Destroy()

code/modules/reagents/chemistry/recipes/others.dm

@@ -709,3 +709,41 @@
 	id = /datum/reagent/carpet/royalblue
 	results = list(/datum/reagent/carpet/royalblue = 2)
 	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/clonexadone = 1)
+
+//////////////////////////////////// Glitter ///////////////////////////////////////////
+
+/datum/chemical_reaction/white_glitter/blue
+	name = "white glitter from blue"
+	id = "white_glitter_blue"
+	results = list(/datum/reagent/glitter/white = 2)
+	required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
+
+/datum/chemical_reaction/white_glitter/pink
+	name = "white glitter from pink"
+	id = "white_glitter_pink"
+	results = list(/datum/reagent/glitter/white = 2)
+	required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
+
+/datum/chemical_reaction/pink_glitter/blue
+	name = "pink glitter from blue"
+	id = "pink_glitter_blue"
+	results = list(/datum/reagent/glitter/pink = 2)
+	required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
+
+/datum/chemical_reaction/pink_glitter/white
+	name = "pink glitter from white"
+	id = "pink_glitter_white"
+	results = list(/datum/reagent/glitter/pink = 2)
+	required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
+
+/datum/chemical_reaction/blue_glitter/pink
+	name = "blue glitter from pink"
+	id = "blue_glitter_pink"
+	results = list(/datum/reagent/glitter/blue = 2)
+	required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)
+
+/datum/chemical_reaction/blue_glitter/white
+	name = "blue glitter from white"
+	id = "blue_glitter_white"
+	results = list(/datum/reagent/glitter/blue  = 2)
+	required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -31,6 +31,7 @@ Borg Hypospray
 	var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed.
 	var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
 								//Used as list for input() in shakers.
+	var/list/reagent_names = list()
 
 /obj/item/reagent_containers/borghypo/Initialize()
 	. = ..()
@@ -54,7 +55,7 @@ Borg Hypospray
 	return 1
 
 // Use this to add more chemicals for the borghypo to produce.
-/obj/item/reagent_containers/borghypo/proc/add_reagent(reagent)
+/obj/item/reagent_containers/borghypo/proc/add_reagent(datum/reagent/reagent)
 	reagent_ids |= reagent
 	var/datum/reagents/RG = new(30)
 	RG.my_atom = src
@@ -64,9 +65,11 @@ Borg Hypospray
 	R.add_reagent(reagent, 30)
 
 	modes[reagent] = modes.len + 1
+	reagent_names[initial(reagent.name)] = reagent
 
-/obj/item/reagent_containers/borghypo/proc/del_reagent(reagent)
+/obj/item/reagent_containers/borghypo/proc/del_reagent(datum/reagent/reagent)
 	reagent_ids -= reagent
+	reagent_names -= initial(reagent.name)
 	var/datum/reagents/RG
 	var/datum/reagents/TRG
 	for(var/i in 1 to reagent_ids.len)
@@ -112,7 +115,7 @@ Borg Hypospray
 	log_combat(user, M, "injected", src, "(CHEMICALS: [english_list(injected)])")
 
 /obj/item/reagent_containers/borghypo/attack_self(mob/user)
-	var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids]
+	var/chosen_reagent = modes[reagent_names[input(user, "What reagent do you want to dispense?") as null|anything in reagent_names]]
 	if(!chosen_reagent)
 		return
 	mode = chosen_reagent

code/modules/reagents/reagent_dispenser.dm

@@ -184,7 +184,7 @@
 	icon_state = "virus_food"
 	anchored = TRUE
 	density = FALSE
-	reagent_id = /datum/reagent/toxin/mutagen/mutagenvirusfood
+	reagent_id = /datum/reagent/consumable/virus_food
 
 /obj/structure/reagent_dispensers/cooking_oil
 	name = "vat of cooking oil"

code/modules/research/designs/machine_desings/machine_designs_medical.dm

@@ -24,7 +24,15 @@
 	id = "sleeper"
 	build_path = /obj/item/circuitboard/machine/sleeper
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
+
+/datum/design/board/syndiesleeper
+	name = "Machine Design (Syndicate Sleeper Board)"
+	desc = "The circuit board for a Syndicate sleeper, with controls inside."
+	id = "syndiesleeper"
+	build_path = /obj/item/circuitboard/machine/sleeper/syndie
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
+	category = list("Medical Machinery")
 
 /datum/design/board/cryotube
 	name = "Machine Design (Cryotube Board)"

code/modules/research/designs/misc_designs.dm

@@ -389,13 +389,23 @@
 ////////////Tools//////////////
 ///////////////////////////////
 
-/datum/design/rcd_upgrade
-	name = "Advanced RCD designs upgrade"
+/datum/design/rcd_upgrade/frames
+	name = "RCD frames designs upgrade"
 	desc = "Adds the computer frame and machine frame to the RCD."
-	id = "rcd_upgrade"
+	id = "rcd_upgrade_frames"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
-	build_path = /obj/item/rcd_upgrade
+	build_path = /obj/item/rcd_upgrade/frames
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rcd_upgrade/simple_circuits
+	name = "RCD simple circuits designs upgrade"
+	desc = "Adds the simple circuits to the RCD."
+	id = "rcd_upgrade_simple_circuits"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
+	build_path = /obj/item/rcd_upgrade/simple_circuits
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
@@ -429,6 +439,26 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/rcd_loaded
+	name = "Rapid Construction Device"
+	desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly."
+	id = "rcd_loaded"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)  // costs more than what it did in the autolathe, this one comes loaded.
+	build_path = /obj/item/construction/rcd/loaded
+	category = list("Equipment")
+	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rpd
+	name = "Rapid Pipe Dispenser"
+	desc = "A tool that can construct and deconstruct pipes on the fly."
+	id = "rpd"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
+	build_path = /obj/item/pipe_dispenser
+	category = list("Equipment")
+	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING
+
 /datum/design/alienwrench
 	name = "Alien Wrench"
 	desc = "An advanced wrench obtained through Abductor technology."

code/modules/research/techweb/all_nodes.dm

@@ -200,7 +200,7 @@
 	display_name = "Advanced Engineering"
 	description = "Pushing the boundaries of physics, one chainsaw-fist at a time."
 	prereq_ids = list("engineering", "emp_basic")
-	design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade")
+	design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade_frames", "rcd_upgrade_simple_circuits")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
 	export_price = 5000
 
@@ -1081,7 +1081,7 @@
 	display_name = "Illegal Technology"
 	description = "Dangerous research used to create dangerous objects."
 	prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons")
-	design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor")
+	design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "syndiesleeper")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
 	export_price = 5000
 	hidden = TRUE

code/modules/surgery/limb_augmentation.dm

@@ -1,15 +1,5 @@
 /////AUGMENTATION SURGERIES//////
 //SURGERY STEPS
-/datum/surgery_step/replace
-	name = "sever muscles"
-	implements = list(TOOL_SCALPEL = 100, TOOL_WIRECUTTER = 55)
-	time = 32
-
-
-/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
-	display_results(user, target, "<span class ='notice'>You begin to sever the muscles on [target]'s [parse_zone(user.zone_selected)]...</span>",
-		"[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_selected)].",
-		"[user] begins an incision on [target]'s [parse_zone(user.zone_selected)].")
 
 /datum/surgery_step/replace_limb
 	name = "replace limb"
@@ -37,7 +27,7 @@
 //ACTUAL SURGERIES
 /datum/surgery/augmentation
 	name = "Augmentation"
-	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace, /datum/surgery_step/saw, /datum/surgery_step/replace_limb)
+	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace_limb)
 	target_mobtypes = list(/mob/living/carbon/human)
 	possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
 	requires_real_bodypart = TRUE

html/changelogs/AutoChangeLog-pr-10416.yml

@@ -0,0 +1,10 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Animations for the RCD"
+  - bugfix: "Said animations being pulled by the Singulo"
+  - balance: "Prevent Reinforced Doors from being RCD'ed"
+  - bugfix: "Deconstructing Floors now cost MUs like everything else"
+  - tweak: "changed the RCD's upgrades into flags"
+  - rscadd: "Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade"
+  - balance: "Allow Engineers to print RCDs and RPDs from their protolathe without needing to hack one."

html/changelogs/AutoChangeLog-pr-10480.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - rscadd: "Second, temporary flavor text!"

html/changelogs/AutoChangeLog-pr-10492.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - rscadd: "Glitter is now makeable with ground plastic and some crayons"

html/changelogs/AutoChangeLog-pr-10504.yml

@@ -0,0 +1,5 @@
+author: "Xantholne"
+delete-after: True
+changes: 
+  - rscadd: "Botany bee pet, Bumbles"
+  - rscadd: "New bee models that aren't 1 tile big of 0 opacity pixels"

html/changelogs/AutoChangeLog-pr-10513.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added a message when pulsing the open wire."

html/changelogs/AutoChangeLog-pr-10516.yml

@@ -0,0 +1,4 @@
+author: "BonniePandora"
+delete-after: True
+changes: 
+  - admin: "Added another SDQL option. Using \"UPDATE selectors SET #null=value\" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc."

html/changelogs/AutoChangeLog-pr-10518.yml

@@ -0,0 +1,6 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - balance: "Explosions now cause knockdown instead of KOs, with the amount of time scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow up attacks."
+  - balance: "Devastating explosions now no longer gib players with more than 50 bomb armor. This used to be more or less random depending on the amount of bomb armor."
+  - code_imp: "Removed reagent explosion code that would trigger for <1 amount reactions."

html/changelogs/AutoChangeLog-pr-10522.yml

@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "Syndicate sleepers (read: the ones that're red and have controls in them) can now be recreated with a sufficient basis in nonstandard (read: illegal) technologies!"

html/changelogs/AutoChangeLog-pr-10532.yml

@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Virus food dispensers dispense virus food again."
+  - bugfix: "Borg hypos inputs do not display typepaths anymore."
+  - bugfix: "Restored chem dispensers alphabetical order."