Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -24,6 +24,10 @@
 /obj/machinery/atmospherics/unary/freezer/New()
 	..()
 	initialize_directions = dir
+
+/obj/machinery/atmospherics/unary/freezer/map/New()
+	..()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -25,6 +25,9 @@
 	..()
 	initialize_directions = dir
 
+/obj/machinery/atmospherics/unary/heater/map/New()
+	..()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/__defines/misc.dm

@@ -78,10 +78,10 @@
 
 // Setting this much higher than 1024 could allow spammers to DOS the server easily.
 #define MAX_MESSAGE_LEN       1024
-#define MAX_PAPER_MESSAGE_LEN 3072
-#define MAX_BOOK_MESSAGE_LEN  9216
+#define MAX_PAPER_MESSAGE_LEN 6144
+#define MAX_BOOK_MESSAGE_LEN  12288
 #define MAX_LNAME_LEN         64
-#define MAX_NAME_LEN          26
+#define MAX_NAME_LEN          52
 
 // Event defines.
 #define EVENT_LEVEL_MUNDANE  1

code/_helpers/global_lists.dm

@@ -23,6 +23,9 @@ var/global/list/joblist = list()					//list of all jobstypes, minus borg and AI
 
 var/global/list/turfs = list()						//list of all turfs
 
+#define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER)
+#define all_genders_text_list list("Male","Female","Plural","Neuter")
+
 //Languages/species/whitelist.
 var/global/list/all_species[0]
 var/global/list/all_languages[0]

code/_helpers/text.dm

@@ -323,3 +323,5 @@ proc/TextPreview(var/string,var/len=40)
 			if(48 to 57)			//Numbers
 				return 1
 	return 0
+
+#define gender2text(gender) capitalize(gender)

code/_helpers/unsorted.dm

@@ -137,7 +137,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 
 			//Now to find a box from center location and make that our destination.
 			for(var/turf/T in block(locate(center.x+b1xerror,center.y+b1yerror,location.z), locate(center.x+b2xerror,center.y+b2yerror,location.z) ))
-				if(density&&T.density)	continue//If density was specified.
+				if(density&&(T.density||T.contains_dense_objects()))	continue//If density was specified.
 				if(T.x>world.maxx || T.x<1)	continue//Don't want them to teleport off the map.
 				if(T.y>world.maxy || T.y<1)	continue
 				destination_list += T
@@ -146,7 +146,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			else	return
 
 		else//Same deal here.
-			if(density&&destination.density)	return
+			if(density&&(destination.density||destination.contains_dense_objects()))	return
 			if(destination.x>world.maxx || destination.x<1)	return
 			if(destination.y>world.maxy || destination.y<1)	return
 	else	return
@@ -1310,7 +1310,7 @@ var/mob/dview/dview_mob = new
 // call to generate a stack trace and print to runtime logs
 /proc/crash_with(msg)
 	CRASH(msg)
-	
+
 /proc/screen_loc2turf(scr_loc, turf/origin)
 	var/tX = splittext(scr_loc, ",")
 	var/tY = splittext(tX[2], ":")
@@ -1321,4 +1321,4 @@ var/mob/dview/dview_mob = new
 	tX = max(1, min(world.maxx, origin.x + (text2num(tX) - (world.view + 1))))
 	tY = max(1, min(world.maxy, origin.y + (text2num(tY) - (world.view + 1))))
 	return locate(tX, tY, tZ)
-	
+

code/_onclick/ai.dm

@@ -121,9 +121,9 @@
 
 /obj/machinery/door/airlock/AIShiftClick()  // Opens and closes doors!
 	if(density)
-		Topic(src, list("src"= "\ref[src]", "command"="open", "activate" = "1"), 1) // 1 meaning no window (consistency!)
+		Topic(src, list("command"="open", "activate" = "1"))
 	else
-		Topic(src, list("src"= "\ref[src]", "command"="open", "activate" = "0"), 1)
+		Topic(src, list("command"="open", "activate" = "0"))
 	return 1
 
 /atom/proc/AICtrlClick()
@@ -131,17 +131,17 @@
 
 /obj/machinery/door/airlock/AICtrlClick() // Bolts doors
 	if(locked)
-		Topic(src, list("src"= "\ref[src]", "command"="bolts", "activate" = "0"), 1)// 1 meaning no window (consistency!)
+		Topic(src, list("command"="bolts", "activate" = "0"))
 	else
-		Topic(src, list("src"= "\ref[src]", "command"="bolts", "activate" = "1"), 1)
+		Topic(src, list("command"="bolts", "activate" = "1"))
 	return 1
 
 /obj/machinery/power/apc/AICtrlClick() // turns off/on APCs.
-	Topic(src, list("src"= "\ref[src]", "breaker"="1"), 1) // 1 meaning no window (consistency!)
+	Topic(src, list("breaker"="1"))
 	return 1
 
 /obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
-	Topic(src, list("src"= "\ref[src]", "command"="enable", "value"="[!enabled]"), 1) // 1 meaning no window (consistency!)
+	Topic(src, list("command"="enable", "value"="[!enabled]"))
 	return 1
 
 /atom/proc/AIAltClick(var/atom/A)
@@ -150,14 +150,14 @@
 /obj/machinery/door/airlock/AIAltClick() // Electrifies doors.
 	if(!electrified_until)
 		// permanent shock
-		Topic(src, list("src"= "\ref[src]", "command"="electrify_permanently", "activate" = "1"), 1) // 1 meaning no window (consistency!)
+		Topic(src, list("command"="electrify_permanently", "activate" = "1"))
 	else
 		// disable/6 is not in Topic; disable/5 disables both temporary and permanent shock
-		Topic(src, list("src"= "\ref[src]", "command"="electrify_permanently", "activate" = "0"), 1)
+		Topic(src, list("command"="electrify_permanently", "activate" = "0"))
 	return 1
 
 /obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
-	Topic(src, list("src"= "\ref[src]", "command"="lethal", "value"="[!lethal]"), 1) // 1 meaning no window (consistency!)
+	Topic(src, list("command"="lethal", "value"="[!lethal]"))
 	return 1
 
 /atom/proc/AIMiddleClick(var/mob/living/silicon/user)
@@ -169,9 +169,9 @@
 		return
 
 	if(!src.lights)
-		Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "1"), 1) // 1 meaning no window (consistency!)
+		Topic(src, list("command"="lights", "activate" = "1"))
 	else
-		Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "0"), 1)
+		Topic(src, list("command"="lights", "activate" = "0"))
 	return 1
 
 //

code/_onclick/hud/hud.dm

@@ -256,7 +256,7 @@ datum/hud/New(mob/owner)
 	if(ishuman(mymob))
 		human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences
 	else if(isrobot(mymob))
-		robot_hud()
+		robot_hud(ui_style, ui_color, ui_alpha, mymob)
 	else if(isbrain(mymob))
 		brain_hud(ui_style)
 	else if(isalien(mymob))

code/_onclick/hud/robot.dm

@@ -1,7 +1,20 @@
 var/obj/screen/robot_inventory
+/*
+/mob/living/silicon/robot/instantiate_hud(var/datum/hud/HUD, var/ui_style, var/ui_color, var/ui_alpha)
+	HUD.robot_hud(ui_style, ui_color, ui_alpha, src)*/
 
+/datum/hud/proc/robot_hud(ui_style='icons/mob/screen1_robot.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255, var/mob/living/silicon/robot/target)
+/*	var/datum/hud_data/hud_data
+	if(!istype(target))
+		hud_data = new()
 
-/datum/hud/proc/robot_hud()
+	if(hud_data.icon)
+		ui_style = hud_data.icon*/
+
+	if(ui_style == 'icons/mob/screen/minimalist.dmi')
+		ui_style = 'icons/mob/screen1_robot_minimalist.dmi'
+	else
+		ui_style = 'icons/mob/screen1_robot.dmi'
 
 	src.adding = list()
 	src.other = list()
@@ -12,7 +25,9 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "radio"
 	using.set_dir(SOUTHWEST)
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "radio"
 	using.screen_loc = ui_movi
 	using.layer = 20
@@ -23,7 +38,9 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "module1"
 	using.set_dir(SOUTHWEST)
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "inv1"
 	using.screen_loc = ui_inv1
 	using.layer = 20
@@ -33,7 +50,9 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "module2"
 	using.set_dir(SOUTHWEST)
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "inv2"
 	using.screen_loc = ui_inv2
 	using.layer = 20
@@ -43,7 +62,9 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "module3"
 	using.set_dir(SOUTHWEST)
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "inv3"
 	using.screen_loc = ui_inv3
 	using.layer = 20
@@ -56,7 +77,8 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "act_intent"
 	using.set_dir(SOUTHWEST)
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
+	using.alpha = ui_alpha
 	using.icon_state = mymob.a_intent
 	using.screen_loc = ui_acti
 	using.layer = 20
@@ -65,47 +87,60 @@ var/obj/screen/robot_inventory
 
 //Cell
 	mymob:cells = new /obj/screen()
-	mymob:cells.icon = 'icons/mob/screen1_robot.dmi'
+	mymob:cells.icon = ui_style
 	mymob:cells.icon_state = "charge-empty"
+	mymob:cells.alpha = ui_alpha
 	mymob:cells.name = "cell"
 	mymob:cells.screen_loc = ui_toxin
+	src.other += mymob:cells
 
 //Health
 	mymob.healths = new /obj/screen()
-	mymob.healths.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.healths.icon = ui_style
 	mymob.healths.icon_state = "health0"
+	mymob.healths.alpha = ui_alpha
 	mymob.healths.name = "health"
 	mymob.healths.screen_loc = ui_borg_health
+	src.other += mymob.healths
 
 //Installed Module
 	mymob.hands = new /obj/screen()
-	mymob.hands.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.hands.icon = ui_style
 	mymob.hands.icon_state = "nomod"
+	mymob.hands.alpha = ui_alpha
 	mymob.hands.name = "module"
 	mymob.hands.screen_loc = ui_borg_module
+	src.other += mymob.hands
 
 //Module Panel
 	using = new /obj/screen()
 	using.name = "panel"
-	using.icon = 'icons/mob/screen1_robot.dmi'
+	using.icon = ui_style
 	using.icon_state = "panel"
+	using.alpha = ui_alpha
 	using.screen_loc = ui_borg_panel
 	using.layer = 19
 	src.adding += using
 
 //Store
 	mymob.throw_icon = new /obj/screen()
-	mymob.throw_icon.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.throw_icon.icon = ui_style
 	mymob.throw_icon.icon_state = "store"
+	mymob.throw_icon.alpha = ui_alpha
+	mymob.throw_icon.color = ui_color
 	mymob.throw_icon.name = "store"
 	mymob.throw_icon.screen_loc = ui_borg_store
+	src.other += mymob.throw_icon
 
 //Inventory
 	robot_inventory = new /obj/screen()
 	robot_inventory.name = "inventory"
-	robot_inventory.icon = 'icons/mob/screen1_robot.dmi'
+	robot_inventory.icon = ui_style
 	robot_inventory.icon_state = "inventory"
+	robot_inventory.alpha = ui_alpha
+	robot_inventory.color = ui_color
 	robot_inventory.screen_loc = ui_borg_inventory
+	src.other += robot_inventory
 
 //Temp
 	mymob.bodytemp = new /obj/screen()
@@ -113,24 +148,30 @@ var/obj/screen/robot_inventory
 	mymob.bodytemp.name = "body temperature"
 	mymob.bodytemp.screen_loc = ui_temp
 
-
 	mymob.oxygen = new /obj/screen()
-	mymob.oxygen.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.oxygen.icon = ui_style
 	mymob.oxygen.icon_state = "oxy0"
+	mymob.oxygen.alpha = ui_alpha
 	mymob.oxygen.name = "oxygen"
 	mymob.oxygen.screen_loc = ui_oxygen
+	src.other += mymob.oxygen
 
 	mymob.fire = new /obj/screen()
-	mymob.fire.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.fire.icon = ui_style
 	mymob.fire.icon_state = "fire0"
+	mymob.fire.alpha = ui_alpha
 	mymob.fire.name = "fire"
 	mymob.fire.screen_loc = ui_fire
+	src.other += mymob.fire
 
 	mymob.pullin = new /obj/screen()
-	mymob.pullin.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.pullin.icon = ui_style
 	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.alpha = ui_alpha
+	mymob.pullin.color = ui_color
 	mymob.pullin.name = "pull"
 	mymob.pullin.screen_loc = ui_borg_pull
+	src.other += mymob.pullin
 
 	mymob.blind = new /obj/screen()
 	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
@@ -140,22 +181,32 @@ var/obj/screen/robot_inventory
 	mymob.blind.layer = 0
 
 	mymob.flash = new /obj/screen()
-	mymob.flash.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.flash.icon = ui_style
 	mymob.flash.icon_state = "blank"
 	mymob.flash.name = "flash"
 	mymob.flash.screen_loc = ui_entire_screen
 	mymob.flash.layer = 17
+	src.other += mymob.flash
 
 	mymob.zone_sel = new /obj/screen/zone_sel()
-	mymob.zone_sel.icon = 'icons/mob/screen1_robot.dmi'
+	mymob.zone_sel.icon = ui_style
+	mymob.zone_sel.alpha = ui_alpha
 	mymob.zone_sel.overlays.Cut()
 	mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")
 
 	//Handle the gun settings buttons
 	mymob.gun_setting_icon = new /obj/screen/gun/mode(null)
+	mymob.gun_setting_icon.icon = ui_style
+	mymob.gun_setting_icon.alpha = ui_alpha
 	mymob.item_use_icon = new /obj/screen/gun/item(null)
+	mymob.item_use_icon.icon = ui_style
+	mymob.item_use_icon.alpha = ui_alpha
 	mymob.gun_move_icon = new /obj/screen/gun/move(null)
+	mymob.gun_move_icon.icon = ui_style
+	mymob.gun_move_icon.alpha = ui_alpha
 	mymob.radio_use_icon = new /obj/screen/gun/radio(null)
+	mymob.radio_use_icon.icon = ui_style
+	mymob.radio_use_icon.alpha = ui_alpha
 
 	mymob.client.screen = list()
 

code/datums/datacore.dm

@@ -1,3 +1,4 @@
+
 /hook/startup/proc/createDatacore()
 	data_core = new /datum/datacore()
 	return 1
@@ -186,7 +187,7 @@
 		G.fields["fingerprint"]	= md5(H.dna.uni_identity)
 		G.fields["p_stat"]		= "Active"
 		G.fields["m_stat"]		= "Stable"
-		G.fields["sex"]			= H.gender
+		G.fields["sex"]			= gender2text(H.gender)
 		G.fields["species"]		= H.get_species()
 		G.fields["home_system"]	= H.home_system
 		G.fields["citizenship"]	= H.citizenship
@@ -199,6 +200,7 @@
 		var/datum/data/record/M = CreateMedicalRecord(H.real_name, id)
 		M.fields["b_type"]		= H.b_type
 		M.fields["b_dna"]		= H.dna.unique_enzymes
+		M.fields["id_gender"]	= gender2text(H.identifying_gender)
 		if(H.med_record && !jobban_isbanned(H, "Records"))
 			M.fields["notes"] = H.med_record
 
@@ -214,7 +216,8 @@
 		L.fields["rank"] 		= H.mind.assigned_role
 		L.fields["age"]			= H.age
 		L.fields["fingerprint"]	= md5(H.dna.uni_identity)
-		L.fields["sex"]			= H.gender
+		L.fields["sex"]			= gender2text(H.gender)
+		L.fields["id_gender"]	= gender2text(H.identifying_gender)
 		L.fields["b_type"]		= H.b_type
 		L.fields["b_dna"]		= H.dna.unique_enzymes
 		L.fields["enzymes"]		= H.dna.SE // Used in respawning
@@ -418,7 +421,7 @@
 	G.fields["id"] = id
 	G.fields["rank"] = "Unassigned"
 	G.fields["real_rank"] = "Unassigned"
-	G.fields["sex"] = "Male"
+	G.fields["sex"] = "Unknown"
 	G.fields["age"] = "Unknown"
 	G.fields["fingerprint"] = "Unknown"
 	G.fields["p_stat"] = "Active"
@@ -460,6 +463,7 @@
 	M.fields["name"]		= name
 	M.fields["b_type"]		= "AB+"
 	M.fields["b_dna"]		= md5(name)
+	M.fields["id_gender"]	= "Unknown"
 	M.fields["mi_dis"]		= "None"
 	M.fields["mi_dis_d"]	= "No minor disabilities have been declared."
 	M.fields["ma_dis"]		= "None"

code/datums/mind.dm

@@ -391,7 +391,7 @@
 		switch(href_list["common"])
 			if("undress")
 				for(var/obj/item/W in current)
-					current.removeItem(W, force = 1)
+					current.drop_from_inventory(W)
 			if("takeuplink")
 				take_uplink()
 				memory = null//Remove any memory they may have had.

code/datums/recipe.dm

@@ -76,7 +76,7 @@
 		checklist = items.Copy() // You should really trust Copy
 		if(istype(container, /obj/machinery))
 			var/obj/machinery/machine = container
-			for(var/obj/O in (machine.contents - machine.component_parts))
+			for(var/obj/O in ((machine.contents - machine.component_parts) - machine.circuit))
 				if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown))
 					continue // Fruit is handled in check_fruit().
 				var/found = 0
