what

2020-01-11 12:31:03 -05:00
parent e9f0740878
commit f752b41c99
958 changed files with 22207 additions and 30253 deletions
@@ -107,7 +107,7 @@

 //Wrapper procs that handle sanity and user feedback
 /atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
-	if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored || !user.can_buckle_others(M, src))
+	if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored)
 		return FALSE

 	add_fingerprint(user)
@@ -9,7 +9,7 @@

 /obj/effect/decal/cleanable/blood/gibs/xeno
 	color = BLOOD_COLOR_XENO
-	gibs_reagent_id = /datum/reagent/liquidgibs/xeno
+	gibs_reagent_id = "liquidxenogibs"
 	gibs_bloodtype = "X*"

 /obj/effect/decal/cleanable/blood/gibs/xeno/Initialize(mapload, list/datum/disease/diseases)
@@ -6,7 +6,7 @@
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = FALSE
 	var/body_colors = "#e3ba84"	//a default color just in case.
-	var/gibs_reagent_id = /datum/reagent/liquidgibs
+	var/gibs_reagent_id = "liquidgibs"
 	var/gibs_bloodtype = "A+"

 /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
@@ -120,6 +120,7 @@
 //Lizards
 /obj/effect/decal/cleanable/blood/gibs/human/lizard
 	body_colors = "117720"
+	gibs_reagent_id = "liquidgibs"
 	gibs_bloodtype = "L"

 /obj/effect/decal/cleanable/blood/gibs/human/lizard/Initialize(mapload, list/datum/disease/diseases)
@@ -147,7 +148,7 @@
 // Slime Gibs
 /obj/effect/decal/cleanable/blood/gibs/slime
 	desc = "They look gooey and gruesome."
-	gibs_reagent_id = /datum/reagent/liquidgibs/slime
+	gibs_reagent_id = "liquidslimegibs"
 	gibs_bloodtype = "GEL"

 /obj/effect/decal/cleanable/blood/gibs/slime/Initialize(mapload, list/datum/disease/diseases)
@@ -186,7 +187,7 @@

 /obj/effect/decal/cleanable/blood/gibs/synth
 	desc = "They look sludgy and disgusting."
-	gibs_reagent_id = /datum/reagent/liquidgibs/synth
+	gibs_reagent_id = "liquidsyntheticgibs"
 	gibs_bloodtype = "SY"

 /obj/effect/decal/cleanable/blood/gibs/synth/Initialize(mapload, list/datum/disease/diseases)
@@ -197,7 +198,7 @@
 /obj/effect/decal/cleanable/blood/gibs/ipc
 	desc = "They look sharp yet oozing."
 	body_colors = "00ff00"
-	gibs_reagent_id = /datum/reagent/liquidgibs/oil
+	gibs_reagent_id = "liquidoilgibs"
 	gibs_bloodtype = "HF"

 /obj/effect/decal/cleanable/blood/gibs/ipc/Initialize(mapload, list/datum/disease/diseases)
@@ -13,7 +13,7 @@

 /obj/effect/decal/cleanable/ash/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/ash, 30)
+	reagents.add_reagent("ash", 30)
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)

@@ -27,7 +27,7 @@

 /obj/effect/decal/cleanable/ash/large/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/ash, 30) //double the amount of ash.
+	reagents.add_reagent("ash", 30) //double the amount of ash.

 /obj/effect/decal/cleanable/glass
 	name = "tiny shards"
@@ -131,10 +131,12 @@
 			playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //slurp
 			H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>")
 			if(reagents)
-				for(var/datum/reagent/consumable/R in reagents.reagent_list)
-					if(R.nutriment_factor > 0)
-						H.nutrition += R.nutriment_factor * R.volume
-						reagents.del_reagent(R.type)
+				for(var/datum/reagent/R in reagents.reagent_list)
+					if (istype(R, /datum/reagent/consumable))
+						var/datum/reagent/consumable/nutri_check = R
+						if(nutri_check.nutriment_factor >0)
+							H.nutrition += nutri_check.nutriment_factor * nutri_check.volume
+							reagents.remove_reagent(nutri_check.id,nutri_check.volume)
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)

@@ -13,7 +13,7 @@

 /obj/effect/decal/cleanable/robot_debris/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
-	reagents.add_reagent(/datum/reagent/liquidgibs, 5)
+	reagents.add_reagent("liquidoilgibs", 5)

 /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
 	set waitfor = 0
@@ -53,8 +53,8 @@

 /obj/effect/decal/cleanable/oil/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/oil, 30)
-	reagents.add_reagent(/datum/reagent/liquidgibs/oil, 5)
+	reagents.add_reagent("oil", 30)
+	reagents.add_reagent("liquidoilgibs", 5)

 /obj/effect/decal/cleanable/oil/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
@@ -55,7 +55,7 @@
 		var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
 		if(!P)
 			P = new(loc)
-		P.reagents.add_reagent(/datum/reagent/stable_plasma, absorbed_plasma)
+		P.reagents.add_reagent("stable_plasma", absorbed_plasma)

 	flick("[icon_state]-disolve", src)
 	QDEL_IN(src, 5)
@@ -123,7 +123,7 @@
 	if(metal)
 		var/turf/T = get_turf(src)
 		if(isspaceturf(T)) //Block up any exposed space
-			T.PlaceOnTop(/turf/open/floor/plating/foam, flags = CHANGETURF_INHERIT_AIR)
+			T.PlaceOnTop(/turf/open/floor/plating/foam)
 		for(var/direction in GLOB.cardinals)
 			var/turf/cardinal_turf = get_step(T, direction)
 			if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
@@ -435,7 +435,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)

 //------Station Rooms Landmarks------------//
 /obj/effect/landmark/stationroom
-	var/list/templates = list()
+	var/list/template_names = list()
 	layer = BULLET_HOLE_LAYER

 /obj/effect/landmark/stationroom/New()
@@ -452,11 +452,11 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	if(!T)
 		return FALSE
 	if(!template_name)
-		for(var/t in templates)
+		for(var/t in template_names)
 			if(!SSmapping.station_room_templates[t])
 				log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
-				templates -= t
-		template_name = pickweight(templates)
+				template_names -= t
+		template_name = safepick(template_names)
 	if(!template_name)
 		GLOB.stationroom_landmarks -= src
 		qdel(src)
@@ -474,10 +474,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // The landmark for the Engine on Box

 /obj/effect/landmark/stationroom/box/engine
-	templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3)
+	template_names = list("Engine SM", "Engine Singulo", "Engine Tesla")
 	icon = 'icons/rooms/box/engine.dmi'


 /obj/effect/landmark/stationroom/box/engine/New()
 	. = ..()
-	templates = CONFIG_GET(keyed_list/box_random_engine)
+	template_names = CONFIG_GET(keyed_list/box_random_engine)
@@ -136,7 +136,7 @@
 	victim.put_in_hands(chainsaw, forced = TRUE)
 	chainsaw.attack_self(victim)
 	chainsaw.wield(victim)
-	victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
+	victim.reagents.add_reagent("adminordrazine",25)
 	to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>")

 	victim.client.color = pure_red
@@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)

 	var/interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP
 	//Citadel Edit for digitigrade stuff
-	var/mutantrace_variation = NONE //Are there special sprites for specific situations? Don't use this unless you need to.
+	var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.

 	var/item_color = null //this needs deprecating, soonish

@@ -578,22 +578,21 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			itempush = 0 //too light to push anything
 		return A.hitby(src, 0, itempush)

-/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, messy_throw = TRUE)
+/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
 	thrownby = thrower
-	callback = CALLBACK(src, .proc/after_throw, callback, (spin && messy_throw)) //replace their callback with our own
+	callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own
 	. = ..(target, range, speed, thrower, spin, diagonals_first, callback)

-/obj/item/proc/after_throw(datum/callback/callback, messy_throw)
+/obj/item/proc/after_throw(datum/callback/callback)
 	if (callback) //call the original callback
 		. = callback.Invoke()
 	throw_speed = initial(throw_speed) //explosions change this.
 	item_flags &= ~IN_INVENTORY
-	if(messy_throw)
-		var/matrix/M = matrix(transform)
-		M.Turn(rand(-170, 170))
-		transform = M
-		pixel_x = rand(-8, 8)
-		pixel_y = rand(-8, 8)
+	var/matrix/M = matrix(transform)
+	M.Turn(rand(-170, 170))
+	transform = M
+	pixel_x = rand(-8, 8)
+	pixel_y = rand(-8, 8)

 /obj/item/proc/remove_item_from_storage(atom/newLoc) //please use this if you're going to snowflake an item out of a obj/item/storage
 	if(!newLoc)
@@ -182,7 +182,7 @@ RSF
 	to_chat(user, "Fabricating Cookie..")
 	var/obj/item/reagent_containers/food/snacks/cookie/S = new /obj/item/reagent_containers/food/snacks/cookie(T)
 	if(toxin)
-		S.reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 10)
+		S.reagents.add_reagent("chloralhydrate", 10)
 	if (iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		R.cell.charge -= 100
@@ -68,7 +68,7 @@

 		// make some colorful reagent, and apply it to the lungs
 		L.create_reagents(10)
-		L.reagents.add_reagent(/datum/reagent/colorful_reagent, 10)
+		L.reagents.add_reagent("colorful_reagent", 10)
 		L.reagents.reaction(L, TOUCH, 1)

 		// TODO maybe add some colorful vomit?
@@ -81,7 +81,7 @@
 		return (TOXLOSS|OXYLOSS)
 	else if(can_use(user) && !L)
 		user.visible_message("<span class='suicide'>[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
-		user.reagents.add_reagent(/datum/reagent/colorful_reagent, 1)
+		user.reagents.add_reagent("colorful_reagent", 1)
 		user.reagents.reaction(user, TOUCH, 1)
 		return TOXLOSS

@@ -120,4 +120,4 @@
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
-	grind_results = list(/datum/reagent/iron = 10, /datum/reagent/silicon = 10)
+	grind_results = list("iron" = 10, "silicon" = 10)
@@ -25,7 +25,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/smoketime = 5
 	w_class = WEIGHT_CLASS_TINY
 	heat = 1000
-	grind_results = list(/datum/reagent/phosphorus = 2)
+	grind_results = list("phosphorus" = 2)

 /obj/item/match/process()
 	smoketime--
@@ -113,7 +113,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/lastHolder = null
 	var/smoketime = 300
 	var/chem_volume = 30
-	var/list/list_reagents = list(/datum/reagent/drug/nicotine = 15)
+	var/list/list_reagents = list("nicotine" = 15)
 	heat = 1000

 /obj/item/clothing/mask/cigarette/suicide_act(mob/user)
@@ -169,15 +169,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	hitsound = 'sound/items/welder.ogg'
 	damtype = "fire"
 	force = 4
-	if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
+	if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
 		var/datum/effect_system/reagents_explosion/e = new()
-		e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) / 2.5, 1), get_turf(src), 0, 0)
+		e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
 		e.start()
 		qdel(src)
 		return
-	if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
+	if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
 		var/datum/effect_system/reagents_explosion/e = new()
-		e.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) / 5, 1), get_turf(src), 0, 0)
+		e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
 		e.start()
 		qdel(src)
 		return
@@ -268,29 +268,29 @@ CIGARETTE PACKETS ARE IN FANCY.DM

 /obj/item/clothing/mask/cigarette/uplift
 	desc = "An Uplift Smooth brand cigarette."
-	list_reagents = list(/datum/reagent/drug/nicotine = 7.5, /datum/reagent/consumable/menthol = 7.5)
+	list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)

 /obj/item/clothing/mask/cigarette/robust
 	desc = "A Robust brand cigarette."

 /obj/item/clothing/mask/cigarette/robustgold
 	desc = "A Robust Gold brand cigarette."
-	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/gold = 1)
+	list_reagents = list("nicotine" = 15, "gold" = 1)

 /obj/item/clothing/mask/cigarette/carp
 	desc = "A Carp Classic brand cigarette."

 /obj/item/clothing/mask/cigarette/syndicate
 	desc = "An unknown brand cigarette."
-	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/medicine/omnizine = 15)
+	list_reagents = list("nicotine" = 15, "omnizine" = 15)

 /obj/item/clothing/mask/cigarette/shadyjims
 	desc = "A Shady Jim's Super Slims cigarette."
-	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5)
+	list_reagents = list("nicotine" = 15, "lipolicide" = 4, "ammonia" = 2, "plantbgone" = 1, "toxin" = 1.5)

 /obj/item/clothing/mask/cigarette/xeno
 	desc = "A Xeno Filtered brand cigarette."
-	list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
+	list_reagents = list ("nicotine" = 20, "regen_jelly" = 15, "krokodil" = 4)

 // Rollies.

@@ -313,17 +313,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	src.pixel_y = rand(-5, 5)

 /obj/item/clothing/mask/cigarette/rollie/nicotine
-	list_reagents = list(/datum/reagent/drug/nicotine = 15)
+	list_reagents = list("nicotine" = 15)

 /obj/item/clothing/mask/cigarette/rollie/trippy
-	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/drug/mushroomhallucinogen = 35)
+	list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35)
 	starts_lit = TRUE

 /obj/item/clothing/mask/cigarette/rollie/cannabis
-	list_reagents = list(/datum/reagent/drug/space_drugs = 15, /datum/reagent/toxin/lipolicide = 35)
+	list_reagents = list("space_drugs" = 15, "lipolicide" = 35)

 /obj/item/clothing/mask/cigarette/rollie/mindbreaker
-	list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/toxin/lipolicide = 15)
+	list_reagents = list("mindbreaker" = 35, "lipolicide" = 15)

 /obj/item/cigbutt/roach
 	name = "roach"
@@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "cigbutt"
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
-	grind_results = list(/datum/reagent/carbon = 2)
+	grind_results = list("carbon" = 2)

 /obj/item/cigbutt/cigarbutt
 	name = "cigar butt"
@@ -506,7 +506,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 1500
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
-	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
+	grind_results = list("iron" = 1, "welding_fuel" = 5, "oil" = 5)

 /obj/item/lighter/Initialize()
 	. = ..()
@@ -665,7 +665,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 3000 //Blue flame!
 	light_color = LIGHT_COLOR_CYAN
 	overlay_state = "slime"
-	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
+	grind_results = list("iron" = 1, "welding_fuel" = 5, "pyroxadone" = 5)


 ///////////
@@ -719,7 +719,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/vape/Initialize(mapload, param_color)
 	. = ..()
 	create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
-	reagents.add_reagent(/datum/reagent/drug/nicotine, 50)
+	reagents.add_reagent("nicotine", 50)
 	if(!icon_state)
 		if(!param_color)
 			param_color = pick("red","blue","black","white","green","purple","yellow","orange")
@@ -810,14 +810,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 				reagents.reaction(C, INGEST, fraction)
 				if(!reagents.trans_to(C, REAGENTS_METABOLISM))
 					reagents.remove_any(REAGENTS_METABOLISM)
-				if(reagents.get_reagent_amount(/datum/reagent/fuel))
+				if(reagents.get_reagent_amount("welding_fuel"))
 					//HOT STUFF
 					C.fire_stacks = 2
 					C.IgniteMob()

-				if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
+				if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
 					var/datum/effect_system/reagents_explosion/e = new()
-					e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) / 2.5, 1), get_turf(src), 0, 0)
+					e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
 					e.start()
 					qdel(src)
 				return
@@ -863,205 +863,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM

 	if(reagents && reagents.total_volume)
 		hand_reagents()
-
-///////////////
-/////BONGS/////
-///////////////
-
-/obj/item/bong
-	name = "bong"
-	desc = "A water bong used for smoking dried plants."
-	icon = 'icons/obj/bongs.dmi'
-	icon_state = null
-	item_state = null
-	w_class = WEIGHT_CLASS_NORMAL
-	light_color = "#FFCC66"
-	var/icon_off = "bong"
-	var/icon_on = "bong_lit"
-	var/chem_volume = 100
-	var/last_used_time //for cooldown
-	var/firecharges = 0 //used for counting how many hits can be taken before the flame goes out
-	var/list/list_reagents = list() //For the base reagents bongs could get
-
-
-/obj/item/bong/Initialize()
-	. = ..()
-	create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
-	reagents.add_reagent_list(list_reagents)
-	icon_state = icon_off
-
-/obj/item/bong/attackby(obj/item/O, mob/user, params)
-	. = ..()
-	//If we're using a dried plant..
-	if(istype(O,/obj/item/reagent_containers/food/snacks))
-		var/obj/item/reagent_containers/food/snacks/DP = O
-		if (DP.dry)
-			//Nothing if our bong is full
-			if (reagents.holder_full())
-				user.show_message("<span class='notice'>The bowl is full!</span>", MSG_VISUAL)
-				return
-
-			//Transfer reagents and remove the plant
-			user.show_message("<span class='notice'>You stuff the [DP] into the [src]'s bowl.</span>", MSG_VISUAL)
-			DP.reagents.trans_to(src, 100)
-			qdel(DP)
-			return
-		else
-			user.show_message("<span class='warning'>[DP] must be dried first!</span>", MSG_VISUAL)
-			return
-
-	if (O.get_temperature() <= 500)
-		return
-	if (reagents && reagents.total_volume) //if there's stuff in the bong
-		var/lighting_text = O.ignition_effect(src, user)
-		if(lighting_text)
-			//Logic regarding igniting it on
-			if (firecharges == 0)
-				user.show_message("<span class='notice'>You light the [src] with the [O]!</span>", MSG_VISUAL)
-				bongturnon()
-			else
-				user.show_message("<span class='notice'>You rekindle [src]'s flame with the [O]!</span>", MSG_VISUAL)
-
-			firecharges = 1
-			return
-	else
-		user.show_message("<span warning='notice'>There's nothing to light up in the bowl.</span>", MSG_VISUAL)
-		return
-
-/obj/item/bong/CtrlShiftClick(mob/user) //empty reagents on alt click
-	..()
-	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-		return
-
-	if (reagents && reagents.total_volume)
-		user.show_message("<span class='notice'>You empty the [src].</span>", MSG_VISUAL)
-		reagents.clear_reagents()
-		if(firecharges)
-			firecharges = 0
-			bongturnoff()
-	else
-		user.show_message("<span class='notice'>The [src] is already empty.</span>", MSG_VISUAL)
-
-/obj/item/bong/AltClick(mob/user)
-	..()
-	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-		return
-
-	if(firecharges)
-		firecharges = 0
-		bongturnoff()
-		user.show_message("<span class='notice'>You quench the flame.</span>", MSG_VISUAL)
-		return TRUE
-
-/obj/item/bong/examine(mob/user)
-	. = ..()
-	if(!reagents.total_volume)
-		. += "<span class='notice'>The bowl is empty.</span>"
-	else if (reagents.total_volume > 80)
-		. += "<span class='notice'>The bowl is filled to the brim.</span>"
-	else if (reagents.total_volume > 40)
-		. += "<span class='notice'>The bowl has plenty weed in it.</span>"
-	else
-		. += "<span class='notice'>The bowl has some weed in it.</span>"
-
-	. += "<span class='notice'>Ctrl+Shift-click to empty.</span>"
-	. += "<span class='notice'>Alt-click to extinguish.</span>"
-
-/obj/item/bong/ignition_effect(atom/A, mob/user)
-	if(firecharges)
-		. = "<span class='notice'>[user] lights [A] off of the [src].</span>"
-	else
-		. = ""
-
-/obj/item/bong/attack(mob/living/carbon/M, mob/living/carbon/user, obj/target)
-	//if it's lit up, some stuff in the bowl and the user is a target, and we're not on cooldown
-
-	if (M != user)
-		return ..()
-
-	if(user.is_mouth_covered(head_only = 1))
-		to_chat(user, "<span class='warning'>Remove your headgear first.</span>")
-		return ..()
-
-	if(user.is_mouth_covered(mask_only = 1))
-		to_chat(user, "<span class='warning'>Remove your mask first.</span>")
-		return ..()
-
-	if (!reagents.total_volume)
-		to_chat(user, "<span class='warning'>There's nothing in the bowl.</span>")
-		return ..()
-
-	if (!firecharges)
-		to_chat(user, "<span class='warning'>You have to light it up first.</span>")
-		return ..()
-
-	if (last_used_time + 30 >= world.time)
-		return ..()
-	var/hit_strength
-	var/noise
-	var/hittext = ""
-	//if the intent is help then you take a small hit, else a big one
-	if (user.a_intent == INTENT_HARM)
-		hit_strength = 2
-		noise = 100
-		hittext = "big hit"
-	else
-		hit_strength = 1
-		noise = 70
-		hittext = "hit"
-	//bubbling sound
-	playsound(user.loc,'sound/effects/bonghit.ogg', noise, 1)
-
-	last_used_time = world.time
-
-	//message
-	user.visible_message("<span class='notice'>[user] begins to take a [hittext] from the [src]!</span>", \
-								"<span class='notice'>You begin to take a [hittext] from [src].</span>")
-
-	//we take a hit here, after an uninterrupted delay
-	if(!do_after(user, 25, target = user))
-		return
-	if (!(reagents && reagents.total_volume))
-		return
-
-	var/fraction = 12 * hit_strength
-
-	var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new
-	s.set_up(reagents, hit_strength, 18, user.loc)
-	s.start()
-
-	reagents.reaction(user, INGEST, fraction)
-	if(!reagents.trans_to(user, fraction))
-		reagents.remove_any(fraction)
-
-	if (hit_strength == 2 && prob(15))
-		user.emote("cough")
-		user.adjustOxyLoss(15)
-
-	user.visible_message("<span class='notice'>[user] takes a [hittext] from the [src]!</span>", \
-							"<span class='notice'>You take a [hittext] from [src].</span>")
-
-	firecharges = firecharges - 1
-	if (!firecharges)
-		bongturnoff()
-	if (!reagents.total_volume)
-		firecharges = 0
-		bongturnoff()
-
-
-
-/obj/item/bong/proc/bongturnon()
-	icon_state = icon_on
-	set_light(3, 0.8)
-
-/obj/item/bong/proc/bongturnoff()
-	icon_state = icon_off
-	set_light(0, 0.0)
-
-
-
-/obj/item/bong/coconut
-	name = "coconut bong"
-	icon_off = "coconut_bong"
-	icon_on = "coconut_bong_lit"
-	desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo."
@@ -12,7 +12,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	materials = list(MAT_GLASS=1000)
 	w_class = WEIGHT_CLASS_SMALL
-	grind_results = list(/datum/reagent/silicon = 20)
+	grind_results = list("silicon" = 20)
 	var/build_path = null

 /obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M)
@@ -260,8 +260,9 @@
 		var/position = vending_names_paths.Find(build_path)
 		position = (position == vending_names_paths.len) ? 1 : (position + 1)
 		var/typepath = vending_names_paths[position]
-		set_type(typepath)
+
 		to_chat(user, "<span class='notice'>You set the board to \"[vending_names_paths[typepath]]\".</span>")
+		set_type(typepath)
 	else
 		return ..()

@@ -1000,16 +1001,3 @@
 		/obj/item/stock_parts/capacitor = 1,
 		/obj/item/stack/cable_coil = 5,
 		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
-
-/obj/item/circuitboard/machine/kinkmate
-	name = "Kinkmate Vendor (Machine Board)"
-	build_path = /obj/machinery/vending/kink
-	req_components = list(/obj/item/vending_refill/kink = 1)
-
-/obj/item/circuitboard/machine/autoylathe
-	name = "Autoylathe (Machine Board)"
-	build_path = /obj/machinery/autoylathe
-	req_components = list(
-		/obj/item/stock_parts/matter_bin = 3,
-		/obj/item/stock_parts/manipulator = 1,
-		/obj/item/stack/sheet/glass = 1)
@@ -23,7 +23,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
-	grind_results = list(/datum/reagent/lye = 10)
+	grind_results = list("lye" = 10)
 	var/cleanspeed = 50 //slower than mop
 	force_string = "robust... against germs"

@@ -180,4 +180,4 @@
 	name = "Canned Laughter"
 	desc = "Just looking at this makes you want to giggle."
 	icon_state = "laughter"
-	list_reagents = list(/datum/reagent/consumable/laughter = 50)
+	list_reagents = list("laughter" = 50)
@@ -59,7 +59,7 @@

 	var/edible = TRUE // That doesn't mean eating it is a good idea

-	var/list/reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
+	var/list/reagent_contents = list("nutriment" = 1)
 	// If the user can toggle the colour, a la vanilla spraycan
 	var/can_change_colour = FALSE

@@ -485,63 +485,63 @@
 	icon_state = "crayonred"
 	paint_color = "#DA0000"
 	item_color = "red"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
+	reagent_contents = list("nutriment" = 1, "redcrayonpowder" = 1)

 /obj/item/toy/crayon/orange
 	icon_state = "crayonorange"
 	paint_color = "#FF9300"
 	item_color = "orange"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/orange = 1)
+	reagent_contents = list("nutriment" = 1, "orangecrayonpowder" = 1)

 /obj/item/toy/crayon/yellow
 	icon_state = "crayonyellow"
 	paint_color = "#FFF200"
 	item_color = "yellow"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/yellow = 1)
+	reagent_contents = list("nutriment" = 1, "yellowcrayonpowder" = 1)

 /obj/item/toy/crayon/green
 	icon_state = "crayongreen"
 	paint_color = "#A8E61D"
 	item_color = "green"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/green = 1)
+	reagent_contents = list("nutriment" = 1, "greencrayonpowder" = 1)

 /obj/item/toy/crayon/blue
 	icon_state = "crayonblue"
 	paint_color = "#00B7EF"
 	item_color = "blue"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)
+	reagent_contents = list("nutriment" = 1, "bluecrayonpowder" = 1)

 /obj/item/toy/crayon/purple
 	icon_state = "crayonpurple"
 	paint_color = "#DA00FF"
 	item_color = "purple"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/purple = 1)
+	reagent_contents = list("nutriment" = 1, "purplecrayonpowder" = 1)

 /obj/item/toy/crayon/black
 	icon_state = "crayonblack"
 	paint_color = "#1C1C1C" //Not completely black because total black looks bad. So Mostly Black.
 	item_color = "black"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/black = 1)
+	reagent_contents = list("nutriment" = 1, "blackcrayonpowder" = 1)

 /obj/item/toy/crayon/white
 	icon_state = "crayonwhite"
 	paint_color = "#FFFFFF"
 	item_color = "white"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
+	reagent_contents = list("nutriment" = 1, "whitecrayonpowder" = 1)

 /obj/item/toy/crayon/mime
 	icon_state = "crayonmime"
 	desc = "A very sad-looking crayon."
 	paint_color = "#FFFFFF"
 	item_color = "mime"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/invisible = 1)
+	reagent_contents = list("nutriment" = 1, "invisiblecrayonpowder" = 1)
 	charges = -1

 /obj/item/toy/crayon/rainbow
 	icon_state = "crayonrainbow"
 	paint_color = "#FFF000"
 	item_color = "rainbow"
-	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent = 1)
+	reagent_contents = list("nutriment" = 1, "colorful_reagent" = 1)
 	drawtype = RANDOM_ANY // just the default starter.

 	charges = -1
@@ -621,7 +621,7 @@
 	can_change_colour = TRUE
 	gang = TRUE //Gang check is true for all things upon the honored hierarchy of spraycans, except those that are FALSE.

-	reagent_contents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1)
+	reagent_contents = list("welding_fuel" = 1, "ethanol" = 1)

 	pre_noise = TRUE
 	post_noise = FALSE
@@ -778,7 +778,7 @@

 	volume_multiplier = 25
 	charges = 100
-	reagent_contents = list(/datum/reagent/clf3 = 1)
+	reagent_contents = list("clf3" = 1)
 	actually_paints = FALSE
 	paint_color = "#000000"

@@ -791,7 +791,7 @@
 	use_overlays = FALSE
 	gang = FALSE

-	reagent_contents = list(/datum/reagent/lube = 1, /datum/reagent/consumable/banana = 1)
+	reagent_contents = list("lube" = 1, "banana" = 1)
 	volume_multiplier = 5

 /obj/item/toy/crayon/spraycan/lubecan/isValidSurface(surface)
@@ -811,7 +811,7 @@

 	pre_noise = FALSE
 	post_noise = FALSE