@@ -110,7 +110,7 @@
 	var/obj/result_obj = new result(container)
 	if(istype(container, /obj/machinery))
 		var/obj/machinery/machine = container
-		for (var/obj/O in ((machine.contents-result_obj)-machine.component_parts))
+		for (var/obj/O in ((machine.contents-result_obj - machine.component_parts) - machine.circuit))
 			O.reagents.trans_to_obj(result_obj, O.reagents.total_volume)
 			qdel(O)
 	else
@@ -128,7 +128,7 @@
 	var/obj/result_obj = new result(container)
 	if(istype(container, /obj/machinery))
 		var/obj/machinery/machine = container
-		for (var/obj/O in ((machine.contents-result_obj)-machine.component_parts))
+		for (var/obj/O in ((machine.contents-result_obj - machine.component_parts) - machine.circuit))
 			if (O.reagents)
 				O.reagents.del_reagent("nutriment")
 				O.reagents.update_total()

code/defines/obj/weapon.dm

@@ -100,7 +100,7 @@
 		user.visible_message("<span class='warning'>[user] has unsheathed \a [concealed_blade] from \his [src]!</span>", "You unsheathe \the [concealed_blade] from \the [src].")
 		// Calling drop/put in hands to properly call item drop/pickup procs
 		playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1)
-		user.removeItem(src)
+		user.drop_from_inventory(src)
 		user.put_in_hands(concealed_blade)
 		user.put_in_hands(src)
 		user.update_inv_l_hand(0)
@@ -112,7 +112,8 @@
 /obj/item/weapon/cane/concealed/attackby(var/obj/item/weapon/material/butterfly/W, var/mob/user)
 	if(!src.concealed_blade && istype(W))
 		user.visible_message("<span class='warning'>[user] has sheathed \a [W] into \his [src]!</span>", "You sheathe \the [W] into \the [src].")
-		user.removeItem(W, src)
+		user.drop_from_inventory(W)
+		W.loc = src
 		src.concealed_blade = W
 		update_icon()
 	else

code/game/antagonist/antagonist_equip.dm

@@ -6,7 +6,8 @@
 	// This could use work.
 	if(flags & ANTAG_CLEAR_EQUIPMENT)
 		for(var/obj/item/thing in player.contents)
-			if(player.removeItem(thing, force = 1))
+			player.drop_from_inventory(thing)
+			if(thing.loc != player)
 				qdel(thing)
 	return 1
 

code/game/antagonist/outsider/mercenary.dm

@@ -39,7 +39,7 @@ var/datum/antagonist/mercenary/mercs
 	player.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(player), slot_shoes)
 	player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), slot_gloves)
 	if(player.backbag == 2) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(player), slot_back)
-	if(player.backbag == 3) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(player), slot_back)
+	if(player.backbag == 3) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(player), slot_back)
 	if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(player), slot_back)
 	player.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(player.back), slot_in_backpack)
 	player.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(player), slot_in_backpack)

code/game/antagonist/outsider/wizard.dm

@@ -81,7 +81,7 @@ var/datum/antagonist/wizard/wizards
 	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
 	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
 	if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
-	if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(wizard_mob), slot_back)
+	if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(wizard_mob), slot_back)
 	if(wizard_mob.backbag == 4) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(wizard_mob), slot_back)
 	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box(wizard_mob), slot_in_backpack)
 	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store)

code/game/antagonist/station/renegade.dm

@@ -3,7 +3,7 @@ var/datum/antagonist/renegade/renegades
 /datum/antagonist/renegade
 	role_text = "Renegade"
 	role_text_plural = "Renegades"
-	welcome_text = "Something's going to go wrong today, you can just feel it. Your paranoid, you've got a gun, and you're going to survive."
+	welcome_text = "Something's going to go wrong today, you can just feel it. You're paranoid, you've got a gun, and you're going to survive."
 	antag_text = "You are a <b>minor</b> antagonist! Within the rules, \
 		try to protect yourself and what's important to you. You aren't here to cause trouble, \
 		you're just more willing (and equipped) to go to extremes to stop it than others are. \
@@ -15,13 +15,11 @@ var/datum/antagonist/renegade/renegades
 
 	id = MODE_RENEGADE
 	flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_RANDSPAWN | ANTAG_VOTABLE
-	hard_cap = 5
-	hard_cap_round = 7
-
+	
 	hard_cap = 8
 	hard_cap_round = 12
-	initial_spawn_req = 3
-	initial_spawn_target = 6
+	initial_spawn_req = 2
+	initial_spawn_target = 4
 
 	var/list/spawn_guns = list(
 		/obj/item/weapon/gun/energy/laser,

code/game/dna/genes/monkey.dm

@@ -22,7 +22,7 @@
 		for(var/obj/item/W in (H.contents-implants))
 			if (W==H.w_uniform) // will be teared
 				continue
-			H.removeItem(W, force = 1)
+			H.drop_from_inventory(W)
 		M.transforming = 1
 		M.canmove = 0
 		M.icon = null
@@ -90,7 +90,7 @@
 		W.loc = null
 	if(!connected)
 		for(var/obj/item/W in (Mo.contents-implants))
-			Mo.removeItem(W, force = 1)
+			Mo.drop_from_inventory(W)
 		M.transforming = 1
 		M.canmove = 0
 		M.icon = null

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

@@ -79,7 +79,7 @@
 							organ.implants -= src
 			host.pinned -= src
 			host.embedded -= src
-			host.removeItem(src, force = 1)
+			host.drop_from_inventory(src)
 		spawn(1)
 			if(src)
 				qdel(src)

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

@@ -78,7 +78,7 @@
 	qdel(animation)
 
 	for(var/obj/item/W in src)
-		C.removeItem(W, force = 1)
+		C.drop_from_inventory(W)
 
 	var/mob/living/carbon/human/O = new /mob/living/carbon/human( src )
 	if (C.dna.GetUIState(DNA_UI_GENDER))

code/game/gamemodes/cult/runes.dm

@@ -346,6 +346,7 @@ var/list/sacrificed = list()
 			for(var/mob/observer/dead/O in loc)
 				if(!O.client)	continue
 				if(O.mind && O.mind.current && O.mind.current.stat != DEAD)	continue
+				if(!(O.client.prefs.be_special & BE_CULTIST)) continue
 				ghost = O
 				break
 
@@ -442,6 +443,7 @@ var/list/sacrificed = list()
 				if(!O.client)	continue
 				if(!O.MayRespawn()) continue
 				if(O.mind && O.mind.current && O.mind.current.stat != DEAD)	continue
+				if(!(O.client.prefs.be_special & BE_CULTIST)) continue
 				ghost = O
 				break
 			if(!ghost)
@@ -830,11 +832,11 @@ var/list/sacrificed = list()
 					return
 				cultist.buckled = null
 				if (cultist.handcuffed)
-					cultist.removeItem(cultist.handcuffed, force = 1)
+					cultist.drop_from_inventory(cultist.handcuffed)
 				if (cultist.legcuffed)
-					cultist.removeItem(cultist.legcuffed, force = 1)
+					cultist.drop_from_inventory(cultist.legcuffed)
 				if (istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle))
-					cultist.removeItem(cultist.wear_mask, force = 1)
+					cultist.drop_from_inventory(cultist.wear_mask)
 				if(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded)
 					cultist.loc:welded = 0
 				if(istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked)

code/game/gamemodes/endgame/supermatter_cascade/blob.dm

@@ -93,7 +93,7 @@
 
 	playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
 
-	user.removeItem(W, force = 1)
+	user.drop_from_inventory(W)
 	Consume(W)
 
 

code/game/gamemodes/mixed/traitorrenegade.dm

@@ -3,9 +3,9 @@
 	round_description = "Subversive elements have invaded the station, and certain individuals are feeling uncertain about their safety."
 	extended_round_description = "Traitors and renegades spawn during this round."
 	config_tag = "traitorren"
-	required_players = 10			//I don't think we can have it lower and not need an ERT every round.
+	required_players = 11			//I don't think we can have it lower and not need an ERT every round.
 	required_players_secret = 11	//I don't think we can have it lower and not need an ERT every round.
 	required_enemies = 4
 	end_on_antag_death = 0
-	antag_tags = list(MODE_TRAITOR, MODE_RENEGADE)
-	require_all_templates = 1
+	antag_tags = list(MODE_AUTOTRAITOR, MODE_RENEGADE)
+	require_all_templates = 1

code/game/jobs/job/assistant.dm

@@ -17,7 +17,7 @@
 	if(!H)	return 0
 	switch(H.backbag)
 		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 	if (H.mind.role_alt_title)
 		switch(H.mind.role_alt_title)

code/game/jobs/job/captain.dm

@@ -28,7 +28,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/cap(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H)
 		if(H.age>49)
@@ -91,7 +91,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)

code/game/jobs/job/civilian.dm

@@ -18,7 +18,7 @@
 		if(!H)	return 0
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
@@ -81,7 +81,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/hydroponics(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/hyd(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		return 1
 
@@ -163,7 +163,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt)
@@ -254,7 +254,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/ia(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/internalaffairs(H), slot_wear_suit)

code/game/jobs/job/engineering.dm

@@ -33,7 +33,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store)
@@ -70,7 +70,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes)
@@ -106,7 +106,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes)

code/game/jobs/job/job.dm

@@ -31,7 +31,7 @@
 /datum/job/proc/equip_backpack(var/mob/living/carbon/human/H)
 	switch(H.backbag)
 		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 
 /datum/job/proc/equip_survival(var/mob/living/carbon/human/H)

code/game/jobs/job/medical.dm

@@ -28,7 +28,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
@@ -60,7 +60,7 @@
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
@@ -77,7 +77,7 @@
 					H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
 					switch(H.backbag)
 						if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
-						if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_vir(H), slot_back)
+						if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/vir(H), slot_back)
 						if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 				if("Medical Doctor")
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
@@ -125,7 +125,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chemistry(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_chem(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/chem(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(H), slot_wear_suit)
 		return 1
@@ -154,7 +154,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/genetics(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/gen(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
@@ -181,7 +181,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
@@ -218,7 +218,7 @@
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)

code/game/jobs/job/science.dm

@@ -34,7 +34,7 @@
 		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
 		return 1
@@ -66,7 +66,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/science(H), slot_belt)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
 		return 1
@@ -96,7 +96,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/science(H), slot_belt)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
 		return 1
@@ -122,7 +122,7 @@
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
 		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_r_store)

code/game/jobs/job/security.dm

@@ -27,7 +27,7 @@
 		if(!H)	return 0
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform)
@@ -66,7 +66,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
@@ -103,7 +103,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
@@ -145,7 +145,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)

code/game/machinery/Sleeper.dm

@@ -9,6 +9,7 @@
 	use_power = 1
 	idle_power_usage = 40
 	interact_offline = 1
+	circuit = /obj/item/weapon/circuitboard/sleeper_console
 
 //obj/machinery/sleep_console/New()
 	//..()
@@ -32,8 +33,39 @@
 /obj/machinery/sleep_console/attack_hand(var/mob/user)
 	if(..())
 		return 1
+	if(connected)
+		connected.ui_interact(user)
 
-	connected.ui_interact(user)
+/obj/machinery/sleep_console/attackby(var/obj/item/I, var/mob/user)
+	if(istype(I, /obj/item/weapon/screwdriver) && circuit)
+		user << "<span class='notice'>You start disconnecting the monitor.</span>"
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
+			var/obj/item/weapon/circuitboard/M = new circuit( A )
+			A.circuit = M
+			A.anchored = 1
+			A.density = 1
+			A.frame_type = M.board_type
+			for (var/obj/C in src)
+				C.forceMove(loc)
+			if (src.stat & BROKEN)
+				user << "<span class='notice'>The broken glass falls out.</span>"
+				new /obj/item/weapon/material/shard( src.loc )
+				A.state = 3
+				A.icon_state = "[A.frame_type]_3"
+			else
+				user << "<span class='notice'>You disconnect the monitor.</span>"
+				A.state = 4
+				A.icon_state = "[A.frame_type]_4"
+			A.pixel_x = pixel_x
+			A.pixel_y = pixel_y
+			A.dir = dir
+			M.deconstruct(src)
+			qdel(src)
+	else
+		src.attack_hand(user)
+	return
 
 /obj/machinery/sleep_console/power_change()
 	..()
@@ -49,6 +81,7 @@
 	icon_state = "sleeper_0"
 	density = 1
 	anchored = 1
+	circuit = /obj/item/weapon/circuitboard/sleeper
 	var/mob/living/carbon/human/occupant = null
 	var/list/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
@@ -59,8 +92,29 @@
 	active_power_usage = 200 //builtin health analyzer, dialysis machine, injectors.
 
 /obj/machinery/sleeper/New()