-	reagent_contents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/toxin/mutetoxin = 1)
+	reagent_contents = list("nothing" = 1, "mutetoxin" = 1)

 /obj/item/toy/crayon/spraycan/gang
 	charges = 20 // Charges back to 20, which is the default value for them.
@@ -700,10 +700,10 @@ GLOBAL_LIST_EMPTY(PDAs)
 		U << browse(null, "window=pda")
 	return

-/obj/item/pda/proc/remove_id(mob/user)
-	if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+/obj/item/pda/proc/remove_id()
+	if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
-	do_remove_id(user)
+	do_remove_id(usr)

 /obj/item/pda/proc/do_remove_id(mob/user)
 	if(!id)
@@ -827,23 +827,23 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P)
 	send_message(U,list(P))

-/obj/item/pda/AltClick(mob/user)
+/obj/item/pda/AltClick()
 	. = ..()
 	if(id)
-		remove_id(user)
+		remove_id()
 		playsound(src, 'sound/machines/terminal_eject_disc.ogg', 50, 1)
 	else
-		remove_pen(user)
+		remove_pen()
 		playsound(src, 'sound/machines/button4.ogg', 50, 1)
 	return TRUE

-/obj/item/pda/CtrlClick(mob/user)
+/obj/item/pda/CtrlClick()
 	..()

 	if(isturf(loc)) //stops the user from dragging the PDA by ctrl-clicking it.
 		return

-	remove_pen(user)
+	remove_pen()

 /obj/item/pda/verb/verb_toggle_light()
 	set category = "Object"
@@ -857,7 +857,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	set src in usr

 	if(id)
-		remove_id(usr)
+		remove_id()
 	else
 		to_chat(usr, "<span class='warning'>This PDA does not have an ID in it!</span>")

@@ -896,7 +896,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/proc/id_check(mob/user, obj/item/card/id/I)
 	if(!I)
 		if(id && (src in user.contents))
-			remove_id(user)
+			remove_id()
 			return TRUE
 		else
 			var/obj/item/card/id/C = user.get_active_held_item()
@@ -12,8 +12,7 @@
 	var/cleaning = FALSE
 	var/cleaning_cycles = 10
 	var/patient_laststat = null
-	var/list/injection_chems = list(/datum/reagent/medicine/antitoxin, /datum/reagent/medicine/epinephrine,
-								/datum/reagent/medicine/salbutamol, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane)
+	var/list/injection_chems = list("antitoxin", "epinephrine", "salbutamol", "bicaridine", "kelotane")
 	var/eject_port = "ingestion"
 	var/escape_in_progress = FALSE
 	var/message_cooldown
@@ -184,7 +183,7 @@
 		data["chem"] = list()
 		for(var/chem in injection_chems)
 			var/datum/reagent/R = GLOB.chemical_reagents_list[chem]
-			data["chem"] += list(list("name" = R.name, "id" = R.type))
+			data["chem"] += list(list("name" = R.name, "id" = R.id))

 	data["occupant"] = list()
 	var/mob/living/mob_occupant = patient
@@ -228,8 +227,8 @@
 			go_out(null, usr)
 			. = TRUE
 		if("inject")
-			var/chem = text2path(params["chem"])
-			if(!patient || !chem)
+			var/chem = params["chem"]
+			if(!patient)
 				return
 			inject_chem(chem, usr)
 			. = TRUE
@@ -267,7 +267,7 @@
 	var/produce_heat = 1500
 	heat = 1000
 	light_color = LIGHT_COLOR_FLARE
-	grind_results = list(/datum/reagent/sulfur = 15)
+	grind_results = list("sulfur" = 15)

 /obj/item/flashlight/flare/New()
 	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -430,7 +430,7 @@
 	color = LIGHT_COLOR_GREEN
 	icon_state = "glowstick"
 	item_state = "glowstick"
-	grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick
+	grind_results = list("phenol" = 15, "hydrogen" = 10, "oxygen" = 5) //Meth-in-a-stick
 	rad_flags = RAD_NO_CONTAMINATE
 	var/fuel = 0

@@ -2,7 +2,7 @@
 	name = "forcefield projector"
 	desc = "An experimental device that can create several forcefields at a distance."
 	icon = 'icons/obj/device.dmi'
-	icon_state = "signmaker_forcefield"
+	icon_state = "signmaker_engi"
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	item_flags = NOBLUDGEON
@@ -8,8 +8,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
 	var/mob/living/silicon/pai/pai
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-	max_integrity = 200
+	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE

 /obj/item/paicard/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!</span>")
@@ -46,8 +45,6 @@
 			dat += "<b>Radio Uplink</b><br>"
 			dat += "Transmit: <A href='byond://?src=[REF(src)];wires=[WIRE_TX]'>[(pai.radio.wires.is_cut(WIRE_TX)) ? "Disabled" : "Enabled"]</A><br>"
 			dat += "Receive: <A href='byond://?src=[REF(src)];wires=[WIRE_RX]'>[(pai.radio.wires.is_cut(WIRE_RX)) ? "Disabled" : "Enabled"]</A><br>"
-			if(pai.radio_short)
-				dat += "<font color='red'>Reset radio short: <a href='byond://?src=[REF(src)];reset_radio_short=1'>\[RESET\]</a><br>"
 		else
 			dat += "<b>Radio Uplink</b><br>"
 			dat += "<font color=red><i>Radio firmware not loaded. Please install a pAI personality to load firmware.</i></font><br>"
@@ -85,6 +82,7 @@
 				pai.master = M.real_name
 				pai.master_dna = M.dna.unique_enzymes
 				to_chat(pai, "<span class='notice'>You have been bound to a new master.</span>")
+				pai.emittersemicd = FALSE
 		if(href_list["wipe"])
 			var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
 			if(confirm == "Yes")
@@ -98,8 +96,6 @@
 			var/wire = text2num(href_list["wires"])
 			if(pai.radio)
 				pai.radio.wires.cut(wire)
-		if(href_list["reset_radio_short"])
-			pai.unshort_radio()
 		if(href_list["setlaws"])
 			var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1]) as message),1,MAX_MESSAGE_LEN)
 			if(newlaws && pai)
@@ -10,23 +10,22 @@
 	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
-
+	var/on = TRUE
 	var/code = 2
 	var/frequency = FREQ_ELECTROPACK
-	var/on = TRUE
-	var/shock_cooldown = FALSE
+	var/shock_cooldown = 0

-/obj/item/electropack/suicide_act(mob/living/carbon/user)
+/obj/item/electropack/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)

 /obj/item/electropack/Initialize()
 	. = ..()
-	set_frequency(frequency)
+	SSradio.add_object(src, frequency, RADIO_SIGNALER)

 /obj/item/electropack/Destroy()
 	SSradio.remove_object(src, frequency)
-	. = ..()
+	return ..()

 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/item/electropack/attack_hand(mob/user)
@@ -37,7 +36,7 @@
 			return
 	return ..()

-/obj/item/electropack/attackby(obj/item/W, mob/living/user, params)
+/obj/item/electropack/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/clothing/head/helmet))
 		var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(user)
 		A.icon = 'icons/obj/assemblies.dmi'
@@ -58,47 +57,43 @@
 		return ..()

 /obj/item/electropack/Topic(href, href_list)
+	//..()
 	var/mob/living/carbon/C = usr
 	if(usr.stat || usr.restrained() || C.back == src)
 		return
-	
-	if(!usr.canUseTopic(src, BE_CLOSE))
+	if((ishuman(usr) && usr.contents.Find(src)) || usr.contents.Find(master) || (in_range(src, usr) && isturf(loc)))
+		usr.set_machine(src)
+		if(href_list["freq"])
+			SSradio.remove_object(src, frequency)
+			frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
+			SSradio.add_object(src, frequency, RADIO_SIGNALER)
+		else
+			if(href_list["code"])
+				code += text2num(href_list["code"])
+				code = round(code)
+				code = min(100, code)
+				code = max(1, code)
+			else
+				if(href_list["power"])
+					on = !( on )
+					icon_state = "electropack[on]"
+		if(!( master ))
+			if(ismob(loc))
+				attack_self(loc)
+			else
+				for(var/mob/M in viewers(1, src))
+					if(M.client)
+						attack_self(M)
+		else
+			if(ismob(master.loc))
+				attack_self(master.loc)
+			else
+				for(var/mob/M in viewers(1, master))
+					if(M.client)
+						attack_self(M)
+	else
 		usr << browse(null, "window=radio")
-		onclose(usr, "radio")
 		return
-
-	if(href_list["set"])
-		if(href_list["set"] == "freq")
-			var/new_freq = input(usr, "Input a new receiving frequency", "Electropack Frequency", format_frequency(frequency)) as num|null
-			if(!usr.canUseTopic(src, BE_CLOSE))
-				return
-			new_freq = unformat_frequency(new_freq)
-			new_freq = sanitize_frequency(new_freq, TRUE)
-			set_frequency(new_freq)
-
-		if(href_list["set"] == "code")
-			var/new_code = input(usr, "Input a new receiving code", "Electropack Code", code) as num|null
-			if(!usr.canUseTopic(src, BE_CLOSE))
-				return
-			new_code = round(new_code)
-			new_code = CLAMP(new_code, 1, 100)
-			code = new_code
-
-		if(href_list["set"] == "power")
-			if(!usr.canUseTopic(src, BE_CLOSE))
-				return
-			on = !(on)
-			icon_state = "electropack[on]"
-
-	if(usr)
-		attack_self(usr)
-
-	return
-
-/obj/item/electropack/proc/set_frequency(new_frequency)
-	SSradio.remove_object(src, frequency)
-	frequency = new_frequency
-	SSradio.add_object(src, frequency, RADIO_SIGNALER)
 	return

 /obj/item/electropack/receive_signal(datum/signal/signal)
@@ -106,10 +101,10 @@
 		return

 	if(isliving(loc) && on)
-		if(shock_cooldown == TRUE)
+		if(shock_cooldown != 0)
 			return
-		shock_cooldown = TRUE
-		addtimer(VARSET_CALLBACK(src, shock_cooldown, FALSE), 100)
+		shock_cooldown = 1
+		addtimer(VARSET_CALLBACK(src, shock_cooldown, 0), 100)
 		var/mob/living/L = loc
 		step(L, pick(GLOB.cardinals))

@@ -124,22 +119,25 @@
 		master.receive_signal()
 	return

-/obj/item/electropack/ui_interact(mob/user)
+/obj/item/electropack/attack_self(mob/user)
+
 	if(!ishuman(user))
 		return
-	
 	user.set_machine(src)
-	var/dat = {"
-<TT>
-Turned [on ? "On" : "Off"] - <A href='?src=[REF(src)];set=power'>Toggle</A><BR>
+	var/dat = {"<TT>Turned [on ? "On" : "Off"] -
+<A href='?src=[REF(src)];power=1'>Toggle</A><BR>
 <B>Frequency/Code</B> for electropack:<BR>
 Frequency:
-[format_frequency(src.frequency)]
-<A href='byond://?src=[REF(src)];set=freq'>Set</A><BR>
+<A href='byond://?src=[REF(src)];freq=-10'>-</A>
+<A href='byond://?src=[REF(src)];freq=-2'>-</A> [format_frequency(frequency)]
+<A href='byond://?src=[REF(src)];freq=2'>+</A>
+<A href='byond://?src=[REF(src)];freq=10'>+</A><BR>

 Code:
-[src.code]
-<A href='byond://?src=[REF(src)];set=code'>Set</A><BR>
+<A href='byond://?src=[REF(src)];code=-5'>-</A>
+<A href='byond://?src=[REF(src)];code=-1'>-</A> [code]
+<A href='byond://?src=[REF(src)];code=1'>+</A>
+<A href='byond://?src=[REF(src)];code=5'>+</A><BR>
 </TT>"}
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
@@ -262,7 +262,7 @@ SLIME SCANNER
 						temp_message += " <span class='info'>Subject has abnormal brain fuctions.</span>"

 					//Astrogen shenanigans
-					if(H.reagents.has_reagent(/datum/reagent/fermi/astral))
+					if(H.reagents.has_reagent("astral"))
 						if(H.mind)
 							temp_message += " <span class='danger'>Warning: subject may be possesed.</span>"
 						else
@@ -465,9 +465,9 @@ SLIME SCANNER
 			else
 				msg += "<span class='notice'>Subject is not addicted to any reagents.</span>\n"

-			var/datum/reagent/impure/fermiTox/F = M.reagents.has_reagent(/datum/reagent/impure/fermiTox)
-			if(istype(F))
-				switch(F.volume)
+			if(M.reagents.has_reagent("fermiTox"))
+				var/datum/reagent/fermiTox = M.reagents.has_reagent("fermiTox")
+				switch(fermiTox.volume)
 					if(5 to 10)
 						msg += "<span class='notice'>Subject contains a low amount of toxic isomers.</span>\n"
 					if(10 to 25)
@@ -519,7 +519,7 @@ SLIME SCANNER
 	throw_range = 7
 	tool_behaviour = TOOL_ANALYZER
 	materials = list(MAT_METAL=30, MAT_GLASS=20)
-	grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
+	grind_results = list("mercury" = 5, "iron" = 5, "silicon" = 5)
 	var/cooldown = FALSE
 	var/cooldown_time = 250
 	var/accuracy // 0 is the best accuracy.
@@ -17,7 +17,7 @@
 	resistance_flags = FIRE_PROOF
 	var/max_water = 50
 	var/last_use = 1
-	var/chem = /datum/reagent/water
+	var/chem = "water"
 	var/safety = TRUE
 	var/refilling = FALSE
 	var/tanktype = /obj/structure/reagent_dispensers/watertank
@@ -332,9 +332,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/aluminium, 30)
-	B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
+	B1.reagents.add_reagent("aluminium", 30)
+	B2.reagents.add_reagent("foaming_agent", 10)
+	B2.reagents.add_reagent("facid", 10)

 	beakers += B1
 	beakers += B2
@@ -350,9 +350,9 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/aluminium, 75)
-	B2.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
+	B1.reagents.add_reagent("aluminium", 75)
+	B2.reagents.add_reagent("smart_foaming_agent", 25)
+	B2.reagents.add_reagent("facid", 25)

 	beakers += B1
 	beakers += B2