+	..()
+	spawn(5)
+		//src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir))
+		var/obj/machinery/sleep_console/C = locate(/obj/machinery/sleep_console) in range(2,src)
+		if(C)
+			C.connected = src
+		return
+	return
+
+/obj/machinery/sleeper/map/New()
 	..()
 	beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src)
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
+	component_parts += new /obj/item/weapon/reagent_containers/syringe(src)
+	component_parts += new /obj/item/weapon/reagent_containers/syringe(src)
+	component_parts += new /obj/item/weapon/reagent_containers/syringe(src)
+	component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
+	RefreshParts()
 
 /obj/machinery/sleeper/initialize()
 	update_icon()
@@ -156,6 +210,10 @@
 	return 1
 
 /obj/machinery/sleeper/attackby(var/obj/item/I, var/mob/user)
+	if(default_deconstruction_screwdriver(user, I))
+		return
+	if(default_deconstruction_crowbar(user, I))
+		return
 	add_fingerprint(user)
 	if(istype(I, /obj/item/weapon/reagent_containers/glass))
 		if(!beaker)
@@ -230,7 +288,9 @@
 	occupant.loc = loc
 	occupant = null
 	for(var/atom/movable/A in src) // In case an object was dropped inside or something
-		if(A == beaker)
+		if(A == beaker || A == circuit)
+			continue
+		if(A in component_parts)
 			continue
 		A.loc = loc
 	update_use_power(1)

code/game/machinery/adv_med.dm

@@ -9,11 +9,31 @@
 	icon_state = "body_scanner_0"
 	density = 1
 	anchored = 1
+	circuit = /obj/item/weapon/circuitboard/body_scanner
 
 	use_power = 1
 	idle_power_usage = 60
 	active_power_usage = 10000	//10 kW. It's a big all-body scanner.
 
+/obj/machinery/bodyscanner/New()
+	..()
+	spawn( 5 )
+		var/obj/machinery/body_scanconsole/C = locate(/obj/machinery/body_scanconsole) in range(2,src)
+		if(C)
+			C.connected = src
+		return
+	return
+
+/obj/machinery/bodyscanner/map/New()
+	..()
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
+	RefreshParts()
+
 /obj/machinery/bodyscanner/relaymove(mob/user as mob)
 	if (user.stat)
 		return
@@ -53,6 +73,10 @@
 	src.icon_state = "body_scanner_1"
 	for(var/obj/O in src)
 		//O = null
+		if(O in component_parts)
+			continue
+		if(O == circuit)
+			continue
 		qdel(O)
 		//Foreach goto(124)
 	src.add_fingerprint(usr)
@@ -62,6 +86,10 @@
 	if ((!( src.occupant ) || src.locked))
 		return
 	for(var/obj/O in src)
+		if(O in component_parts)
+			continue
+		if(O == circuit)
+			continue
 		O.loc = src.loc
 		//Foreach goto(30)
 	if (src.occupant.client)
@@ -73,35 +101,50 @@
 	src.icon_state = "body_scanner_0"
 	return
 
-/obj/machinery/bodyscanner/attackby(obj/item/weapon/grab/G as obj, user as mob)
-	if ((!( istype(G, /obj/item/weapon/grab) ) || !( ismob(G.affecting) )))
+/obj/machinery/bodyscanner/attackby(var/obj/item/G, user as mob)
+	if(default_deconstruction_screwdriver(user, G))
 		return
-	if (src.occupant)
-		user << "<span class='warning'>The scanner is already occupied!</span>"
+	if(default_deconstruction_crowbar(user, G))
 		return
-	if (G.affecting.abiotic())
-		user << "<span class='warning'>Subject cannot have abiotic items on.</span>"
-		return
-	var/mob/M = G.affecting
-	if (M.client)
-		M.client.perspective = EYE_PERSPECTIVE
-		M.client.eye = src
-	M.loc = src
-	src.occupant = M
-	update_use_power(2)
-	src.icon_state = "body_scanner_1"
-	for(var/obj/O in src)
-		O.loc = src.loc
-		//Foreach goto(154)
-	src.add_fingerprint(user)
-	//G = null
-	qdel(G)
+
+	if(istype(G, /obj/item/weapon/grab))
+		var/obj/item/weapon/grab/H = G
+		if(!(ismob(H.affecting)))
+			return
+		if (src.occupant)
+			user << "<span class='warning'>The scanner is already occupied!</span>"
+			return
+		if (H.affecting.abiotic())
+			user << "<span class='warning'>Subject cannot have abiotic items on.</span>"
+			return
+		var/mob/M = H.affecting
+		if (M.client)
+			M.client.perspective = EYE_PERSPECTIVE
+			M.client.eye = src
+		M.loc = src
+		src.occupant = M
+		update_use_power(2)
+		src.icon_state = "body_scanner_1"
+		for(var/obj/O in src)
+			if(O in component_parts)
+				continue
+			if(O == circuit)
+				continue
+			O.loc = src.loc
+			//Foreach goto(154)
+		src.add_fingerprint(user)
+		//G = null
+		qdel(G)
 	return
 
 /obj/machinery/bodyscanner/ex_act(severity)
 	switch(severity)
 		if(1.0)
 			for(var/atom/movable/A as mob|obj in src)
+				if(A in component_parts)
+					continue
+				if(A == circuit)
+					continue
 				A.loc = src.loc
 				ex_act(severity)
 				//Foreach goto(35)
@@ -111,6 +154,10 @@
 		if(2.0)
 			if (prob(50))
 				for(var/atom/movable/A as mob|obj in src)
+					if(A in component_parts)
+						continue
+					if(A == circuit)
+						continue
 					A.loc = src.loc
 					ex_act(severity)
 					//Foreach goto(108)
@@ -120,6 +167,10 @@
 		if(3.0)
 			if (prob(25))
 				for(var/atom/movable/A as mob|obj in src)
+					if(A in component_parts)
+						continue
+					if(A == circuit)
+						continue
 					A.loc = src.loc
 					ex_act(severity)
 					//Foreach goto(181)
@@ -166,11 +217,12 @@
 	dir = 8
 	density = 0
 	anchored = 1
+	circuit = /obj/item/weapon/circuitboard/scanner_console
 
 /obj/machinery/body_scanconsole/New()
 	..()
 	spawn( 5 )
-		src.connected = locate(/obj/machinery/bodyscanner, get_step(src, WEST)) //We assume dir = 8 so scanner is WEST. Other sprites do exist.
+		src.connected = locate(/obj/machinery/bodyscanner) in range(2,src)
 		return
 	return
 
@@ -228,6 +280,36 @@
 	user << browse(dat, "window=scanconsole;size=430x600")
 	return
 
+/obj/machinery/body_scanconsole/attackby(var/obj/item/I, var/mob/user)
+	if(istype(I, /obj/item/weapon/screwdriver) && circuit)
+		user << "<span class='notice'>You start disconnecting the monitor.</span>"
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
+			var/obj/item/weapon/circuitboard/M = new circuit( A )
+			A.circuit = M
+			A.anchored = 1
+			A.density = 1
+			A.frame_type = M.board_type
+			for (var/obj/C in src)
+				C.forceMove(loc)
+			if (src.stat & BROKEN)
+				user << "<span class='notice'>The broken glass falls out.</span>"
+				new /obj/item/weapon/material/shard( src.loc )
+				A.state = 3
+				A.icon_state = "[A.frame_type]_3"
+			else
+				user << "<span class='notice'>You disconnect the monitor.</span>"
+				A.state = 4
+				A.icon_state = "[A.frame_type]_4"
+			A.pixel_x = pixel_x
+			A.pixel_y = pixel_y
+			A.dir = dir
+			M.deconstruct(src)
+			qdel(src)
+	else
+		src.attack_hand(user)
+	return
 
 /obj/machinery/body_scanconsole/Topic(href, href_list)
 	if (..())

code/game/machinery/autolathe.dm

@@ -23,12 +23,14 @@
 
 	var/datum/wires/autolathe/wires = null
 
-
 /obj/machinery/autolathe/New()
-
 	..()
 	wires = new(src)
+
+/obj/machinery/autolathe/map/New()
+	..()
 	//Create parts for lathe.
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
@@ -196,7 +198,8 @@
 		var/obj/item/stack/stack = eating
 		stack.use(max(1, round(total_used/mass_per_sheet))) // Always use at least 1 to prevent infinite materials.
 	else
-		user.deleteItem(O)
+		user.remove_from_mob(O)
+		qdel(O)
 
 	updateUsrDialog()
 	return

code/game/machinery/autolathe_datums.dm

@@ -226,26 +226,21 @@
 	path = /obj/item/weapon/circuitboard/fax
 	category = "Engineering"
 
-/datum/autolathe/recipe/conveyor
-	name = "conveyor electronics"
-	path = /obj/item/weapon/circuitboard/conveyor
-	category = "Engineering"
-
 /datum/autolathe/recipe/microwave
 	name = "microwave electronics"
 	path = /obj/item/weapon/circuitboard/microwave
 	category = "Engineering"
 
-/datum/autolathe/recipe/vending
-	name = "vending machine electronics"
-	path = /obj/item/weapon/circuitboard/vending
-	category = "Engineering"
-
 /datum/autolathe/recipe/washing
 	name = "washing machine electronics"
 	path = /obj/item/weapon/circuitboard/washing
 	category = "Engineering"
 
+/datum/autolathe/recipe/request
+	name = "request console electronics"
+	path = /obj/item/weapon/circuitboard/request
+	category = "Engineering"
+
 /datum/autolathe/recipe/motor
 	name = "motor"
 	path = /obj/item/weapon/stock_parts/motor

code/game/machinery/biogenerator.dm

@@ -21,8 +21,11 @@
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
 	R.my_atom = src
-	beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src)
 
+/obj/machinery/biogenerator/map/New()
+	..()
+	beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src)
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
@@ -52,7 +55,8 @@
 		if(beaker)
 			user << "<span class='notice'>]The [src] is already loaded.</span>"
 		else
-			user.removeItem(O, src)
+			user.remove_from_mob(O)
+			O.loc = src
 			beaker = O
 			updateUsrDialog()
 	else if(processing)
@@ -83,7 +87,8 @@
 		if(i >= 10)
 			user << "<span class='notice'>\The [src] is full! Activate it.</span>"
 		else
-			user.removeItem(O, src)
+			user.remove_from_mob(O)
+			O.loc = src
 			user << "<span class='notice'>You put \the [O] in \the [src]</span>"
 	update_icon()
 	return

code/game/machinery/camera/camera_assembly.dm

@@ -127,7 +127,8 @@
 	if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
 		user << "You attach \the [W] into the assembly inner circuits."
 		upgrades += W
-		user.removeItem(W, src)
+		user.remove_from_mob(W)
+		W.loc = src
 		return
 
 	// Taking out upgrades

code/game/machinery/cloning.dm

@@ -45,8 +45,9 @@
 	var/eject_wait = 0 //Don't eject them as soon as they are created fuckkk
 	var/biomass = CLONE_BIOMASS * 3
 
-/obj/machinery/clonepod/New()
+/obj/machinery/clonepod/map/New()
 	..()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/game/machinery/computer/card.dm

@@ -59,9 +59,13 @@
 	if(!istype(id_card))
 		return ..()
 
-	if(!scan && (access_change_ids in id_card.access) && user.removeItem(id_card, src))
+	if(!scan && (access_change_ids in id_card.access) && user.unEquip(id_card))
+		user.drop_item()
+		id_card.forceMove(src)
 		scan = id_card
-	else if(!modify && user.removeItem(id_card, src))
+	else if(!modify)
+		user.drop_item()
+		id_card.forceMove(src)
 		modify = id_card
 
 	nanomanager.update_uis(src)
@@ -153,7 +157,8 @@
 					modify = null
 			else
 				var/obj/item/I = usr.get_active_hand()
-				if (istype(I, /obj/item/weapon/card/id) && usr.removeItem(I, src))
+				if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
+					I.forceMove(src)
 					modify = I
 
 		if ("scan")

code/game/machinery/computer/guestpass.dm

@@ -61,6 +61,7 @@
 	..()
 	uid = "[rand(100,999)]-G[rand(10,99)]"
 
+
 /obj/machinery/computer/guestpass/attackby(obj/I, mob/user)
 	if(istype(I, /obj/item/weapon/screwdriver) && circuit)
 		user << "<span class='notice'>You start disconnecting the monitor.</span>"
@@ -82,7 +83,8 @@
 			qdel(src)
 		return
 	if(istype(I, /obj/item/weapon/card/id))
-		if(!giver && user.removeItem(I, src))
+		if(!giver && user.unEquip(I))
+			I.forceMove(src)
 			giver = I
 			updateUsrDialog()
 		else if(giver)
@@ -175,7 +177,8 @@
 					accesses.Cut()
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id) && usr.removeItem(I, src))
+					if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
+						I.loc = src
 						giver = I
 				updateUsrDialog()
 

code/game/machinery/computer/medical.dm

@@ -36,7 +36,8 @@
 	return
 
 /obj/machinery/computer/med_data/attackby(var/obj/item/O, var/mob/user)
-	if(istype(O, /obj/item/weapon/card/id) && !scan && user.removeItem(O, src))
+	if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O))
+		O.loc = src
 		scan = O
 		user << "You insert \the [O]."
 	else
@@ -48,11 +49,11 @@
 /obj/machinery/computer/med_data/attack_hand(mob/user as mob)
 	if(..())
 		return
-	var/dat
+	var/dat = list()
 	if (src.temp)
-		dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>")
+		dat += text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>")
 	else
-		dat = text("Confirm Identity: <A href='?src=\ref[];scan=1'>[]</A><HR>", src, (src.scan ? text("[]", src.scan.name) : "----------"))
+		dat += text("Confirm Identity: <A href='?src=\ref[];scan=1'>[]</A><HR>", src, (src.scan ? text("[]", src.scan.name) : "----------"))
 		if (src.authenticated)
 			switch(src.screen)
 				if(1.0)
@@ -84,8 +85,12 @@
 					if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 						dat += "<table><tr><td>Name: [active1.fields["name"]] \
 								ID: [active1.fields["id"]]<BR>\n	\
-								Sex: <A href='?src=\ref[src];field=sex'>[active1.fields["sex"]]</A><BR>\n	\
-								Age: <A href='?src=\ref[src];field=age'>[active1.fields["age"]]</A><BR>\n	\
+								Sex: <A href='?src=\ref[src];field=sex'>[active1.fields["sex"]]</A><BR>\n"
+						if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+							dat += "Gender identity: <A href='?src=\ref[src];field=id_gender'>[active2.fields["id_gender"]]</A><BR>"
+						else
+							dat += "Gender identity: <A href='?src=\ref[src];field=id_gender'>Unknown</A><BR>"
+						dat +=  "Age: <A href='?src=\ref[src];field=age'>[active1.fields["age"]]</A><BR>\n	\
 								Fingerprint: <A href='?src=\ref[src];field=fingerprint'>[active1.fields["fingerprint"]]</A><BR>\n	\
 								Physical Status: <A href='?src=\ref[src];field=p_stat'>[active1.fields["p_stat"]]</A><BR>\n	\
 								Mental Status: <A href='?src=\ref[src];field=m_stat'>[active1.fields["m_stat"]]</A><BR></td><td align = center valign = top> \
@@ -134,6 +139,7 @@
 				else
 		else
 			dat += text("<A href='?src=\ref[];login=1'>{Log In}</A>", src)
+	dat = jointext(dat,null)
 	user << browse(text("<HEAD><TITLE>Medical Records</TITLE></HEAD><TT>[]</TT>", dat), "window=med_rec")
 	onclose(user, "med_rec")
 	return
@@ -248,10 +254,10 @@
 							src.active1.fields["fingerprint"] = t1
 					if("sex")
 						if (istype(src.active1, /datum/data/record))
-							if (src.active1.fields["sex"] == "Male")
-								src.active1.fields["sex"] = "Female"
-							else
-								src.active1.fields["sex"] = "Male"
+							src.active1.fields["sex"] = next_in_list(src.active1.fields["sex"], all_genders_text_list)
+					if("id_gender")
+						if (istype(src.active2, /datum/data/record))
+							src.active2.fields["id_gender"] = next_in_list(src.active2.fields["id_gender"], all_genders_text_list)
 					if("age")
 						if (istype(src.active1, /datum/data/record))
 							var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null)  as num

code/game/machinery/computer/security.dm

@@ -248,7 +248,8 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id) && usr.removeItem(I, src))
+					if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
+						I.loc = src
 						scan = I
 
 			if("Log Out")

code/game/machinery/computer/skills.dm

@@ -25,7 +25,8 @@
 	var/order = 1 // -1 = Descending - 1 = Ascending
 
 /obj/machinery/computer/skills/attackby(obj/item/O as obj, var/mob/user)
-	if(istype(O, /obj/item/weapon/card/id) && !scan && user.removeItem(O, src))
+	if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O))
+		O.loc = src
 		scan = O
 		user << "You insert [O]."
 	else
@@ -184,7 +185,8 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id) && usr.removeItem(I, src))
+					if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
+						I.loc = src
 						scan = I
 
 			if("Log Out")

code/game/machinery/computer3/computers/HolodeckControl.dm

@@ -154,7 +154,7 @@
 		if(isobj(obj))
 			var/mob/M = obj.loc
 			if(ismob(M))
-				M.removeItem(obj)
+				M.remove_from_mob(obj)
 				M.update_icons()	//so their overlays update
 
 		if(!silent)

code/game/machinery/cryopod.dm

@@ -386,7 +386,8 @@
 /obj/machinery/cryopod/proc/despawn_occupant()
 	//Drop all items into the pod.
 	for(var/obj/item/W in occupant)
-		occupant.removeItem(W, src, force = 1)
+		occupant.drop_from_inventory(W)
+		W.forceMove(src)
 
 		if(W.contents.len) //Make sure we catch anything not handled by qdel() on the items.
 			for(var/obj/item/O in W.contents)

code/game/machinery/exonet_node.dm

@@ -18,7 +18,7 @@
 // Proc: New()
 // Parameters: None
 // Description: Adds components to the machine for deconstruction.
-/obj/machinery/exonet_node/New()
+/obj/machinery/exonet_node/map/New()
 	..()
 
 	component_parts = list()

code/game/machinery/frame.dm

@@ -13,10 +13,13 @@
 	var/list/req_component_names = null
 
 	var/list/alarms = list("firealarm", "airalarm", "intercom", "keycard")
-	var/list/machines = list("machine", "photocopier", "fax", "microwave", "conveyor", "vending", "recharger", "wrecharger", "washing", "grinder")
-	var/list/computers = list("computer", "holopad")
-	var/list/displays = list("display", "guestpass", "newscaster", "atm")
-	var/list/no_circuit = list("wrecharger", "recharger", "grinder","conveyor")
+	var/list/machines = list(
+								"machine", "photocopier", "fax", "microwave", "conveyor", "recharger", "wrecharger",
+								"washing", "grinder", "teleporter_hub", "teleporter_station", "medpod", "dna_analyzer",
+								"massdriver")
+	var/list/computers = list("computer", "holopad", "console")
+	var/list/displays = list("display", "guestpass", "newscaster", "atm", "request")
+	var/list/no_circuit = list("wrecharger", "recharger", "grinder", "conveyor", "massdriver")
 
 /obj/structure/frame/proc/update_desc()
 	var/D
@@ -35,15 +38,16 @@
 		req_components[A] = circuit.req_components[A]
 	req_component_names = circuit.req_components.Copy()
 	for(var/A in req_components)
-		var/cp = text2path(A)
-		var/obj/ct = new cp() // have to quickly instantiate it get name
-		req_component_names[A] = ct.name
+		var/obj/ct = A
+		req_component_names[A] = initial(ct.name)
 
 /obj/structure/frame/New(var/loc, var/dir, var/building = 0, var/obj/item/frame/frame_type, mob/user as mob)
 	..()
 	if(building)
 		src.frame_type = frame_type
 		icon_state = "[frame_type]_0"
+		if(dir)
+			src.set_dir(dir)
 
 		if(frame_type in alarms)
 			if(loc)
@@ -69,7 +73,7 @@
 			if(loc)
 				src.loc = loc
 
-			if(frame_type == "display" || frame_type == "atm")
+			if(frame_type == "display" || frame_type == "atm" || frame_type == "request")
 				pixel_x = (dir & 3)? 0 : (dir == 4 ? -32 : 32)
 				pixel_y = (dir & 3)? (dir == 1 ? -32 : 32) : 0
 
@@ -104,8 +108,8 @@
 				circuit = new /obj/item/weapon/circuitboard/grinder(src)
 			if(frame_type == "conveyor")
 				circuit = new /obj/item/weapon/circuitboard/conveyor(src)
-				if(dir)
-					src.set_dir(dir)
+			if(frame_type == "massdriver")
+				circuit = new /obj/item/weapon/circuitboard/mass_driver(src)
 
 	if(frame_type == "computer")
 		density = 1
@@ -214,12 +218,25 @@
 				if(component_check)
 					playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 					var/obj/machinery/new_machine = new src.circuit.build_path(src.loc, src.dir)
-					if(!new_machine.component_parts)
-						for(var/obj/O in src.components)
-							O.forceMove(null)
-						new_machine.RefreshParts()
+					if(new_machine.component_parts)
+						new_machine.component_parts.Cut()
+					else
+						new_machine.component_parts = list()
 
 					src.circuit.construct(new_machine)
+
+					for(var/obj/O in src.components)
+						if(circuit.contain_parts)
+							O.loc = new_machine
+						else
+							O.loc = null
+						new_machine.component_parts += O
+
+					circuit.loc = null
+					new_machine.circuit = circuit
+
+					new_machine.RefreshParts()
+
 					new_machine.pixel_x = src.pixel_x
 					new_machine.pixel_y = src.pixel_y
 					qdel(src)
@@ -243,6 +260,7 @@
 				var/obj/machinery/B = new src.circuit.build_path ( src.loc )
 				B.pixel_x = src.pixel_x
 				B.pixel_y = src.pixel_y
+				B.set_dir(dir)
 				src.circuit.construct(B)
 				qdel(src)
 				return
@@ -253,6 +271,7 @@
 				var/obj/machinery/B = new src.circuit.build_path ( src.loc )
 				B.pixel_x = src.pixel_x
 				B.pixel_y = src.pixel_y
+				B.set_dir(dir)
 				src.circuit.construct(B)
 				qdel(src)
 				return
@@ -386,13 +405,13 @@
 		if(state == 3)
 			if(frame_type in machines)
 				for(var/I in req_components)
-					if(istype(P, text2path(I)) && (req_components[I] > 0))
+					if(istype(P, I) && (req_components[I] > 0))
 						playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-						if(istype(P, /obj/item/stack))
-							var/obj/item/stack/CP = P
+						if(istype(P, /obj/item/stack/cable_coil))
+							var/obj/item/stack/cable_coil/CP = P
 							if(CP.get_amount() > 1)
 								var/camt = min(CP.amount, req_components[I]) // amount of cable to take, idealy amount required, but limited by amount provided
-								var/obj/item/stack/CC = new /obj/item/stack(src)
+								var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src)
 								CC.amount = camt
 								CC.update_icon()
 								CP.use(camt)
@@ -400,6 +419,20 @@
 								req_components[I] -= camt
 								update_desc()
 								break
+
+						if(istype(P, /obj/item/stack/material/glass/reinforced))
+							var/obj/item/stack/material/glass/reinforced/CP = P
+							if(CP.get_amount() > 1)
+								var/camt = min(CP.amount, req_components[I]) // amount of cable to take, idealy amount required, but limited by amount provided
+								var/obj/item/stack/material/glass/reinforced/CC = new /obj/item/stack/material/glass/reinforced(src)
+								CC.amount = camt
+								CC.update_icon()
+								CP.use(camt)
+								components += CC
+								req_components[I] -= camt
+								update_desc()
+								break
+
 						user.drop_item()
 						P.forceMove(src)
 						components += P

code/game/machinery/kitchen/microwave.dm

@@ -1,4 +1,3 @@
-
 /obj/machinery/microwave
 	name = "Microwave"
 	icon = 'icons/obj/kitchen.dmi'
@@ -31,6 +30,9 @@
 	reagents = new/datum/reagents(100)
 	reagents.my_atom = src
 
+/obj/machinery/microwave/map/New()
+	..()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)
@@ -114,7 +116,7 @@
 			user << "<span class='warning'>It's dirty!</span>"
 			return 1
 	else if(is_type_in_list(O,acceptable_items))
-		if (contents.len>=(max_n_of_items + component_parts.len))	//Adds component_parts to the maximum number of items.
+		if (contents.len>=(max_n_of_items + component_parts.len + 1))	//Adds component_parts to the maximum number of items.	The 1 is from the circuit
 			user << "<span class='warning'>This [src] is full of ingredients, you cannot put more.</span>"
 			return 1
 		if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it
@@ -126,7 +128,9 @@
 				"<span class='notice'>You add one of [O] to \the [src].</span>")
 			return
 		else
-			user.removeItem(O, src)
+		//	user.remove_from_mob(O)	//This just causes problems so far as I can tell. -Pete
+			user.drop_item()
+			O.loc = src
 			user.visible_message( \
 				"<span class='notice'>\The [user] has added \the [O] to \the [src].</span>", \
 				"<span class='notice'>You add \the [O] to \the [src].</span>")
@@ -175,7 +179,7 @@
 		var/list/items_counts = new
 		var/list/items_measures = new
 		var/list/items_measures_p = new
-		for (var/obj/O in (contents-component_parts))
+		for (var/obj/O in ((contents - component_parts) - circuit))
 			var/display_name = O.name
 			if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg))
 				items_measures[display_name] = "egg"
@@ -235,7 +239,7 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 	start()
-	if (reagents.total_volume==0 && !(locate(/obj) in (contents-component_parts))) //dry run
+	if (reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run
 		if (!wzhzhzh(10))
 			abort()
 			return
@@ -297,7 +301,7 @@
 	return 1
 
 /obj/machinery/microwave/proc/has_extra_item()
-	for (var/obj/O in (contents-component_parts))
+	for (var/obj/O in ((contents - component_parts) - circuit))
 		if ( \
 				!istype(O,/obj/item/weapon/reagent_containers/food) && \
 				!istype(O, /obj/item/weapon/grown) \
@@ -358,7 +362,7 @@
 /obj/machinery/microwave/proc/fail()
 	var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/ffuu = new(src)
 	var/amount = 0
-	for (var/obj/O in (contents-ffuu)-component_parts)
+	for (var/obj/O in (((contents - ffuu) - component_parts) - circuit))
 		amount++
 		if (O.reagents)
 			var/id = O.reagents.get_master_reagent_id()

code/game/machinery/kitchen/smartfridge.dm

@@ -218,7 +218,8 @@
 			user << "<span class='notice'>\The [src] is full.</span>"
 			return 1
 		else
-			user.removeItem(O, src)
+			user.remove_from_mob(O)
+			O.loc = src
 			if(item_quants[O.name])
 				item_quants[O.name]++
 			else

code/game/machinery/machinery.dm

@@ -286,8 +286,7 @@ Class Procs:
 		var/obj/item/weapon/circuitboard/CB = circuit
 		var/P
 		for(var/obj/item/weapon/stock_parts/A in component_parts)
-			for(var/D in CB.req_components)
-				var/T = text2path(D)
+			for(var/T in CB.req_components)
 				if(ispath(A.type, T))
 					P = T
 					break
@@ -328,14 +327,14 @@ Class Procs:
 /obj/machinery/proc/dismantle()
 	playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 	var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
-	var/obj/item/weapon/circuitboard/M = new circuit( A )
+	var/obj/item/weapon/circuitboard/M = circuit
 	A.circuit = M
 	A.anchored = 1
 	A.density = 1
 	A.frame_type = M.board_type
 	if(A.frame_type in A.no_circuit)
 		A.need_circuit = 0
-	for (var/obj/D in src)
+	for (var/obj/D in src.component_parts)
 		D.forceMove(loc)
 	if(A.components)
 		A.components.Cut()
@@ -344,10 +343,12 @@ Class Procs:
 	component_parts = list()
 	A.icon_state = "[A.frame_type]_3"
 	A.state = 3
+	A.dir = dir
 	A.pixel_x = pixel_x
 	A.pixel_y = pixel_y
 	A.check_components()
 	A.update_desc()
+	M.loc = null
 	M.deconstruct(src)
 	qdel(src)
 	return 1

code/game/machinery/mass_driver.dm

@@ -9,12 +9,41 @@
 	use_power = 1
 	idle_power_usage = 2
 	active_power_usage = 50
+	circuit = /obj/item/weapon/circuitboard/mass_driver
 
 	var/power = 1.0
 	var/code = 1.0
 	var/id = 1.0
 	var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess.
 
+/obj/machinery/mass_driver/map/New()
+	..()
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/motor(src)
+	component_parts += new /obj/item/weapon/stock_parts/motor(src)
+	component_parts += new /obj/item/weapon/stock_parts/gear(src)
+	component_parts += new /obj/item/weapon/stock_parts/gear(src)
+	component_parts += new /obj/item/weapon/stock_parts/spring(src)
+	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 5)
+	RefreshParts()
+
+/obj/machinery/mass_driver/attackby(var/obj/item/I, mob/user)
+	if(default_deconstruction_screwdriver(user, I))
+		return
+	if(default_deconstruction_crowbar(user, I))
+		return
+
+	if(istype(I, /obj/item/device/multitool))
+		if(panel_open)
+			var/input = sanitize(input(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id))
+			if(!input)
+				usr << "No input found please hang up and try your call again."
+				return
+			id = input
+			return
+	return
 
 /obj/machinery/mass_driver/proc/drive(amount)
 	if(stat & (BROKEN|NOPOWER))

code/game/machinery/pipe/construction.dm

@@ -311,7 +311,7 @@ Buildable meters
 /obj/item/pipe/afterattack(turf/simulated/floor/target, mob/user, proximity)
 	if(!proximity) return
 	if(istype(target))
-		user.removeItem(src, target)
+		user.drop_from_inventory(src, target)
 	else
 		return ..()
 

code/game/machinery/portable_turret.dm

@@ -746,7 +746,7 @@ var/list/turret_icons
 				if(isrobot(user))
 					return
 				var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun
-				if(!user.removeItem(I))
+				if(!user.unEquip(I))
 					user << "<span class='notice'>\the [I] is stuck to your hand, you cannot put it in \the [src]</span>"
 					return
 				installation = I.type //installation becomes I.type
@@ -767,7 +767,7 @@ var/list/turret_icons
 		if(4)
 			if(isprox(I))
 				build_step = 5
-				if(!user.removeItem(I))
+				if(!user.unEquip(I))
 					user << "<span class='notice'>\the [I] is stuck to your hand, you cannot put it in \the [src]</span>"
 					return
 				user << "<span class='notice'>You add the prox sensor to the turret.</span>"

code/game/machinery/recharger.dm

@@ -15,9 +15,9 @@ obj/machinery/recharger
 	var/icon_state_idle = "recharger0" //also when unpowered
 	var/portable = 1
 	circuit = /obj/item/weapon/circuitboard/recharger
-	frame_type = "recharger"
 
-obj/machinery/recharger/New()
+obj/machinery/recharger/map/New()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 5)
@@ -171,4 +171,13 @@ obj/machinery/recharger/wallcharger
 	icon_state_idle = "wrecharger0"
 	portable = 0
 	circuit = /obj/item/weapon/circuitboard/recharger/wrecharger