@@ -368,9 +368,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
+	B1.reagents.add_reagent("phosphorus", 25)
+	B2.reagents.add_reagent("stable_plasma", 25)
+	B2.reagents.add_reagent("sacid", 25)

 	beakers += B1
 	beakers += B2
@@ -386,10 +386,10 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
+	B1.reagents.add_reagent("plantbgone", 25)
+	B1.reagents.add_reagent("potassium", 25)
+	B2.reagents.add_reagent("phosphorus", 25)
+	B2.reagents.add_reagent("sugar", 25)

 	beakers += B1
 	beakers += B2
@@ -405,9 +405,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
-	B2.reagents.add_reagent(/datum/reagent/water, 40)
-	B2.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
+	B1.reagents.add_reagent("fluorosurfactant", 40)
+	B2.reagents.add_reagent("water", 40)
+	B2.reagents.add_reagent("cleaner", 10)

 	beakers += B1
 	beakers += B2
@@ -423,9 +423,9 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
-	B2.reagents.add_reagent(/datum/reagent/water, 40)
-	B2.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a  t h i c c  distribution
+	B1.reagents.add_reagent("fluorosurfactant", 40)
+	B2.reagents.add_reagent("water", 40)
+	B2.reagents.add_reagent("ez_clean", 60) //ensures a  t h i c c  distribution

 	beakers += B1
 	beakers += B2
@@ -442,10 +442,10 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 40)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 40)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 40)
+	B1.reagents.add_reagent("condensedcapsaicin", 60)
+	B1.reagents.add_reagent("potassium", 40)
+	B2.reagents.add_reagent("phosphorus", 40)
+	B2.reagents.add_reagent("sugar", 40)

 	beakers += B1
 	beakers += B2
@@ -461,11 +461,11 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 10)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 10)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 10)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 280)
+	B1.reagents.add_reagent("facid", 290)
+	B1.reagents.add_reagent("potassium", 10)
+	B2.reagents.add_reagent("phosphorus", 10)
+	B2.reagents.add_reagent("sugar", 10)
+	B2.reagents.add_reagent("facid", 280)

 	beakers += B1
 	beakers += B2
@@ -481,10 +481,10 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/colorful_reagent, 25)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
+	B1.reagents.add_reagent("colorful_reagent", 25)
+	B1.reagents.add_reagent("potassium", 25)
+	B2.reagents.add_reagent("phosphorus", 25)
+	B2.reagents.add_reagent("sugar", 25)

 	beakers += B1
 	beakers += B2
@@ -493,7 +493,7 @@
 	name = "generic glitter grenade"
 	desc = "You shouldn't see this description."
 	stage = READY
-	var/glitter_type = /datum/reagent/glitter
+	var/glitter_type = "glitter"

 /obj/item/grenade/chem_grenade/glitter/Initialize()
 	. = ..()
@@ -501,9 +501,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)

 	B1.reagents.add_reagent(glitter_type, 25)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
+	B1.reagents.add_reagent("potassium", 25)
+	B2.reagents.add_reagent("phosphorus", 25)
+	B2.reagents.add_reagent("sugar", 25)

 	beakers += B1
 	beakers += B2
@@ -511,17 +511,17 @@
 /obj/item/grenade/chem_grenade/glitter/pink
 	name = "pink glitter bomb"
 	desc = "For that HOT glittery look."
-	glitter_type = /datum/reagent/glitter/pink
+	glitter_type = "pink_glitter"

 /obj/item/grenade/chem_grenade/glitter/blue
 	name = "blue glitter bomb"
 	desc = "For that COOL glittery look."
-	glitter_type = /datum/reagent/glitter/blue
+	glitter_type = "blue_glitter"

 /obj/item/grenade/chem_grenade/glitter/white
 	name = "white glitter bomb"
 	desc = "For that somnolent glittery look."
-	glitter_type = /datum/reagent/glitter/white
+	glitter_type = "white_glitter"

 /obj/item/grenade/chem_grenade/clf3
 	name = "clf3 grenade"
@@ -533,10 +533,10 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250)
-	B1.reagents.add_reagent(/datum/reagent/clf3, 50)
-	B2.reagents.add_reagent(/datum/reagent/water, 250)
-	B2.reagents.add_reagent(/datum/reagent/clf3, 50)
+	B1.reagents.add_reagent("fluorosurfactant", 250)
+	B1.reagents.add_reagent("clf3", 50)
+	B2.reagents.add_reagent("water", 250)
+	B2.reagents.add_reagent("clf3", 50)

 	beakers += B1
 	beakers += B2
@@ -551,13 +551,13 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/cryptobiolin, 75)
-	B1.reagents.add_reagent(/datum/reagent/water, 50)
-	B1.reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 50)
-	B1.reagents.add_reagent(/datum/reagent/toxin/spore, 75)
-	B1.reagents.add_reagent(/datum/reagent/toxin/itching_powder, 50)
-	B2.reagents.add_reagent(/datum/reagent/fluorosurfactant, 150)
-	B2.reagents.add_reagent(/datum/reagent/toxin/mutagen, 150)
+	B1.reagents.add_reagent("cryptobiolin", 75)
+	B1.reagents.add_reagent("water", 50)
+	B1.reagents.add_reagent("mutetoxin", 50)
+	B1.reagents.add_reagent("spore", 75)
+	B1.reagents.add_reagent("itching_powder", 50)
+	B2.reagents.add_reagent("fluorosurfactant", 150)
+	B2.reagents.add_reagent("mutagen", 150)
 	beakers += B1
 	beakers += B2

@@ -571,11 +571,11 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/potassium, 50)
-	B1.reagents.add_reagent(/datum/reagent/phosphorus, 50)
-	B1.reagents.add_reagent(/datum/reagent/fungalspores, 200)
-	B2.reagents.add_reagent(/datum/reagent/blood, 250)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 50)
+	B1.reagents.add_reagent("potassium", 50)
+	B1.reagents.add_reagent("phosphorus", 50)
+	B1.reagents.add_reagent("fungalspores", 200)
+	B2.reagents.add_reagent("blood", 250)
+	B2.reagents.add_reagent("sugar", 50)

 	beakers += B1
 	beakers += B2
@@ -591,8 +591,8 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)

-	B1.reagents.add_reagent(/datum/reagent/potassium, 100)
-	B2.reagents.add_reagent(/datum/reagent/water/holywater, 100)
+	B1.reagents.add_reagent("potassium", 100)
+	B2.reagents.add_reagent("holywater", 100)

 	beakers += B1
 	beakers += B2
@@ -94,11 +94,11 @@
 		var/chem = pick(slime_chems)
 		var/amount = 5
 		if(chem == "lesser plasma") //In the rare case we get another rainbow.
-			chem = /datum/reagent/toxin/plasma
+			chem = "plasma"
 			amount = 4
 		if(chem == "holy water and uranium")
-			chem = /datum/reagent/uranium
-			reagents.add_reagent(/datum/reagent/water/holywater)
+			chem = "uranium"
+			reagents.add_reagent("holywater")
 		reagents.add_reagent(chem,amount)

 /obj/effect/payload_spawner/random_slime/spawn_payload(type, numspawned)
@@ -20,10 +20,10 @@
 /obj/item/grenade/flashbang/proc/flashbang_mobs(turf/source, range)
 	var/list/banged = get_hearers_in_view(range, source)
 	var/list/flashed = viewers(range, source)
-	for(var/mob/living/l in banged)
-		bang(l, source)
-	for(var/mob/living/l in flashed)
-		flash(l, source)
+	for(var/i in banged)
+		bang(i, source)
+	for(var/i in flashed)
+		flash(i, source)

 /obj/item/grenade/flashbang/proc/bang(mob/living/M, turf/source)
 	if(M.stat == DEAD)	//They're dead!
@@ -78,17 +78,9 @@

 /obj/item/holosign_creator/atmos
 	name = "ATMOS holofan projector"
-	desc = "A holographic projector that creates holographic fans that prevent changes in atmosphere conditions. Somehow."
-	icon_state = "signmaker_atmos"
-	holosign_type = /obj/structure/holosign/barrier/atmos
-	creation_time = 0
-	max_signs = 3
-
-/obj/item/holosign_creator/firelock
-	name = "ATMOS holofirelock projector"
-	desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
+	desc = "A holographic projector that creates holographic barriers that prevent changes in atmosphere conditions."
 	icon_state = "signmaker_engi"
-	holosign_type = /obj/structure/holosign/barrier/firelock
+	holosign_type = /obj/structure/holosign/barrier/atmos
 	creation_time = 0
 	max_signs = 3

@@ -308,7 +308,7 @@
 	block_chance = 50
 	var/shield_icon = "shield-red"

-/obj/item/nullrod/staff/worn_overlays(isinhands, icon_file, style_flags = NONE)
+/obj/item/nullrod/staff/worn_overlays(isinhands)
 	. = list()
 	if(isinhands)
 		. += mutable_appearance('icons/effects/effects.dmi', shield_icon, MOB_LAYER + 0.01)
@@ -479,10 +479,10 @@

 	possessed = TRUE

-	var/list/mob/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)

 	if(LAZYLEN(candidates))
-		var/mob/C = pick(candidates)
+		var/mob/dead/observer/C = pick(candidates)
 		var/mob/living/simple_animal/shade/S = new(src)
 		S.real_name = name
 		S.name = name
@@ -789,7 +789,7 @@

 	praying = TRUE
 	if(do_after(user, 20, target = M))
-		M.reagents?.add_reagent(/datum/reagent/water/holywater, 5)
+		M.reagents?.add_reagent("holywater", 5)
 		to_chat(M, "<span class='notice'>[user]'s prayer to [deity_name] has eased your pain!</span>")
 		M.adjustToxLoss(-5, TRUE, TRUE)
 		M.adjustOxyLoss(-5)
@@ -75,7 +75,7 @@
 			L.SetKnockdown(0)
 			L.SetSleeping(0)
 			L.SetUnconscious(0)
-			L.reagents.add_reagent(/datum/reagent/medicine/muscle_stimulant, CLAMP(5 - L.reagents.get_reagent_amount(/datum/reagent/medicine/muscle_stimulant), 0, 5))	//If you don't have legs or get bola'd, tough luck!
+			L.reagents.add_reagent("muscle_stimulant", CLAMP(5 - L.reagents.get_reagent_amount("muscle_stimulant"), 0, 5))	//If you don't have legs or get bola'd, tough luck!
 			colorize(L)

 /obj/item/hot_potato/examine(mob/user)
@@ -33,7 +33,7 @@
 /obj/item/implant/adrenalin/activate()
 	. = ..()
 	uses--
-	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/medicine/inaprovaline = 3, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/regen_jelly = 10, /datum/reagent/medicine/stimulants = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
+	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
 	to_chat(imp_in, "<span class='notice'>You feel a sudden surge of energy!</span>")
 	if(!uses)
 		qdel(src)
@@ -41,10 +41,10 @@
 	if(forkload)
 		if(M == user)
 			M.visible_message("<span class='notice'>[user] eats a delicious forkful of omelette!</span>")
-			M.reagents.add_reagent(forkload.type, 1)
+			M.reagents.add_reagent(forkload.id, 1)
 		else
 			M.visible_message("<span class='notice'>[user] feeds [M] a delicious forkful of omelette!</span>")
-			M.reagents.add_reagent(forkload.type, 1)
+			M.reagents.add_reagent(forkload.id, 1)
 		icon_state = "fork"
 		forkload = null

@@ -339,7 +339,7 @@
 	. = ..()
 	. += "<span class='notice'>Alt-click to recolor it.</span>"

-/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
+/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
 	. = ..()
 	if(active)
 		if(isinhands)
@@ -374,7 +374,7 @@
 			It appears to have a wooden grip and a shaved down guard."
 	icon_state = "cxsword_hilt_traitor"
 	force_on = 30
-	armour_penetration = 35
+	armour_penetration = 50
 	embedding = list("embedded_pain_multiplier" = 10, "embed_chance" = 75, "embedded_fall_chance" = 0, "embedded_impact_pain_multiplier" = 10)
 	block_chance = 50
 	hitsound_on = 'sound/weapons/blade1.ogg'
@@ -216,11 +216,10 @@
 			return
 	else
 		if(last_hit < world.time)
-			if(target.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
-				playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
-				return
 			if(ishuman(target))
 				var/mob/living/carbon/human/H = target
+				if (H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+					return
 				if(check_martial_counter(H, user))
 					return
 			playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
@@ -25,7 +25,7 @@


 /obj/item/mop/proc/clean(turf/A)
-	if(reagents.has_reagent(/datum/reagent/water, 1) || reagents.has_reagent(/datum/reagent/water/holywater, 1) || reagents.has_reagent(/datum/reagent/consumable/ethanol/vodka, 1) || reagents.has_reagent(/datum/reagent/space_cleaner, 1))
+	if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
 		SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 		A.clean_blood()
 		for(var/obj/effect/O in A)
@@ -98,7 +98,7 @@
 	stamusage = 1
 	var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water.
 	var/refill_rate = 1 //Rate per process() tick mop refills itself
-	var/refill_reagent = /datum/reagent/water //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING
+	var/refill_reagent = "water" //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING

 /obj/item/mop/advanced/New()
 	..()
@@ -50,6 +50,7 @@
 		if(tank)
 			updateTank(tank, 1, user)

+
 /obj/item/melee/powerfist/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
 	if(removing)
 		if(!tank)
@@ -70,42 +71,26 @@


 /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
-    if(!tank)
-        to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
-        return
-    var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
-    var/turf/T = get_turf(src)
-    if(!T)
-        return
-    T.assume_air(gasused)
-    T.air_update_turf()
-    if(!gasused)
-        to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
-        target.apply_damage((force / 5), BRUTE)
-        playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punches you!</span>")
-        return
-    if(gasused.total_moles() < gasperfist * fisto_setting)
-        to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
-        playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
-        target.apply_damage((force / 2), BRUTE)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punch strikes with force!</span>")
-        return
-    target.apply_damage(force * fisto_setting, BRUTE)
-    target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-        "<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-    new /obj/effect/temp_visual/kinetic_blast(target.loc)
-    playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
-    playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+	if(!tank)
+		to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
+		return
+	if(tank && !tank.air_contents.remove(gasperfist * fisto_setting))
+		to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
+		playsound(loc, 'sound/effects/refill.ogg', 50, 1)
+		return
+	target.apply_damage(force * fisto_setting, BRUTE)
+	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
+	new /obj/effect/temp_visual/kinetic_blast(target.loc)
+	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)

-    var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+	var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))