-	frame_type = "wrecharger"
+	frame_type = "wrecharger"
+
+obj/machinery/recharger/wallcharger/map/New()
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 5)
+	RefreshParts()
+	..()
+	return

code/game/machinery/rechargestation.dm

@@ -22,9 +22,9 @@
 	var/weld_power_use = 2300	// power used per point of brute damage repaired. 2.3 kW ~ about the same power usage of a handheld arc welder
 	var/wire_power_use = 500	// power used per point of burn damage repaired.
 
-/obj/machinery/recharge_station/New()
+/obj/machinery/recharge_station/map/New()
 	..()
-
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/game/machinery/requests_console.dm

@@ -28,6 +28,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	anchored = 1
 	icon = 'icons/obj/terminals.dmi'
 	icon_state = "req_comp0"
+	circuit = /obj/item/weapon/circuitboard/request
 	var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
 	var/list/message_log = list() //List of all messages
 	var/departmentType = 0 		//Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines.
@@ -79,7 +80,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		req_console_supplies |= department
 	if (departmentType & RC_INFO)
 		req_console_information |= department
-	
+
 	set_light(1)
 
 /obj/machinery/requests_console/Destroy()
@@ -199,27 +200,29 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 
 					//err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messanging on that console (EXTREME priority...), but the code for that was removed.
 /obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
-	/*
-	if (istype(O, /obj/item/weapon/crowbar))
-		if(open)
-			open = 0
-			icon_state="req_comp0"
-		else
-			open = 1
-			if(hackState == 0)
-				icon_state="req_comp_open"
-			else if(hackState == 1)
-				icon_state="req_comp_rewired"
-	if (istype(O, /obj/item/weapon/screwdriver))
-		if(open)
-			if(hackState == 0)
-				hackState = 1
-				icon_state="req_comp_rewired"
-			else if(hackState == 1)
-				hackState = 0
-				icon_state="req_comp_open"
-		else
-			user << "You can't do much with that."*/
+	if(default_deconstruction_screwdriver(user, O))
+		return
+	if(default_deconstruction_crowbar(user, O))
+		return
+	if(istype(O, /obj/item/device/multitool))
+		if(panel_open)
+			var/input = sanitize(input(usr, "What Department id would you like to give this Request Console?", "Multitool-Request Console interface", department))
+			if(!input)
+				usr << "No input found please hang up and try your call again."
+				return
+			department = input
+			announcement.title = "[department] announcement"
+			announcement.newscast = 1
+
+			name = "[department] Requests Console"
+			allConsoles += src
+			if (departmentType & RC_ASSIST)
+				req_console_assistance |= department
+			if (departmentType & RC_SUPPLY)
+				req_console_supplies |= department
+			if (departmentType & RC_INFO)
+				req_console_information |= department
+			return
 
 	if (istype(O, /obj/item/weapon/card/id))
 		if(inoperable(MAINT)) return

code/game/machinery/seed_extractor.dm

@@ -11,7 +11,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
 	// Fruits and vegetables.
 	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
 
-		user.removeItem(O)
+		user.remove_from_mob(O)
 
 		var/datum/seed/new_seed_type
 		if(istype(O, /obj/item/weapon/grown))

code/game/machinery/supplybeacon.dm

@@ -17,7 +17,8 @@
 		return
 	var/obj/S = new deploy_path(get_turf(user))
 	user.visible_message("<span class='notice'>\The [user] deploys \the [S].</span>")
-	user.deleteItem(src)
+	user.unEquip(src)
+	qdel(src)
 
 /obj/machinery/power/supply_beacon
 	name = "supply beacon"

code/game/machinery/teleporter.dm

@@ -170,6 +170,7 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 2000
+	circuit = /obj/item/weapon/circuitboard/teleporter_hub
 	var/obj/machinery/computer/teleporter/com
 
 
@@ -178,6 +179,21 @@
 	underlays.Cut()
 	underlays += image('icons/obj/stationobjs.dmi', icon_state = "tele-wires")
 
+/obj/machinery/teleport/hub/map/New()
+	..()
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 10)
+	RefreshParts()
+
 /obj/machinery/teleport/hub/Bumped(M as mob|obj)
 	spawn()
 		if (src.icon_state == "tele1")
@@ -307,6 +323,7 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 2000
+	circuit = /obj/item/weapon/circuitboard/teleporter_station
 	var/obj/machinery/teleport/hub/com
 
 /obj/machinery/teleport/station/New()
@@ -314,6 +331,16 @@
 	overlays.Cut()
 	overlays += image('icons/obj/stationobjs.dmi', icon_state = "controller-wires")
 
+/obj/machinery/teleport/station/map/New()
+	..()
+	circuit = new circuit(src)
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
+	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 10)
+	RefreshParts()
+
 /obj/machinery/teleport/station/attackby(var/obj/item/weapon/W)
 	src.attack_hand()
 

code/game/machinery/vending.dm

@@ -36,8 +36,6 @@
 	layer = 2.9
 	anchored = 1
 	density = 1
-	circuit = /obj/item/weapon/circuitboard/vending
-	frame_type = "vending"
 
 	var/icon_vend //Icon_state when vending
 	var/icon_deny //Icon_state when denying access
@@ -96,14 +94,6 @@
 /obj/machinery/vending/New()
 	..()
 	wires = new(src)
-	component_parts = list()
-	component_parts += new /obj/item/weapon/stock_parts/spring(src)
-	component_parts += new /obj/item/weapon/stock_parts/spring(src)
-	component_parts += new /obj/item/weapon/stock_parts/motor(src)
-	component_parts += new /obj/item/weapon/stock_parts/motor(src)
-	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
-	component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
-	RefreshParts()
 	spawn(4)
 		if(src.product_slogans)
 			src.slogan_list += splittext(src.product_slogans, ";")
@@ -242,9 +232,6 @@
 			user << "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>"
 			anchored = !anchored
 		return
-	else if(default_deconstruction_crowbar(user, W))
-		return
-
 	else
 
 		for(var/datum/data/vending_product/R in product_records)
@@ -273,7 +260,8 @@
 		cashmoney.worth -= currently_vending.price
 
 		if(cashmoney.worth <= 0)
-			usr.deleteItem(cashmoney)
+			usr.drop_from_inventory(cashmoney)
+			qdel(cashmoney)
 		else
 			cashmoney.update_icon()
 
@@ -904,8 +892,26 @@
 	desc = "A kitchen and restaurant equipment vendor."
 	product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
 	icon_state = "dinnerware"
-	products = list(/obj/item/weapon/tray = 8,/obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/kitchen/utensil/knife = 6, /obj/item/weapon/material/kitchen/utensil/spoon = 6, /obj/item/weapon/material/knife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2)
-	contraband = list(/obj/item/weapon/material/kitchen/rollingpin = 2, /obj/item/weapon/material/knife/butch = 2)
+	products = list(
+	/obj/item/weapon/tray = 8,
+	/obj/item/weapon/material/kitchen/utensil/fork = 6,
+	/obj/item/weapon/material/kitchen/utensil/knife = 6,
+	/obj/item/weapon/material/kitchen/utensil/spoon = 6,
+	/obj/item/weapon/material/knife = 3,
+	/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,
+	/obj/item/clothing/suit/chef/classic = 2,
+	/obj/item/weapon/storage/toolbox/lunchbox = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/heart = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/cat = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/nt = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/mars = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/cti = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/nymph = 3,
+	/obj/item/weapon/storage/toolbox/lunchbox/syndicate = 3)
+
+
+	contraband = list(/obj/item/weapon/material/kitchen/rollingpin = 2,
+	/obj/item/weapon/material/knife/butch = 2)
 
 /obj/machinery/vending/sovietsoda
 	name = "BODA"
@@ -938,12 +944,15 @@
 					/obj/item/weapon/circuitboard/airalarm = 10,/obj/item/weapon/circuitboard/firealarm = 10,/obj/item/weapon/circuitboard/status_display = 2,
 					/obj/item/weapon/circuitboard/ai_status_display = 2,/obj/item/weapon/circuitboard/newscaster = 2,/obj/item/weapon/circuitboard/holopad = 2,
 					/obj/item/weapon/circuitboard/intercom = 4,/obj/item/weapon/circuitboard/security/telescreen/entertainment = 4,
-					/obj/item/weapon/circuitboard/atm = 0,/obj/item/weapon/circuitboard/guestpass = 0,/obj/item/weapon/circuitboard/keycard_auth = 0,
-					/obj/item/weapon/circuitboard/photocopier = 0,/obj/item/weapon/circuitboard/fax = 0,/obj/item/weapon/circuitboard/conveyor = 0,
-					/obj/item/weapon/circuitboard/microwave = 0,/obj/item/weapon/circuitboard/vending = 0,/obj/item/weapon/circuitboard/washing = 0,
-					/obj/item/weapon/stock_parts/motor = 0,/obj/item/weapon/stock_parts/spring = 0,/obj/item/weapon/stock_parts/gear = 0)
+					/obj/item/weapon/stock_parts/motor = 2,/obj/item/weapon/stock_parts/spring = 2,/obj/item/weapon/stock_parts/gear = 2,
+					/obj/item/weapon/circuitboard/atm,/obj/item/weapon/circuitboard/guestpass,/obj/item/weapon/circuitboard/keycard_auth,
+					/obj/item/weapon/circuitboard/photocopier,/obj/item/weapon/circuitboard/fax,/obj/item/weapon/circuitboard/request,
+					/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/washing,/obj/item/weapon/circuitboard/scanner_console,
+					/obj/item/weapon/circuitboard/sleeper_console,/obj/item/weapon/circuitboard/body_scanner,/obj/item/weapon/circuitboard/sleeper,
+					/obj/item/weapon/circuitboard/dna_analyzer)
 	contraband = list(/obj/item/weapon/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)
+	product_records = list()
 
 //This one's from bay12
 /obj/machinery/vending/engineering

code/game/machinery/wall_frames.dm

@@ -22,11 +22,12 @@
 	if(!build_machine_type)
 		return
 
-	var/ndir
 	if(!frame_type)
 		var/response = input(usr, "What kind of frame would you like to make?", "Frame type request", null) in list("Computer", "Machine", "Holopad", "Conveyor",
-																													"Photocopier", "Fax", "Microwave", "Vending Machine",
+																													"Photocopier", "Fax", "Microwave",
 																													"Recharger", "Washing Machine", "Grinder",
+																													"Medical Console", "Medical Pod", "DNA Analyzer",
+																													"Mass Driver",
 																													"Cancel")
 
 		if(response == "Cancel")
@@ -37,22 +38,29 @@
 		switch(response)
 			if("Holopad")
 				new /obj/item/stack/material/steel( usr.loc, 1 ) //holopads are smaller, they only need 4 sheets
-			if("Conveyor")
-				ndir = get_dir(src,usr)
-				if (!(ndir in cardinal))
-					return
 			if("Fax")
 				new /obj/item/stack/material/steel( usr.loc, 2 ) //faxes are smaller, they only need 3 sheets
 			if("Microwave")
 				new /obj/item/stack/material/steel( usr.loc, 1 ) //microwaves are smaller, they only need 4 sheets
-			if("Vending Machine")
-				frame_type = "vending"
 			if("Recharger")
 				new /obj/item/stack/material/steel( usr.loc, 2 ) //rechargers are smaller, they only need 3 sheets
 			if("Washing Machine")
 				frame_type = "washing"
 			if("Grinder")
 				new /obj/item/stack/material/steel( usr.loc, 2 ) //grinders are smaller, they only need 3 sheets
+			if("Medical Console")
+				frame_type = "console"
+			if("Medical Pod")
+				frame_type = "medpod"
+			if("DNA Analyzer")
+				frame_type = "dna_analyzer"
+			if("Mass Driver")
+				frame_type = "massdriver"
+
+	var/ndir
+	ndir = usr.dir
+	if (!(ndir in cardinal))
+		return
 
 	var/obj/machinery/M = new build_machine_type(get_turf(src.loc), ndir, 1, frame_type)
 	M.fingerprints = src.fingerprints
@@ -64,7 +72,7 @@
 	if(!frame_type)
 		var/response = input(usr, "What kind of frame would you like to make?", "Frame type request", null) in list("Fire Alarm", "Air Alarm", "Display", "Newscaster",
 																													"ATM", "Guest Pass Console", "Intercom", "Keycard Authenticator",
-																													"Wall Charger",
+																													"Wall Charger", "Supply Request Console",
 																													"Cancel")
 
 		if(response == "Cancel")
@@ -92,6 +100,8 @@
 			if("Wall Charger")
 				frame_type = "wrecharger"
 				new /obj/item/stack/material/steel( usr.loc, 2 ) //wall rechargers are smaller, they only need 3 sheets
+			if("Supply Request Console")
+				frame_type = "request"
 
 	if(!build_machine_type)
 		return

code/game/machinery/washing_machine.dm

@@ -21,7 +21,8 @@
 	var/obj/crayon
 	var/list/washing = list()
 
-/obj/machinery/washing_machine/New()
+/obj/machinery/washing_machine/map/New()
+	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)
 	component_parts += new /obj/item/weapon/stock_parts/gear(src)

code/game/mecha/mecha.dm

@@ -794,7 +794,8 @@
 		return
 
 	else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
-		user.removeItem(W, src)
+		user.drop_from_inventory(W)
+		W.forceMove(src)
 		user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")
 		return
 

code/game/objects/effects/effect_system.dm

@@ -193,16 +193,14 @@ steam.start() -- spawns the effect
 		affect(M)
 
 /obj/effect/effect/smoke/proc/affect(var/mob/living/carbon/M)
-	if (istype(M))
+	if (!istype(M))
 		return 0
-	if (M.internal != null)
-		if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
+	if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
+		return 0
+	if(istype(M,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		if(H.head && (H.head.item_flags & AIRTIGHT))
 			return 0
-		if(istype(M,/mob/living/carbon/human))
-			var/mob/living/carbon/human/H = M
-			if(H.head && (H.head.item_flags & AIRTIGHT))
-				return 0
-		return 0
 	return 1
 
 /////////////////////////////////////////////
@@ -225,7 +223,8 @@ steam.start() -- spawns the effect
 /////////////////////////////////////////////
 
 /obj/effect/effect/smoke/bad
-	time_to_live = 200
+	time_to_live = 600
+	//var/list/projectiles
 
 /obj/effect/effect/smoke/bad/Move()
 	..()
@@ -235,70 +234,25 @@ steam.start() -- spawns the effect
 /obj/effect/effect/smoke/bad/affect(var/mob/living/carbon/M)
 	if (!..())
 		return 0
-	M.drop_item()
 	M.adjustOxyLoss(1)
-	if (M.coughedtime != 1)
-		M.coughedtime = 1
+	if(prob(25))
 		M.emote("cough")
-		spawn ( 20 )
-			M.coughedtime = 0
 
-/obj/effect/effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(air_group || (height==0)) return 1
-	if(istype(mover, /obj/item/projectile/beam))
-		var/obj/item/projectile/beam/B = mover
-		B.damage = (B.damage/2)
+/* Not feasile until a later date
+/obj/effect/effect/smoke/bad/Crossed(atom/movable/M as mob|obj)
+	..()
+	if(istype(M, /obj/item/projectile/beam))
+		var/obj/item/projectile/beam/B = M
+		if(!(B in projectiles))
+			B.damage = (B.damage/2)
+			projectiles += B
+			destroyed_event.register(B, src, /obj/effect/effect/smoke/bad/proc/on_projectile_delete)
+		world << "Damage is: [B.damage]"
 	return 1
-/////////////////////////////////////////////
-// Sleep smoke
-/////////////////////////////////////////////
 
-/obj/effect/effect/smoke/sleepy
-
-/obj/effect/effect/smoke/sleepy/Move()
-	..()
-	for(var/mob/living/carbon/M in get_turf(src))
-		affect(M)
-
-/obj/effect/effect/smoke/sleepy/affect(mob/living/carbon/M as mob )
-	if (!..())
-		return 0
-
-	M.drop_item()
-	M:sleeping += 1
-	if (M.coughedtime != 1)
-		M.coughedtime = 1
-		M.emote("cough")
-		spawn ( 20 )
-			M.coughedtime = 0
-/////////////////////////////////////////////
-// Mustard Gas
-/////////////////////////////////////////////
-
-
-/obj/effect/effect/smoke/mustard
-	name = "mustard gas"
-	icon_state = "mustard"
-
-/obj/effect/effect/smoke/mustard/Move()
-	..()
-	for(var/mob/living/carbon/human/R in get_turf(src))
-		affect(R)
-
-/obj/effect/effect/smoke/mustard/affect(var/mob/living/carbon/human/R)
-	if (!..())
-		return 0
-	if (R.wear_suit != null)
-		return 0
-
-	R.burn_skin(0.75)
-	if (R.coughedtime != 1)
-		R.coughedtime = 1
-		R.emote("gasp")
-		spawn (20)
-			R.coughedtime = 0
-	R.updatehealth()
-	return
+/obj/effect/effect/smoke/bad/proc/on_projectile_delete(obj/item/projectile/beam/proj)
+	projectiles -= proj
+*/
 
 /////////////////////////////////////////////
 // Smoke spread
@@ -321,7 +275,7 @@ steam.start() -- spawns the effect
 	if(direct)
 		direction = direct
 
-/datum/effect/effect/system/smoke_spread/start()
+/datum/effect/effect/system/smoke_spread/start(var/I)
 	var/i = 0
 	for(i=0, i<src.number, i++)
 		if(src.total_smoke > 20)
@@ -331,6 +285,7 @@ steam.start() -- spawns the effect
 				src.location = get_turf(holder)
 			var/obj/effect/effect/smoke/smoke = PoolOrNew(smoke_type, src.location)
 			src.total_smoke++
+			smoke.color = I
 			var/direction = src.direction
 			if(!direction)
 				if(src.cardinals)
@@ -348,14 +303,6 @@ steam.start() -- spawns the effect
 /datum/effect/effect/system/smoke_spread/bad
 	smoke_type = /obj/effect/effect/smoke/bad
 
-/datum/effect/effect/system/smoke_spread/sleepy
-	smoke_type = /obj/effect/effect/smoke/sleepy
-
-
-/datum/effect/effect/system/smoke_spread/mustard
-	smoke_type = /obj/effect/effect/smoke/mustard
-
-
 /////////////////////////////////////////////
 //////// Attach an Ion trail to any object, that spawns when it moves (like for the jetpack)
 /// just pass in the object to attach it to in set_up
@@ -507,9 +454,9 @@ steam.start() -- spawns the effect
 				M << "<span class='warning'>The solution violently explodes.</span>"
 
 			explosion(
-				location, 
-				round(min(devst, BOMBCAP_DVSTN_RADIUS)), 
-				round(min(heavy, BOMBCAP_HEAVY_RADIUS)), 
-				round(min(light, BOMBCAP_LIGHT_RADIUS)), 
+				location,
+				round(min(devst, BOMBCAP_DVSTN_RADIUS)),
+				round(min(heavy, BOMBCAP_HEAVY_RADIUS)),
+				round(min(light, BOMBCAP_LIGHT_RADIUS)),
 				round(min(flash, BOMBCAP_FLASH_RADIUS))
 				)

code/game/objects/items.dm

@@ -85,7 +85,7 @@
 /obj/item/Destroy()
 	if(ismob(loc))
 		var/mob/m = loc
-		m.removeItem(src, force = 1)
+		m.drop_from_inventory(src)
 		m.update_inv_r_hand()
 		m.update_inv_l_hand()
 		src.loc = null
@@ -178,7 +178,7 @@
 
 	src.throwing = 0
 	if (src.loc == user)
-		if(!user.removeItem(src))
+		if(!user.unEquip(src))
 			return
 	else
 		if(isliving(src.loc))

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

@@ -1152,13 +1152,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			return 1
 		else
 			var/obj/item/I = user.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id) && user.removeItem(I, src))
+			if (istype(I, /obj/item/weapon/card/id) && user.unEquip(I))
+				I.loc = src
 				id = I
 			return 1
 	else
 		var/obj/item/weapon/card/I = user.get_active_hand()
-		if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.removeItem(I, src))
+		if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.unEquip(I))
 			var/obj/old_id = id
+			I.loc = src
 			id = I
 			user.put_in_hands(old_id)
 			return 1

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

@@ -0,0 +1,140 @@
+/obj/item/device/closet_painter
+	name = "closet painter"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "labeler1"
+	item_state = "flight"
+
+	var/colour =        "plain"
+	var/colour_secure = "plain"
+
+	var/list/colours = list(
+		"plain" = 				list("open" = "open", "closed" = "closed"),
+		"blue" = 				list("open" = "open", "closed" = "blue"),
+		"mixed" = 				list("open" = "open", "closed" = "mixed"),
+		"grey" = 				list("open" = "open", "closed" = "grey"),
+		"green" = 				list("open" = "open", "closed" = "green"),
+		"orange" = 				list("open" = "open", "closed" = "orange"),
+		"pink" = 				list("open" = "open", "closed" = "pink"),
+		"red" = 				list("open" = "open", "closed" = "red"),
+		"white" = 				list("open" = "open", "closed" = "white"),
+		"yellow" = 				list("open" = "open", "closed" = "yellow"),
+		"black" = 				list("open" = "open", "closed" = "black"),
+		"bio" = 				list("open" = "bioopen", "closed" = "bio"),
+		"bio-virology" = 		list("open" = "bio_virologyopen", "closed" = "bio_virology"),
+		"bio-security" = 		list("open" = "bio_securityopen", "closed" = "bio_security"),
+		"bio-janitor" = 		list("open" = "bio_janitoropen", "closed" = "bio_janitor"),
+		"bio-scientist" = 		list("open" = "bio_scientistopen", "closed" = "bio_scientist"),
+		"bombsuit" = 			list("open" = "bombsuitopen", "closed" = "bombsuit"),
+		"bombsuit-security" = 	list("open" = "bombsuitsecopen", "closed" = "bombsuitsec"),
+		"full-red" = 			list("open" = "syndicateopen", "closed" = "syndicate"),
+		"full-green" = 			list("open" = "syndicate1open", "closed" = "syndicate1"),
+		"full-purple" = 		list("open" = "aclosetopen", "closed" = "acloset"),
+		"mining" = 				list("open" = "miningopen", "closed" = "mining"),
+		"emergency" = 			list("open" = "emergencyopen", "closed" = "emergency"),
+		"fire" = 				list("open" = "fireclosetopen", "closed" = "firecloset"),
+		"tool" = 				list("open" = "toolclosetopen", "closed" = "toolcloset"),
+		"radiation" = 			list("open" = "toolclosetopen", "closed" = "radsuitcloset")
+		)
+
+	var/list/colours_secure = list(
+		"plain" = 				list("open" = "open", "closed" = "secure", "locked" = "secure1", "broken" = "securebroken", "off" = "secureoff"),
+		"medical-red" = 		list("open" = "medicalopen", "closed" = "medical", "locked" = "medical1", "broken" = "medicalbroken", "off" = "medicaloff"),
+		"medical-green" = 		list("open" = "securemedopen", "closed" = "securemed", "locked" = "securemed1", "broken" = "securemedbroken", "off" = "securemedoff"),
+		"CMO" = 				list("open" = "cmosecureopen", "closed" = "cmosecure", "locked" = "cmosecure1", "broken" = "cmosecurebroken", "off" = "cmosecureoff"),
+		"cargo" = 				list("open" = "securecargoopen", "closed" = "securecargo", "locked" = "securecargo1", "broken" = "securecargobroken", "off" = "securecargooff"),
+		"mining" = 				list("open" = "miningsecopen", "closed" = "miningsec", "locked" = "miningsec1", "broken" = "miningsecbroken", "off" = "miningsecoff"),
+		"QM" = 					list("open" = "secureqmopen", "closed" = "secureqm", "locked" = "secureqm1", "broken" = "secureqmbroken", "off" = "secureqmoff"),
+		"hydroponics" = 		list("open" = "hydrosecureopen", "closed" = "hydrosecure", "locked" = "hydrosecure1", "broken" = "hydrosecurebroken", "off" = "hydrosecureoff"),
+		"atmospherics" = 		list("open" = "secureatmopen", "closed" = "secureatm", "locked" = "secureatm1", "broken" = "secureatmbroken", "off" = "secureatmoff"),
+		"engineer" = 			list("open" = "secureengopen", "closed" = "secureeng", "locked" = "secureeng1", "broken" = "secureengbroken", "off" = "secureengoff"),
+		"CE" = 					list("open" = "secureceopen", "closed" = "securece", "locked" = "securece1", "broken" = "securecebroken", "off" = "secureceoff"),
+		"electrical" = 			list("open" = "toolclosetopen", "closed" = "secureengelec", "locked" = "secureengelec1", "broken" = "secureengelecbroken", "off" = "secureengelecoff"),
+		"welding" = 			list("open" = "toolclosetopen", "closed" = "secureengweld", "locked" = "secureengweld1", "broken" = "secureengweldbroken", "off" = "secureengweldoff"),
+		"research" = 			list("open" = "secureresopen", "closed" = "secureres", "locked" = "secureres1", "broken" = "secureresbroken", "off" = "secureresoff"),
+		"RD" = 					list("open" = "rdsecureopen", "closed" = "rdsecure", "locked" = "rdsecure1", "broken" = "rdsecurebroken", "off" = "rdsecureoff"),
+		"security" = 			list("open" = "secopen", "closed" = "sec", "locked" = "sec1", "broken" = "secbroken", "off" = "secoff"),
+		"warden" = 				list("open" = "wardensecureopen", "closed" = "wardensecure", "locked" = "wardensecure1", "broken" = "wardensecurebroken", "off" = "wardensecureoff"),
+		"HoS" = 				list("open" = "hossecureopen", "closed" = "hossecure", "locked" = "hossecure1", "broken" = "hossecurebroken", "off" = "hossecureoff"),
+		"HoP" = 				list("open" = "hopsecureopen", "closed" = "hopsecure", "locked" = "hopsecure1", "broken" = "hopsecurebroken", "off" = "hopsecureoff"),
+		"Captain" = 			list("open" = "capsecureopen", "closed" = "capsecure", "locked" = "capsecure1", "broken" = "capsecurebroken", "off" = "capsecureoff")
+		)
+
+/obj/item/device/closet_painter/afterattack(atom/A, var/mob/user, proximity)
+	if(!proximity)
+		return
+
+	if(!istype(A,/obj/structure/closet))
+		user << "<span class='warning'>\The [src] can only be used on closets.</span>"
+		return
+
+	var/config_error
+
+	if(istype(A,/obj/structure/closet/secure_closet))
+		var/obj/structure/closet/secure_closet/F = A
+		if(F.broken)
+			user << "<span class='warning'>\The [src] cannot paint broken closets.</span>"
+			return
+
+		var/list/colour_data = colours_secure[colour_secure]
+		if(!islist(colour_data))
+			config_error = 1
+		if(!config_error)
+			F.icon_opened = colour_data["open"]
+			F.icon_closed = colour_data["closed"]
+			F.icon_locked = colour_data["locked"]
+			F.icon_broken = colour_data["broken"]
+			F.icon_off = colour_data["off"]
+			F.update_icon()
+
+	else
+		var/obj/structure/closet/F = A
+		var/list/colour_data = colours[colour]
+		if(!islist(colour_data))
+			config_error = 1
+		if(!config_error)
+			F.icon_opened = colour_data["open"]
+			F.icon_closed = colour_data["closed"]
+			F.update_icon()
+
+	if(config_error)
+		user << "<span class='warning'>\The [src] flashes an error light. You might need to reconfigure it.</span>"
+		return
+
+/obj/item/device/closet_painter/attack_self(var/mob/user)
+	var/choice = input("Do you wish to change the regular closet colour or the secure closet colour?") as null|anything in list("Regular Closet Colour","Secure Closet Colour")
+	if(choice == "Regular Closet Colour")
+		choose_colour()
+	else if(choice == "Secure Closet Colour")
+		choose_colour_secure()
+
+/obj/item/device/closet_painter/examine(mob/user)
+	..(user)
+	user << "It is configured to produce the '[colour]' paint scheme or the '[colour_secure]' secure closet paint scheme."
+
+/obj/item/device/closet_painter/verb/choose_colour()
+	set name = "Choose Colour"
+	set desc = "Choose a regular closet painter colour."
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+
+	var/new_colour = input("Select a colour.") as null|anything in colours
+	if(new_colour && !isnull(colours[new_colour]))
+		colour = new_colour
+		usr << "<span class='notice'>You set \the [src] regular closet colour to '[colour]'.</span>"
+
+/obj/item/device/closet_painter/verb/choose_colour_secure()
+	set name = "Choose Secure Colour"
+	set desc = "Choose a secure closet painter colour."
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+
+	var/new_colour_secure = input("Select a colour.") as null|anything in colours_secure
+	if(new_colour_secure && !isnull(colours_secure[new_colour_secure]))
+		colour_secure = new_colour_secure
+		usr << "<span class='notice'>You set \the [src] secure closet colour to '[colour_secure]'.</span>"

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