-    target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
+	target.throw_at(throw_target, 5 * fisto_setting, 0.2)

-    log_combat(user, target, "power fisted", src)
+	log_combat(user, target, "power fisted", src)

-    user.changeNext_move(CLICK_CD_MELEE * click_delay)
+	user.changeNext_move(CLICK_CD_MELEE * click_delay)

-    return
+	return
@@ -98,7 +98,7 @@
 /obj/item/banner/medical/special_inspiration(mob/living/carbon/human/H)
 	H.adjustToxLoss(-15)
 	H.setOxyLoss(0)
-	H.reagents.add_reagent(/datum/reagent/medicine/inaprovaline, 5)
+	H.reagents.add_reagent("inaprovaline", 5)

 /obj/item/banner/science
 	name = "sciencia banner"
@@ -11,9 +11,11 @@
 	var/charge_cost = 30

 /obj/item/borg/stun/attack(mob/living/M, mob/living/user)
-	if(M.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
-		playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
-		return FALSE
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
+			playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
+			return FALSE
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		if(!R.cell.use(charge_cost))
@@ -814,93 +816,3 @@
 			return
 		else
 			to_chat(user, "<span class='danger'>Your gripper cannot hold \the [target].</span>")
-
-/obj/item/weapon/gripper/mining
-	name = "shelter capsule deployer"
-	desc = "A simple grasping tool for carrying and deploying shelter capsules."
-	icon_state = "gripper_mining"
-	can_hold = list(
-		/obj/item/survivalcapsule
-		)
-
-/obj/item/weapon/gripper/mining/attack_self()
-	if(wrapped)
-		wrapped.forceMove(get_turf(wrapped))
-		wrapped.attack_self()
-		wrapped = null
-	return
-
-/obj/item/gun/energy/plasmacutter/cyborg
-	name = "cyborg plasma cutter"
-	desc = "A basic variation of the plasma cutter, compressed into a cyborg chassis. Less effective than normal plasma cutters."
-	force = 15
-	ammo_type = list(/obj/item/ammo_casing/energy/plasma/weak)
-	can_charge = FALSE
-	selfcharge = EGUN_SELFCHARGE_BORG
-	cell_type = /obj/item/stock_parts/cell/secborg
-	charge_delay = 5
-
-/obj/item/cyborg_clamp
-	name = "cyborg loading clamp"
-	desc = "Equipment for supply cyborgs. Lifts objects and loads them into cargo. Will not carry living beings."
-	icon = 'icons/mecha/mecha_equipment.dmi'
-	icon_state = "mecha_clamp"
-	tool_behaviour = TOOL_RETRACTOR
-	item_flags = NOBLUDGEON
-	flags_1 = NONE
-	var/cargo_capacity = 8
-	var/cargo = list()
-
-/obj/item/cyborg_clamp/attack(mob/M, mob/user, def_zone)
-	return
-
-/obj/item/cyborg_clamp/afterattack(atom/movable/target, mob/user, proximity)
-	. = ..()
-	if(!proximity)
-		return FALSE
-	if(isobj(target))
-		var/obj/O = target
-		if(!O.anchored)
-			if(contents.len < cargo_capacity)
-				user.visible_message("[user] lifts [target] and starts to load it into its cargo compartment.")
-				O.anchored = TRUE
-				if(do_mob(user, O, 20))
-					for(var/mob/chump in target.GetAllContents())
-						to_chat(user, "<span class='warning'>Error: Living entity detected in [target]. Cannot load.</span>")
-						O.anchored = initial(O.anchored)
-						return
-					for(var/obj/item/disk/nuclear/diskie in target.GetAllContents())
-						to_chat(user, "<span class='warning'>Error: Nuclear class authorization device detected in [target]. Cannot load.</span>")
-						O.anchored = initial(O.anchored)
-						return
-					if(contents.len < cargo_capacity) //check both before and after
-						cargo += O
-						O.forceMove(src)
-						O.anchored = FALSE
-						to_chat(user, "<span class='notice'>[target] successfully loaded.</span>")
-						playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
-					else
-						to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of [cargo_capacity] objects!</span>")
-						O.anchored = initial(O.anchored)
-						return
-				else
-					O.anchored = initial(O.anchored)
-			else
-				to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of eight objects!</span>")
-		else
-			to_chat(user, "<span class='warning'>[target] is firmly secured!</span>")
-
-/obj/item/cyborg_clamp/attack_self(mob/user)
-	var/obj/chosen_cargo = input(user, "Drop what?") as null|anything in cargo
-	if(!chosen_cargo)
-		return
-	chosen_cargo.forceMove(get_turf(chosen_cargo))
-	cargo -= chosen_cargo
-	user.visible_message("[user] unloads [chosen_cargo] from its cargo.")
-	playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
-
-/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."
-	access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
-	icon_state = "data_1"
@@ -173,64 +173,32 @@
 		R.module.basic_modules += S
 		R.module.add_module(S, FALSE, TRUE)

-/obj/item/borg/upgrade/premiumka
-	name = "mining cyborg premium KA"
-	desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator."
+/obj/item/borg/upgrade/soh
+	name = "mining cyborg satchel of holding"
+	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 	module_type = list(/obj/item/robot_module/miner)

-/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr)
+/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
 	. = ..()
 	if(.)
-		for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module)
-			for(var/obj/item/borg/upgrade/modkit/M in KA.modkits)
-				M.uninstall(src)
-			R.module.remove_module(KA, TRUE)
+		for(var/obj/item/storage/bag/ore/cyborg/S in R.module)
+			R.module.remove_module(S, TRUE)

-		var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module)
-		R.module.basic_modules += PKA
-		R.module.add_module(PKA, FALSE, TRUE)
+		var/obj/item/storage/bag/ore/holding/H = new /obj/item/storage/bag/ore/holding(R.module)
+		R.module.basic_modules += H
+		R.module.add_module(H, FALSE, TRUE)

-/obj/item/borg/upgrade/premiumka/deactivate(mob/living/silicon/robot/R, user = usr)
+/obj/item/borg/upgrade/soh/deactivate(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if (.)
-		for(var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA in R.module)
-			for(var/obj/item/borg/upgrade/modkit/M in PKA.modkits)
-				M.uninstall(src)
-			R.module.remove_module(PKA, TRUE)
+		for(var/obj/item/storage/bag/ore/holding/H in R.module)
+			R.module.remove_module(H, TRUE)

-		var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA = new (R.module)
-		R.module.basic_modules += KA
-		R.module.add_module(KA, FALSE, TRUE)
-		
-
-/obj/item/borg/upgrade/advcutter
-	name = "mining cyborg advanced plasma cutter"
-	desc = "An upgrade for the mining cyborgs plasma cutter, bringing it to advanced operation."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = list(/obj/item/robot_module/miner)
-
-/obj/item/borg/upgrade/advcutter/action(mob/living/silicon/robot/R, user = usr)
-	. = ..()
-	if(.)
-		for(var/obj/item/gun/energy/plasmacutter/cyborg/C in R.module)
-			C.name = "advanced cyborg plasma cutter"
-			C.desc = "An improved version of the cyborg plasma cutter. Baring functionality identical to the standard hand held version."
-			C.icon_state = "adv_plasmacutter"
-			for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
-				L.projectile_type = /obj/item/projectile/plasma/adv
-
-/obj/item/borg/upgrade/advcutter/deactivate(mob/living/silicon/robot/R, user = usr)
-	. = ..()
-	if (.)
-		for(var/obj/item/gun/energy/plasmacutter/cyborg/C in R.module)
-			C.name = initial(name)
-			C.desc = initial(desc)
-			C.icon_state = initial(icon_state)
-			for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
-				L.projectile_type = initial(L.projectile_type)
+		var/obj/item/storage/bag/ore/cyborg/S = new (R.module)
+		R.module.basic_modules += S
+		R.module.add_module(S, FALSE, TRUE)

 /obj/item/borg/upgrade/tboh
 	name = "janitor cyborg trash bag of holding"
@@ -466,15 +434,15 @@
 	name = "medical cyborg expanded hypospray"
 	desc = "An upgrade to the Medical module's hypospray, allowing it \
 		to treat a wider range of conditions and problems."
-	additional_reagents = list(/datum/reagent/medicine/mannitol, /datum/reagent/medicine/oculine, /datum/reagent/medicine/inacusiate,
-		/datum/reagent/medicine/mutadone, /datum/reagent/medicine/haloperidol)
+	additional_reagents = list("mannitol", "oculine", "inacusiate",
+		"mutadone", "haloperidol")

 /obj/item/borg/upgrade/hypospray/high_strength
 	name = "medical cyborg high-strength hypospray"
 	desc = "An upgrade to the Medical module's hypospray, containing \
 		stronger versions of existing chemicals."
-	additional_reagents = list(/datum/reagent/medicine/oxandrolone, /datum/reagent/medicine/sal_acid,
-								/datum/reagent/medicine/rezadone, /datum/reagent/medicine/pen_acid)
+	additional_reagents = list("oxandrolone", "sal_acid", "rezadone",
+		"pen_acid")

 /obj/item/borg/upgrade/piercing_hypospray
 	name = "cyborg piercing hypospray"
@@ -10,7 +10,7 @@
 	points = 50
 	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
 	refined_type = /obj/item/stack/sheet/bluespace_crystal
-	grind_results = list(/datum/reagent/bluespace = 20)
+	grind_results = list("bluespace" = 20)

 /obj/item/stack/ore/bluespace_crystal/refined
 	name = "refined bluespace crystal"
@@ -53,7 +53,7 @@
 	blink_range = 4 // Not as good as the organic stuff!
 	points = 0 //nice try
 	refined_type = null
-	grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20)
+	grind_results = list("bluespace" = 10, "silicon" = 20)

 //Polycrystals, aka stacks
 /obj/item/stack/sheet/bluespace_crystal
@@ -66,7 +66,7 @@
 	materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
 	novariants = TRUE
-	grind_results = list(/datum/reagent/bluespace = 20)
+	grind_results = list("bluespace" = 20)
 	point_value = 30
 	var/crystal_type = /obj/item/stack/ore/bluespace_crystal/refined

@@ -57,7 +57,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	var/heal_brute = 20
 	self_delay = 20
-	grind_results = list(/datum/reagent/medicine/styptic_powder = 10)
+	grind_results = list("styptic_powder" = 10)

 /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
@@ -140,7 +140,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	var/heal_burn = 20
 	self_delay = 20
-	grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10)
+	grind_results = list("silver_sulfadiazine" = 10)

 /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
@@ -11,7 +11,7 @@
 	throw_range = 7
 	flags_1 = CONDUCT_1
 	max_amount = 60
-	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/copper = 5)
+	grind_results = list("silicon" = 20, "copper" = 5)

 /obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/stack/sheet/metal))
@@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list(/datum/reagent/carbon = 20)
+	grind_results = list("carbon" = 20)
 	point_value = 25
 	merge_type = /obj/item/stack/sheet/mineral/diamond