@@ -23,7 +23,8 @@
 
 	if(!parts)
 		user << "<span class='warning'>This kit has no parts for this modification left.</span>"
-		user.deleteItem(src)
+		user.drop_from_inventory(src)
+		qdel(src)
 		return
 
 	var/allowed = 0
@@ -58,7 +59,8 @@
 		parts &= ~MODKIT_SUIT
 
 	if(!parts)
-		user.deleteItem(src)
+		user.drop_from_inventory(src)
+		qdel(src)
 
 /obj/item/device/modkit/examine(mob/user)
 	..(user)

code/game/objects/items/devices/radio/electropack.dm

@@ -27,11 +27,13 @@
 		var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
 		A.icon = 'icons/obj/assemblies.dmi'
 
-		user.removeItem(W, A)
+		user.drop_from_inventory(W)
+		W.loc = A
 		W.master = A
 		A.part1 = W
 
-		user.removeItem(src, A)
+		user.drop_from_inventory(src)
+		loc = A
 		master = A
 		A.part2 = src
 

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

@@ -15,6 +15,7 @@ For new antags, make sure to add "player.mind.accept_tcrystals = 1" if you want
 /obj/item/device/telecrystal/attack_self(mob/user as mob)
 	if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals
 		user.mind.tcrystals += 1
-		user.deleteItem(src)
+		user.drop_from_inventory(src)
+		qdel(src)
 	return
 	

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

@@ -47,8 +47,9 @@
 		if(attached_device)
 			user << "<span class='warning'>There is already an device attached to the valve, remove it first.</span>"
 			return
-		user.removeItem(A, src)
+		user.remove_from_mob(item)
 		attached_device = A
+		A.loc = src
 		user << "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>"
 		A.holder = src
 		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).

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

@@ -155,6 +155,10 @@ datum/uplink_item/dd_SortValue()
 	name = "9mm"
 	path = /obj/item/ammo_magazine/mc9mm
 
+/datum/uplink_item/item/ammo/c45m
+	name = ".45"
+	path = /obj/item/ammo_magazine/c45m
+
 /datum/uplink_item/item/ammo/darts
 	name = "Darts"
 	path = /obj/item/ammo_magazine/chemdart
@@ -163,6 +167,14 @@ datum/uplink_item/dd_SortValue()
 	name = "14.5mm"
 	path = /obj/item/weapon/storage/box/sniperammo
 
+/datum/uplink_item/item/ammo/a556
+	name = "5.56mm"
+	path = /obj/item/ammo_magazine/a556
+
+/datum/uplink_item/item/ammo/a556/ap
+	name = "5.56mm AP"
+	path = /obj/item/ammo_magazine/a556/ap
+
 /datum/uplink_item/item/ammo/a10mm
 	name = "10mm"
 	path = /obj/item/ammo_magazine/a10mm
@@ -171,6 +183,23 @@ datum/uplink_item/dd_SortValue()
 	name = "7.62mm"
 	path = /obj/item/ammo_magazine/a762
 
+/datum/uplink_item/item/ammo/a762/ap
+	name = "7.62mm AP"
+	path = /obj/item/ammo_magazine/a762/ap
+
+/datum/uplink_item/item/ammo/g12
+	name = "12 gauge"
+	path = /obj/item/ammo_magazine/g12
+
+/datum/uplink_item/item/ammo/g12/beanbag
+	name = "12 gauge beanbag"
+	path = /obj/item/ammo_magazine/g12/beanbag
+	item_cost = 1 // Discount due to it being LTL.
+
+/datum/uplink_item/item/ammo/g12/pellet
+	name = "12 gauge pellet"
+	path = /obj/item/ammo_magazine/g12/pellet
+
 /***************************************
 * Highly Visible and Dangerous Weapons *
 ***************************************/
@@ -192,10 +221,10 @@ datum/uplink_item/dd_SortValue()
 	item_cost = 5
 	path = /obj/item/weapon/gun/energy/crossbow
 
-/datum/uplink_item/item/visible_weapons/g9mm
-	name = "Silenced 9mm"
+/datum/uplink_item/item/visible_weapons/silenced_45
+	name = "Silenced .45"
 	item_cost = 5
-	path = /obj/item/weapon/storage/box/syndie_kit/g9mm
+	path = /obj/item/weapon/gun/projectile/silenced
 
 /datum/uplink_item/item/visible_weapons/riggedlaser
 	name = "Exosuit Rigged Laser"
@@ -223,6 +252,36 @@ datum/uplink_item/dd_SortValue()
 	item_cost = 7
 	path = /obj/item/weapon/gun/projectile/automatic/sts35
 
+/datum/uplink_item/item/visible_weapons/combatshotgun
+	name = "Combat Shotgun"
+	item_cost = 7
+	path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
+
+/datum/uplink_item/item/visible_weapons/egun
+	name = "Energy Gun"
+	item_cost = 5
+	path = /obj/item/weapon/gun/energy/gun
+
+/datum/uplink_item/item/visible_weapons/lasercannon
+	name = "Laser Cannon"
+	item_cost = 6
+	path = /obj/item/weapon/gun/energy/lasercannon
+
+/datum/uplink_item/item/visible_weapons/lasercarbine
+	name = "Laser Carbine"
+	item_cost = 7
+	path = /obj/item/weapon/gun/energy/laser
+
+/datum/uplink_item/item/visible_weapons/ionrifle
+	name = "Ion Rifle"
+	item_cost = 5
+	path = /obj/item/weapon/gun/energy/ionrifle
+
+/datum/uplink_item/item/visible_weapons/xray
+	name = "Xray Gun"
+	item_cost = 7
+	path = /obj/item/weapon/gun/energy/xray
+
 /*************************************
 * Stealthy and Inconspicuous Weapons *
 *************************************/

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

@@ -38,7 +38,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 /datum/uplink_random_selection/default/New()
 	..()
 
-	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/g9mm)
+	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/silenced_45)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/mc9mm)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/revolver)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/a357)

code/game/objects/items/glassjar.dm

@@ -72,7 +72,8 @@
 			return
 		var/obj/item/weapon/spacecash/S = W
 		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].</span>")
-		user.removeItem(S, src)
+		user.drop_from_inventory(S)
+		S.loc = src
 		update_icon()
 
 /obj/item/glass_jar/update_icon() // Also updates name and desc

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

@@ -19,7 +19,7 @@
 	if(!istype(user))
 		var/mob/living/temp = user
 		if(istype(temp))
-			temp.removeItem(src, force = 1)
+			temp.drop_from_inventory(src)
 		qdel(src)
 		return
 

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

@@ -118,7 +118,7 @@
 			B.loc = get_turf(src)
 			user << "<span class='notice'>You armed the robot frame.</span>"
 			if (user.get_inactive_hand()==src)
-				user.removeItem(src)
+				user.remove_from_mob(src)
 				user.put_in_inactive_hand(B)
 			qdel(src)
 		else

code/game/objects/items/stacks/stack.dm

@@ -187,7 +187,7 @@
 		amount -= used
 		if (amount <= 0)
 			if(usr)
-				usr.removeItem(src)
+				usr.remove_from_mob(src)
 			qdel(src) //should be safe to qdel immediately since if someone is still using this stack it will persist for a little while longer
 		return 1
 	else

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

@@ -51,7 +51,8 @@
 		if((stored_matter + 10) > 30)
 			user << "<span class='notice'>The RCD can't hold any more matter-units.</span>"
 			return
-		user.deleteItem(W)
+		user.drop_from_inventory(W)
+		qdel(W)
 		stored_matter += 10
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 		user << "<span class='notice'>The RCD now holds [stored_matter]/30 matter-units.</span>"

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

@@ -156,7 +156,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/mob/living/M = loc
 			if (!nomessage)
 				M << "<span class='notice'>Your [name] goes out.</span>"
-			M.removeItem(src) //un-equip it so the overlays can update
+			M.remove_from_mob(src) //un-equip it so the overlays can update
 			M.update_inv_wear_mask(0)
 			M.update_inv_l_hand(0)
 			M.update_inv_r_hand(1)

code/game/objects/items/weapons/circuitboards/frame.dm

@@ -36,6 +36,12 @@
 	board_type = "atm"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 
+/obj/item/weapon/circuitboard/request
+	name = T_BOARD("reques console")
+	build_path = /obj/machinery/requests_console
+	board_type = "request"
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+
 //Alarm
 
 /obj/item/weapon/circuitboard/firealarm
@@ -70,6 +76,18 @@
 	board_type = "holopad"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 
+/obj/item/weapon/circuitboard/scanner_console
+	name = T_BOARD("body scanner console")
+	build_path = /obj/machinery/body_scanconsole
+	board_type = "console"
+	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+
+/obj/item/weapon/circuitboard/sleeper_console
+	name = T_BOARD("sleeper console")
+	build_path = /obj/machinery/sleep_console
+	board_type = "console"
+	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+
 //Machine
 
 /obj/item/weapon/circuitboard/photocopier
@@ -78,10 +96,10 @@
 	board_type = "photocopier"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
-							"/obj/item/weapon/stock_parts/motor" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/weapon/stock_parts/matter_bin" = 1)
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/matter_bin = 1)
 
 /obj/item/weapon/circuitboard/fax
 	name = T_BOARD("fax")
@@ -89,19 +107,19 @@
 	board_type = "fax"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
-							"/obj/item/weapon/stock_parts/motor" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/weapon/stock_parts/matter_bin" = 1)
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/matter_bin = 1)
 
 /obj/item/weapon/circuitboard/conveyor
 	name = T_BOARD("conveyor")
 	build_path = /obj/machinery/conveyor
 	board_type = "conveyor"
 	req_components = list(
-							"/obj/item/weapon/stock_parts/gear" = 2,
-							"/obj/item/weapon/stock_parts/motor" = 2,
-							"/obj/item/stack/cable_coil" = 5)
+							/obj/item/weapon/stock_parts/gear = 2,
+							/obj/item/weapon/stock_parts/motor = 2,
+							/obj/item/stack/cable_coil = 5)
 
 /obj/item/weapon/circuitboard/microwave
 	name = T_BOARD("microwave")
@@ -109,29 +127,17 @@
 	board_type = "microwave"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/weapon/stock_parts/motor" = 1,
-							"/obj/item/weapon/stock_parts/capacitor" = 1)
-
-/obj/item/weapon/circuitboard/vending
-	name = T_BOARD("vending")
-	build_path = /obj/machinery/vending
-	board_type = "vending"
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
-	req_components = list(
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/weapon/stock_parts/motor" = 2,
-							"/obj/item/weapon/stock_parts/spring" = 2,
-							"/obj/item/stack/material/glass/reinforced" = 2)
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/capacitor = 1)
 
 /obj/item/weapon/circuitboard/recharger
 	name = T_BOARD("recharger")
 	build_path = /obj/machinery/recharger
 	board_type = "recharger"
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/capacitor" = 1,
-							"/obj/item/stack/cable_coil" = 5)
+							/obj/item/weapon/stock_parts/capacitor = 1,
+							/obj/item/stack/cable_coil = 5)
 
 /obj/item/weapon/circuitboard/recharger/wrecharger
 	name = T_BOARD("wall recharger")
@@ -144,18 +150,78 @@
 	board_type = "washing"
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/motor" = 1,
-							"/obj/item/weapon/stock_parts/gear" = 2)
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/gear = 2)
 
 /obj/item/weapon/circuitboard/grinder
 	name = T_BOARD("reagent grinder")
 	build_path = /obj/machinery/reagentgrinder
 	board_type = "grinder"
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/motor" = 1,
-							"/obj/item/weapon/stock_parts/gear" = 1,
-							"/obj/item/weapon/reagent_containers/glass/beaker/large" = 1)
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/gear = 1,
+							/obj/item/weapon/reagent_containers/glass/beaker/large = 1)
+
+/obj/item/weapon/circuitboard/teleporter_hub
+	name = T_BOARD("teleporter hub")
+	build_path = /obj/machinery/teleport/hub
+	board_type = "teleporter_hub"
+//	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4)
+	req_components = list(
+							/obj/item/weapon/stock_parts/scanning_module = 4,
+							/obj/item/weapon/stock_parts/micro_laser = 4,
+							/obj/item/stack/cable_coil = 10)
+
+/obj/item/weapon/circuitboard/teleporter_station
+	name = T_BOARD("teleporter station")
+	build_path = /obj/machinery/teleport/station
+	board_type = "teleporter_station"
+//	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3)
+	req_components = list(
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/weapon/stock_parts/capacitor = 2,
+							/obj/item/stack/cable_coil = 10)
+
+/obj/item/weapon/circuitboard/body_scanner
+	name = T_BOARD("body scanner")
+	build_path = /obj/machinery/bodyscanner
+	board_type = "medpod"
+	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+	req_components = list(
+							/obj/item/weapon/stock_parts/scanning_module = 3,
+							/obj/item/stack/material/glass/reinforced = 2)
+
+/obj/item/weapon/circuitboard/sleeper
+	name = T_BOARD("sleeper")
+	build_path = /obj/machinery/sleeper
+	board_type = "medpod"
+	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+	req_components = list(
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/reagent_containers/glass/beaker = 3,
+							/obj/item/weapon/reagent_containers/syringe = 3,
+							/obj/item/stack/material/glass/reinforced = 2)
+
+/obj/item/weapon/circuitboard/dna_analyzer
+	name = T_BOARD("dna analyzer")
+	build_path = /obj/machinery/dnaforensics
+	board_type = "dna_analyzer"
+	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2, TECH_DATA = 2)
+	req_components = list(
+							/obj/item/weapon/stock_parts/scanning_module = 2,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1)
+
+/obj/item/weapon/circuitboard/mass_driver
+	name = T_BOARD("mass driver")
+	build_path = /obj/machinery/mass_driver
+	board_type = "massdriver"
+	req_components = list(
+							/obj/item/weapon/stock_parts/gear = 2,
+							/obj/item/weapon/stock_parts/motor = 2,
+							/obj/item/weapon/stock_parts/capacitor = 1,
+							/obj/item/weapon/stock_parts/spring = 1,
+							/obj/item/stack/cable_coil = 5)
 
 //for testing - If this is still in when I commit, someone shoot me. --leaving in for now, shouldn't be able to get these on station anyways.
 /obj/item/weapon/storage/box/frame_parts