@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list(/datum/reagent/uranium = 20)
+	grind_results = list("uranium" = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/uranium

@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list(/datum/reagent/toxin/plasma = 20)
+	grind_results = list("plasma" = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/plasma

@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	singular_name = "gold bar"
 	sheettype = "gold"
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list(/datum/reagent/gold = 20)
+	grind_results = list("gold" = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/gold

@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
 	singular_name = "silver bar"
 	sheettype = "silver"
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list(/datum/reagent/silver = 20)
+	grind_results = list("silver" = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/silver
 	tableVariant = /obj/structure/table/optable
@@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
 	sheettype = "bananium"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list(/datum/reagent/consumable/banana = 20)
+	grind_results = list("banana" = 20)
 	point_value = 50
 	merge_type = /obj/item/stack/sheet/mineral/bananium

@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	singular_name = "snow block"
 	force = 1
 	throwforce = 2
-	grind_results = list(/datum/reagent/consumable/ice = 20)
+	grind_results = list("ice" = 20)
 	merge_type = /obj/item/stack/sheet/mineral/snow

 GLOBAL_LIST_INIT(snow_recipes, list ( \
@@ -422,7 +422,7 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	icon_state = "slag"
 	singular_name = "coal lump"
 	merge_type = /obj/item/stack/sheet/mineral/coal
-	grind_results = list(/datum/reagent/carbon = 20)
+	grind_results = list("carbon" = 20)

 /obj/item/stack/sheet/mineral/coal/attackby(obj/item/W, mob/user, params)
 	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	flags_1 = CONDUCT_1
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/metal
-	grind_results = list(/datum/reagent/iron = 20)
+	grind_results = list("iron" = 20)
 	point_value = 2
 	tableVariant = /obj/structure/table

@@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/plasteel
-	grind_results = list(/datum/reagent/iron = 20, /datum/reagent/toxin/plasma = 20)
+	grind_results = list("iron" = 20, "plasma" = 20)
 	point_value = 23
 	tableVariant = /obj/structure/table/reinforced

@@ -238,7 +238,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/wood
 	novariants = TRUE
-	grind_results = list(/datum/reagent/carbon = 20)
+	grind_results = list("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.
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/bamboo
-	grind_results = list(/datum/reagent/carbon = 5)
+	grind_results = list("carbon" = 5)

 /obj/item/stack/sheet/mineral/bamboo/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.bamboo_recipes
@@ -398,64 +398,39 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 * Cardboard
 */
 GLOBAL_LIST_INIT(cardboard_recipes, list ( \
-	new/datum/stack_recipe("box", /obj/item/storage/box),										\
-	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3),				\
-	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg),				\
-	new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4),					\
-	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5),					\
-	new/datum/stack_recipe("pizza box", /obj/item/pizzabox),									\
-	new/datum/stack_recipe("folder", /obj/item/folder),											\
-	// holy fuck why are there so many boxes
-	new/datum/stack_recipe_list("fancy boxes", list ( \
-		new /datum/stack_recipe("donut box", /obj/item/storage/fancy/donut_box), 				\
-		new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), 					\
-		new /datum/stack_recipe("donk-pockets box", /obj/item/storage/box/donkpockets), 		\
-		new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes), 			\
-		new /datum/stack_recipe("box (internals)", /obj/item/storage/box/otwo), 				\
-		null, 																					\
-		new /datum/stack_recipe("security-styled box", /obj/item/storage/box/seclooking), 		\
-		new /datum/stack_recipe("buckshot shell box", /obj/item/storage/box/lethalshot),		\
-		new /datum/stack_recipe("rubber shot shell box", /obj/item/storage/box/rubbershot),		\
-		new /datum/stack_recipe("beanbag shell box", /obj/item/storage/box/beanbag),			\
-		new /datum/stack_recipe("slug shell box", /obj/item/storage/box/lethalslugs), 			\
-		new /datum/stack_recipe("stunslug shell box", /obj/item/storage/box/stunslug), 			\
-		new /datum/stack_recipe("tech shell box", /obj/item/storage/box/techsslug), 			\
-		new /datum/stack_recipe("incendiary ammo box", /obj/item/storage/box/fireshot), 		\
-		new /datum/stack_recipe("loose ammo box", /obj/item/storage/box/ammoshells), 			\
-		new /datum/stack_recipe("firing pins box", /obj/item/storage/box/firingpins), 			\
-		null,																					\
-		new /datum/stack_recipe("flashbang box", /obj/item/storage/box/flashbangs),				\
-		new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes),					\
-		new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs),				\
-		new /datum/stack_recipe("ID card box", /obj/item/storage/box/ids),						\
-		new /datum/stack_recipe("PDA box", /obj/item/storage/box/PDAs),							\
-		null,																					\
-		new /datum/stack_recipe("pill bottle box", /obj/item/storage/box/pillbottles),			\
-		new /datum/stack_recipe("beaker box", /obj/item/storage/box/beakers),					\
-		new /datum/stack_recipe("syringe box", /obj/item/storage/box/syringes),					\
-		new /datum/stack_recipe("latex gloves box", /obj/item/storage/box/gloves),				\
-		new /datum/stack_recipe("sterile masks box", /obj/item/storage/box/masks),				\
-		new /datum/stack_recipe("body bag box", /obj/item/storage/box/bodybags),				\
-		new /datum/stack_recipe("prescription glasses box", /obj/item/storage/box/rxglasses),	\
-		null,																					\
-		new /datum/stack_recipe("disk box", /obj/item/storage/box/disks),						\
-		new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes),			\
-		new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs),			\
-		new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed),		\
-		new /datum/stack_recipe("power cell box", /obj/item/storage/box/cells), 				\
-		new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps),			\
-		new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box),				\
-		null,																					\
-		new /datum/stack_recipe("box (brown)", /obj/item/storage/box/brown), 					\
-		new /datum/stack_recipe("box (green)", /obj/item/storage/box/green), 					\
-		new /datum/stack_recipe("box (blue)", /obj/item/storage/box/blue), 						\
-		new /datum/stack_recipe("box (red)", /obj/item/storage/box/red), 						\
-		new /datum/stack_recipe("box (yellow)", /obj/item/storage/box/yellow), 					\
-		new /datum/stack_recipe("box (pink)", /obj/item/storage/box/pink), 						\
-		new /datum/stack_recipe("box (purple)", /obj/item/storage/box/purple), 					\
-		)),
-	null,																						\
-))
+	new/datum/stack_recipe("box", /obj/item/storage/box), \
+	new/datum/stack_recipe("sec box", /obj/item/storage/box/seclooking), \
+	new/datum/stack_recipe("light tubes", /obj/item/storage/box/lights/tubes), \
+	new/datum/stack_recipe("light bulbs", /obj/item/storage/box/lights/bulbs), \
+	new/datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps), \
+	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
+	new/datum/stack_recipe("power cell", /obj/item/storage/box/cells), \
+	new/datum/stack_recipe("02", /obj/item/storage/box/otwo), \
+	null, \
+	new/datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \
+	new/datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \
+	new/datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag), \
+	new/datum/stack_recipe("12g ammo box", /obj/item/storage/box/lethalslugs), \
+	new/datum/stack_recipe("stun slug ammo box", /obj/item/storage/box/stunslug), \
+	new/datum/stack_recipe("tech shell ammo box", /obj/item/storage/box/techsslug), \
+	new/datum/stack_recipe("incendiary ammo box", /obj/item/storage/box/fireshot), \
+	new/datum/stack_recipe("firing pins", /obj/item/storage/box/firingpins), \
+	new/datum/stack_recipe("loose ammo", /obj/item/storage/box/ammoshells), \
+	null, \
+	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
+	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
+	new/datum/stack_recipe("folder", /obj/item/folder), \
+	new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4), \
+	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
+	null, \
+	new/datum/stack_recipe("colored brown", /obj/item/storage/box/brown), \
+	new/datum/stack_recipe("colored green", /obj/item/storage/box/green), \
+	new/datum/stack_recipe("colored red", /obj/item/storage/box/blue), \
+	new/datum/stack_recipe("colored blue", /obj/item/storage/box/red), \
+	new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
+	new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
+	new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
+	))

 /obj/item/stack/sheet/cardboard	//BubbleWrap //it's cardboard you fuck
 	name = "cardboard"
@@ -481,7 +456,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 		var/atom/droploc = drop_location()
 		if(use(1))
 			playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
-			to_chat(user, "<span class='notice'>You stamp the cardboard! It's a clown box! Honk!</span>")
+			to_chat(user, "<span class='notice'>You stamp the cardboard! Its a clown box! Honk!</span>")
 			if (amount >= 0)
 				new/obj/item/storage/box/clown(droploc) //bugfix
 	else
@@ -511,7 +486,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
 	novariants = TRUE
-	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/blood = 15)
+	grind_results = list("iron" = 5, "blood" = 15)

 /obj/item/stack/sheet/runed_metal/ratvar_act()
 	new /obj/item/stack/tile/brass(loc, amount)
@@ -546,30 +521,31 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 */
 GLOBAL_LIST_INIT(brass_recipes, list ( \
 	new/datum/stack_recipe("wall gear", /obj/structure/destructible/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
-	null, \
+	null,
 	new/datum/stack_recipe("brass pinion airlock", /obj/machinery/door/airlock/clockwork, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass pinion airlock - windowed", /obj/machinery/door/airlock/clockwork/brass, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
-	null, \
+	null,
 	new/datum/stack_recipe("brass reflector", /obj/structure/destructible/clockwork/reflector, 10, time = 100, one_per_turf = TRUE, on_floor = TRUE, window_checks = TRUE), \
-	null, \
+	null,
 	new/datum/stack_recipe("brass window - directional", /obj/structure/window/reinforced/clockwork/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("brass window - fulltile", /obj/structure/window/reinforced/clockwork/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass bar stool",  /obj/structure/chair/stool/bar/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass stool", /obj/structure/chair/stool/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
-	null, \
+	null,
 	new/datum/stack_recipe("sender - pressure sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - mech sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/mech, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - lever", /obj/structure/destructible/clockwork/trap/trigger/lever, 1, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - repeater", /obj/structure/destructible/clockwork/trap/trigger/repeater, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
-	null, \
+	null,
 	new/datum/stack_recipe("receiver - brass skewer", /obj/structure/destructible/clockwork/trap/brass_skewer, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_ADJACENT), \
 	new/datum/stack_recipe("receiver - steam vent", /obj/structure/destructible/clockwork/trap/steam_vent, 3, time = 30, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \
 	new/datum/stack_recipe("receiver - power nullifier", /obj/structure/destructible/clockwork/trap/power_nullifier, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \
-	null, \
+	null,
 	new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \
+
 ))

 /obj/item/stack/tile/brass
@@ -586,7 +562,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	throw_range = 3
 	turf_type = /turf/open/floor/clockwork
 	novariants = FALSE
-	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/teslium = 15, /datum/reagent/fuel/holyoil = 1)
+	grind_results = list("iron" = 5, "teslium" = 15, "holyoil" = 1)
 	merge_type = /obj/item/stack/tile/brass
 	tableVariant = /obj/structure/table/reinforced/brass

@@ -639,7 +615,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	throw_range = 3
 	turf_type = /turf/open/floor/bronze
 	novariants = FALSE
-	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/copper = 3) //we have no "tin" reagent so this is the closest thing
+	grind_results = list("iron" = 5, "copper" = 3) //we have no "tin" reagent so this is the closest thing
 	merge_type = /obj/item/stack/tile/bronze
 	tableVariant = /obj/structure/table/bronze

@@ -693,12 +669,11 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 1
 	throw_range = 3
-	grind_results = list(/datum/reagent/carbon = 10)
+	grind_results = list("carbon" = 10)
 	merge_type = /obj/item/stack/sheet/bone

 GLOBAL_LIST_INIT(plastic_recipes, list(
-	new /datum/stack_recipe("see-through plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
-	new /datum/stack_recipe("opaque plastic flaps", /obj/structure/plasticflaps/opaque, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
+	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
 	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
 	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
 	new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\
@@ -192,15 +192,9 @@
 		var/obj/O
 		if(R.max_res_amount > 1) //Is it a stack?
 			O = new R.result_type(usr.drop_location(), R.res_amount * multiplier)
-		else if(ispath(R.result_type, /turf))
-			var/turf/T = usr.drop_location()
-			if(!isturf(T))
-				return
-			T.PlaceOnTop(R.result_type, flags = CHANGETURF_INHERIT_AIR)
 		else
 			O = new R.result_type(usr.drop_location())
-		if(O)
-			O.setDir(usr.dir)
+		O.setDir(usr.dir)
 		use(R.req_amount * multiplier)

 		//START: oh fuck i'm so sorry
@@ -445,4 +439,4 @@

 /datum/stack_recipe_list/New(title, recipes)
 	src.title = title
-	src.recipes = recipes
+	src.recipes = recipes
@@ -110,7 +110,6 @@
 	var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
 	var/mob/listeningTo
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
-	var/range = null

 /obj/item/storage/bag/ore/ComponentInitialize()
 	. = ..()
@@ -131,8 +130,7 @@

 /obj/item/storage/bag/ore/dropped()
 	. = ..()
-	if(listeningTo)
-		UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
+	UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
 	listeningTo = null

 /obj/item/storage/bag/ore/proc/Pickup_ores(mob/living/user)
@@ -143,21 +141,12 @@
 		return
 	if (istype(user.pulling, /obj/structure/ore_box))
 		box = user.pulling
-	if(issilicon(user))
-		var/mob/living/silicon/robot/borgo = user
-		for(var/obj/item/cyborg_clamp/C in borgo.module.modules)
-			for(var/obj/structure/ore_box/B in C)
-				box = B
-
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	if(STR)
 		for(var/A in tile)
 			if (!is_type_in_typecache(A, STR.can_hold))
 				continue
 			if (box)
-				if(range)
-					for(var/obj/item/stack/ore/ore in range(range, user))
-						user.transferItemToLoc(ore, box)
 				user.transferItemToLoc(A, box)
 				show_message = TRUE
 			else if(SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, A, user, TRUE))
@@ -179,7 +168,6 @@

 /obj/item/storage/bag/ore/cyborg
 	name = "cyborg mining satchel"
-	range = 1

 /obj/item/storage/bag/ore/cyborg/ComponentInitialize()
 	. = ..()
@@ -24,7 +24,7 @@
 			add_overlay(M)
 	..()

-/obj/item/storage/belt/worn_overlays(isinhands, icon_file, style_flags = NONE)
+/obj/item/storage/belt/worn_overlays(isinhands, icon_file)
 	. = ..()
 	if(!isinhands && worn_overlays)
 		for(var/obj/item/I in contents)
@@ -61,7 +61,6 @@
 		/obj/item/radio,
 		/obj/item/clothing/gloves,
 		/obj/item/holosign_creator,
-		/obj/item/forcefield_projector,
 		/obj/item/assembly/signaler
 		))
 	STR.can_hold = can_hold
@@ -459,7 +458,8 @@
 		/obj/item/extinguisher/mini,
 		/obj/item/radio,
 		/obj/item/clothing/gloves,
-		/obj/item/holosign_creator,
+		/obj/item/holosign_creator/atmos,
+		/obj/item/holosign_creator/engineering,
 		/obj/item/forcefield_projector,
 		/obj/item/assembly/signaler,
 		/obj/item/lightreplacer,
@@ -571,7 +571,6 @@
 		/obj/item/reagent_containers/spray,
 		/obj/item/soap,
 		/obj/item/holosign_creator,
-		/obj/item/forcefield_projector,
 		/obj/item/key/janitor,
 		/obj/item/clothing/gloves,
 		/obj/item/melee/flyswatter,
@@ -583,7 +582,7 @@

 /obj/item/storage/belt/bandolier
 	name = "bandolier"
-	desc = "A bandolier for holding ammunition."
+	desc = "A bandolier for holding shotgun ammunition."
 	icon_state = "bandolier"
 	item_state = "bandolier"

@@ -593,7 +592,7 @@
 	STR.max_items = 18
 	STR.display_numerical_stacking = TRUE
 	STR.can_hold = typecacheof(list(
-		/obj/item/ammo_casing
+		/obj/item/ammo_casing/shotgun
 		))

 /obj/item/storage/belt/bandolier/durathread
@@ -163,16 +163,16 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			for(var/obj/effect/rune/R in orange(2,user))
 				R.invisibility = 0
 	if(user.mind && (user.mind.isholy))
-		if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) // blesses all the water in the holder
+		if(A.reagents && A.reagents.has_reagent("water")) // blesses all the water in the holder
 			to_chat(user, "<span class='notice'>You bless [A].</span>")
-			var/water2holy = A.reagents.get_reagent_amount(/datum/reagent/water)
-			A.reagents.del_reagent(/datum/reagent/water)
-			A.reagents.add_reagent(/datum/reagent/water/holywater,water2holy)
-		if(A.reagents && A.reagents.has_reagent(/datum/reagent/fuel/unholywater)) // yeah yeah, copy pasted code - sue me
+			var/water2holy = A.reagents.get_reagent_amount("water")
+			A.reagents.del_reagent("water")
+			A.reagents.add_reagent("holywater",water2holy)
+		if(A.reagents && A.reagents.has_reagent("unholywater")) // yeah yeah, copy pasted code - sue me
 			to_chat(user, "<span class='notice'>You purify [A].</span>")
-			var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater)
-			A.reagents.del_reagent(/datum/reagent/fuel/unholywater)
-			A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean)
+			var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
+			A.reagents.del_reagent("unholywater")
+			A.reagents.add_reagent("holywater",unholy2clean)
 	if(istype(A, /obj/item/twohanded/required/cult_bastard) && !iscultist(user))
 		var/obj/item/twohanded/required/cult_bastard/sword = A
 		to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
@@ -1259,12 +1259,3 @@
 	var/obj/item/stack/sheet/cardboard/I = new(user.drop_location())
 	qdel(src)
 	user.put_in_hands(I)
-
-/obj/item/storage/box/marshmallow
-	name = "box of marshmallows"
-	desc = "A box of marshmallows."
-	illustration = "marshmallow"
-
-/obj/item/storage/box/marshmallow/PopulateContents()
-	for (var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/snacks/marshmallow(src)
@@ -205,7 +205,7 @@
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for
 	new /obj/item/clothing/glasses/hud/health/night(src)
-
+	
 /*
 * Pill Bottles
 */
@@ -439,8 +439,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)

 /obj/item/storage/hypospraykit/fire
 	name = "burn treatment hypospray kit"
@@ -452,8 +452,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/burn(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/kelotane(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)

 /obj/item/storage/hypospraykit/toxin
 	name = "toxin treatment hypospray kit"
@@ -464,8 +464,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/toxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)

 /obj/item/storage/hypospraykit/o2
 	name = "oxygen deprivation hypospray kit"
@@ -476,8 +476,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/oxygen(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)

 /obj/item/storage/hypospraykit/enlarge
 	name = "organomegaly trauma hypospray kit"
@@ -488,12 +488,12 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/enlarge(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)

 /obj/item/storage/hypospraykit/brute
 	name = "brute trauma hypospray kit"
@@ -504,8 +504,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/brute(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)

 /obj/item/storage/hypospraykit/tactical
 	name = "combat hypospray kit"
@@ -517,8 +517,8 @@
 		return
 	new /obj/item/defibrillator/compact/combat/loaded(src)
 	new /obj/item/hypospray/mkii/CMO/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)

 /obj/item/storage/hypospraykit/cmo
 	name = "deluxe hypospray kit"
@@ -537,11 +537,11 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/CMO(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/charcoal(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/salglu(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src)

 /obj/item/storage/box/vials
 	name = "box of hypovials"
@@ -225,31 +225,16 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	STR.max_items = 10

 /obj/item/storage/toolbox/artistic/PopulateContents()
-	new /obj/item/storage/crayons(src)
-	new /obj/item/crowbar(src)
-	new /obj/item/stack/cable_coil/red(src)
-	new /obj/item/stack/cable_coil/yellow(src)
-	new /obj/item/stack/cable_coil/blue(src)
-	new /obj/item/stack/cable_coil/green(src)
-	new /obj/item/stack/cable_coil/pink(src)
-	new /obj/item/stack/cable_coil/orange(src)
-	new /obj/item/stack/cable_coil/cyan(src)
-	new /obj/item/stack/cable_coil/white(src)
-
-/obj/item/storage/toolbox/ammo
-	name = "ammo box"
-	desc = "It contains a few clips."
-	icon_state = "ammobox"
-	item_state = "ammobox"
-
-/obj/item/storage/toolbox/ammo/PopulateContents()
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
+	new/obj/item/storage/crayons(src)
+	new/obj/item/crowbar(src)
+	new/obj/item/stack/cable_coil/red(src)
+	new/obj/item/stack/cable_coil/yellow(src)
+	new/obj/item/stack/cable_coil/blue(src)
+	new/obj/item/stack/cable_coil/green(src)
+	new/obj/item/stack/cable_coil/pink(src)
+	new/obj/item/stack/cable_coil/orange(src)
+	new/obj/item/stack/cable_coil/cyan(src)
+	new/obj/item/stack/cable_coil/white(src)

 /obj/item/storage/toolbox/gold_real
 	name = "golden toolbox"
@@ -329,4 +314,4 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 		generate_rubber_toolbox_icon()
 	icon = GLOB.rubber_toolbox_icons[icon_state]
 	. = ..()
-	AddComponent(/datum/component/bouncy)
+	AddComponent(/datum/component/bouncy)
@@ -36,7 +36,7 @@
 	. = ..()
 	if(preload_cell_type)
 		if(!ispath(preload_cell_type,/obj/item/stock_parts/cell))
-			log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
+			log_world("### MAP WARNING, [src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
 		else
 			cell = new preload_cell_type(src)
 	update_icon()
@@ -168,9 +168,11 @@


 /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user)
-	if(L.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
-		playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
-		return FALSE
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
+			playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
+			return FALSE
 	var/stunpwr = stunforce
 	var/obj/item/stock_parts/cell/our_cell = get_cell()
 	if(!our_cell)
@@ -148,7 +148,7 @@

 /obj/item/watertank/janitor/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/space_cleaner, 500)
+	reagents.add_reagent("cleaner", 500)

 /obj/item/reagent_containers/spray/mister/janitor
 	name = "janitor spray nozzle"
@@ -184,7 +184,7 @@

 /obj/item/watertank/atmos/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/water, 200)
+	reagents.add_reagent("water", 200)

 /obj/item/watertank/atmos/make_noz()
 	return new /obj/item/extinguisher/mini/nozzle(src)
@@ -376,7 +376,7 @@
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
 		add_overlay(filling)

-/obj/item/reagent_containers/chemtank/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE) //apply chemcolor and level
+/obj/item/reagent_containers/chemtank/worn_overlays(var/isinhands = FALSE) //apply chemcolor and level
 	. = list()
 	//inhands + reagent_filling
 	if(!isinhands && reagents.total_volume)
@@ -436,13 +436,13 @@

 /obj/item/watertank/op/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/toxin/mutagen,350)
-	reagents.add_reagent(/datum/reagent/napalm,125)
-	reagents.add_reagent(/datum/reagent/fuel,125)
-	reagents.add_reagent(/datum/reagent/clf3,300)
-	reagents.add_reagent(/datum/reagent/cryptobiolin,350)
-	reagents.add_reagent(/datum/reagent/toxin/plasma,250)
-	reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin,500)
+	reagents.add_reagent("mutagen",350)
+	reagents.add_reagent("napalm",125)
+	reagents.add_reagent("welding_fuel",125)
+	reagents.add_reagent("clf3",300)
+	reagents.add_reagent("cryptobiolin",350)
+	reagents.add_reagent("plasma",250)
+	reagents.add_reagent("condensedcapsaicin",500)

 /obj/item/reagent_containers/spray/mister/op
 	desc = "A mister nozzle attached to several extended water tanks. It suspiciously has a compressor in the system and is labelled entirely in New Cyrillic."