@@ -175,7 +241,6 @@
 		new /obj/item/weapon/circuitboard/photocopier( src )
 		new /obj/item/weapon/circuitboard/fax( src )
 		new /obj/item/weapon/circuitboard/microwave( src )
-		new /obj/item/weapon/circuitboard/vending( src )
 		new /obj/item/weapon/circuitboard/washing( src )
 		new /obj/item/weapon/stock_parts/scanning_module( src )
 		new /obj/item/weapon/stock_parts/motor( src )

code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/biogenerator
@@ -8,5 +8,5 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 1)
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1)

code/game/objects/items/weapons/circuitboards/machinery/cloning.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/clonepod
@@ -8,10 +8,10 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 3, TECH_BIO = 3)
 	req_components = list(
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/scanning_module" = 2,
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/weapon/stock_parts/console_screen" = 1)
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/scanning_module = 2,
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/weapon/stock_parts/console_screen = 1)
 
 /obj/item/weapon/circuitboard/clonescanner
 	name = T_BOARD("cloning scanner")
@@ -19,8 +19,8 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 2, TECH_BIO = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 2)
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/stack/cable_coil = 2)

code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/mech_recharger
@@ -8,6 +8,6 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/capacitor" = 2,
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 2)
+							/obj/item/weapon/stock_parts/capacitor = 2,
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/stock_parts/manipulator = 2)

code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/miningdrill
@@ -8,10 +8,10 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/capacitor" = 1,
-							"/obj/item/weapon/cell" = 1,
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1)
+							/obj/item/weapon/stock_parts/capacitor = 1,
+							/obj/item/weapon/cell = 1,
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1)
 
 /obj/item/weapon/circuitboard/miningdrillbrace
 	name = T_BOARD("mining drill brace")

code/game/objects/items/weapons/circuitboards/machinery/pacman.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/pacman
@@ -8,10 +8,10 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/capacitor" = 1)
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/capacitor = 1)
 
 /obj/item/weapon/circuitboard/pacman/super
 	name = T_BOARD("SUPERPACMAN-type generator")

code/game/objects/items/weapons/circuitboards/machinery/power.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/smes
@@ -7,18 +7,18 @@
 	build_path = "/obj/machinery/power/smes/buildable"
 	board_type = "machine"
 	origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4)
-	req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30)
+	req_components = list(/obj/item/weapon/smes_coil = 1, /obj/item/stack/cable_coil = 30)
 
 /obj/item/weapon/circuitboard/batteryrack
 	name = T_BOARD("battery rack PSU")
 	build_path = "/obj/machinery/power/smes/batteryrack"
 	board_type = "machine"
 	origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2)
-	req_components = list("/obj/item/weapon/cell" = 3)
+	req_components = list(/obj/item/weapon/cell = 3)
 
 /obj/item/weapon/circuitboard/ghettosmes
 	name = T_BOARD("makeshift PSU")
 	desc = "An APC circuit repurposed into some power storage device controller"
 	build_path = "/obj/machinery/power/smes/batteryrack/makeshift"
 	board_type = "machine"
-	req_components = list("/obj/item/weapon/cell" = 3)
+	req_components = list(/obj/item/weapon/cell = 3)

code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/recharge_station
@@ -8,7 +8,7 @@
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
 	req_components = list(
-							"/obj/item/stack/cable_coil" = 5,
-							"/obj/item/weapon/stock_parts/capacitor" = 2,
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/weapon/cell" = 1)
+							/obj/item/stack/cable_coil = 5,
+							/obj/item/weapon/stock_parts/capacitor = 2,
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/weapon/cell = 1)

code/game/objects/items/weapons/circuitboards/machinery/research.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 obj/item/weapon/circuitboard/rdserver
@@ -8,8 +8,8 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 3)
 	req_components = list(
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/scanning_module" = 1)
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/scanning_module = 1)
 
 /obj/item/weapon/circuitboard/destructive_analyzer
 	name = T_BOARD("destructive analyzer")
@@ -17,9 +17,9 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1)
+							/obj/item/weapon/stock_parts/scanning_module = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1)
 
 /obj/item/weapon/circuitboard/autolathe
 	name = T_BOARD("autolathe")
@@ -27,9 +27,9 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 3,
-							"/obj/item/weapon/stock_parts/manipulator" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1)
+							/obj/item/weapon/stock_parts/matter_bin = 3,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1)
 
 /obj/item/weapon/circuitboard/protolathe
 	name = T_BOARD("protolathe")
@@ -37,10 +37,9 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 2,
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/weapon/reagent_containers/glass/beaker" = 2)
-
+							/obj/item/weapon/stock_parts/matter_bin = 2,
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/weapon/reagent_containers/glass/beaker = 2)
 
 /obj/item/weapon/circuitboard/circuit_imprinter
 	name = T_BOARD("circuit imprinter")
@@ -48,9 +47,9 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 1,
-							"/obj/item/weapon/reagent_containers/glass/beaker" = 2)
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/reagent_containers/glass/beaker = 2)
 
 /obj/item/weapon/circuitboard/mechfab
 	name = "Circuit board (Exosuit Fabricator)"
@@ -58,7 +57,7 @@ obj/item/weapon/circuitboard/rdserver
 	board_type = "machine"
 	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/matter_bin" = 2,
-							"/obj/item/weapon/stock_parts/manipulator" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1)
+							/obj/item/weapon/stock_parts/matter_bin = 2,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1)

code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/shield_gen_ex
@@ -8,12 +8,12 @@
 	build_path = "/obj/machinery/shield_gen/external"
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
+							/obj/item/weapon/stock_parts/manipulator/pico = 2,
+							/obj/item/weapon/stock_parts/subspace/transmitter = 1,
+							/obj/item/weapon/stock_parts/subspace/crystal = 1,
+							/obj/item/weapon/stock_parts/subspace/amplifier = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/stack/cable_coil = 5)
 
 /obj/item/weapon/circuitboard/shield_gen
 	name = T_BOARD("bubble shield generator")
@@ -21,12 +21,12 @@
 	build_path = "/obj/machinery/shield_gen"
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
+							/obj/item/weapon/stock_parts/manipulator/pico = 2,
+							/obj/item/weapon/stock_parts/subspace/transmitter = 1,
+							/obj/item/weapon/stock_parts/subspace/crystal = 1,
+							/obj/item/weapon/stock_parts/subspace/amplifier = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/stack/cable_coil = 5)
 
 /obj/item/weapon/circuitboard/shield_cap
 	name = T_BOARD("shield capacitor")
@@ -34,9 +34,9 @@
 	build_path = "/obj/machinery/shield_capacitor"
 	origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/treatment" = 1,
-							"/obj/item/weapon/stock_parts/subspace/analyzer" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
+							/obj/item/weapon/stock_parts/manipulator/pico = 2,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/subspace/treatment = 1,
+							/obj/item/weapon/stock_parts/subspace/analyzer = 1,
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/stack/cable_coil = 5)

code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm

@@ -10,69 +10,69 @@
 	build_path = "/obj/machinery/telecomms/receiver"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/subspace/ansible" = 1,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1)
+							/obj/item/weapon/stock_parts/subspace/ansible = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/weapon/stock_parts/micro_laser = 1)
 
 /obj/item/weapon/circuitboard/telecomms/hub
 	name = T_BOARD("hub mainframe")
 	build_path = "/obj/machinery/telecomms/hub"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 2)
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/subspace/filter = 2)
 
 /obj/item/weapon/circuitboard/telecomms/relay
 	name = T_BOARD("relay mainframe")
 	build_path = "/obj/machinery/telecomms/relay"
 	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 2)
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/subspace/filter = 2)
 
 /obj/item/weapon/circuitboard/telecomms/bus
 	name = T_BOARD("bus mainframe")
 	build_path = "/obj/machinery/telecomms/bus"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/stack/cable_coil" = 1,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1)
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/stack/cable_coil = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1)
 
 /obj/item/weapon/circuitboard/telecomms/processor
 	name = T_BOARD("processor unit")
 	build_path = "/obj/machinery/telecomms/processor"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 3,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/treatment" = 2,
-							"/obj/item/weapon/stock_parts/subspace/analyzer" = 1,
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1)
+							/obj/item/weapon/stock_parts/manipulator = 3,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/subspace/treatment = 2,
+							/obj/item/weapon/stock_parts/subspace/analyzer = 1,
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/subspace/amplifier = 1)
 
 /obj/item/weapon/circuitboard/telecomms/server
 	name = T_BOARD("telecommunication server")
 	build_path = "/obj/machinery/telecomms/server"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/stack/cable_coil" = 1,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1)
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/stack/cable_coil = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1)
 
 /obj/item/weapon/circuitboard/telecomms/broadcaster
 	name = T_BOARD("subspace broadcaster")
 	build_path = "/obj/machinery/telecomms/broadcaster"
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/stack/cable_coil" = 1,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser/high" = 2)
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/stack/cable_coil = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/subspace/crystal = 1,
+							/obj/item/weapon/stock_parts/micro_laser/high = 2)
 
 //This isn't a real telecomms board but I don't want to make a whole file to hold only one circuitboard.
 /obj/item/weapon/circuitboard/telecomms/exonet_node
@@ -80,10 +80,10 @@
 	build_path = "/obj/machinery/exonet_node"
 	origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4)
 	req_components = list(
-							"/obj/item/weapon/stock_parts/subspace/ansible" = 1,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/manipulator" = 2,
-							"/obj/item/weapon/stock_parts/micro_laser" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/subspace/treatment" = 2,
-							"/obj/item/stack/cable_coil" = 2)
+							/obj/item/weapon/stock_parts/subspace/ansible = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/manipulator = 2,
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/subspace/crystal = 1,
+							/obj/item/weapon/stock_parts/subspace/treatment = 2,
+							/obj/item/stack/cable_coil = 2)

code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm

@@ -1,5 +1,5 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/unary_atmos
@@ -18,16 +18,16 @@
 	build_path = "/obj/machinery/atmospherics/unary/heater"
 	origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1)
 	req_components = list(
-							"/obj/item/stack/cable_coil" = 5,
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/capacitor" = 2)
+							/obj/item/stack/cable_coil = 5,
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/capacitor = 2)
 
 /obj/item/weapon/circuitboard/unary_atmos/cooler
 	name = T_BOARD("gas cooling system")
 	build_path = "/obj/machinery/atmospherics/unary/freezer"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
 	req_components = list(
-							"/obj/item/stack/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/matter_bin" = 1,
-							"/obj/item/weapon/stock_parts/capacitor" = 2,
-							"/obj/item/weapon/stock_parts/manipulator" = 1)
+							/obj/item/stack/cable_coil = 2,
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/capacitor = 2,
+							/obj/item/weapon/stock_parts/manipulator = 1)

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

@@ -93,7 +93,7 @@
 
 	spawn(0)//this prevents the collapse of space-time continuum
 		if (user)
-			user.removeItem(src, force = 1)
+			user.drop_from_inventory(src)
 		qdel(src)
 	return uses
 

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

@@ -109,7 +109,7 @@
 	if(!ispath(gift_type,/obj/item))	return
 
 	var/obj/item/I = new gift_type(M)
-	M.removeItem(src)
+	M.remove_from_mob(src)
 	M.put_in_hands(I)
 	I.add_fingerprint(M)
 	qdel(src)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -59,7 +59,8 @@
 			path = 1
 			user << "<span class='notice'>You add [W] to the metal casing.</span>"
 			playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, -3)
-			user.removeItem(det, src)
+			user.remove_from_mob(det)
+			det.loc = src
 			detonator = det
 			if(istimer(detonator.a_left))
 				var/obj/item/device/assembly/timer/T = detonator.a_left
@@ -175,7 +176,7 @@
 
 		if(istype(loc, /mob/living/carbon))		//drop dat grenade if it goes off in your hand
 			var/mob/living/carbon/C = loc
-			C.removeItem(src)
+			C.drop_from_inventory(src)
 			C.throw_mode_off()
 
 		invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/grenade/smokebomb
-	desc = "It is set to detonate in 2 seconds."
+	desc = "It is set to detonate in 2 seconds. These high-tech grenades can have their color adapted on the fly with a multitool!"
 	name = "smoke bomb"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "flashbang"
@@ -7,6 +7,8 @@
 	item_state = "flashbang"
 	slot_flags = SLOT_BELT
 	var/datum/effect/effect/system/smoke_spread/bad/smoke
+	var/smoke_color
+	var/smoke_strength = 8
 
 /obj/item/weapon/grenade/smokebomb/New()
 	..()
@@ -22,18 +24,15 @@
 	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 	src.smoke.set_up(10, 0, usr.loc)
 	spawn(0)
-		src.smoke.start()
-		sleep(10)
-		src.smoke.start()
-		sleep(10)
-		src.smoke.start()
-		sleep(10)
-		src.smoke.start()
+		for(var/i = 1 to smoke_strength)
+			src.smoke.start(smoke_color)
+			sleep(10)
+		qdel(src)
 
-	for(var/obj/effect/blob/B in view(8,src))
-		var/damage = round(30/(get_dist(B,src)+1))
-		B.health -= damage
-		B.update_icon()
-	sleep(80)
-	qdel(src)
 	return
+
+/obj/item/weapon/grenade/smokebomb/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I,/obj/item/device/multitool))
+		var/new_smoke_color = input(user, "Choose a color for the smoke:", "Smoke Color", smoke_color) as color|null
+		if(new_smoke_color)
+			smoke_color = new_smoke_color

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

@@ -81,7 +81,7 @@
 	if(dispenser)
 		cuffs = new(get_turf(user))
 	else
-		user.removeItem(cuffs)
+		user.drop_from_inventory(cuffs)
 	cuffs.loc = target
 	target.handcuffed = cuffs
 	target.update_inv_handcuffed()

code/game/objects/items/weapons/implants/implanter.dm

@@ -126,7 +126,7 @@
 		c.scanned = A
 		if(istype(A.loc,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = A.loc
-			H.removeItem(A)
+			H.remove_from_mob(A)
 		else if(istype(A.loc,/obj/item/weapon/storage))
 			var/obj/item/weapon/storage/S = A.loc
 			S.remove_from_storage(A)

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

@@ -62,7 +62,9 @@
 		finished = new /obj/item/weapon/melee/baton/cattleprod(get_turf(user))
 		user << "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>"
 	if(finished)
-		user.deleteItem(src)
-		user.deleteItem(I)
+		user.drop_from_inventory(src)
+		user.drop_from_inventory(I)
+		qdel(I)
+		qdel(src)
 		user.put_in_hands(finished)
 	update_icon(user)

code/game/objects/items/weapons/material/ashtray.dm

@@ -50,7 +50,8 @@ var/global/list/ashtray_cache = list()
 		if (contents.len >= max_butts)
 			user << "\The [src] is full."
 			return
-		user.removeItem(W, src)
+		user.remove_from_mob(W)
+		W.loc = src
 
 		if (istype(W,/obj/item/clothing/mask/smokable/cigarette))
 			var/obj/item/clothing/mask/smokable/cigarette/cig = W