@@ -1,17 +0,0 @@
-/obj/item/tele_iv
-	name = "telescopic IV drip"
-	desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
-	icon = 'icons/obj/iv_drip.dmi'
-	icon_state = "tele_iv"
-
-/obj/item/tele_iv/attack_self(mob/user)
-	deploy_iv(user, user.loc)
-
-/obj/item/tele_iv/afterattack(atom/target, mob/user, proximity)
-	. = ..()
-	if(proximity && isopenturf(target) && user.CanReach(target))
-		deploy_iv(user, target)
-
-/obj/item/tele_iv/proc/deploy_iv(mob/user, atom/location)
-	new /obj/machinery/iv_drip/telescopic(location)
-	qdel(src)
@@ -53,7 +53,7 @@
 	base_overlay.appearance_flags = RESET_COLOR
 	add_overlay(base_overlay)

-/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
+/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file)
 	. = list()
 	if(isinhands && random_color)
 		var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head")
@@ -37,7 +37,7 @@
 /obj/item/weldingtool/Initialize()
 	. = ..()
 	create_reagents(max_fuel)
-	reagents.add_reagent(/datum/reagent/fuel, max_fuel)
+	reagents.add_reagent("welding_fuel", max_fuel)
 	update_icon()


@@ -97,7 +97,7 @@

 /obj/item/weldingtool/proc/explode()
 	var/turf/T = get_turf(loc)
-	var/plasmaAmount = reagents.get_reagent_amount(/datum/reagent/toxin/plasma)
+	var/plasmaAmount = reagents.get_reagent_amount("plasma")
 	dyn_explosion(T, plasmaAmount/5)//20 plasma in a standard welder has a 4 power explosion. no breaches, but enough to kill/dismember holder
 	qdel(src)

@@ -142,7 +142,7 @@


 /obj/item/weldingtool/attack_self(mob/user)
-	if(src.reagents.has_reagent(/datum/reagent/toxin/plasma))
+	if(src.reagents.has_reagent("plasma"))
 		message_admins("[ADMIN_LOOKUPFLW(user)] activated a rigged welder at [AREACOORD(user)].")
 		explode()
 	switched_on(user)
@@ -154,7 +154,7 @@

 // Returns the amount of fuel in the welder
 /obj/item/weldingtool/proc/get_fuel()
-	return reagents.get_reagent_amount(/datum/reagent/fuel)
+	return reagents.get_reagent_amount("welding_fuel")


 // Uses fuel from the welding tool.
@@ -165,7 +165,7 @@
 	if(used)
 		burned_fuel_for = 0
 	if(get_fuel() >= used)
-		reagents.remove_reagent(/datum/reagent/fuel, used)
+		reagents.remove_reagent("welding_fuel", used)
 		check_fuel()
 		return TRUE
 	else
@@ -333,7 +333,7 @@

 /obj/item/weldingtool/abductor/process()
 	if(get_fuel() <= max_fuel)
-		reagents.add_reagent(/datum/reagent/fuel, 1)
+		reagents.add_reagent("welding_fuel", 1)
 	..()

 /obj/item/weldingtool/hugetank
@@ -377,7 +377,7 @@
 	..()
 	if(get_fuel() < max_fuel && nextrefueltick < world.time)
 		nextrefueltick = world.time + 10
-		reagents.add_reagent(/datum/reagent/fuel, 1)
+		reagents.add_reagent("welding_fuel", 1)

 /obj/item/weldingtool/advanced
 	name = "advanced welding tool"
@@ -390,7 +390,7 @@

 /obj/item/weldingtool/advanced/process()
 	if(get_fuel() <= max_fuel)
-		reagents.add_reagent(/datum/reagent/fuel, 1)
+		reagents.add_reagent("welding_fuel", 1)
 	..()

 #undef WELDER_FUEL_BURN_INTERVAL
@@ -353,7 +353,7 @@
 		update_light()
 	return TRUE

-/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
+/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file)
 	. = ..()
 	if(active)
 		if(isinhands)
@@ -70,12 +70,12 @@
 	name = "crushed can"
 	icon_state = "cola"
 	resistance_flags = NONE
-	grind_results = list(/datum/reagent/aluminium = 10)
+	grind_results = list("aluminium" = 10)

 /obj/item/trash/boritos
 	name = "boritos bag"
 	icon_state = "boritos"
-	grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag
+	grind_results = list("aluminium" = 1) //from the mylar bag

 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
@@ -556,7 +556,7 @@
 		update_light()
 	return TRUE

-/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file, style_flags = NONE)
+/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file)
 	. = ..()
 	if(isinhands)
 		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
@@ -781,11 +781,6 @@
 	throwforce = 20
 	throw_speed = 4
 	attack_verb = list("gored")
-	var/clonechance = 50
-	var/clonedamage = 12
-	var/clonespeed = 0
-	var/clone_replication_chance = 30
-	var/clone_lifespan = 100

 /obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity)
 	. = ..()
@@ -796,11 +791,10 @@
 		var/mob/living/L = AM
 		if(istype (L, /mob/living/simple_animal/hostile/illusion))
 			return
-		if(!L.stat && prob(clonechance))
+		if(!L.stat && prob(50))
 			var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
 			M.faction = user.faction.Copy()
-			M.set_varspeed(clonespeed)
-			M.Copy_Parent(user, clone_lifespan, user.health/2.5, clonedamage, clone_replication_chance)
+			M.Copy_Parent(user, 100, user.health/2.5, 12, 30)
 			M.GiveTarget(L)

 /obj/item/twohanded/pitchfork
@@ -878,7 +872,7 @@
 		user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
 		playsound(target, 'sound/magic/disintegrate.ogg', 100, 1)
 		W.break_wall()
-		W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+		W.ScrapeAway()
 		return

 //HF blade
@@ -1016,4 +1010,4 @@
 		var/client/C = user.client
 		C.change_view(CONFIG_GET(string/default_view))
 		user.client.pixel_x = 0
-		user.client.pixel_y = 0
+		user.client.pixel_y = 0
@@ -80,12 +80,13 @@
 	SEND_SIGNAL(src, COMSIG_OBJ_SETANCHORED, anchorvalue)
 	anchored = anchorvalue

-/obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, messy_throw)
-	. = ..()
+/obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
+	..()
 	if(obj_flags & FROZEN)
 		visible_message("<span class='danger'>[src] shatters into a million pieces!</span>")
 		qdel(src)

+
 /obj/assume_air(datum/gas_mixture/giver)
 	if(loc)
 		return loc.assume_air(giver)
@@ -88,28 +88,6 @@
 	else
 		return ..()

-/obj/structure/chair/alt_attack_hand(mob/living/user)
-	if(Adjacent(user) && istype(user))
-		if(!item_chair || !user.can_hold_items() || !has_buckled_mobs() || buckled_mobs.len > 1 || dir != user.dir || flags_1 & NODECONSTRUCT_1)
-			return TRUE
-		if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-			to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-			return TRUE
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
-			return TRUE
-		var/mob/living/poordude = buckled_mobs[1]
-		if(!istype(poordude))
-			return TRUE
-		user.visible_message("<span class='notice'>[user] pulls [src] out from under [poordude].</span>", "<span class='notice'>You pull [src] out from under [poordude].</span>")
-		var/C = new item_chair(loc)
-		user.put_in_hands(C)
-		poordude.Knockdown(20)//rip in peace
-		user.adjustStaminaLoss(5)
-		unbuckle_all_mobs(TRUE)
-		qdel(src)
-		return TRUE
-
 /obj/structure/chair/attack_tk(mob/user)
 	if(!anchored || has_buckled_mobs() || !isturf(user.loc))
 		..()
@@ -252,7 +252,7 @@ LINEN BINS
 	add_overlay(g_mouth)
 	add_overlay(g_eyes)

-/obj/item/bedsheet/gondola/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
+/obj/item/bedsheet/gondola/worn_overlays(isinhands = FALSE, icon_file)
 	. = ..()
 	if(!isinhands)
 		. += mutable_appearance(icon_file, g_mouth)
@@ -22,9 +22,7 @@
 	if(opened || move_delay || user.stat || user.IsStun() || user.IsKnockdown() || user.IsUnconscious() || !isturf(loc) || !has_gravity(loc))
 		return
 	move_delay = TRUE
-	var/oldloc = loc
-	step(src, direction)
-	if(oldloc != loc)
+	if(step(src, direction))
 		addtimer(CALLBACK(src, .proc/ResetMoveDelay), (use_mob_movespeed ? user.movement_delay() : CONFIG_GET(number/movedelay/walk_delay)) * move_speed_multiplier)
 	else
 		ResetMoveDelay()
@@ -12,12 +12,18 @@
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/hardhat/weldhat/white(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/tank/jetpack/suit(src)
 	new /obj/item/cartridge/ce(src)
 	new /obj/item/radio/headset/heads/ce(src)
+	new /obj/item/storage/toolbox/mechanical(src)
+	new /obj/item/clothing/suit/hazardvest(src)
 	new /obj/item/megaphone/command(src)
 	new /obj/item/areaeditor/blueprints(src)
+	new /obj/item/airlock_painter(src)
 	new /obj/item/holosign_creator/engineering(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/multitool(src)
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/door_remote/chief_engineer(src)
@@ -61,7 +67,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/welding(src)
 	for(var/i in 1 to 3)
-		new /obj/item/weldingtool/largetank(src)
+		new /obj/item/weldingtool(src)

 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
@@ -78,6 +84,7 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/storage/box/emptysandbags(src)

+
 /obj/structure/closet/secure_closet/atmospherics
 	name = "\proper atmospheric technician's locker"
 	req_access = list(ACCESS_ATMOSPHERICS)
@@ -91,39 +98,8 @@
 	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/analyzer(src)
 	new /obj/item/holosign_creator/atmos(src)
-	new /obj/item/holosign_creator/firelock(src)
 	new /obj/item/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/clothing/glasses/meson/engine/tray(src)
 	new /obj/item/extinguisher/advanced(src)
-
-/*
- * Empty lockers
- * Some of the lockers are filled with junk, and sometimes its nice to just fill it with your own set-up for your own map gimmicks.
- */
-
-/obj/structure/closet/secure_closet/engineering_chief/empty
-
-/obj/structure/closet/secure_closet/engineering_chief/empty/PopulateContents()
-	return
-
-/obj/structure/closet/secure_closet/engineering_electrical/empty
-
-/obj/structure/closet/secure_closet/engineering_electrical/empty/PopulateContents()
-	return
-
-/obj/structure/closet/secure_closet/engineering_welding/empty
-
-/obj/structure/closet/secure_closet/engineering_welding/empty/PopulateContents()
-	return
-
-/obj/structure/closet/secure_closet/engineering_personal/empty
-
-/obj/structure/closet/secure_closet/engineering_personal/empty/PopulateContents()
-	return
-
-/obj/structure/closet/secure_closet/atmospherics/empty
-
-/obj/structure/closet/secure_closet/atmospherics/empty/PopulateContents()
-	return
@@ -237,12 +237,6 @@
 	start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
 	req_access = list(ACCESS_RD)

-/obj/structure/displaycase/clown
-	desc = "In the event of clown, honk glass."
-	alert = TRUE
-	start_showpiece_type = /obj/item/bikehorn
-	req_access = list(ACCESS_CENT_GENERAL)
-
 /obj/structure/displaycase/trophy
 	name = "trophy display case"
 	desc = "Store your trophies of accomplishment in here, and they will stay forever."
@@ -39,7 +39,7 @@
 		return
 	last_process = world.time
 	to_chat(user, "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>")
-	user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
+	user.reagents.add_reagent("godblood",20)
 	update_icon()
 	addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)

@@ -30,11 +30,11 @@
 		return

 	var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")
-	if(!(GLOB.underwear_list[H.underwear]?.has_color))
+	if(!UNDIE_COLORABLE(GLOB.underwear_list[H.underwear]))
 		undergarment_choices -= "Underwear Color"
-	if(!(GLOB.undershirt_list[H.undershirt]?.has_color))
+	if(!UNDIE_COLORABLE(GLOB.undershirt_list[H.undershirt]))
 		undergarment_choices -= "Undershirt Color"
-	if(!(GLOB.socks_list[H.socks]?.has_color))
+	if(!UNDIE_COLORABLE(GLOB.socks_list[H.socks]))
 		undergarment_choices -= "Socks Color"

 	var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices
@@ -30,8 +30,6 @@
 	new/obj/structure/fluff/empty_terrarium(get_turf(src))
 	return ..()

-/obj/effect/mob_spawn/human/seed_vault/special(mob/living/carbon/human/new_spawn)
-	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
 //Ash walker eggs: Spawns in ash walker dens in lavaland. Ghosts become unbreathing lizards that worship the Necropolis and are advised to retrieve corpses to create more ash walkers.

 /obj/effect/mob_spawn/human/ash_walker
@@ -253,9 +251,6 @@
 	new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
 	return ..()

-/obj/effect/mob_spawn/human/hermit/special(mob/living/carbon/human/new_spawn)
-	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
-
 //Broken rejuvenation pod: Spawns in animal hospitals in lavaland. Ghosts become disoriented interns and are advised to search for help.
 /obj/effect/mob_spawn/human/doctor/alive/lavaland
 	name = "broken rejuvenation pod"
@@ -358,9 +353,6 @@
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	..()

-/obj/effect/mob_spawn/human/hotel_staff/special(mob/living/carbon/human/new_spawn)
-	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
-
 /obj/effect/mob_spawn/human/demonic_friend
 	name = "Essence of friendship"
 	desc = "Oh boy! Oh boy! A friend!"
@@ -605,7 +597,7 @@
 	rank = "Gunner"

 /obj/effect/mob_spawn/human/ghostcafe
-	name = "Ghost Cafe Sleeper"
+	name = "ghost cafe sleeper"
 	uses = -1
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
@@ -619,24 +611,6 @@
 	skip_reentry_check = TRUE
 	banType = "ghostcafe"

-/datum/action/toggle_dead_chat_mob
-	icon_icon = 'icons/mob/mob.dmi'
-	button_icon_state = "ghost"
-	name = "Toggle deadchat"
-	desc = "Turn off or on your ability to hear ghosts."
-
-/datum/action/toggle_dead_chat_mob/Trigger()
-	if(!..())
-		return 0
-	var/mob/M = target
-	if(HAS_TRAIT_FROM(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT))
-		REMOVE_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
-		to_chat(M,"<span class='notice'>You're no longer hearing deadchat.</span>")
-	else
-		ADD_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
-		to_chat(M,"<span class='notice'>You're once again longer hearing deadchat.</span>")
-
-
 /obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
 	if(new_spawn.client)
 		new_spawn.client.prefs.copy_to(new_spawn)
@@ -644,23 +618,12 @@
 		O.equip(new_spawn, FALSE, new_spawn.client)
 		SSjob.equip_loadout(null, new_spawn, FALSE)
 		SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
-		new_spawn.AddElement(/datum/element/ghost_role_eligibility)
-		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
-		ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
-		ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
-		to_chat(new_spawn,"<span class='boldwarning'>You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
-		to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
-		var/datum/action/ghost/G = new(new_spawn)
-		G.Grant(new_spawn)
-		var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
-		D.Grant(new_spawn)

 /datum/outfit/ghostcafe
 	name = "ID, jumpsuit and shoes"
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	id = /obj/item/card/id
-	r_hand = /obj/item/storage/box/syndie_kit/chameleon/ghostcafe


 /datum/outfit/ghostcafe/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
@@ -676,18 +639,4 @@
 			uniform = /obj/item/clothing/under/color/random
 		else
 			uniform = /obj/item/clothing/under/skirt/color/random
-
-/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
-	name = "ghost cafe costuming kit"
-	desc = "Look just the way you did in life - or better!"
-
-/obj/item/storage/box/syndie_kit/chameleon/ghostcafe/PopulateContents() // Doesn't contain a PDA, for isolation reasons.
-	new /obj/item/clothing/under/chameleon(src)
-	new /obj/item/clothing/suit/chameleon(src)
-	new /obj/item/clothing/gloves/chameleon(src)
-	new /obj/item/clothing/shoes/chameleon(src)
-	new /obj/item/clothing/glasses/chameleon(src)
-	new /obj/item/clothing/head/chameleon(src)
-	new /obj/item/clothing/mask/chameleon(src)
-	new /obj/item/storage/backpack/chameleon(src)
-	new /obj/item/clothing/neck/cloak/chameleon(src)
+		
@@ -84,7 +84,7 @@

 /obj/structure/grille/attack_animal(mob/user)
 	. = ..()
-	if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille)
+	if(!shock(user, 70))
 		take_damage(rand(5,10), BRUTE, "melee", 1)

 /obj/structure/grille/attack_paw(mob/user)
@@ -69,9 +69,9 @@
 	rad_insulation = RAD_LIGHT_INSULATION

 /obj/structure/holosign/barrier/atmos
-	name = "holo fan"
-	desc = "A holographic barrier resembling a tiny fan. Though it does not prevent solid objects from passing through, gas is kept out. Somehow."
-	icon_state = "holo_fan"
+	name = "holo firelock"
+	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
+	icon_state = "holo_firelock"
 	density = FALSE
 	anchored = TRUE
 	CanAtmosPass = ATMOS_PASS_NO
@@ -81,18 +81,6 @@
 	. = ..()
 	air_update_turf(TRUE)

-/obj/structure/holosign/barrier/firelock
-	name = "holo firelock"
-	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects or gas from passing through, temperature changes are kept out."
-	icon_state = "holo_firelock"
-	density = FALSE
-	anchored = TRUE
-	alpha = 150
-	resistance_flags = FIRE_PROOF
-
-/obj/structure/holosign/barrier/firelock/blocksTemperature()
-	return TRUE
-
 /obj/structure/holosign/barrier/cyborg
 	name = "Energy Field"
 	desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."
@@ -18,7 +18,7 @@
 	//	flags = CONDUCT_1

 /obj/structure/lattice/examine(mob/user)
-	. = ..()
+	..()
 	. += deconstruction_hints(user)

 /obj/structure/lattice/proc/deconstruction_hints(mob/user)
@@ -60,7 +60,7 @@
 		to_chat(user, "<span class='notice'>You build a floor.</span>")
 		var/turf/T = src.loc
 		if(isspaceturf(T))
-			T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+			T.PlaceOnTop(/turf/open/floor/plating)
 			qdel(src)
 			return TRUE
 	return FALSE
@@ -102,13 +102,13 @@
 /obj/structure/stairs/proc/force_open_above()
 	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	if(T && !istype(T))
-		T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
+		T.ChangeTurf(/turf/open/openspace)

 /obj/structure/stairs/proc/on_multiz_new(turf/source, dir)
 	if(dir == UP)
 		var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 		if(T && !istype(T))
-			T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
+			T.ChangeTurf(/turf/open/openspace)

 /obj/structure/stairs/intercept_zImpact(atom/movable/AM, levels = 1)
 	. = ..()
@@ -182,17 +182,6 @@
 	else
 		return ..()

-/obj/structure/table/alt_attack_hand(mob/user)
-	if(user && Adjacent(user) && !user.incapacitated())
-		user.setClickCooldown(4)
-		if(istype(user) && user.a_intent == INTENT_HARM)
-			user.visible_message("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
-			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
-		else
-			user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
-			playsound(src, 'sound/weapons/tap.ogg', 50, 1)
-		user.do_attack_animation(src)
-		return TRUE

 /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
 	if(!(flags_1 & NODECONSTRUCT_1))
@@ -5,8 +5,6 @@
 	icon_state = "toilet00"
 	density = FALSE
 	anchored = TRUE
-	can_buckle = TRUE
-	buckle_lying = 0
 	var/open = FALSE			//if the lid is up
 	var/cistern = 0			//if the cistern bit is open
 	var/w_items = 0			//the combined w_class of all the items in the cistern
@@ -103,7 +101,7 @@
 		if (!open)
 			return
 		var/obj/item/reagent_containers/RG = I
-		RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		to_chat(user, "<span class='notice'>You fill [RG] from [src]. Gross.</span>")
 	else
 		return ..()
@@ -201,7 +199,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "urinalcake"
 	w_class = WEIGHT_CLASS_TINY
-	list_reagents = list(/datum/reagent/chlorine = 3, /datum/reagent/ammonia = 1)
+	list_reagents = list("chlorine" = 3, "ammonia" = 1)

 /obj/item/reagent_containers/food/urinalcake/attack_self(mob/living/user)
 	user.visible_message("<span class='notice'>[user] squishes [src]!</span>", "<span class='notice'>You squish [src].</span>", "<i>You hear a squish.</i>")
@@ -463,7 +461,7 @@
 	desc = "A sink used for washing one's hands and face."
 	anchored = TRUE
 	var/busy = FALSE 	//Something's being washed at the moment
-	var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens
+	var/dispensedreagent = "water" // for whenever plumbing happens


 /obj/structure/sink/attack_hand(mob/living/user)
@@ -538,7 +536,7 @@
 				return

 	if(istype(O, /obj/item/mop))
-		O.reagents.add_reagent(dispensedreagent, 5)
+		O.reagents.add_reagent("[dispensedreagent]", 5)
 		to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 		return
@@ -684,4 +682,4 @@
 			else
 				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			playsound(loc, 'sound/items/welder.ogg', 80, 1)
+			playsound(loc, 'sound/items/welder.ogg', 80, 1)