Merge branch 'master' into upstream-merge-29953

code/modules/VR/vr_sleeper.dm

@@ -52,8 +52,7 @@
 /obj/machinery/vr_sleeper/Destroy()
 	open_machine()
 	cleanup_vr_human()
-	qdel(sparks)
-	sparks = null
+	QDEL_NULL(sparks)
 	return ..()
 
 

code/modules/admin/admin.dm

@@ -31,6 +31,8 @@
 	if(M.client)
 		body += " played by <b>[M.client]</b> "
 		body += "\[<A href='?_src_=holder;editrights=rank;ckey=[M.ckey]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
+		if(config.use_exp_tracking)
+			body += "\[<A href='?_src_=holder;getplaytimewindow=\ref[M]'>" + M.client.get_exp_living() + "</a>\]"
 
 	if(isnewplayer(M))
 		body += " <B>Hasn't Entered Game</B> "

code/modules/admin/admin_investigate.dm.rej

@@ -1 +0,0 @@
-garbage

code/modules/admin/admin_verbs.dm

@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	return list(
 	/client/proc/invisimin,				/*allows our mob to go invisible/visible*/
 //	/datum/admins/proc/show_traitor_panel,	/*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
-	/datum/admins/proc/show_player_panel,	/*shows an interface for individual players, with various links (links require additional flags*/
+	/datum/admins/proc/show_player_panel,	/*shows an interface for individual players, with various links (links require additional flags_1*/
 	/client/proc/game_panel,			/*game panel, allows to change game-mode etc*/
 	/client/proc/check_ai_laws,			/*shows AI and borg laws*/
 	/datum/admins/proc/toggleooc,		/*toggles ooc on/off for everyone*/
@@ -61,6 +61,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/cmd_admin_local_narrate,	/*sends text to all mobs within view of atom*/
 	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/cmd_change_command_name,
+	/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
 	/client/proc/toggle_antag_hud, 	/*toggle display of the admin antag hud*/
 	/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
 	/client/proc/customiseSNPC, /* Customise any interactive crewmembers in the world */
@@ -457,7 +458,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 				mob.invisibility = INVISIBILITY_MAXIMUM //JUST IN CASE
 				mob.alpha = 0 //JUUUUST IN CASE
 				mob.name = " "
-				mob.mouse_opacity = 0
+				mob.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 		log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
 		message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
 	SSblackbox.add_details("admin_verb","Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/admin_verbs.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm	(rejected hunks)
+@@ -663,7 +664,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable())
+ 
+ 	if(!holder)
+ 		return
+-	
++
+ 	if(has_antag_hud())
+ 		toggle_antag_hud()
+ 

code/modules/admin/create_object.dm

@@ -12,7 +12,7 @@
 	var/static/list/create_object_forms = list(
 	/obj, /obj/structure, /obj/machinery, /obj/effect,
 	/obj/item, /obj/item/clothing, /obj/item/stack, /obj/item/device,
-	/obj/item/weapon, /obj/item/weapon/reagent_containers, /obj/item/weapon/gun)
+	/obj/item/weapon, /obj/item/reagent_containers, /obj/item/gun)
 	
 	var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms
 	var/html_form = create_object_forms[path]

code/modules/admin/fun_balloon.dm

@@ -1,7 +1,7 @@
 /obj/effect/fun_balloon
 	name = "fun balloon"
 	desc = "This is going to be a laugh riot."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "syndballoon"
 	anchored = TRUE
 	var/popped = FALSE
@@ -86,7 +86,7 @@
 /obj/effect/station_crash
 	name = "station crash"
 	desc = "With no survivors!"
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "syndballoon"
 	anchored = TRUE
 
@@ -105,7 +105,7 @@
 /obj/effect/shuttle_build
 	name = "shuttle_build"
 	desc = "Some assembly required"
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "syndballoon"
 	anchored = TRUE
 
@@ -139,7 +139,7 @@
 		L.forceMove(LA)
 		L.hallucination = 0
 		to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>")
-		for(var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw in L)
+		for(var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw in L)
 			qdel(chainsaw)
 	else
 		to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")

code/modules/admin/holder2.dm

@@ -31,11 +31,11 @@ GLOBAL_PROTECT(admin_datums)
 	GLOB.admin_datums[ckey] = src
 
 /datum/admins/proc/associate(client/C)
-	if(IsAdminAdvancedProcCall())
-		var/msg = " has tried to elevate permissions!"
-		message_admins("[key_name_admin(usr)][msg]")
-		log_admin_private("[key_name(usr)][msg]")
-		return
+	if(IsAdminAdvancedProcCall())
+		var/msg = " has tried to elevate permissions!"
+		message_admins("[key_name_admin(usr)][msg]")
+		log_admin_private("[key_name(usr)][msg]")
+		return
 	if(istype(C))
 		owner = C
 		owner.holder = src
@@ -66,7 +66,7 @@ GLOBAL_PROTECT(admin_datums)
 	return FALSE //nice try trialmin
 
 /*
-checks if usr is an admin with at least ONE of the flags in rights_required. (Note, they don't need all the flags)
+checks if usr is an admin with at least ONE of the flags_1 in rights_required. (Note, they don't need all the flags_1)
 if rights_required == 0, then it simply checks if they are an admin.
 if it doesn't return 1 and show_msg=1 it will prints a message explaining why the check has failed
 generally it would be used like so:
@@ -84,7 +84,7 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
 			return 1
 		else
 			if(show_msg)
-				to_chat(usr, "<font color='red'>Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].</font>")
+				to_chat(usr, "<font color='red'>Error: You do not have sufficient rights to do that. You require one of the following flags_1:[rights2text(rights_required," ")].</font>")
 	return 0
 
 //probably a bit iffy - will hopefully figure out a better solution

code/modules/admin/ipintel.dm

@@ -77,7 +77,7 @@
 	if (!SSipintel.enabled)
 		return
 
-	var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags=f")
+	var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags_1=f")
 
 	if (http)
 		var/status = text2num(http["STATUS"])

code/modules/admin/permissionverbs/permissionedit.dm

@@ -86,7 +86,7 @@
 		admin_id = text2num(query_get_admin.item[1])
 
 	if(new_admin)
-		var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin")]` (`id`, `ckey`, `rank`, `level`, `flags`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, 0)")
+		var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin")]` (`id`, `ckey`, `rank`, `level`, `flags_1`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, 0)")
 		if(!query_add_admin.warn_execute())
 			return
 		var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');")
@@ -119,7 +119,7 @@
 	if(!adm_ckey || !istext(adm_ckey) || !isnum(new_permission))
 		return
 
-	var/datum/DBQuery/query_get_perms = SSdbcore.NewQuery("SELECT id, flags FROM [format_table_name("admin")] WHERE ckey = '[adm_ckey]'")
+	var/datum/DBQuery/query_get_perms = SSdbcore.NewQuery("SELECT id, flags_1 FROM [format_table_name("admin")] WHERE ckey = '[adm_ckey]'")
 	if(!query_get_perms.warn_execute())
 		return
 
@@ -130,7 +130,7 @@
 	if(!admin_id)
 		return
 
-	var/datum/DBQuery/query_change_perms = SSdbcore.NewQuery("UPDATE `[format_table_name("admin")]` SET flags = [new_permission] WHERE id = [admin_id]")
+	var/datum/DBQuery/query_change_perms = SSdbcore.NewQuery("UPDATE `[format_table_name("admin")]` SET flags_1 = [new_permission] WHERE id = [admin_id]")
 	if(!query_change_perms.warn_execute())
 		return
 	var/datum/DBQuery/query_change_perms_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edit permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');")

code/modules/admin/player_panel.dm

@@ -396,7 +396,7 @@
 					dat += "<tr><td><i><a href='?_src_=vars;Vars=\ref[N]'>[N.name]([N.key])</a> Nuclear Operative Body destroyed!</i></td>"
 					dat += "<td><A href='?priv_msg=[N.key]'>PM</A></td></tr>"
 			dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>"
-			for(var/obj/item/weapon/disk/nuclear/N in GLOB.poi_list)
+			for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
 				dat += "<tr><td>[N.name], "
 				var/atom/disk_loc = N.loc
 				while(!isturf(disk_loc))

code/modules/admin/secrets.dm

@@ -410,7 +410,7 @@
 						H.equip_to_slot_or_del(I, slot_w_uniform)
 						qdel(olduniform)
 						if(droptype == "Yes")
-							I.flags |= NODROP
+							I.flags_1 |= NODROP_1
 				else
 					to_chat(H, "You're not kawaii enough for this.")
 

code/modules/admin/topic.dm

@@ -22,6 +22,24 @@
 	else if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
 
+	else if(href_list["getplaytimewindow"])
+		if(!check_rights(R_ADMIN))
+			return
+		var/mob/M = locate(href_list["getplaytimewindow"]) in GLOB.mob_list
+		if(!M)
+			to_chat(usr, "<span class='danger'>ERROR: Mob not found.</span>")
+			return
+		cmd_show_exp_panel(M.client)
+
+	else if(href_list["toggleexempt"])
+		if(!check_rights(R_ADMIN))
+			return
+		var/client/C = locate(href_list["toggleexempt"]) in GLOB.clients
+		if(!C)
+			to_chat(usr, "<span class='danger'>ERROR: Client not found.</span>")
+			return
+		toggle_exempt_status(C)
+
 	else if(href_list["makeAntag"])
 		if (!SSticker.mode)
 			to_chat(usr, "<span class='danger'>Not until the round starts!</span>")
@@ -1684,7 +1702,7 @@
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.")
 			return
 
-		var/obj/item/weapon/reagent_containers/food/snacks/cookie/cookie = new(H)
+		var/obj/item/reagent_containers/food/snacks/cookie/cookie = new(H)
 		if(H.put_in_hands(cookie))
 			H.update_inv_hands()
 		else
@@ -1753,7 +1771,7 @@
 	else if(href_list["reject_custom_name"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/obj/item/weapon/station_charter/charter = locate(href_list["reject_custom_name"])
+		var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"])
 		if(istype(charter))
 			charter.reject_proposed(usr)
 	else if(href_list["jumpto"])

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

@@ -10,7 +10,7 @@
 	-- Will change all the tube lights to green
 	UPDATE /obj/machinery/light IN world SET color = "#0F0" WHERE icon_state == "tube1"
 	-- Will delete all pickaxes. "IN world" is not required.
-	DELETE /obj/item/weapon/pickaxe
+	DELETE /obj/item/pickaxe
 	-- Will flicker the lights once, then turn all mobs green. The semicolon is important to separate the consecutive querys, but is not required for standard one-query use
 	CALL flicker(1) ON /obj/machinery/light; UPDATE /mob SET color = "#00cc00"
 

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

@@ -3,8 +3,8 @@
 /proc/_abs(A)
 	return abs(A)
 
-/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
-	animate(A, set_vars, time, loop, easing, flags)
+/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags_1 = null)
+	animate(A, set_vars, time, loop, easing, flags_1)
 	Borked. If anyone wants to fix this be my guest.*/
 
 /proc/_acrccos(A)
@@ -112,8 +112,8 @@
 /proc/_range(Dist, Center = usr)
 	return range(Dist, Center)
 
-/proc/_regex(pattern, flags)
-	return regex(pattern, flags)
+/proc/_regex(pattern, flags_1)
+	return regex(pattern, flags_1)
 
 /proc/_REGEX_QUOTE(text)
 	return REGEX_QUOTE(text)

code/modules/admin/verbs/adminhelp.dm

@@ -24,7 +24,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	QDEL_NULL(cstatclick)
 	QDEL_NULL(rstatclick)
 	return ..()
-	
+
 /datum/admin_help_tickets/proc/TicketByID(id)
 	var/list/lists = list(active_tickets, closed_tickets, resolved_tickets)
 	for(var/I in lists)
@@ -185,8 +185,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 	TimeoutVerb()
 
-	var/parsed_message = keywords_lookup(msg)
-
 	statclick = new(null, src)
 	_interactions = list()
 
@@ -194,7 +192,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		AddInteraction("<font color='blue'>[key_name_admin(usr)] PM'd [LinkedReplyName()]</font>")
 		message_admins("<font color='blue'>Ticket [TicketHref("#[id]")] created</font>")
 	else
-		MessageNoRecipient(msg, parsed_message)
+		MessageNoRecipient(msg)
 
 		//send it to irc if nobody is on and tell us how many were on
 		var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]")
@@ -249,13 +247,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 //message from the initiator without a target, all admins will see this
 //won't bug irc
-/datum/admin_help/proc/MessageNoRecipient(msg, parsed_msg)
+/datum/admin_help/proc/MessageNoRecipient(msg)
 	var/ref_src = "\ref[src]"
 	//Message to be sent to all admins
-	var/admin_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [parsed_msg]</span>"
+	var/admin_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [keywords_lookup(msg)]</span>"
 
 	AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
-	
+
 	//send this msg to all admins
 	for(var/client/X in GLOB.admins)
 		if(X.prefs.toggles & SOUND_ADMINHELP)

code/modules/admin/verbs/debug.dm

@@ -348,11 +348,10 @@ GLOBAL_PROTECT(AdminProcCallCount)
 			/obj/effect/decal/cleanable = "CLEANABLE",
 			/obj/item/device/radio/headset = "HEADSET",
 			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
-			/obj/item/weapon/book/manual = "MANUAL",
-			/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
-			/obj/item/weapon/reagent_containers/food = "FOOD",
-			/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
-			/obj/item/weapon = "WEAPON",
+			/obj/item/book/manual = "MANUAL",
+			/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+			/obj/item/reagent_containers/food = "FOOD",
+			/obj/item/reagent_containers = "REAGENT_CONTAINERS",
 			/obj/machinery/atmospherics = "ATMOS_MECH",
 			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
 			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
@@ -442,14 +441,14 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/worn = H.wear_id
-		var/obj/item/weapon/card/id/id = null
+		var/obj/item/card/id/id = null
 		if(worn)
 			id = worn.GetID()
 		if(id)
 			id.icon_state = "gold"
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 		else
-			id = new /obj/item/weapon/card/id/gold(H.loc)
+			id = new /obj/item/card/id/gold(H.loc)
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 			id.registered_name = H.real_name
 			id.assignment = "Captain"
@@ -460,8 +459,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 					var/obj/item/device/pda/PDA = worn
 					PDA.id = id
 					id.forceMove(PDA)
-				else if(istype(worn, /obj/item/weapon/storage/wallet))
-					var/obj/item/weapon/storage/wallet/W = worn
+				else if(istype(worn, /obj/item/storage/wallet))
+					var/obj/item/storage/wallet/W = worn
 					W.front_id = id
 					id.forceMove(W)
 					W.update_icon()
@@ -505,12 +504,13 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	var/list/areas_with_LS = list()
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
+	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin))
 
 	for(var/area/A in world)
 		if(on_station)
 			var/turf/picked = safepick(get_area_turfs(A.type))
 			if(picked && (picked.z == ZLEVEL_STATION))
-				if(!(A.type in areas_all))
+				if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
 					areas_all.Add(A.type)
 		else if(!(A.type in areas_all))
 			areas_all.Add(A.type)
@@ -705,7 +705,7 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	for(var/obj/machinery/power/rad_collector/Rad in GLOB.machines)
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
-				var/obj/item/weapon/tank/internals/plasma/Plasma = new/obj/item/weapon/tank/internals/plasma(Rad)
+				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
 				Plasma.air_contents.assert_gas("plasma")
 				Plasma.air_contents.gases["plasma"][MOLES] = 70
 				Rad.drainratio = 0

code/modules/admin/verbs/machine_upgrade.dm

@@ -3,7 +3,7 @@
 	set category = "Debug"
 	var/new_rating = input("Enter new rating:","Num") as num
 	if(new_rating && M.component_parts)
-		for(var/obj/item/weapon/stock_parts/P in M.component_parts)
+		for(var/obj/item/stock_parts/P in M.component_parts)
 			P.rating = new_rating
 		M.RefreshParts()
 

code/modules/admin/verbs/manipulate_organs.dm

@@ -16,11 +16,11 @@
 			organ.Insert(C)
 
 		if("add implant")
-			for(var/path in subtypesof(/obj/item/weapon/implant))
-				var/dat = replacetext("[path]", "/obj/item/weapon/implant/", ":")
+			for(var/path in subtypesof(/obj/item/implant))
+				var/dat = replacetext("[path]", "/obj/item/implant/", ":")
 				organs[dat] = path
 
-			var/obj/item/weapon/implant/organ = input("Select implant type:", "Organ Manipulation", null) in organs
+			var/obj/item/implant/organ = input("Select implant type:", "Organ Manipulation", null) in organs
 			organ = organs[organ]
 			organ = new organ
 			organ.implant(C)
@@ -31,14 +31,14 @@
 				organs["[I.name] ([I.type])"] = I
 
 			for(var/X in C.implants)
-				var/obj/item/weapon/implant/I = X
+				var/obj/item/implant/I = X
 				organs["[I.name] ([I.type])"] = I
 
 			var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
 			organ = organs[organ]
 			if(!organ) return
 			var/obj/item/organ/O
-			var/obj/item/weapon/implant/I
+			var/obj/item/implant/I
 
 			if(isorgan(organ))
 				O = organ
@@ -52,7 +52,7 @@
 			if(operation == "remove organ/implant")
 				qdel(organ)
 			else if(I) // Put the implant in case.
-				var/obj/item/weapon/implantcase/case = new(get_turf(C))
+				var/obj/item/implantcase/case = new(get_turf(C))
 				case.imp = I
 				I.loc = case
 				case.update_icon()

code/modules/admin/verbs/onlyone.dm

@@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 
 	send_to_playing_players("<span class='boldannounce'><font size=6>THERE CAN BE ONLY ONE</font></span>")
 
-	for(var/obj/item/weapon/disk/nuclear/N in GLOB.poi_list)
+	for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
 		N.relocate() //Gets it out of bags and such
 
 	for(var/mob/living/carbon/human/H in GLOB.player_list)
@@ -50,26 +50,26 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(src), slot_ears)
 	equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(src), slot_head)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes)
-	equip_to_slot_or_del(new /obj/item/weapon/pinpointer(src), slot_l_store)
-	for(var/obj/item/weapon/pinpointer/P in src)
+	equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_l_store)
+	for(var/obj/item/pinpointer/P in src)
 		P.attack_self(src)
-	var/obj/item/weapon/card/id/W = new(src)
+	var/obj/item/card/id/W = new(src)
 	W.icon_state = "centcom"
 	W.access = get_all_accesses()
 	W.access += get_all_centcom_access()
 	W.assignment = "Highlander"
 	W.registered_name = real_name
-	W.flags |= NODROP
+	W.flags_1 |= NODROP_1
 	W.update_label(real_name)
 	equip_to_slot_or_del(W, slot_wear_id)
 
-	var/obj/item/weapon/claymore/highlander/H1 = new(src)
+	var/obj/item/claymore/highlander/H1 = new(src)
 	if(!GLOB.highlander)
 		H1.admin_spawned = TRUE //To prevent announcing
 	put_in_hands(H1)
 	H1.pickup(src) //For the stun shielding
 
-	var/obj/item/weapon/bloodcrawl/antiwelder = new(src)
+	var/obj/item/bloodcrawl/antiwelder = new(src)
 	antiwelder.name = "compulsion of honor"
 	antiwelder.desc = "You are unable to hold anything in this hand until you're the last one left!"
 	antiwelder.icon_state = "bloodhand_right"
@@ -108,10 +108,10 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 		var/obj/item/slot_item_hand = H.get_item_for_held_index(2)
 		H.dropItemToGround(slot_item_hand)
 
-		var /obj/item/weapon/multisword/multi = new(H)
+		var /obj/item/multisword/multi = new(H)
 		H.put_in_hands_or_del(multi)
 
-		var/obj/item/weapon/card/id/W = new(H)
+		var/obj/item/card/id/W = new(H)
 		W.icon_state = "centcom"
 		W.access = get_all_accesses()
 		W.access += get_all_centcom_access()

code/modules/admin/verbs/playsound.dm

@@ -9,6 +9,11 @@
 		freq = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
 		to_chat(src, "You feel the Honkmother messing with your song...")
 
+	var/vol = input(usr, "What volume would you like the sound to play at?",, 100) as null|num
+	if(!vol)
+		return
+	vol = Clamp(vol, 1, 100)
+
 	var/sound/admin_sound = new()
 	admin_sound.file = S
 	admin_sound.priority = 250
@@ -17,7 +22,8 @@
 	admin_sound.wait = 1
 	admin_sound.repeat = 0
 	admin_sound.status = SOUND_STREAM
-		
+	admin_sound.volume = vol
+
 	var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel")
 	switch(res)
 		if("Yes")

code/modules/admin/verbs/randomverbs.dm.rej

@@ -0,0 +1,25 @@
+diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm	(rejected hunks)
+@@ -1246,7 +1246,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
+ 		to_chat(usr, "<span class='danger'>ERROR: Client not found.</span>")
+ 		return
+ 
+-	C.set_db_player_flags()
++	if(!C.set_db_player_flags())
++		to_chat(usr, "<span class='danger'>ERROR: Unable read player flags from database. Please check logs.</span>")
+ 	var/dbflags = C.prefs.db_flags
+ 	var/newstate = FALSE
+ 	if(dbflags & DB_FLAG_EXEMPT)
+@@ -1254,6 +1255,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
+ 	else
+ 		newstate = TRUE
+ 
+-	message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
+-	log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
+-	C.update_flag_db(DB_FLAG_EXEMPT, newstate)
+\ No newline at end of file
++	if(C.update_flag_db(DB_FLAG_EXEMPT, newstate))
++		to_chat(usr, "<span class='danger'>ERROR: Unable to update player flags. Please check logs.</span>")
++	else
++		message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
++		log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
+\ No newline at end of file

code/modules/assembly/assembly.dm

@@ -3,7 +3,7 @@
 	desc = "A small electronic device that should never exist."
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=100)
 	throwforce = 2
@@ -81,7 +81,7 @@
 	return secured
 
 
-/obj/item/device/assembly/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/assembly/attackby(obj/item/W, mob/user, params)
 	if(isassembly(W))
 		var/obj/item/device/assembly/A = W
 		if((!A.secured) && (!secured))
@@ -91,7 +91,7 @@
 		else
 			to_chat(user, "<span class='warning'>Both devices must be in attachable mode to be attached together.</span>")
 		return
-	if(istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/screwdriver))
 		if(toggle_secure())
 			to_chat(user, "<span class='notice'>\The [src] is ready!</span>")
 		else

code/modules/assembly/bomb.dm

@@ -8,10 +8,10 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 2
 	throw_range = 4
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
-	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank
+	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
 	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/onetankbomb/examine(mob/user)
@@ -26,11 +26,11 @@
 		copy_overlays(bombassembly)
 		add_overlay("bomb_assembly")
 
-/obj/item/device/onetankbomb/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/onetankbomb/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/device/analyzer))
 		bombtank.attackby(W, user)
 		return
-	if(istype(W, /obj/item/weapon/wrench) && !status)	//This is basically bomb assembly code inverted. apparently it works.
+	if(istype(W, /obj/item/wrench) && !status)	//This is basically bomb assembly code inverted. apparently it works.
 
 		to_chat(user, "<span class='notice'>You disassemble [src].</span>")
 
@@ -44,7 +44,7 @@
 
 		qdel(src)
 		return
-	var/obj/item/weapon/weldingtool/WT = W
+	var/obj/item/weldingtool/WT = W
 	if((istype(WT) && WT.welding))
 		if(!status)
 			status = TRUE
@@ -84,7 +84,7 @@
 
 // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
 
-/obj/item/weapon/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
+/obj/item/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
 	var/obj/item/device/assembly_holder/S = W
 	var/mob/M = user
 	if(isigniter(S.a_left) == isigniter(S.a_right))		//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
@@ -108,7 +108,7 @@
 	R.update_icon()
 	return
 
-/obj/item/weapon/tank/proc/ignite()	//This happens when a bomb is told to explode
+/obj/item/tank/proc/ignite()	//This happens when a bomb is told to explode
 	air_contents.assert_gases("plasma", "o2")
 	var/fuel_moles = air_contents.gases["plasma"][MOLES] + air_contents.gases["o2"][MOLES]/6
 	air_contents.garbage_collect()
@@ -160,7 +160,7 @@
 		qdel(master)
 	qdel(src)
 
-/obj/item/weapon/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
+/obj/item/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
 	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
 	var/turf/T = get_turf(src)
 	if(!T)

code/modules/assembly/flash.dm

@@ -180,7 +180,7 @@
 	..()
 	new /obj/effect/temp_visual/borgflash(get_turf(src))
 
-/obj/item/device/assembly/flash/cyborg/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/assembly/flash/cyborg/attackby(obj/item/W, mob/user, params)
 	return
 
 /obj/item/device/assembly/flash/memorizer
@@ -224,7 +224,7 @@
 /obj/item/device/assembly/flash/shield
 	name = "strobe shield"
 	desc = "A shield with a built in, high intensity light capable of blinding and disorienting suspects. Takes regular handheld flashes as bulbs."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "flashshield"
 	item_state = "flashshield"
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
@@ -247,7 +247,7 @@
 		return 0
 	return 1
 
-/obj/item/device/assembly/flash/shield/attackby(obj/item/weapon/W, mob/user)
+/obj/item/device/assembly/flash/shield/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/device/assembly/flash/handheld))
 		var/obj/item/device/assembly/flash/handheld/flash = W
 		if(flash.crit_fail)

code/modules/assembly/health.dm

@@ -31,7 +31,7 @@
 	update_icon()
 	return secured
 
-/obj/item/device/assembly/health/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/assembly/health/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/device/multitool))
 		if(alarm_health == 0)
 			alarm_health = -90

code/modules/assembly/holder.dm

@@ -5,7 +5,7 @@
 	item_state = "assembly"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	throwforce = 5
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 2
@@ -81,8 +81,8 @@
 	..()
 	return
 
-/obj/item/device/assembly_holder/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/screwdriver))
+/obj/item/device/assembly_holder/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/screwdriver))
 		var/turf/T = get_turf(src)
 		if(!T)
 			return 0

code/modules/assembly/shock_kit.dm

@@ -6,15 +6,15 @@
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/electropack/part2 = null
 	w_class = WEIGHT_CLASS_HUGE
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 
 /obj/item/assembly/shock_kit/Destroy()
 	qdel(part1)
 	qdel(part2)
 	return ..()
 
-/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/wrench))
+/obj/item/assembly/shock_kit/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/wrench))
 		var/turf/T = loc
 		if(ismob(T))
 			T = T.loc

code/modules/assembly/signaler.dm

@@ -97,7 +97,7 @@ Code:
 
 	return
 
-/obj/item/device/assembly/signaler/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/assembly/signaler/attackby(obj/item/W, mob/user, params)
 	if(issignaler(W))
 		var/obj/item/device/assembly/signaler/signaler2 = W
 		if(secured && signaler2.secured)
@@ -201,5 +201,5 @@ Code:
 /obj/item/device/assembly/signaler/cyborg
 	origin_tech = null
 
-/obj/item/device/assembly/signaler/cyborg/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
 	return

code/modules/assembly/voice.dm

@@ -4,7 +4,7 @@
 	icon_state = "voice"
 	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	origin_tech = "magnets=1;engineering=1"
-	flags = HEAR
+	flags_1 = HEAR_1
 	attachable = 1
 	verb_say = "beeps"
 	verb_ask = "beeps"
@@ -65,7 +65,7 @@
 			if(length(raw_message))
 				. = 1
 
-/obj/item/device/assembly/voice/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/device/assembly/voice/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/device/multitool))
 		mode %= modes.len
 		mode++

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -45,7 +45,7 @@
 //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
 /obj/effect/hotspot
 	anchored = TRUE
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "1"
 	layer = ABOVE_OPEN_TURF_LAYER

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
 
 /obj/effect/overlay/gas
 	icon = 'icons/effects/tile_effects.dmi'
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	layer = FLY_LAYER
 	appearance_flags = TILE_BOUND
 

code/modules/atmospherics/machinery/airalarm.dm

@@ -21,7 +21,7 @@
 		return 1
 	return 0
 
-/obj/item/weapon/electronics/airalarm
+/obj/item/electronics/airalarm
 	name = "air alarm electronics"
 	icon_state = "airalarm_electronics"
 
@@ -640,20 +640,20 @@
 /obj/machinery/airalarm/attackby(obj/item/W, mob/user, params)
 	switch(buildstage)
 		if(2)
-			if(istype(W, /obj/item/weapon/wirecutters) && panel_open && wires.is_all_cut())
+			if(istype(W, /obj/item/wirecutters) && panel_open && wires.is_all_cut())
 				playsound(src.loc, W.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You cut the final wires.</span>")
 				new /obj/item/stack/cable_coil(loc, 5)
 				buildstage = 1
 				update_icon()
 				return
-			else if(istype(W, /obj/item/weapon/screwdriver))  // Opening that Air Alarm up.
+			else if(istype(W, /obj/item/screwdriver))  // Opening that Air Alarm up.
 				playsound(src.loc, W.usesound, 50, 1)
 				panel_open = !panel_open
 				to_chat(user, "<span class='notice'>The wires have been [panel_open ? "exposed" : "unexposed"].</span>")
 				update_icon()
 				return
-			else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
+			else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
 				if(stat & (NOPOWER|BROKEN))
 					to_chat(user, "<span class='warning'>It does nothing!</span>")
 				else
@@ -667,14 +667,14 @@
 				wires.interact(user)
 				return
 		if(1)
-			if(istype(W, /obj/item/weapon/crowbar))
+			if(istype(W, /obj/item/crowbar))
 				user.visible_message("[user.name] removes the electronics from [src.name].",\
 									"<span class='notice'>You start prying out the circuit...</span>")
 				playsound(src.loc, W.usesound, 50, 1)
 				if (do_after(user, 20*W.toolspeed, target = src))
 					if (buildstage == 1)
 						to_chat(user, "<span class='notice'>You remove the air alarm electronics.</span>")
-						new /obj/item/weapon/electronics/airalarm( src.loc )
+						new /obj/item/electronics/airalarm( src.loc )
 						playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
 						buildstage = 0
 						update_icon()
@@ -701,7 +701,7 @@
 						update_icon()
 				return
 		if(0)
-			if(istype(W, /obj/item/weapon/electronics/airalarm))
+			if(istype(W, /obj/item/electronics/airalarm))
 				if(user.temporarilyRemoveItemFromInventory(W))
 					to_chat(user, "<span class='notice'>You insert the circuit.</span>")
 					buildstage = 1
@@ -709,7 +709,7 @@
 					qdel(W)
 				return
 
-			if(istype(W, /obj/item/weapon/wrench))
+			if(istype(W, /obj/item/wrench))
 				to_chat(user, "<span class='notice'>You detach \the [src] from the wall.</span>")
 				playsound(src.loc, W.usesound, 50, 1)
 				new /obj/item/wallframe/airalarm( user.loc )
@@ -734,9 +734,9 @@
 	update_icon()
 
 /obj/machinery/airalarm/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc, 2)
-		var/obj/item/I = new /obj/item/weapon/electronics/airalarm(loc)
+		var/obj/item/I = new /obj/item/electronics/airalarm(loc)
 		if(!disassembled)
 			I.obj_integrity = I.max_integrity * 0.5
 		new /obj/item/stack/cable_coil(loc, 3)

code/modules/atmospherics/machinery/atmosmachinery.dm

@@ -129,8 +129,8 @@ Pipelines + Other Objects -> Pipe network
 /obj/machinery/atmospherics/update_icon()
 	return
 
-/obj/machinery/atmospherics/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/wrench))
+/obj/machinery/atmospherics/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/wrench))
 		if(can_unwrench(user))
 			var/turf/T = get_turf(src)
 			if (level==1 && isturf(T) && T.intact)
@@ -186,7 +186,7 @@ Pipelines + Other Objects -> Pipe network
 	user.throw_at(target, range, speed)
 
 /obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(can_unwrench)
 			var/obj/item/pipe/stored = new(loc, make_from=src)
 			if(!disassembled)

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -9,9 +9,10 @@
 	max_integrity = 350
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 30, acid = 30)
 	layer = ABOVE_WINDOW_LAYER
+	state_open = FALSE
+	circuit = /obj/item/circuitboard/machine/cryo_tube
 
 	var/on = FALSE
-	state_open = FALSE
 	var/autoeject = FALSE
 	var/volume = 100
 
@@ -21,7 +22,7 @@
 	var/heat_capacity = 20000
 	var/conduction_coefficient = 0.30
 
-	var/obj/item/weapon/reagent_containers/glass/beaker = null
+	var/obj/item/reagent_containers/glass/beaker = null
 	var/reagent_transfer = 0
 
 	var/obj/item/device/radio/radio
@@ -35,8 +36,6 @@
 /obj/machinery/atmospherics/components/unary/cryo_cell/Initialize()
 	. = ..()
 	initialize_directions = dir
-	var/obj/item/weapon/circuitboard/machine/cryo_tube/B = new
-	B.apply_default_parts(src)
 
 	radio = new(src)
 	radio.keyslot = new radio_key
@@ -44,22 +43,12 @@
 	radio.canhear_range = 0
 	radio.recalculateChannels()
 
-/obj/item/weapon/circuitboard/machine/cryo_tube
-	name = "Cryotube (Machine Board)"
-	build_path = /obj/machinery/atmospherics/components/unary/cryo_cell
-	origin_tech = "programming=4;biotech=3;engineering=4;plasmatech=3"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 1,
-							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/console_screen = 1,
-							/obj/item/stack/sheet/glass = 2)
-
 /obj/machinery/atmospherics/components/unary/cryo_cell/on_construction()
 	..(dir, dir)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/RefreshParts()
 	var/C
-	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		C += M.rating
 
 	efficiency = initial(efficiency) * C
@@ -69,11 +58,8 @@
 	conduction_coefficient = initial(conduction_coefficient) * C
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy()
-	qdel(radio)
-	radio = null
-	if(beaker)
-		qdel(beaker)
-		beaker = null
+	QDEL_NULL(radio)
+	QDEL_NULL(beaker)
 	return ..()
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target)
@@ -280,7 +266,7 @@
 	close_machine(target)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/reagent_containers/glass))
+	if(istype(I, /obj/item/reagent_containers/glass))
 		. = 1 //no afterattack
 		if(beaker)
 			to_chat(user, "<span class='warning'>A beaker is already loaded into [src]!</span>")

code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm

@@ -10,6 +10,7 @@
 	max_integrity = 300
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
 	layer = OBJ_LAYER
+	circuit = /obj/item/circuitboard/machine/thermomachine
 
 	var/on = FALSE
 	var/min_temperature = 0
@@ -18,56 +19,16 @@
 	var/heat_capacity = 0
 	var/interactive = TRUE // So mapmakers can disable interaction.
 
-/obj/machinery/atmospherics/components/unary/thermomachine/New()
-	..()
-	initialize_directions = dir
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/thermomachine
-	name = "Thermomachine (Machine Board)"
-	desc = "You can use a screwdriver to switch between heater and freezer."
-	origin_tech = "programming=3;plasmatech=3"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 2,
-							/obj/item/weapon/stock_parts/micro_laser = 2,
-							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/console_screen = 1)
-
-/obj/item/weapon/circuitboard/machine/thermomachine/Initialize()
+/obj/machinery/atmospherics/components/unary/thermomachine/Initialize()
 	. = ..()
-	if(prob(50))
-		name = "Freezer (Machine Board)"
-		build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
-	else
-		name = "Heater (Machine Board)"
-		build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater
-
-/obj/item/weapon/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params)
-	var/obj/item/weapon/circuitboard/machine/freezer = /obj/item/weapon/circuitboard/machine/thermomachine/freezer
-	var/obj/item/weapon/circuitboard/machine/heater = /obj/item/weapon/circuitboard/machine/thermomachine/heater
-	var/obj/item/weapon/circuitboard/machine/newtype
-
-	if(istype(I, /obj/item/weapon/screwdriver))
-		var/new_setting = "Heater"
-		playsound(src.loc, I.usesound, 50, 1)
-		if(build_path == initial(heater.build_path))
-			newtype = freezer
-			new_setting = "Freezer"
-		else
-			newtype = heater
-		name = initial(newtype.name)
-		build_path = initial(newtype.build_path)
-		to_chat(user, "<span class='notice'>You change the circuitboard setting to \"[new_setting]\".</span>")
-	else
-		return ..()
+	initialize_directions = dir
 
 /obj/machinery/atmospherics/components/unary/thermomachine/on_construction()
 	..(dir,dir)
 
 /obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts()
 	var/B
-	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		B += M.rating
 	heat_capacity = 5000 * ((B - 1) ** 2)
 
@@ -123,7 +84,7 @@
 		return
 	return ..()
 
-/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W)
+/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/wrench/W)
 	if(!..())
 		return 0
 	SetInitDirections()
@@ -202,20 +163,12 @@
 	icon_state_open = "freezer-o"
 	max_temperature = T20C
 	min_temperature = 170
-
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine/freezer(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/thermomachine/freezer
-	name = "Freezer (Machine Board)"
-	build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
+	circuit = /obj/item/circuitboard/machine/thermomachine/freezer
 
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts()
 	..()
 	var/L
-	for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
+	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
 		L += M.rating
 	min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB)
 
@@ -227,19 +180,11 @@
 	icon_state_open = "heater-o"
 	max_temperature = 140
 	min_temperature = T20C
-
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine/heater(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/thermomachine/heater
-	name = "Heater (Machine Board)"
-	build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater
+	circuit = /obj/item/circuitboard/machine/thermomachine/heater
 
 /obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts()
 	..()
 	var/L
-	for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
+	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
 		L += M.rating
 	max_temperature = T20C + (initial(max_temperature) * L)

code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

@@ -260,8 +260,8 @@
 	return
 
 /obj/machinery/atmospherics/components/unary/vent_pump/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
+	if(istype(W, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
 			playsound(loc, WT.usesound, 40, 1)
 			to_chat(user, "<span class='notice'>You begin welding the vent...</span>")

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -257,7 +257,7 @@
 	return 1
 
 
-//There is no easy way for an object to be notified of changes to atmos can pass flags
+//There is no easy way for an object to be notified of changes to atmos can pass flags_1
 //	So we check every machinery process (2 seconds)
 /obj/machinery/atmospherics/components/unary/vent_scrubber/process()
 	if (widenet)
@@ -339,9 +339,9 @@
 	..()
 	update_icon_nopipes()
 
-/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
+/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0,user))
 			playsound(loc, WT.usesound, 40, 1)
 			to_chat(user, "<span class='notice'>Now welding the scrubber.</span>")

code/modules/atmospherics/machinery/other/meter.dm

@@ -91,8 +91,8 @@
 	to_chat(user, status())
 
 
-/obj/machinery/meter/attackby(obj/item/weapon/W, mob/user, params)
-	if (istype(W, /obj/item/weapon/wrench))
+/obj/machinery/meter/attackby(obj/item/W, mob/user, params)
+	if (istype(W, /obj/item/wrench))
 		playsound(src.loc, W.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
 		if (do_after(user, 40*W.toolspeed, target = src))

code/modules/atmospherics/machinery/pipes/pipes.dm

@@ -61,7 +61,7 @@
 		parent = new /datum/pipeline()
 		parent.build_pipeline(src)
 
-/obj/machinery/atmospherics/pipe/attackby(obj/item/weapon/W, mob/user, params)
+/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/device/analyzer))
 		atmosanalyzer_scan(parent.air, user)
 	else

code/modules/atmospherics/machinery/portable/canister.dm

@@ -247,7 +247,7 @@
 
 
 /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			canister_break()
 		if(disassembled)
@@ -256,9 +256,9 @@
 			new /obj/item/stack/sheet/metal (loc, 5)
 	qdel(src)
 
-/obj/machinery/portable_atmospherics/canister/attackby(obj/item/weapon/W, mob/user, params)
-	if(user.a_intent != INTENT_HARM && istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
+/obj/machinery/portable_atmospherics/canister/attackby(obj/item/W, mob/user, params)
+	if(user.a_intent != INTENT_HARM && istype(W, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = W
 		if(stat & BROKEN)
 			if(!WT.remove_fuel(0, user))
 				return
@@ -273,7 +273,7 @@
 		return ..()
 
 /obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
-	if((stat & BROKEN) || (flags & NODECONSTRUCT))
+	if((flags_1 & BROKEN) || (flags_1 & NODECONSTRUCT_1))
 		return
 	canister_break()
 

code/modules/atmospherics/machinery/portable/portable_atmospherics.dm

@@ -8,7 +8,7 @@
 
 	var/datum/gas_mixture/air_contents
 	var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port
-	var/obj/item/weapon/tank/holding
+	var/obj/item/tank/holding
 
 	var/volume = 0
 
@@ -76,16 +76,16 @@
 /obj/machinery/portable_atmospherics/portableConnectorReturnAir()
 	return air_contents
 
-/obj/machinery/portable_atmospherics/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/tank))
+/obj/machinery/portable_atmospherics/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/tank))
 		if(!(stat & BROKEN))
-			var/obj/item/weapon/tank/T = W
+			var/obj/item/tank/T = W
 			if(holding || !user.drop_item())
 				return
 			T.loc = src
 			holding = T
 			update_icon()
-	else if(istype(W, /obj/item/weapon/wrench))
+	else if(istype(W, /obj/item/wrench))
 		if(!(stat & BROKEN))
 			if(connected_port)
 				disconnect()

code/modules/atmospherics/machinery/portable/pump.dm

@@ -16,7 +16,7 @@
 	volume = 1000
 
 /obj/machinery/portable_atmospherics/pump/Initialize()
-	..()
+	. = ..()
 	pump = new(src, FALSE)
 	pump.on = TRUE
 	pump.stat = 0
@@ -26,8 +26,7 @@
 	var/turf/T = get_turf(src)
 	T.assume_air(air_contents)
 	air_update_turf()
-	qdel(pump)
-	pump = null
+	QDEL_NULL(pump)
 	return ..()
 
 /obj/machinery/portable_atmospherics/pump/update_icon()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -127,7 +127,7 @@
 		for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE))
 			scrub(AT.return_air())
 
-/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/weapon/W, mob/user)
+/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user)
 	if(default_unfasten_wrench(user, W))
 		if(!movable)
 			on = FALSE

code/modules/awaymissions/capture_the_flag.dm

@@ -8,9 +8,9 @@
 
 
 
-/obj/item/weapon/twohanded/ctf
+/obj/item/twohanded/ctf
 	name = "banner"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "banner"
 	item_state = "banner"
 	lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
@@ -23,24 +23,22 @@
 	armour_penetration = 1000
 	resistance_flags = INDESTRUCTIBLE
 	anchored = TRUE
+	flags_2 = SLOWS_WHILE_IN_HAND_2
 	var/team = WHITE_TEAM
 	var/reset_cooldown = 0
 	var/obj/effect/ctf/flag_reset/reset
 	var/reset_path = /obj/effect/ctf/flag_reset
 
-/obj/item/weapon/twohanded/ctf/Destroy()
-	if(reset)
-		qdel(reset)
-		reset = null
-	. = ..()
+/obj/item/twohanded/ctf/Destroy()
+	QDEL_NULL(reset)
+	return ..()
 
-/obj/item/weapon/twohanded/ctf/Initialize()
-	..()
-	SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
+/obj/item/twohanded/ctf/Initialize()
+	. = ..()
 	if(!reset)
 		reset = new reset_path(get_turf(src))
 
-/obj/item/weapon/twohanded/ctf/process()
+/obj/item/twohanded/ctf/process()
 	if(world.time > reset_cooldown)
 		forceMove(get_turf(src.reset))
 		for(var/mob/M in GLOB.player_list)
@@ -49,7 +47,7 @@
 				to_chat(M, "<span class='userdanger'>\The [src] has been returned to base!</span>")
 		STOP_PROCESSING(SSobj, src)
 
-/obj/item/weapon/twohanded/ctf/attack_hand(mob/living/user)
+/obj/item/twohanded/ctf/attack_hand(mob/living/user)
 	if(!is_ctf_target(user))
 		to_chat(user, "Non players shouldn't be moving the flag!")
 		return
@@ -71,7 +69,7 @@
 			to_chat(M, "<span class='userdanger'>\The [src] has been taken!</span>")
 	STOP_PROCESSING(SSobj, src)
 
-/obj/item/weapon/twohanded/ctf/dropped(mob/user)
+/obj/item/twohanded/ctf/dropped(mob/user)
 	..()
 	user.anchored = FALSE
 	reset_cooldown = world.time + 200 //20 seconds
@@ -83,7 +81,7 @@
 	anchored = TRUE
 
 
-/obj/item/weapon/twohanded/ctf/red
+/obj/item/twohanded/ctf/red
 	name = "red flag"
 	icon_state = "banner-red"
 	item_state = "banner-red"
@@ -92,7 +90,7 @@
 	reset_path = /obj/effect/ctf/flag_reset/red
 
 
-/obj/item/weapon/twohanded/ctf/blue
+/obj/item/twohanded/ctf/blue
 	name = "blue flag"
 	icon_state = "banner-blue"
 	item_state = "banner-blue"
@@ -102,7 +100,7 @@
 
 /obj/effect/ctf/flag_reset
 	name = "banner landmark"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "banner"
 	desc = "This is where a banner with Nanotrasen's logo on it would go."
 	layer = LOW_ITEM_LAYER
@@ -163,7 +161,7 @@
 			/obj/machinery,
 			/obj/structure,
 			/obj/effect/ctf,
-			/obj/item/weapon/twohanded/ctf
+			/obj/item/twohanded/ctf
 		))
 	GLOB.poi_list |= src
 
@@ -262,8 +260,8 @@
 			attack_ghost(ghost)
 
 /obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/twohanded/ctf))
-		var/obj/item/weapon/twohanded/ctf/flag = I
+	if(istype(I, /obj/item/twohanded/ctf))
+		var/obj/item/twohanded/ctf/flag = I
 		if(flag.team != src.team)
 			user.transferItemToLoc(flag, get_turf(flag.reset), TRUE)
 			points++
@@ -280,7 +278,7 @@
 		if(istype(mob_area, /area/ctf))
 			to_chat(M, "<span class='narsie'>[team] team wins!</span>")
 			to_chat(M, "<span class='userdanger'>The game has been reset! Teams have been cleared. The machines will be active again in 30 seconds.</span>")
-			for(var/obj/item/weapon/twohanded/ctf/W in M)
+			for(var/obj/item/twohanded/ctf/W in M)
 				M.dropItemToGround(W)
 			M.dust()
 	for(var/obj/machinery/control_point/control in GLOB.machines)
@@ -350,16 +348,16 @@
 			CTF.ctf_gear = initial(ctf_gear)
 			CTF.respawn_cooldown = DEFAULT_RESPAWN
 
-/obj/item/weapon/gun/ballistic/automatic/pistol/deagle/ctf
+/obj/item/gun/ballistic/automatic/pistol/deagle/ctf
 	desc = "This looks like it could really hurt in melee."
 	force = 75
 	mag_type = /obj/item/ammo_box/magazine/m50/ctf
 
-/obj/item/weapon/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
+/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
 	. = ..()
 	addtimer(CALLBACK(src, .proc/floor_vanish), 1)
 
-/obj/item/weapon/gun/ballistic/automatic/pistol/deagle/ctf/proc/floor_vanish()
+/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/proc/floor_vanish()
 	if(isturf(loc))
 		qdel(src)
 
@@ -377,16 +375,16 @@
 		damage = 60
 	. = ..()
 
-/obj/item/weapon/gun/ballistic/automatic/laser/ctf
+/obj/item/gun/ballistic/automatic/laser/ctf
 	mag_type = /obj/item/ammo_box/magazine/recharge/ctf
 	desc = "This looks like it could really hurt in melee."
 	force = 50
 
-/obj/item/weapon/gun/ballistic/automatic/laser/ctf/dropped()
+/obj/item/gun/ballistic/automatic/laser/ctf/dropped()
 	. = ..()
 	addtimer(CALLBACK(src, .proc/floor_vanish), 1)
 
-/obj/item/weapon/gun/ballistic/automatic/laser/ctf/proc/floor_vanish()
+/obj/item/gun/ballistic/automatic/laser/ctf/proc/floor_vanish()
 	if(isturf(loc))
 		qdel(src)
 
@@ -424,7 +422,7 @@
 
 // RED TEAM GUNS
 
-/obj/item/weapon/gun/ballistic/automatic/laser/ctf/red
+/obj/item/gun/ballistic/automatic/laser/ctf/red
 	mag_type = /obj/item/ammo_box/magazine/recharge/ctf/red
 
 /obj/item/ammo_box/magazine/recharge/ctf/red
@@ -439,7 +437,7 @@
 
 // BLUE TEAM GUNS
 
-/obj/item/weapon/gun/ballistic/automatic/laser/ctf/blue
+/obj/item/gun/ballistic/automatic/laser/ctf/blue
 	mag_type = /obj/item/ammo_box/magazine/recharge/ctf/blue
 
 /obj/item/ammo_box/magazine/recharge/ctf/blue
@@ -460,52 +458,52 @@
 	toggle_helmet = FALSE // see the whites of their eyes
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
-	id = /obj/item/weapon/card/id/syndicate
-	belt = /obj/item/weapon/gun/ballistic/automatic/pistol/deagle/ctf
+	id = /obj/item/card/id/syndicate
+	belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf
-	r_hand = /obj/item/weapon/gun/ballistic/automatic/laser/ctf
+	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf
 
 /datum/outfit/ctf/post_equip(mob/living/carbon/human/H, visualsOnly=FALSE)
 	if(visualsOnly)
 		return
 	var/list/no_drops = list()
-	var/obj/item/weapon/card/id/W = H.wear_id
+	var/obj/item/card/id/W = H.wear_id
 	no_drops += W
 	W.registered_name = H.real_name
 	W.update_label(W.registered_name, W.assignment)
 
-	// The shielded hardsuit is already NODROP
+	// The shielded hardsuit is already NODROP_1
 	no_drops += H.get_item_by_slot(slot_gloves)
 	no_drops += H.get_item_by_slot(slot_shoes)
 	no_drops += H.get_item_by_slot(slot_w_uniform)
 	no_drops += H.get_item_by_slot(slot_ears)
 	for(var/i in no_drops)
 		var/obj/item/I = i
-		I.flags |= NODROP
+		I.flags_1 |= NODROP_1
 
 /datum/outfit/ctf/instagib
-	r_hand = /obj/item/weapon/gun/energy/laser/instakill
+	r_hand = /obj/item/gun/energy/laser/instakill
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 
 /datum/outfit/ctf/red
 	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/red
-	r_hand = /obj/item/weapon/gun/ballistic/automatic/laser/ctf/red
+	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/red
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/red
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/red
 
 /datum/outfit/ctf/red/instagib
-	r_hand = /obj/item/weapon/gun/energy/laser/instakill/red
+	r_hand = /obj/item/gun/energy/laser/instakill/red
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 
 /datum/outfit/ctf/blue
 	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/blue
-	r_hand = /obj/item/weapon/gun/ballistic/automatic/laser/ctf/blue
+	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/blue
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/blue
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/blue
 
 /datum/outfit/ctf/blue/instagib
-	r_hand = /obj/item/weapon/gun/energy/laser/instakill/blue
+	r_hand = /obj/item/gun/energy/laser/instakill/blue
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 
 /datum/outfit/ctf/red/post_equip(mob/living/carbon/human/H)
@@ -534,6 +532,7 @@
 	var/team = WHITE_TEAM
 	time_between_triggers = 1
 	anchored = TRUE
+	flags_2 = SLOWS_WHILE_IN_HAND_2
 	alpha = 255
 
 /obj/structure/trap/examine(mob/user)
@@ -600,7 +599,7 @@
 		if(M in CTF.spawned_mobs)
 			var/outfit = CTF.ctf_gear
 			var/datum/outfit/O = new outfit
-			for(var/obj/item/weapon/gun/G in M)
+			for(var/obj/item/gun/G in M)
 				qdel(G)
 			O.equip(M)
 			to_chat(M, "<span class='notice'>Ammunition reloaded!</span>")

code/modules/awaymissions/corpse.dm

@@ -46,10 +46,13 @@
 		create()
 	else
 		GLOB.poi_list |= src
+		LAZYADD(GLOB.mob_spawners[name], src)
 
 /obj/effect/mob_spawn/Destroy()
-	GLOB.poi_list.Remove(src)
-	. = ..()
+	GLOB.poi_list -= src
+	var/list/spawners = GLOB.mob_spawners[name]
+	LAZYREMOVE(spawners, src)
+	return ..()
 
 /obj/effect/mob_spawn/proc/special(mob/M)
 	return
@@ -156,7 +159,7 @@
 			var/obj/item/device/pda/PDA = locate(/obj/item/device/pda) in H
 			if(PDA)
 				PDA.toff = TRUE
-	var/obj/item/weapon/card/id/W = H.wear_id
+	var/obj/item/card/id/W = H.wear_id
 	if(W)
 		if(id_access)
 			for(var/jobtype in typesof(/datum/job))
@@ -315,11 +318,11 @@
 /datum/outfit/spacebartender
 	name = "Space Bartender"
 	uniform = /obj/item/clothing/under/rank/bartender
-	back = /obj/item/weapon/storage/backpack
+	back = /obj/item/storage/backpack
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	suit = /obj/item/clothing/suit/armor/vest
 	glasses = /obj/item/clothing/glasses/sunglasses/reagent
-	id = /obj/item/weapon/card/id
+	id = /obj/item/card/id
 
 
 /obj/effect/mob_spawn/human/beach
@@ -340,7 +343,7 @@
 	name = "Beach Bum"
 	glasses = /obj/item/clothing/glasses/sunglasses
 	uniform = /obj/item/clothing/under/shorts/red
-	r_pocket = /obj/item/weapon/storage/wallet/random
+	r_pocket = /obj/item/storage/wallet/random
 
 /datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
@@ -363,7 +366,7 @@
 	suit = /obj/item/clothing/suit/armor/bulletproof
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	glasses = /obj/item/clothing/glasses/sunglasses
-	id = /obj/item/weapon/card/id
+	id = /obj/item/card/id
 
 
 /obj/effect/mob_spawn/human/commander
@@ -382,8 +385,8 @@
 	head = /obj/item/clothing/head/centhat
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat/swat
-	r_pocket = /obj/item/weapon/lighter
-	id = /obj/item/weapon/card/id
+	r_pocket = /obj/item/lighter
+	id = /obj/item/card/id
 
 
 /obj/effect/mob_spawn/human/nanotrasensoldier
@@ -400,8 +403,8 @@
 	gloves = /obj/item/clothing/gloves/combat
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	head = /obj/item/clothing/head/helmet/swat/nanotrasen
-	back = /obj/item/weapon/storage/backpack/security
-	id = /obj/item/weapon/card/id
+	back = /obj/item/storage/backpack/security
+	id = /obj/item/card/id
 
 
 /obj/effect/mob_spawn/human/commander/alive
@@ -486,7 +489,7 @@
 /datum/outfit/cryobartender
 	name = "Cryogenic Bartender"
 	uniform = /obj/item/clothing/under/rank/bartender
-	back = /obj/item/weapon/storage/backpack
+	back = /obj/item/storage/backpack
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	suit = /obj/item/clothing/suit/armor/vest
 	glasses = /obj/item/clothing/glasses/sunglasses/reagent

code/modules/awaymissions/exile.dm

@@ -5,9 +5,9 @@
 
 /obj/structure/closet/secure_closet/exile/New()
 	..()
-	new /obj/item/weapon/implanter/exile(src)
-	new /obj/item/weapon/implantcase/exile(src)
-	new /obj/item/weapon/implantcase/exile(src)
-	new /obj/item/weapon/implantcase/exile(src)
-	new /obj/item/weapon/implantcase/exile(src)
-	new /obj/item/weapon/implantcase/exile(src)
+	new /obj/item/implanter/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)

code/modules/awaymissions/gateway.dm

@@ -22,7 +22,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 		switch(dir)
 			if(SOUTH,SOUTHEAST,SOUTHWEST)
 				density = FALSE
-	..()
+	return ..()
 
 /obj/machinery/gateway/proc/toggleoff()
 	for(var/obj/machinery/gateway/G in linked)
@@ -75,10 +75,13 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 /obj/machinery/gateway/proc/toggleon(mob/user)
 	return FALSE
 
-/obj/machinery/gateway/centerstation/New()
-	..()
+/obj/machinery/gateway/centerstation/Initialize()
+	. = ..()
 	if(!GLOB.the_gateway)
 		GLOB.the_gateway = src
+	update_icon()
+	wait = world.time + config.gateway_delay	//+ thirty minutes default
+	awaygate = locate(/obj/machinery/gateway/centeraway)
 
 /obj/machinery/gateway/centerstation/Destroy()
 	if(GLOB.the_gateway == src)
@@ -96,12 +99,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	var/obj/machinery/gateway/centeraway/awaygate = null
 	can_link = TRUE
 
-/obj/machinery/gateway/centerstation/Initialize()
-	..()
-	update_icon()
-	wait = world.time + config.gateway_delay	//+ thirty minutes default
-	awaygate = locate(/obj/machinery/gateway/centeraway)
-
 /obj/machinery/gateway/centerstation/update_icon()
 	if(active)
 		icon_state = "oncenter"
@@ -182,7 +179,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 
 
 /obj/machinery/gateway/centeraway/Initialize()
-	..()
+	. = ..()
 	update_icon()
 	stationgate = locate(/obj/machinery/gateway/centerstation)
 
@@ -207,7 +204,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	update_icon()
 
 /obj/machinery/gateway/centeraway/proc/check_exile_implant(mob/living/carbon/C)
-	for(var/obj/item/weapon/implant/exile/E in C.implants)//Checking that there is an exile implant
+	for(var/obj/item/implant/exile/E in C.implants)//Checking that there is an exile implant
 		to_chat(C, "\black The station gate has detected your exile implant and is blocking your entry.")
 		return TRUE
 	return FALSE
@@ -240,6 +237,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 			M.client.move_delay = max(world.time + 5, M.client.move_delay)
 
 
-/obj/item/weapon/paper/fluff/gateway
+/obj/item/paper/fluff/gateway
 	info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Blue Space Research"
 	name = "Confidential Correspondence, Pg 1"

code/modules/awaymissions/mission_code/Academy.dm

@@ -1,32 +1,32 @@
 
 //Academy Items
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/console_maint
+/obj/item/paper/fluff/awaymissions/academy/console_maint
 	name = "Console Maintenance"
 	info = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/class/automotive
+/obj/item/paper/fluff/awaymissions/academy/class/automotive
 	name = "Automotive Repair 101"
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/class/pyromancy
+/obj/item/paper/fluff/awaymissions/academy/class/pyromancy
 	name = "Pyromancy 250"
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/class/biology
+/obj/item/paper/fluff/awaymissions/academy/class/biology
 	name = "Biology Lab"
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/grade/aplus
+/obj/item/paper/fluff/awaymissions/academy/grade/aplus
 	name = "Summoning Midterm Exam"
 	info = "Grade: A+ Educator's Notes: Excellent form."
 	
-/obj/item/weapon/paper/fluff/awaymissions/academy/grade/bminus
+/obj/item/paper/fluff/awaymissions/academy/grade/bminus
 	name = "Summoning Midterm Exam"
 	info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."
 
-/obj/item/weapon/paper/fluff/awaymissions/academy/grade/dminus
+/obj/item/paper/fluff/awaymissions/academy/grade/dminus
 	name = "Summoning Midterm Exam"
 	info = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."
 	
-/obj/item/weapon/paper/fluff/awaymissions/academy/grade/failure
+/obj/item/paper/fluff/awaymissions/academy/grade/failure
 	name = "Pyromancy Evaluation"
 	info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons.  Suggest additional tutilage."
 
@@ -111,7 +111,7 @@
 
 	var/mob/living/carbon/human/wizbody = new(T)
 	wizbody.equipOutfit(/datum/outfit/wizard/academy)
-	var/obj/item/weapon/implant/exile/Implant = new/obj/item/weapon/implant/exile(wizbody)
+	var/obj/item/implant/exile/Implant = new/obj/item/implant/exile(wizbody)
 	Implant.implant(wizbody)
 	wizbody.faction |= "wizard"
 	wizbody.real_name = "Academy Teacher"
@@ -146,9 +146,9 @@
 	r_hand = null
 	suit = /obj/item/clothing/suit/wizrobe/red
 	head = /obj/item/clothing/head/wizard/red
-	backpack_contents = list(/obj/item/weapon/storage/box/survival = 1)
+	backpack_contents = list(/obj/item/storage/box/survival = 1)
 
-/obj/item/weapon/dice/d20/fate
+/obj/item/dice/d20/fate
 	name = "Die of Fate"
 	desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
 	icon_state = "d20"
@@ -157,10 +157,10 @@
 	var/reusable = 1
 	var/used = 0
 
-/obj/item/weapon/dice/d20/fate/one_use
+/obj/item/dice/d20/fate/one_use
 	reusable = 0
 
-/obj/item/weapon/dice/d20/fate/diceroll(mob/user)
+/obj/item/dice/d20/fate/diceroll(mob/user)
 	..()
 	if(!used)
 		if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
@@ -171,13 +171,13 @@
 		else
 			effect(user,result)
 
-/obj/item/weapon/dice/d20/fate/equipped(mob/user, slot)
+/obj/item/dice/d20/fate/equipped(mob/user, slot)
 	if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
 		to_chat(user, "<span class='warning'>You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.</span>")
 		user.drop_item()
 
 
-/obj/item/weapon/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll)
+/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll)
 	if(!reusable)
 		used = 1
 	visible_message("<span class='userdanger'>The die flare briefly.</span>")
@@ -196,7 +196,7 @@
 		if(4)
 			//Destroy Equipment
 			for (var/obj/item/I in user)
-				if (istype(I, /obj/item/weapon/implant))
+				if (istype(I, /obj/item/implant))
 					continue
 				qdel(I)
 		if(5)
@@ -225,7 +225,7 @@
 			visible_message("<span class='notice'>[src] roll perfectly.</span>")
 		if(11)
 			//Cookie
-			var/obj/item/weapon/reagent_containers/food/snacks/cookie/C = new(get_turf(src))
+			var/obj/item/reagent_containers/food/snacks/cookie/C = new(get_turf(src))
 			C.name = "Cookie of Fate"
 		if(12)
 			//Healing
@@ -238,15 +238,15 @@
 				if(rand(0,1))
 					new /obj/item/stack/spacecash/c1000(T)
 				else
-					var/obj/item/weapon/storage/bag/money/M = new(T)
+					var/obj/item/storage/bag/money/M = new(T)
 					for(var/i in 1 to rand(5,50))
-						new /obj/item/weapon/coin/gold(M)
+						new /obj/item/coin/gold(M)
 		if(14)
 			//Free Gun
-			new /obj/item/weapon/gun/ballistic/revolver/mateba(get_turf(src))
+			new /obj/item/gun/ballistic/revolver/mateba(get_turf(src))
 		if(15)
 			//Random One-use spellbook
-			new /obj/item/weapon/spellbook/oneuse/random(get_turf(src))
+			new /obj/item/spellbook/oneuse/random(get_turf(src))
 		if(16)
 			//Servant & Servant Summon
 			var/mob/living/carbon/human/H = new(get_turf(src))
@@ -270,10 +270,10 @@
 
 		if(17)
 			//Tator Kit
-			new /obj/item/weapon/storage/box/syndicate/(get_turf(src))
+			new /obj/item/storage/box/syndicate/(get_turf(src))
 		if(18)
 			//Captain ID
-			new /obj/item/weapon/card/id/captains_spare(get_turf(src))
+			new /obj/item/card/id/captains_spare(get_turf(src))
 		if(19)
 			//Instrinct Resistance
 			to_chat(user, "<span class='notice'>You feel robust.</span>")

code/modules/awaymissions/mission_code/Cabin.dm

@@ -58,7 +58,7 @@
 	emagged = 2 //Always gibs people
 	item_recycle_sound = 'sound/weapons/chainsawhit.ogg'
 
-/obj/machinery/recycler/lumbermill/recycle_item(obj/item/weapon/grown/log/L)
+/obj/machinery/recycler/lumbermill/recycle_item(obj/item/grown/log/L)
 	if(!istype(L))
 		return
 	else

code/modules/awaymissions/mission_code/caves.dm

@@ -1,31 +1,31 @@
 //caves papers
 
-/obj/item/weapon/paper/crumpled/awaymissions/caves/unsafe_area
+/obj/item/paper/crumpled/awaymissions/caves/unsafe_area
 	info = "<center><b>WARNING</center></b><br><br><center>Majority of this area is consitered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.</center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/omega
+/obj/item/paper/fluff/awaymissions/caves/omega
 	name = "Subject Omega Notes"
 	info = "<b><center>Testing Notes</b></center><br><br><center>Subject appears unresponsive to most interactions, refusing to move away from the corners or face any scientists. Subject appears to move between the two back corners every observation. A strange humming can be heard from inside the cell, appears to be originating from the subject itself, further testing is necessary to confirm or deny this.</center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/magma
+/obj/item/paper/fluff/awaymissions/caves/magma
 	info = "<center> Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely managble as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.</center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/work_notice
+/obj/item/paper/fluff/awaymissions/caves/work_notice
 	name = "work notice"
 	info = "<center><b>Survival Info For Miners</b></center><br><br><center>The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this infomation and hopefully we'll all go home alive.</center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_notice
+/obj/item/paper/fluff/awaymissions/caves/shipment_notice
 	name = "shipment notice"
 	info = "<center>We were suppose to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but its been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.</center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/saftey_notice
+/obj/item/paper/fluff/awaymissions/caves/saftey_notice
 	name = "safety notice"
 	info = "<center>Some of the miners have gone to laying some mine traps among the lower levels of the mine to keep the monsters at bay.  This probably isn't the smartest idea in a cavern like this but the boys seem to get a chuckle out of every distant blast they hear go off, so I guess it works </center>"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_receipt
+/obj/item/paper/fluff/awaymissions/caves/shipment_receipt
 	name = "Shipment Receipt"
 	info = "<center><b>CARAVAN SERVICES</b></center><br><center><i>Quality service since 2205</i></center><br><br><center><b>SHIPMENT CONTENTS:</b></center><br><br>4 scattershot rifles<br>6 grenades<br>1 laser rifle<br>1 blowup doll"
 
-/obj/item/weapon/paper/fluff/awaymissions/caves/mech_notice
+/obj/item/paper/fluff/awaymissions/caves/mech_notice
 	name = "NOTICE!! paper"
 	info = "<center><b>NOTICE!!</center></b><br><br><center>Although you may seem indestructible in a mech, remember, THIS SHIT ISN'T LAVA PROOF!! The boys have already had to deal with loosing the last two to salvage because the dumbass thought he could just wade through the lower lakes like it was nothing. The fact he even managed to get back without being fused with what was left of the mech is a miracle in itself. They're built to be resistant against extreme heat, not heat PROOF!</center><br><br><i>Robotics Team</i>"

code/modules/awaymissions/mission_code/centcomAway.dm

@@ -2,7 +2,7 @@
 
 //centcomAway items
 
-/obj/item/weapon/paper/pamphlet/centcom/visitor_info
+/obj/item/paper/pamphlet/centcom/visitor_info
 	name = "Visitor Info Pamphlet"
 	info = "<b> XCC-P5831 Visitor Information </b><br>\
 	Greetings, visitor, to  XCC-P5831! As you may know, this outpost was once \
@@ -14,7 +14,7 @@
 	and the thrilling pay-per-view broadcasts of <i>PLASTEEL CHEF</i> and <i>THUNDERDOME LIVE</i>.<br> \
 	We hope you enjoy your stay!"
 
-/obj/item/weapon/paper/fluff/awaymissions/centcom/gateway_memo
+/obj/item/paper/fluff/awaymissions/centcom/gateway_memo
 	name = "Memo to XCC-P5831 QM"
 	info = "<b>From: XCC-P5831 Management Office</b><br>\
 	<b>To: Rolf Ingram, XCC-P5831 Quartermaster</b><br>\

code/modules/awaymissions/mission_code/moonoutpost19.dm

@@ -1,82 +1,82 @@
 /////////// moonoutpost19 papers
 
-/obj/item/weapon/paper/crumpled/awaymissions/moonoutpost19/hastey_note
+/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note
 	name = "Hastily Written Note"
 	info = "<i>19 06 2554</i><br><br><i>I fucking knew it. There was a major breach, that idiotic force field failed and the xenomorphs rushed out and took out the scientists. I've managed to make it to my office and closed the blast doors. I can hear them trying to pry open the doors. Probably don't have long. I have no clue what has happened to the rest of the crew, for all I know they've been killed to produce more of the fucks.</i>"
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_social
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social
 	name = "Larva Xenomorph Social Interactions & Capturing Procedure"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>04/06/2554</u><br><br>Report:<br>As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.<br><br>The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.<br><br>The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.<br><br>It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."	
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen
 	name = "Queen Xenomorph Physiology & Behavior Observation"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>04/06/2554</u><br><br>Report:<br>I have studied many interesting and diverse life-forms as a xenobiologist ranging from creatures as large as cows, to specimens too small see with the naked eye. This is by far the largest alien I have ever seen. The alien we were previously studying has molted and has become an absolutely enormous creature. Standing at over 15 feet tall and weighing in at likely two tons or more, the xenomorph queen is an absolutely breathtakingly large and cruel monster. Its behavior has changed drastically from when it was a drone, having become far more comfortable with sitting and staring at us, rather than smashing at the windows.<br><br>The queen, physiologically speaking, is fairly similar to the other xenomorphs, with a few key differences. Its enormous size demands large legs, while the back seems to be always hunched forward. The dorsal tubes on the back have changed to several large spikes, and we observed the alien now sports a second pair of smaller arms on its chest.  The purpose of these secondary arms is still unknown. Finally, the queen's crown has become incredibly large, with what seems to be a retractable slot to hide its head in. The dome appears to be extremely thick near the front, and will likely be able to resist a lot of trauma. Despite the enormous size it has grown to, it is not that much slower than it used to be.<br><br>After two hours of doing relatively nothing but staring, the queen began to produce an unusually large amount of resin and weeds, quickly shaping up a large nest that it then hid behind. It then proceeded to smash out all the lights, leaving us with very little to see with our cameras. When we looked through the back cameras, we had discovered that it had grown a large ovipositor, and was releasing large eggs onto the ground. This had us all in agreement that this stage of the life cycle was the queen.<br><br>Over the next few hours, the eggs grew to their full sizes, and we provided the subject with new monkey hosts. When they approached the eggs, they opened to release more facehuggers. It seems that we have observed the full cycle of reproduction for this species. We can expect more larvae in the next few hours."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult
 	name = "Adult Xenomorph Physiology & Behavior Observation"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>03/06/2554</u><br><br>Report:<br>The other scientists and I can hardly believe our eyes. The snake-like larva has molted into a 7 foot tall insectoid nightmare in just a few hours. It's obvious now as to why such heavy duty containment was needed. It immediately tried to escape however by flinging itself at the window in a flurry of swipes and stabs. It seems its behavior has returned to a state that is very similar to the facehugger, though I doubt with the same intent! Thankfully, our glass and shields have shown to be more than sturdy enough for such a violent creature, and so far, any attempts at the creature escaping have been in vain.<br><br>As for its physiology, the creature has an elongated head with what appears to be have an exoskeleton resembling an external rib-cage on the torso. The alien is also fairly skinny with a lean body. The little amount of meat on the alien appears to be entirely muscle.  We assume this makes it deceptively strong, while remaining agile at the same time.  One of the most interesting things we have seen is its pharyngeal jaw.  It has some what of an inner mouth capable of being fired externally at extremely high speeds. It has already caused many dents in the walls and a few small cracks in the window with it. The alien also has a couple of dorsal tubes on its back, their purpose unknown. Finally, this monster sports a long ridged tail, complete with a large and extremely sharp blade at the tip.<br><br>Normally I would be absolutely terrified of something like this, but I'm putting my trust in Nanotrasen with the containment. After all, they wouldn't build a cell that could fail to contain its subject, would they?"
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_psych
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_psych
 	name = "Larva Xenomorph Physiology & Behavior Observation"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>03/06/2554</u><br><br>Report:<br>When the larva first emerged from the chest of the monkey, it seemed very curious. It would wander around aimlessly for awhile and then sit still. We are unable to determine the gender of the larva, or even determine if it has a gender. After some time had passed, it seemed to lose interest in its surroundings and sat mostly still while occasionally wagging its tail. We decided to throw in a live mouse to see if it would consume it. The larva quickly attacked and ate the mouse and seemed to get larger very suddenly, this suggests that the larvae are capable of metabolizing and directing all the energy towards growth at previously thought impossible speeds. It is a shame that we cannot observe the process more closely, as we do not currently know how dangerous or violent this creature is or will become as it matures fully.<br><br>It is tempting to imagine the possibilities of utilizing such a mechanism. The capability of skipping years of growth time for children, repairing bodily damage in a matter of moments, even its usage in existing cloning technology."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/facehugger
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/facehugger
 	name = "'Facehugger' Xenomorph Physiology & Behavior Observation"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>03/06/2554</u><br><br>Report:<br>The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.<br><br>When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off dead and curled its legs up like a spider moments after it had finished with the monkey's body.<br><br>While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours until we were horrified to discover it screaming out in pain as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind
 	name = "The Hivemind Hypothesis"
 	info = "Researcher: <u>Dr. Mark Douglas    </u><br>Date: <u>17/06/2554</u><br><br>Report:<br>Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.<br><br>The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"
 	
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior
 	name = "A Preliminary Study of Alien Behavior"
 	info = "Researcher: <u>Dr. Sakuma Sano    </u><br>Date: <u>08/06/2554</u><br><br>Report:<br>The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.<br><br>The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes
 	name = "The Xenomorph 'Castes'"
 	info = "Researcher: <u>Dr. Mark Douglas    </u><br>Date: <u>06/06/2554</u><br><br>Report:<br>While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.<br><br>Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.<br><br>Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.<br><br>Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive.  They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy
 	name = "Larva Xenomorph Autopsy Report"
 	info = "Researcher: <u>Dr. Mark Douglas    </u><br>Date: <u>04/06/2554</u><br><br>Report:<br>After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.<br><br>The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.<br><br>We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/evacuation
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation
 	name = "Evacuation Procedure"
 	info = "<h3><font color=red>In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediatly.</h3></b><br><br><h3>Current Xenobiology Containment Level:<u><strike>Secure</strike><i><b> RUN                    </h3></b></i></u>"
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal
+/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal
 	name = "Personal Log"
 	info = "Log 1:<br>We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.<br><br>Log 2:<br>Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognise his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.<br><br>Log 3:<br>Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal_2
+/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2
 	name = "Personal Log"
 	info = "Log 1:<br>While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.<br><br>Log 2:<br>Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.<br><br>Log 3:<br>That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/engineering
+/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering
 	name = "Engineering Instructions"
 	info = "Alright, listen up. If you're reading this, I'm either taking a shit or I've been recalled back to Command. Either way, you'll need to know how to restore power. We've stolen this stuff from Nanotrasen, so all the equipment is jury-rigged. We have generators that work on both plasma and uranium, about 50 sheets should power the outpost for quite a while. If the generators aren't working, which is very likely, take the power cell on the desk and put it into the APC in the hallway. That should get the place running, at least for a little while."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/kenneth
+/obj/item/paper/fluff/awaymissions/moonoutpost19/log/kenneth
 	name = "Personal Log - Kenneth Cunningham"
 	info = "Entry One - 27/05/2554:<br>I just arrived, and already I hate my job. I'm stuck on this shithole of an outpost, trying to avoid these damn eggheads running all over the place preparing for god knows what. There's no crimes to stop, no syndies to kill, and I'm not even allowed to beat the fuckin' assistant senseless! They said I was transferred from Space Station 13 for 'good behavior', but this feels more like a punishment than a reward. All I know is that if I don't get some action soon, I'm going to go insane.<br><br>Entry Two - 03/06/2554:<br>Okay, so get this: we got a fuckin' deathsquad coming in today! I thought the day I saw one of them would be the day my employment was 'terminated', if you get my drift. They're escorting some sort of weird alien creature for the eggheads to study. I heard one of the docs telling the chef that this thing killed a whole security force before it was captured. I sure as hell hope that I don't have to fight it.<br><br>Entry Three - 08/06/2554:<br>My first real bit of 'action' today, if you could call it that. Crazy Ivan got in a fight with Kuester today about his Booze-O-Mat. Apparently one of the crewmembers had stolen a couple bottles of booze from the machine after Ivan disabled the ID lock. Tell you the truth, I don't blame the thief. Everyone is going a little stir-crazy in here, and the bartender is being damn stingy with the alcohol. Either way, once they started to pick a fight, I had to take them down. It's a damn shame that we don't have a brig, though. I had to lock Ivan in a fuckin' freezer, for god's sake. Let's hope that we can keep our sanity together, at least for a while.<br><br>Entry Four - 10/06/2554:<br>Jesus fucking Christ riding on a motorbike. These things the scientists are studying are terrifying! Fucking great huge purple bug things as tall as the ceiling, with blades for arms and drooling at the mouth. I don't think my taser will do jack shit against these damn things, but the eggheads say that they're safely contained. If they do, I have a feeling that it's only a matter of time before we're all screwed. These bastards look like walking death.<br><br>Entry Five - 18/06/2554:<br>Finally caught who stole the booze from Kuester. It was that fuckin' loser assistant Steve! He was in the dorms, chugging his worries away. I took one of the bottles back to the barkeep, but no one has to know about this second one. I think I'm gonna enjoy this while watching tomorrow's Thunderdome match.<br><br>Entry Six - 19/06/2554:<br>Oh, great. The chef is still sleeping, so we get Ivan's gruel for breakfast today. I overheard Sano and Douglas saying something about the aliens being restless, so we might get some action today. As long as it happens after the big game, I'm fine with it. I still got one beer to drink before I'm ready to die."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/ivan
+/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan
 	name = "Personal Log - Ivan Volodin"
 	info = "Ivan Volodin Stories:<br><br>Entry Won - 28/05/2554:<br>Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.<br><br>Entry Too - 05/06/2554:<br>I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.<br><br>Entry Tree - 08/06/2554:<br>Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.<br><br>Entry Fore - 12/06/2554:<br>Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?<br><br>Entry Fiv - 15/06/2554:<br>I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.<br><br>Entry Sex: 19/06/2554:<br>Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."	
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/gerald
+/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald
 	name = "Personal Log - Gerald Rosswell"
 	info = "Personal Log for Research Director Gerald Rosswell<br><br>Entry One - 17/05/2554:<br>You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.<br><br>Entry Two - 25/05/2554:<br>Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.<br><br>Entry Three - 27/05/2554:<br>The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.<br><br>Entry Four - 06/06/2554:<br>My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.<br><br>Entry Five - 10/06/2554:<br>Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.<br><br>Entry Six - 17/06/2554:<br>The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/food_specials
+/obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials
 	name = "Specials This Week"
 	info = "<b><h2>I Can't Believe It's Not Pasta: Half off on Wednesdays</h2></b><br><br><b><h2><font color=blue>Burger night every Friday 6PM-10PM, free drinks with purchase of meal!</font></h2></b><br><br><b><h2><font color=red>Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM</font></h2></b>"
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/welcome
+/obj/item/paper/fluff/awaymissions/moonoutpost19/welcome
 	name = "Welcome Notice"
 	info = "<p><p align=center><h2>Welcome to Moon Outpost 19! Property of Nanotrasen Inc.</h2></p><hr><br><br>Staff Roster:<br>-Dr. Gerald Rosswell: Research Director & Acting Captain<br>-Dr. Sakuma Sano: Xenobiologist<br>-Dr. Mark Douglas: Xenobiologist<br>-Kenneth Cunningham: Security Officer-Ivan Volodin: Engineer<br>-Mathias Kuester: Bartender<br>-Sven Edling: Chef<br>-Steve: Assistant<br><br>Please enjoy your stay, and report any abnormalities to an officer."
 
-/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/goodbye_note
+/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note
 	name = "Note"
 	info = "<i>Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all.</i>"
 	

code/modules/awaymissions/mission_code/research.dm

@@ -1,5 +1,5 @@
 //research papers
 
-/obj/item/weapon/paper/crumpled/awaymissions/research/sensitive_info
+/obj/item/paper/crumpled/awaymissions/research/sensitive_info
 	info = "Theres a lot of sensitive info on these disks, try and keep them secure! If these backup copies get into the wrong hands, god knows what they could do with the genetic research on these disk.."
 

code/modules/awaymissions/mission_code/snowdin.dm

@@ -1,27 +1,27 @@
 ///////////	papers
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/snowdingatewaynotice
+/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice
 	name = "scribbled note"
 	info = {"The gateway has been inactive for months, engineers think it's due to the recent drop in tempature fucking with the
 	circuitry or something. Without a constant supply of resources from central command, our stock is getting awfully low. Some of the security members have taken to
 	using the sparse rifle ammo left to hunting some of the wildlife to try and keep our food supply from emptying. God forbid if the heating goes out, I don't want to
 	die as a fucking popsicle down here."}
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/misc1
+/obj/item/paper/crumpled/ruins/snowdin/misc1
 	name = "Mission Prologue"
 	info = {"Holy shit, what a rush! Those Nanotrasen bastards didn't even know what hit 'em! All five of us dropped in right on the captain, didn't even have time to yell! We were in and out with that disk in mere minutes!
 	Crew didn't even know what was happening till the delta alert went down and by then were were already gone. We got a case to drink on the way home to celebrate, fuckin' job well done!"}
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/keys
+/obj/item/paper/crumpled/ruins/snowdin/keys
 	name = "scribbled note"
 	info = {"As a notice for anyone looking to borrow an ATV, some asshat lost the key set for all the vehicles. Nobody has yet to actually come forward about the potential where-abouts, either due to embarrassment or fear of
 	reprecussions. I hope they enjoy walking through that shit snow during the next shipment because I sure as hell ain't."}
 
-/obj/item/weapon/paper/fluff/awaymissions/snowdin/saw_usage
+/obj/item/paper/fluff/awaymissions/snowdin/saw_usage
 	name = "SAW Usage"
 	info = "YOU SEEN IVAN, WHEN YOU HOLD SAAW LIKE PEESTOL, YOU STRONGER THAN RECOIL FOR FEAR OF HITTING FACE!"
 
-/obj/item/weapon/paper/fluff/awaymissions/snowdin/log
+/obj/item/paper/fluff/awaymissions/snowdin/log
 	name = "Activity Log"
 	info = {"<b><center>ACTIVITY LOG</b></center><br><br><b>June 3rd</b><br>We've moved to the main base in the valley finally, apparently establishing a listening system on a planet
 	that never stops fucking snowing is a great idea. There's a few outposts further south we'll be supplying from the main gateway. The summer months are enough already, I can only imagine how bad it'll be during winter.<br><br><b>August 23rd</b><br>
@@ -33,7 +33,7 @@
 	<br><br><b>December 10th</b><br>Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from central before investigating.<br><br>
 	<i>The rest of the paper seems to be a mixture of scribbles and smudged ink.</i> "}
 
-/obj/item/weapon/paper/fluff/awaymissions/snowdin/log2
+/obj/item/paper/fluff/awaymissions/snowdin/log2
 	name = "Activity Log"
 	info = {"<b><center>ACTIVITY LOG</b></center><br><br><b>June 14th</b><br>Movement to the second post is finally done. We're located on the southernmost area of the valley with a similar objective as the northern post.
 	There are two mid-way stops on the eastern and western sides of the valley so movement in between bases isn't horrible. Not too big of a fan of relying on the northern base for
@@ -43,7 +43,7 @@
 	shipment of supplies. The snow has really kicked up recently, shits almost like a constant blizzard right now. Maybe it'll drop down soon so we can get a word in.<br><br>
 	<i>The rest of the paper seems to be a mixture of scribbles and smudged ink.</i> "}
 
-/obj/item/weapon/paper/fluff/awaymissions/snowdin/secnotice
+/obj/item/paper/fluff/awaymissions/snowdin/secnotice
 	name = "Security Notice"
 	info = {"You have been assigned a position on a listening outpost. Here you'll be watching over several crewmembers assigned to watching signals of the general area.
 	As not much is expected in terms of issues, we've only assigned one guard per outpost. Crewmembers are expected to keep to their regulated work schedules and may be
@@ -51,23 +51,23 @@
 	should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to central and dealt with swiftly. You're here to secure and protect
 	Nanotrasen assets, not be a police officer. Do what you must, but make sure it's not messy."}
 
-/obj/item/weapon/paper/fluff/awaymissions/snowdin/syndienotice
+/obj/item/paper/fluff/awaymissions/snowdin/syndienotice
 	name = "Assignment Notice"
 	info = {"You've been assigned as an agent to listen in on Nanotrasen activities from passing ships and nearby stations. The outpost you've been assigned to is under lays of solid
 	ice and we've supplied you with a scrambler to help avoid Nanotrasen discovery, as they've recently built a listening post of their own aboveground. Get aquainted with your new
 	crewmates, because you're gonna be here for awhile. Enjoy the free syndicakes."}
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/syndielava
+/obj/item/paper/crumpled/ruins/snowdin/syndielava
 	name = "scribbled note"
 	info = {"Some cracks in the ice nearby have exposed some sort of hidden magma stream under all this shit ice. I don't know whats worse at this point honestly; freezing to death or
 	burning alive."}
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/lootstructures
+/obj/item/paper/crumpled/ruins/snowdin/lootstructures
 	name = "scribbled note"
 	info = {"From what we've seen so far, theres a ton of iced-over ruins down here in the caves. We sent a few men out to check things out and they never came back, so we decided to
 	border up majority of the ruins. We've heard some weird shit coming out of these caves and I'm not gonna find out the hard way myself."}
 
-/obj/item/weapon/paper/crumpled/ruins/snowdin/shovel
+/obj/item/paper/crumpled/ruins/snowdin/shovel
 	name = "shoveling duties"
 	info = {"Snow piles up bad here all-year round, even worse during the winter months. Keeping a constant rotation of shoveling that shit out of the way of the airlocks and keeping the paths decently clear
 	is a good step towards not getting stuck walking through knee-deep snow."}
@@ -81,21 +81,21 @@
 	name = "why are you using this dummy"
 	lootdoubles = 0
 	lootcount = 1
-	loot = list(/obj/item/weapon/bikehorn = 100)
+	loot = list(/obj/item/bikehorn = 100)
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonlite
 	name = "dungeon lite"
-	loot = list(/obj/item/weapon/melee/classic_baton = 11,
-				/obj/item/weapon/melee/classic_baton/telescopic = 12,
-				/obj/item/weapon/spellbook/oneuse/smoke = 10,
-				/obj/item/weapon/spellbook/oneuse/blind = 10,
-				/obj/item/weapon/storage/firstaid/regular = 45,
-				/obj/item/weapon/storage/firstaid/toxin = 35,
-				/obj/item/weapon/storage/firstaid/brute = 27,
-				/obj/item/weapon/storage/firstaid/fire = 27,
-				/obj/item/weapon/storage/toolbox/syndicate = 12,
-				/obj/item/weapon/grenade/plastic/c4 = 7,
-				/obj/item/weapon/grenade/clusterbuster/smoke = 15,
+	loot = list(/obj/item/melee/classic_baton = 11,
+				/obj/item/melee/classic_baton/telescopic = 12,
+				/obj/item/spellbook/oneuse/smoke = 10,
+				/obj/item/spellbook/oneuse/blind = 10,
+				/obj/item/storage/firstaid/regular = 45,
+				/obj/item/storage/firstaid/toxin = 35,
+				/obj/item/storage/firstaid/brute = 27,
+				/obj/item/storage/firstaid/fire = 27,
+				/obj/item/storage/toolbox/syndicate = 12,
+				/obj/item/grenade/plastic/c4 = 7,
+				/obj/item/grenade/clusterbuster/smoke = 15,
 				/obj/item/clothing/under/chameleon = 13,
 				/obj/item/clothing/shoes/chameleon = 10,
 				/obj/item/borg/upgrade/ddrill = 3,
@@ -103,47 +103,47 @@
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonmid
 	name = "dungeon mid"
-	loot = list(/obj/item/weapon/defibrillator/compact = 6,
-				/obj/item/weapon/storage/firstaid/tactical = 35,
-				/obj/item/weapon/shield/energy = 6,
-				/obj/item/weapon/shield/riot/tele = 12,
-				/obj/item/weapon/dnainjector/lasereyesmut = 7,
-				/obj/item/weapon/gun/magic/wand/fireball/inert = 3,
-				/obj/item/weapon/pneumatic_cannon = 15,
-				/obj/item/weapon/melee/transforming/energy/sword = 7,
-				/obj/item/weapon/spellbook/oneuse/knock = 15,
-				/obj/item/weapon/spellbook/oneuse/summonitem = 20,
-				/obj/item/weapon/spellbook/oneuse/forcewall = 17,
-				/obj/item/weapon/storage/backpack/holding = 12,
-				/obj/item/weapon/grenade/spawnergrenade/manhacks = 6,
-				/obj/item/weapon/grenade/spawnergrenade/spesscarp = 7,
-				/obj/item/weapon/grenade/clusterbuster/inferno = 3,
+	loot = list(/obj/item/defibrillator/compact = 6,
+				/obj/item/storage/firstaid/tactical = 35,
+				/obj/item/shield/energy = 6,
+				/obj/item/shield/riot/tele = 12,
+				/obj/item/dnainjector/lasereyesmut = 7,
+				/obj/item/gun/magic/wand/fireball/inert = 3,
+				/obj/item/pneumatic_cannon = 15,
+				/obj/item/melee/transforming/energy/sword = 7,
+				/obj/item/spellbook/oneuse/knock = 15,
+				/obj/item/spellbook/oneuse/summonitem = 20,
+				/obj/item/spellbook/oneuse/forcewall = 17,
+				/obj/item/storage/backpack/holding = 12,
+				/obj/item/grenade/spawnergrenade/manhacks = 6,
+				/obj/item/grenade/spawnergrenade/spesscarp = 7,
+				/obj/item/grenade/clusterbuster/inferno = 3,
 				/obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
-				/obj/item/weapon/spellbook/oneuse/barnyard = 4,
-				/obj/item/weapon/pickaxe/drill/diamonddrill = 6,
+				/obj/item/spellbook/oneuse/barnyard = 4,
+				/obj/item/pickaxe/drill/diamonddrill = 6,
 				/obj/item/borg/upgrade/vtec = 7,
 				/obj/item/borg/upgrade/disablercooler = 7)
 
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonheavy
 	name = "dungeon heavy"
-	loot = list(/obj/item/weapon/twohanded/singularityhammer = 25,
-				/obj/item/weapon/twohanded/mjollnir = 10,
-				/obj/item/weapon/twohanded/fireaxe = 25,
+	loot = list(/obj/item/twohanded/singularityhammer = 25,
+				/obj/item/twohanded/mjollnir = 10,
+				/obj/item/twohanded/fireaxe = 25,
 				/obj/item/organ/brain/alien = 17,
-				/obj/item/weapon/twohanded/dualsaber = 15,
+				/obj/item/twohanded/dualsaber = 15,
 				/obj/item/organ/heart/demon = 7,
-				/obj/item/weapon/gun/ballistic/automatic/c20r/unrestricted = 16,
-				/obj/item/weapon/gun/magic/wand/resurrection/inert = 15,
-				/obj/item/weapon/gun/magic/wand/resurrection = 10,
+				/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
+				/obj/item/gun/magic/wand/resurrection/inert = 15,
+				/obj/item/gun/magic/wand/resurrection = 10,
 				/obj/item/device/radio/uplink/old = 2,
-				/obj/item/weapon/spellbook/oneuse/charge = 12,
-				/obj/item/weapon/grenade/clusterbuster/spawner_manhacks = 15,
-				/obj/item/weapon/spellbook/oneuse/fireball = 10,
-				/obj/item/weapon/pickaxe/drill/jackhammer = 30,
+				/obj/item/spellbook/oneuse/charge = 12,
+				/obj/item/grenade/clusterbuster/spawner_manhacks = 15,
+				/obj/item/spellbook/oneuse/fireball = 10,
+				/obj/item/pickaxe/drill/jackhammer = 30,
 				/obj/item/borg/upgrade/syndicate = 13,
 				/obj/item/borg/upgrade/selfrepair = 17)
 
@@ -154,8 +154,8 @@
 
 	loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
 				/obj/item/toy/snowball = 15,
-				/obj/item/weapon/shovel = 10,
-				/obj/item/weapon/twohanded/spear = 8,
+				/obj/item/shovel = 10,
+				/obj/item/twohanded/spear = 8,
 				)
 
 //special items//--
@@ -171,12 +171,12 @@
 	desc = "High speed, low drag combat boots, now with an added layer of insulation."
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 
-/obj/item/weapon/gun/magic/wand/fireball/inert
+/obj/item/gun/magic/wand/fireball/inert
 	name = "weakened wand of fireball"
 	desc = "This wand shoots scorching balls of fire that explode into destructive flames. The years of the cold have weakened the magic inside the wand."
 	max_charges = 4
 
-/obj/item/weapon/gun/magic/wand/resurrection/inert
+/obj/item/gun/magic/wand/resurrection/inert
 	name = "weakened wand of healing"
 	desc = "This wand uses healing magics to heal and revive. The years of the cold have weakened the magic inside the wand."
 	max_charges = 5
@@ -215,9 +215,9 @@
 	uniform = /obj/item/clothing/under/syndicate/coldres
 	shoes = /obj/item/clothing/shoes/combat/coldres
 	ears = /obj/item/device/radio/headset/syndicate/alt
-	r_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol
-	l_pocket = /obj/item/weapon/card/id/syndicate
-	implants = list(/obj/item/weapon/implant/exile)
+	r_pocket = /obj/item/gun/ballistic/automatic/pistol
+	l_pocket = /obj/item/card/id/syndicate
+	implants = list(/obj/item/implant/exile)
 
 /obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female
 	mob_gender = FEMALE

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -23,20 +23,20 @@
 	name = "Safecode hint spawner"
 
 /obj/effect/landmark/sc_bible_spawner/New()
-	var/obj/item/weapon/storage/book/bible/B = new /obj/item/weapon/storage/book/bible/booze(src.loc)
+	var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible/booze(src.loc)
 	B.name = "The Holy book of the Geometer"
 	B.deity_name = "Narsie"
 	B.icon_state = "melted"
 	B.item_state = "melted"
-	new /obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B)
-	new /obj/item/weapon/pen(B)
+	new /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B)
+	new /obj/item/pen(B)
 	qdel(src)
 
 /*
  * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
  */
 //Captain's retro laser - Fires practice laser shots instead.
-/obj/item/weapon/gun/energy/laser/retro/sc_retro
+/obj/item/gun/energy/laser/retro/sc_retro
 	name ="retro laser"
 	icon_state = "retro"
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
@@ -44,25 +44,25 @@
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face
 
 //Syndicate sub-machine guns.
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r
+/obj/item/gun/ballistic/automatic/c20r/sc_c20r
 
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/Initialize()
+/obj/item/gun/ballistic/automatic/c20r/sc_c20r/Initialize()
 	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
 
 //Barman's shotgun
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump
+/obj/item/gun/ballistic/shotgun/sc_pump
 
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump/Initialize()
+/obj/item/gun/ballistic/shotgun/sc_pump/Initialize()
 	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
 
 //Lasers
-/obj/item/weapon/gun/energy/laser/practice/sc_laser
+/obj/item/gun/energy/laser/practice/sc_laser
 	name = "Old laser"
 	desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly."
 	clumsy_check = 0
@@ -79,30 +79,30 @@ GLOBAL_VAR_INIT(sc_safecode4, "[rand(0,9)]")
 GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
 
 //Pieces of paper actually containing the hints
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_prison
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison
 	name = "smudged paper"
 
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/New()
 	info = "<i>The ink is smudged, you can only make out a couple numbers:</i> '[GLOB.sc_safecode1]**[GLOB.sc_safecode4]*'"
 
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro
 	name = "shredded paper"
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/New()
 	info = "<i>Although the paper is shredded, you can clearly see the number:</i> '[GLOB.sc_safecode2]'"
 
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_caf
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_caf
 	name = "blood-soaked paper"
 	//This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode]
 	info = "<font color=red><i>This paper is soaked in blood, it is impossible to read any text.</i></font>"
 
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_bible
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible
 	name = "hidden paper"
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/New()
 	info = {"<i>It would appear that the pen hidden with the paper had leaked ink over the paper.
 			However you can make out the last three digits:</i>'[GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]'
 			"}
 
-/obj/item/weapon/paper/fluff/awaymissions/stationcollision/safehint_paper_shuttle
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_shuttle
 	info = {"<b>Target:</b> Research-station Epsilon<br>
 			<b>Objective:</b> Prototype weaponry. The captain likely keeps them locked in her safe.<br>
 			<br>
@@ -118,18 +118,18 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
 /*
  * Captain's safe
  */
-/obj/item/weapon/storage/secure/safe/sc_ssafe
+/obj/item/storage/secure/safe/sc_ssafe
 	name = "Captain's secure safe"
 
-/obj/item/weapon/storage/secure/safe/sc_ssafe/New()
+/obj/item/storage/secure/safe/sc_ssafe/New()
 	..()
 	l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]"
 	l_set = 1
-	new /obj/item/weapon/gun/energy/mindflayer(src)
+	new /obj/item/gun/energy/mindflayer(src)
 	new /obj/item/device/soulstone(src)
 	new /obj/item/clothing/suit/space/hardsuit/cult(src)
-	//new /obj/item/weapon/teleportation_scroll(src)
-	new /obj/item/weapon/ore/diamond(src)
+	//new /obj/item/teleportation_scroll(src)
+	new /obj/item/ore/diamond(src)
 
 /*
  * Modified Nar-Sie

code/modules/awaymissions/mission_code/wildwest.dm

@@ -6,23 +6,23 @@
 
  ////////// wildwest papers
  
-/obj/item/weapon/paper/fluff/awaymissions/wildwest/grinder
+/obj/item/paper/fluff/awaymissions/wildwest/grinder
 	info = "meat grinder requires sacri"
 
 
-/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page1
+/obj/item/paper/fluff/awaymissions/wildwest/journal/page1
 	name = "Planer Saul's Journal: Page 1"
 	info = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into.   It is a lot sturdier than we could have imagined.  We have decided to call it 'The Vault' "
 
-/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page4
+/obj/item/paper/fluff/awaymissions/wildwest/journal/page4
 	name = "Planer Saul's Journal: Page 4"
 	info = " The miners in the town have become sick and almost all production has stopped. They, in a fit of delusion, tossed all of their mining equipment into the furnaces.  They all claimed the same thing. A voice beckoning them to lay down their arms. Stupid miners."
 
-/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page7
+/obj/item/paper/fluff/awaymissions/wildwest/journal/page7
 	name = "Planer Sauls' Journal: Page 7"
 	info = "The Vault...it just keeps growing and growing.  I went on my daily walk through the garden and now its just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...its calling to me."
 
-/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page8
+/obj/item/paper/fluff/awaymissions/wildwest/journal/page8
 	name = "Planer Saul's Journal: Page 8"
 	info = "The syndicate have invaded.  Their ships appeared out of nowhere and now they likely intend to kill us all and take everything.  On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry.  In case you find this, send for help immediately and open the Vault. Find us inside."
 

code/modules/awaymissions/pamphlet.dm

@@ -1,8 +1,8 @@
-/obj/item/weapon/paper/pamphlet
+/obj/item/paper/pamphlet
 	name = "pamphlet"
 	icon_state = "pamphlet"
 
-/obj/item/weapon/paper/pamphlet/gateway
+/obj/item/paper/pamphlet/gateway
 	info = "<b>Welcome to the Nanotrasen Gateway project...</b><br>\
 			Congratulations! If you're reading this, you and your superiors have decided that you're \
 			ready to commit to a life spent colonising the rolling hills of far away worlds. You \
@@ -35,5 +35,5 @@
 			environs."
 
 //we don't want the silly text overlay!
-/obj/item/weapon/paper/pamphlet/update_icon()
+/obj/item/paper/pamphlet/update_icon()
 	return

code/modules/awaymissions/signpost.dm

@@ -11,7 +11,7 @@
 	. = ..()
 	set_light(2)
 
-/obj/structure/signpost/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/signpost/attackby(obj/item/W, mob/user, params)
 	return attack_hand(user)
 
 /obj/structure/signpost/attack_hand(mob/user)

code/modules/awaymissions/super_secret_room.dm

@@ -66,7 +66,7 @@
 			SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's a experience in itself, right?"))
 		if(251)
 			SpeakPeace(list("Anyway, here.", "I can't give you anything that would impact the progression of the round.","But you've earned this at least."))
-			var/obj/item/weapon/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user))
+			var/obj/item/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user))
 			the_ride.name = "Overextending The Joke: Second Place"
 			the_ride.desc = "There's a point where this needed to stop, and we've clearly passed it."
 		if(252)
@@ -76,7 +76,7 @@
 		if(1000)
 			SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me."))
 		if(5643)
-			var/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
+			var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
 			never_ends.name = "Overextending The Joke: First Place"
 			never_ends.desc = "And so we are left alone with our regrets."
 		else

code/modules/cargo/console.dm

@@ -2,7 +2,7 @@
 	name = "supply console"
 	desc = "Used to order supplies, approve requests, and control the shuttle."
 	icon_screen = "supply"
-	circuit = /obj/item/weapon/circuitboard/computer/cargo
+	circuit = /obj/item/circuitboard/computer/cargo
 	var/requestonly = FALSE
 	var/contraband = FALSE
 	var/safety_warning = "For safety reasons the automated supply shuttle \
@@ -15,12 +15,12 @@
 	name = "supply request console"
 	desc = "Used to request supplies from cargo."
 	icon_screen = "request"
-	circuit = /obj/item/weapon/circuitboard/computer/cargo/request
+	circuit = /obj/item/circuitboard/computer/cargo/request
 	requestonly = TRUE
 
-/obj/machinery/computer/cargo/New()
-	..()
-	var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
+/obj/machinery/computer/cargo/Initialize()
+	. = ..()
+	var/obj/item/circuitboard/computer/cargo/board = circuit
 	contraband = board.contraband
 	emagged = board.emagged
 
@@ -34,7 +34,7 @@
 	contraband = TRUE
 
 	// This also permamently sets this on the circuit board
-	var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
+	var/obj/item/circuitboard/computer/cargo/board = circuit
 	board.contraband = TRUE
 	board.emagged = TRUE
 

code/modules/cargo/console.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm	(rejected hunks)
-@@ -145,7 +145,7 @@
- 
- 			var/reason = ""
- 			if(requestonly)
--				reason = stripped_input("Reason:", name, "") as text|null
-+				reason = stripped_input("Reason:", name, "")
- 				if(isnull(reason) || ..())
- 					return
- 

code/modules/cargo/export_scanner.dm

@@ -5,7 +5,7 @@
 	item_state = "radio"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	w_class = WEIGHT_CLASS_SMALL
 	siemens_coefficient = 1
 	var/obj/machinery/computer/cargo/cargo_console = null

code/modules/cargo/exports.dm

@@ -115,7 +115,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 		return FALSE
 	if(!get_cost(O, contr, emag))
 		return FALSE
-	if(HAS_SECONDARY_FLAG(O, HOLOGRAM))
+	if(O.flags_2 & HOLOGRAM_2)
 		return FALSE
 	return TRUE
 

code/modules/cargo/exports/gear.dm

@@ -39,7 +39,7 @@
 /datum/export/gear/riot_shield
 	cost = 400
 	unit_name = "riot shield"
-	export_types = list(/obj/item/weapon/shield/riot)
+	export_types = list(/obj/item/shield/riot)
 
 
 // Masks

code/modules/cargo/exports/large_objects.dm

@@ -103,7 +103,7 @@
 /datum/export/large/barrier
 	cost = 325
 	unit_name = "security barrier"
-	export_types = list(/obj/item/weapon/grenade/barrier, /obj/structure/barricade/security)
+	export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security)
 
 //Mecha
 /datum/export/large/mech

code/modules/cargo/exports/manifest.dm

@@ -4,13 +4,13 @@
 	cost = 200
 	k_elasticity = 0
 	unit_name = "approved manifest"
-	export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
 
 /datum/export/manifest_correct/applies_to(obj/O)
 	if(!..())
 		return FALSE
 
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	if(M.is_approved() && !M.errors)
 		return TRUE
 	return FALSE
@@ -21,19 +21,19 @@
 	cost = -500
 	k_elasticity = 0
 	unit_name = "correctly denied manifest"
-	export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
 
 /datum/export/manifest_error_denied/applies_to(obj/O)
 	if(!..())
 		return FALSE
 
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	if(M.is_denied() && M.errors)
 		return TRUE
 	return FALSE
 
 /datum/export/manifest_error_denied/get_cost(obj/O)
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	return ..() + M.order_cost
 
 
@@ -41,19 +41,19 @@
 // Substracts the package cost.
 /datum/export/manifest_error
 	unit_name = "erroneously approved manifest"
-	export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
 
 /datum/export/manifest_error/applies_to(obj/O)
 	if(!..())
 		return FALSE
 
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	if(M.is_approved() && M.errors)
 		return TRUE
 	return FALSE
 
 /datum/export/manifest_error/get_cost(obj/O)
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	return -M.order_cost
 
 
@@ -62,17 +62,17 @@
 /datum/export/manifest_correct_denied
 	cost = 500
 	unit_name = "erroneously denied manifest"
-	export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
 
 /datum/export/manifest_correct_denied/applies_to(obj/O)
 	if(!..())
 		return FALSE
 
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	if(M.is_denied() && !M.errors)
 		return TRUE
 	return FALSE
 
 /datum/export/manifest_correct_denied/get_cost(obj/O)
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	return ..() - M.order_cost

code/modules/cargo/exports/materials.dm

@@ -4,7 +4,7 @@
 	var/material_id = null
 	export_types = list(
 		/obj/item/stack/sheet/mineral, /obj/item/stack/tile/mineral,
-		/obj/item/weapon/ore, /obj/item/weapon/coin)
+		/obj/item/ore, /obj/item/coin)
 // Yes, it's a base type containing export_types.
 // But it has no material_id, so any applies_to check will return false, and these types reduce amount of copypasta a lot
 
@@ -22,7 +22,7 @@
 	if(istype(I, /obj/item/stack))
 		var/obj/item/stack/S = I
 		amount *= S.amount
-	else if(istype(I, /obj/item/weapon/ore))
+	else if(istype(I, /obj/item/ore))
 		amount *= 0.8 // Station's ore redemption equipment is really goddamn good.
 
 	return round(amount/MINERAL_MATERIAL_AMOUNT)
@@ -84,11 +84,11 @@
 	material_id = MAT_METAL
 	export_types = list(
 		/obj/item/stack/sheet/metal, /obj/item/stack/tile/plasteel,
-		/obj/item/stack/rods, /obj/item/weapon/ore, /obj/item/weapon/coin)
+		/obj/item/stack/rods, /obj/item/ore, /obj/item/coin)
 
 // Glass. Common building material.
 /datum/export/material/glass
 	message = "cm3 of glass"
 	material_id = MAT_GLASS
-	export_types = list(/obj/item/stack/sheet/glass, /obj/item/weapon/ore,
-		/obj/item/weapon/shard)
+	export_types = list(/obj/item/stack/sheet/glass, /obj/item/ore,
+		/obj/item/shard)

code/modules/cargo/exports/parts.dm

@@ -8,12 +8,12 @@
 /datum/export/solar/tracker_board
 	cost = 100
 	unit_name = "solar tracker board"
-	export_types = list(/obj/item/weapon/electronics/tracker)
+	export_types = list(/obj/item/electronics/tracker)
 
 /datum/export/solar/control_board
 	cost = 150
 	unit_name = "solar panel control board"
-	export_types = list(/obj/item/weapon/circuitboard/computer/solar_control)
+	export_types = list(/obj/item/circuitboard/computer/solar_control)
 
 /datum/export/swarmer
 	cost = 2000

code/modules/cargo/exports/research.dm

@@ -2,11 +2,11 @@
 /datum/export/tech
 	cost = 500
 	unit_name = "technology data disk"
-	export_types = list(/obj/item/weapon/disk/tech_disk)
+	export_types = list(/obj/item/disk/tech_disk)
 	var/list/techLevels = list()
 
 /datum/export/tech/get_cost(obj/O)
-	var/obj/item/weapon/disk/tech_disk/D = O
+	var/obj/item/disk/tech_disk/D = O
 	var/cost = 0
 	for(var/V in D.tech_stored)
 		if(!V)
@@ -17,7 +17,7 @@
 
 /datum/export/tech/sell_object(obj/O)
 	..()
-	var/obj/item/weapon/disk/tech_disk/D = O
+	var/obj/item/disk/tech_disk/D = O
 	for(var/V in D.tech_stored)
 		if(!V)
 			continue

code/modules/cargo/exports/tools.dm

@@ -3,7 +3,7 @@
 /datum/export/toolbox
 	cost = 4
 	unit_name = "toolbox"
-	export_types = list(/obj/item/weapon/storage/toolbox)
+	export_types = list(/obj/item/storage/toolbox)
 
 // mechanical toolbox:	22cr
 // emergency toolbox:	17-20cr
@@ -14,55 +14,55 @@
 /datum/export/screwdriver
 	cost = 2
 	unit_name = "screwdriver"
-	export_types = list(/obj/item/weapon/screwdriver)
+	export_types = list(/obj/item/screwdriver)
 	include_subtypes = FALSE
 
 /datum/export/wrench
 	cost = 2
 	unit_name = "wrench"
-	export_types = list(/obj/item/weapon/wrench)
+	export_types = list(/obj/item/wrench)
 
 /datum/export/crowbar
 	cost = 2
 	unit_name = "crowbar"
-	export_types = list(/obj/item/weapon/crowbar)
+	export_types = list(/obj/item/crowbar)
 
 /datum/export/wirecutters
 	cost = 2
 	unit_name = "pair"
 	message = "of wirecutters"
-	export_types = list(/obj/item/weapon/wirecutters)
+	export_types = list(/obj/item/wirecutters)
 
 
 // Welding tools
 /datum/export/weldingtool
 	cost = 5
 	unit_name = "welding tool"
-	export_types = list(/obj/item/weapon/weldingtool)
+	export_types = list(/obj/item/weldingtool)
 	include_subtypes = FALSE
 
 /datum/export/weldingtool/emergency
 	cost = 2
 	unit_name = "emergency welding tool"
-	export_types = list(/obj/item/weapon/weldingtool/mini)
+	export_types = list(/obj/item/weldingtool/mini)
 
 /datum/export/weldingtool/industrial
 	cost = 10
 	unit_name = "industrial welding tool"
-	export_types = list(/obj/item/weapon/weldingtool/largetank, /obj/item/weapon/weldingtool/hugetank)
+	export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
 
 
 // Fire extinguishers
 /datum/export/extinguisher
 	cost = 15
 	unit_name = "fire extinguisher"
-	export_types = list(/obj/item/weapon/extinguisher)
+	export_types = list(/obj/item/extinguisher)
 	include_subtypes = FALSE
 
 /datum/export/extinguisher/mini
 	cost = 2
 	unit_name = "pocket fire extinguisher"
-	export_types = list(/obj/item/weapon/extinguisher/mini)
+	export_types = list(/obj/item/extinguisher/mini)
 
 
 // Flashlights
@@ -106,14 +106,14 @@
 /datum/export/rcd
 	cost = 100 // 15 metal -> 75 credits, +25 credits for production
 	unit_name = "rapid construction device"
-	export_types = list(/obj/item/weapon/construction/rcd)
+	export_types = list(/obj/item/construction/rcd)
 
 /datum/export/rcd_ammo
 	cost = 60 // 6 metal, 4 glass -> 50 credits, +10 credits
 	unit_name = "compressed matter cardridge"
-	export_types = list(/obj/item/weapon/rcd_ammo)
+	export_types = list(/obj/item/rcd_ammo)
 
 /datum/export/rpd
 	cost = 350 // 37.5 metal, 18.75 glass -> 281.25 credits, + some
 	unit_name = "rapid piping device"
-	export_types = list(/obj/item/weapon/pipe_dispenser)
+	export_types = list(/obj/item/pipe_dispenser)

code/modules/cargo/exports/weapons.dm

@@ -6,57 +6,57 @@
 /datum/export/weapon/baton
 	cost = 100
 	unit_name = "stun baton"
-	export_types = list(/obj/item/weapon/melee/baton)
-	exclude_types = list(/obj/item/weapon/melee/baton/cattleprod)
+	export_types = list(/obj/item/melee/baton)
+	exclude_types = list(/obj/item/melee/baton/cattleprod)
 	include_subtypes = TRUE
 
 /datum/export/weapon/knife
 	cost = 750
 	unit_name = "combat knife"
-	export_types = list(/obj/item/weapon/kitchen/knife/combat)
+	export_types = list(/obj/item/kitchen/knife/combat)
 
 
 /datum/export/weapon/taser
 	cost = 250
 	unit_name = "advanced taser"
-	export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
+	export_types = list(/obj/item/gun/energy/e_gun/advtaser)
 
 /datum/export/weapon/laser
 	cost = 250
 	unit_name = "laser gun"
-	export_types = list(/obj/item/weapon/gun/energy/laser)
+	export_types = list(/obj/item/gun/energy/laser)
 
 /datum/export/weapon/disabler
 	cost = 100
 	unit_name = "disabler"
-	export_types = list(/obj/item/weapon/gun/energy/disabler)
+	export_types = list(/obj/item/gun/energy/disabler)
 
 /datum/export/weapon/energy_gun
 	cost = 900
 	unit_name = "energy gun"
-	export_types = list(/obj/item/weapon/gun/energy/e_gun)
+	export_types = list(/obj/item/gun/energy/e_gun)
 
 
 /datum/export/weapon/wt550
 	cost = 1400
 	unit_name = "WT-550 automatic rifle"
-	export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
+	export_types = list(/obj/item/gun/ballistic/automatic/wt550)
 
 /datum/export/weapon/shotgun
 	cost = 350
 	unit_name = "combat shotgun"
-	export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
+	export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat)
 
 
 /datum/export/weapon/flashbang
 	cost = 15
 	unit_name = "flashbang grenade"
-	export_types = list(/obj/item/weapon/grenade/flashbang)
+	export_types = list(/obj/item/grenade/flashbang)
 
 /datum/export/weapon/teargas
 	cost = 15
 	unit_name = "tear gas grenade"
-	export_types = list(/obj/item/weapon/grenade/chem_grenade/teargas)
+	export_types = list(/obj/item/grenade/chem_grenade/teargas)
 
 
 /datum/export/weapon/flash
@@ -69,4 +69,4 @@
 	cost = 3
 	unit_name = "pair"
 	message = "of handcuffs"
-	export_types = list(/obj/item/weapon/restraints/handcuffs)
+	export_types = list(/obj/item/restraints/handcuffs)

code/modules/cargo/order.dm

@@ -1,9 +1,9 @@
-/obj/item/weapon/paper/fluff/jobs/cargo/manifest
+/obj/item/paper/fluff/jobs/cargo/manifest
 	var/order_cost = 0
 	var/order_id = 0
 	var/errors = 0
 
-/obj/item/weapon/paper/fluff/jobs/cargo/manifest/New(atom/A, id, cost)
+/obj/item/paper/fluff/jobs/cargo/manifest/New(atom/A, id, cost)
 	..()
 	order_id = id
 	order_cost = cost
@@ -15,10 +15,10 @@
 	if(prob(MANIFEST_ERROR_CHANCE))
 		errors |= MANIFEST_ERROR_ITEM
 
-/obj/item/weapon/paper/fluff/jobs/cargo/manifest/proc/is_approved()
+/obj/item/paper/fluff/jobs/cargo/manifest/proc/is_approved()
 	return stamped && stamped.len && !is_denied()
 
-/obj/item/weapon/paper/fluff/jobs/cargo/manifest/proc/is_denied()
+/obj/item/paper/fluff/jobs/cargo/manifest/proc/is_denied()
 	return stamped && ("stamp-deny" in stamped)
 
 /datum/supply_order
@@ -38,7 +38,7 @@
 	src.reason = reason
 
 /datum/supply_order/proc/generateRequisition(turf/T)
-	var/obj/item/weapon/paper/P = new(T)
+	var/obj/item/paper/P = new(T)
 
 	P.name = "requisition form - #[id] ([pack.name])"
 	P.info += "<h2>[station_name()] Supply Requisition</h2>"
@@ -54,7 +54,7 @@
 	return P
 
 /datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C)
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/P = new(C, id, pack.cost)
+	var/obj/item/paper/fluff/jobs/cargo/manifest/P = new(C, id, pack.cost)
 
 	var/station_name = (P.errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name()
 
@@ -85,7 +85,7 @@
 
 /datum/supply_order/proc/generate(turf/T)
 	var/obj/structure/closet/crate/C = pack.generate(T)
-	var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = generateManifest(C)
+	var/obj/item/paper/fluff/jobs/cargo/manifest/M = generateManifest(C)
 
 	if(M.errors & MANIFEST_ERROR_ITEM)
 		if(istype(C, /obj/structure/closet/crate/secure) || istype(C, /obj/structure/closet/crate/large))

code/modules/cargo/vg_clothing_packs.dm

@@ -1,3 +1,4 @@
+/* // Can't be bothered to maintain this, mostly just memes anyway. 
 /datum/supply_pack/misc/vidyacon
 	name = "Vidya-Con Surplus Crate"
 	cost = 3250
@@ -30,4 +31,4 @@ datum/supply_pack/misc/reenactor
 					/obj/item/clothing/under/officeruniform,/obj/item/clothing/head/naziofficer,/obj/item/clothing/suit/officercoat,
 					/obj/item/clothing/head/panzer,
 					/obj/item/clothing/suit/russofurcoat,/obj/item/clothing/head/russofurhat,/obj/item/clothing/under/soviet)
-	crate_name = "historical reanactor crate"
+	crate_name = "historical reanactor crate" */

code/modules/chatter/chatter.dm

@@ -38,7 +38,7 @@
 	var/path = "sound/chatter/[phomeme]_[length].ogg"
 
 	playsound(loc, path,
-		vol = 40, vary = 0, extrarange = 3, falloff = FALSE, surround = 1)
+		vol = 40, vary = 0, extrarange = 3, falloff = FALSE)
 
 	sleep((length + 1) * chatter_get_sleep_multiplier(phomeme))
 

code/modules/client/client_procs.dm

@@ -361,35 +361,34 @@ GLOBAL_LIST(external_rsc_urls)
 		holder.owner = null
 		GLOB.admins -= src
 		if (!GLOB.admins.len && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
-			if(!GLOB.admins.len) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
-				var/cheesy_message = pick(
-					"I have no admins online!",\
-					"I'm all alone... :(",\
-					"I'm feeling lonely. :(",\
-					"I'm so lonely. :(",\
-					"Why does nobody love me? :(",\
-					"I want a man. :(",\
-					"Where has everyone gone?",\
-					"I need a hug. :(",\
-					"Someone come hold me. :(",\
-					"I need someone on me :(",\
-					"What happened? Where has everyone gone?",\
-					"My nipples are so stiff, but Zelda ain't here. :(",\
-					"Leon senpai, play more Spessmans. :(",\
-					"If only Serdy were here...",\
-					"Panic bunker can't keep my love for you out.",\
-					"Cebu needs to Awoo herself back into my heart.",\
-					"I don't even have a Turry to snuggle viciously here.",\
-					"MOM, WHERE ARE YOU??? D:",\
-					"It's a beautiful day outside. Birds are singing, flowers are blooming. On days like this...kids like you...SHOULD BE BURNING IN HELL.",\
-					"Sometimes when I have sex, I think about putting an entire peanut butter and jelly sandwich in the VCR.",\
-					"Oh good, no-one around to watch me lick Goofball's nipples. :D",\
-					"I've replaced Beepsky with a fidget spinner, glory be autism abuse.",\
-					"i shure hop dere are no PRED arund!!!!",\
-					"NO PRED CAN eVER CATCH MI"\
-					)
+			var/cheesy_message = pick(
+				"I have no admins online!",\
+				"I'm all alone... :(",\
+				"I'm feeling lonely. :(",\
+				"I'm so lonely. :(",\
+				"Why does nobody love me? :(",\
+				"I want a man. :(",\
+				"Where has everyone gone?",\
+				"I need a hug. :(",\
+				"Someone come hold me. :(",\
+				"I need someone on me :(",\
+				"What happened? Where has everyone gone?",\
+				"My nipples are so stiff, but Zelda ain't here. :(",\
+				"Leon senpai, play more Spessmans. :(",\
+				"If only Serdy were here...",\
+				"Panic bunker can't keep my love for you out.",\
+				"Cebu needs to Awoo herself back into my heart.",\
+				"I don't even have a Turry to snuggle viciously here.",\
+				"MOM, WHERE ARE YOU??? D:",\
+				"It's a beautiful day outside. Birds are singing, flowers are blooming. On days like this...kids like you...SHOULD BE BURNING IN HELL.",\
+				"Sometimes when I have sex, I think about putting an entire peanut butter and jelly sandwich in the VCR.",\
+				"Oh good, no-one around to watch me lick Goofball's nipples. :D",\
+				"I've replaced Beepsky with a fidget spinner, glory be autism abuse.",\
+				"i shure hop dere are no PRED arund!!!!",\
+				"NO PRED CAN eVER CATCH MI"\
+				)
 
-				send2irc("Server", "[cheesy_message] (No admins online)")
+			send2irc("Server", "[cheesy_message] (No admins online)")
 
 	GLOB.ahelp_tickets.ClientLogout(src)
 	GLOB.directory -= ckey

code/modules/client/client_procs.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -73,7 +73,7 @@
- 			return
- 
- 	//Logs all hrefs, except chat pings
--	if(href_list["proc"] != "ping")
-+	if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
- 		WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
- 
- 	// Admin PM

code/modules/client/preferences.dm.rej

@@ -0,0 +1,14 @@
+diff a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm	(rejected hunks)
+@@ -130,12 +130,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
+ 	menuoptions = list()
+ 	return
+ 
+-/datum/preferences/vv_edit_var(var_name, var_value)
+-	var/static/list/banned_edits = list("exp")
+-	if(var_name in banned_edits)
+-		return FALSE
+-	return ..()
+-
+ /datum/preferences/proc/ShowChoices(mob/user)
+ 	if(!user || !user.client)
+ 		return

code/modules/client/preferences_savefile.dm

@@ -343,6 +343,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["job_engsec_low"]		>> job_engsec_low
 
 	//Citadel code
+	S["feature_genitals_use_skintone"]	>> features["genitals_use_skintone"]
 	S["feature_exhibitionist"]			>> features["exhibitionist"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
@@ -519,6 +520,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["job_engsec_low"]		, job_engsec_low)
 
 	//Citadel
+	S["feature_genitals_use_skintone"]	<< features["genitals_use_skintone"]
 	S["feature_exhibitionist"]			<< features["exhibitionist"]
 	S["feature_mcolor2"]				<< features["mcolor2"]
 	S["feature_mcolor3"]				<< features["mcolor3"]

code/modules/client/preferences_savefile.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm	(rejected hunks)
-@@ -193,7 +193,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
- 		return 0
- 	S.cd = "/"
- 
--	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date)
-+	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX)		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date
- 
- 	//general preferences
- 	WRITE_FILE(S["ooccolor"], ooccolor)

code/modules/client/verbs/ping.dm

@@ -9,7 +9,7 @@
 		avgping = MC_AVERAGE_SLOW(avgping, ping)
 
 /client/proc/pingfromtime(time)
-	return ((world.time+world.tick_lag*world.tick_usage/100)-time)*100
+	return ((world.time+world.tick_lag*TICK_USAGE_REAL/100)-time)*100
 
 /client/verb/display_ping(time as num)
 	set instant = TRUE
@@ -19,4 +19,4 @@
 /client/verb/ping()
 	set name = "Ping"
 	set category = "OOC"
-	winset(src, null, "command=.display_ping+[world.time+world.tick_lag*world.tick_usage/100]")
+	winset(src, null, "command=.display_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]")

code/modules/clothing/chameleon.dm

@@ -60,7 +60,7 @@
 		to_chat(owner, "<span class='warning'>You shouldn't be able to toggle a camogear helmetmask if you're not wearing it</span>")
 	if(new_headgear)
 		// Force drop the item in the headslot, even though
-		// it's NODROP
+		// it's NODROP_1
 		D.dropItemToGround(target, TRUE)
 		qdel(old_headgear)
 		// where is `slot_head` defined? WHO KNOWS
@@ -85,7 +85,7 @@
 	for(var/V in typesof(chameleon_type))
 		if(ispath(V) && ispath(V, /obj/item))
 			var/obj/item/I = V
-			if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT))
+			if(chameleon_blacklist[V] || (initial(I.flags_1) & ABSTRACT_1))
 				continue
 			if(!initial(I.icon_state) || !initial(I.item_state))
 				continue
@@ -119,8 +119,8 @@
 		update_item(chameleon_list[picked_name])
 
 /datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item)
-	if(istype(target, /obj/item/weapon/gun/energy/laser/chameleon))
-		var/obj/item/weapon/gun/energy/laser/chameleon/CG = target
+	if(istype(target, /obj/item/gun/energy/laser/chameleon))
+		var/obj/item/gun/energy/laser/chameleon/CG = target
 		CG.get_chameleon_projectile(picked_item)
 	if(isliving(user))
 		var/mob/living/C = user
@@ -153,7 +153,7 @@
 	return 1
 
 /datum/action/item_action/chameleon/change/proc/emp_randomise()
-	if(istype(target, /obj/item/weapon/gun/energy/laser/chameleon))
+	if(istype(target, /obj/item/gun/energy/laser/chameleon))
 		return	//Please no crash!
 	START_PROCESSING(SSprocessing, src)
 	random_look(owner)
@@ -170,30 +170,30 @@
 	var/obj/item/I = target
 	var/mob/living/M = owner
 
-	var/flags = I.slot_flags
-	if(flags & SLOT_OCLOTHING)
+	var/flags_1 = I.slot_flags
+	if(flags_1 & SLOT_OCLOTHING)
 		M.update_inv_wear_suit()
-	if(flags & SLOT_ICLOTHING)
+	if(flags_1 & SLOT_ICLOTHING)
 		M.update_inv_w_uniform()
-	if(flags & SLOT_GLOVES)
+	if(flags_1 & SLOT_GLOVES)
 		M.update_inv_gloves()
-	if(flags & SLOT_EYES)
+	if(flags_1 & SLOT_EYES)
 		M.update_inv_glasses()
-	if(flags & SLOT_EARS)
+	if(flags_1 & SLOT_EARS)
 		M.update_inv_ears()
-	if(flags & SLOT_MASK)
+	if(flags_1 & SLOT_MASK)
 		M.update_inv_wear_mask()
-	if(flags & SLOT_HEAD)
+	if(flags_1 & SLOT_HEAD)
 		M.update_inv_head()
-	if(flags & SLOT_FEET)
+	if(flags_1 & SLOT_FEET)
 		M.update_inv_shoes()
-	if(flags & SLOT_ID)
+	if(flags_1 & SLOT_ID)
 		M.update_inv_wear_id()
-	if(flags & SLOT_BELT)
+	if(flags_1 & SLOT_BELT)
 		M.update_inv_belt()
-	if(flags & SLOT_BACK)
+	if(flags_1 & SLOT_BACK)
 		M.update_inv_back()
-	if(flags & SLOT_NECK)
+	if(flags_1 & SLOT_NECK)
 		M.update_inv_neck()
 
 /obj/item/clothing/under/chameleon
@@ -314,7 +314,7 @@
 /obj/item/clothing/head/chameleon/drone
 	// The camohat, I mean, holographic hat projection, is part of the
 	// drone itself.
-	flags = NODROP
+	flags_1 = NODROP_1
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	// which means it offers no protection, it's just air and light
 
@@ -334,7 +334,7 @@
 	resistance_flags = 0
 	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
 
-	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -362,7 +362,7 @@
 
 /obj/item/clothing/mask/chameleon/drone
 	//Same as the drone chameleon hat, undroppable and no protection
-	flags = NODROP
+	flags_1 = NODROP_1
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	// Can drones use the voice changer part? Let's not find out.
 	vchange = 0
@@ -384,10 +384,10 @@
 	item_color = "black"
 	desc = "A pair of black shoes."
 	permeability_coefficient = 0.05
-	flags = NOSLIP
+	flags_1 = NOSLIP_1
 	origin_tech = "syndicate=2"
 	resistance_flags = 0
-	pockets = /obj/item/weapon/storage/internal/pocket/shoes
+	pockets = /obj/item/storage/internal/pocket/shoes
 	armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
 
 	var/datum/action/item_action/chameleon/change/chameleon_action
@@ -403,14 +403,14 @@
 /obj/item/clothing/shoes/chameleon/emp_act(severity)
 	chameleon_action.emp_randomise()
 
-/obj/item/weapon/gun/energy/laser/chameleon
+/obj/item/gun/energy/laser/chameleon
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
 	ammo_type = list(/obj/item/ammo_casing/energy/chameleon)
 	clumsy_check = 0
 	needs_permit = 0
 	pin = /obj/item/device/firing_pin
-	cell_type = /obj/item/weapon/stock_parts/cell/bluespace
+	cell_type = /obj/item/stock_parts/cell/bluespace
 
 	var/datum/action/item_action/chameleon/change/chameleon_action
 	var/list/chameleon_projectile_vars
@@ -422,15 +422,15 @@
 	var/badmin_mode = FALSE
 	var/static/list/blacklisted_vars = list("locs", "loc", "contents", "x", "y", "z")
 
-/obj/item/weapon/gun/energy/laser/chameleon/Initialize()
+/obj/item/gun/energy/laser/chameleon/Initialize()
 	. = ..()
 	chameleon_action = new(src)
-	chameleon_action.chameleon_type = /obj/item/weapon/gun
+	chameleon_action.chameleon_type = /obj/item/gun
 	chameleon_action.chameleon_name = "Gun"
-	chameleon_action.chameleon_blacklist = typecacheof(/obj/item/weapon/gun/magic, ignore_root_path = FALSE)
+	chameleon_action.chameleon_blacklist = typecacheof(/obj/item/gun/magic, ignore_root_path = FALSE)
 	chameleon_action.initialize_disguises()
 
-/obj/item/weapon/gun/energy/laser/chameleon/Initialize()
+/obj/item/gun/energy/laser/chameleon/Initialize()
 	..()
 	projectile_copy_vars = list("name", "icon", "icon_state", "item_state", "speed", "color", "hitsound", "forcedodge", "impact_effect_type", "range", "suppressed", "hitsound_wall", "impact_effect_type", "pass_flags")
 	chameleon_projectile_vars = list("name" = "practice laser", "icon" = 'icons/obj/projectiles.dmi', "icon_state" = "laser")
@@ -439,12 +439,12 @@
 	ammo_copy_vars = list("firing_effect_type")
 	chameleon_ammo_vars = list()
 	recharge_newshot()
-	get_chameleon_projectile(/obj/item/weapon/gun/energy/laser)
+	get_chameleon_projectile(/obj/item/gun/energy/laser)
 
-/obj/item/weapon/gun/energy/laser/chameleon/emp_act(severity)
+/obj/item/gun/energy/laser/chameleon/emp_act(severity)
 	return
 
-/obj/item/weapon/gun/energy/laser/chameleon/proc/reset_chameleon_vars()
+/obj/item/gun/energy/laser/chameleon/proc/reset_chameleon_vars()
 	chameleon_ammo_vars = list()
 	chameleon_gun_vars = list()
 	chameleon_projectile_vars = list()
@@ -460,7 +460,7 @@
 	QDEL_NULL(chambered.BB)
 	chambered.newshot()
 
-/obj/item/weapon/gun/energy/laser/chameleon/proc/set_chameleon_ammo(obj/item/ammo_casing/AC, passthrough = TRUE, reset = FALSE)
+/obj/item/gun/energy/laser/chameleon/proc/set_chameleon_ammo(obj/item/ammo_casing/AC, passthrough = TRUE, reset = FALSE)
 	if(!istype(AC))
 		CRASH("[AC] is not /obj/item/ammo_casing!")
 		return FALSE
@@ -473,7 +473,7 @@
 		var/obj/item/projectile/P = AC.BB
 		set_chameleon_projectile(P)
 
-/obj/item/weapon/gun/energy/laser/chameleon/proc/set_chameleon_projectile(obj/item/projectile/P)
+/obj/item/gun/energy/laser/chameleon/proc/set_chameleon_projectile(obj/item/projectile/P)
 	if(!istype(P))
 		CRASH("[P] is not /obj/item/projectile!")
 		return FALSE
@@ -489,17 +489,17 @@
 		chambered.projectile_type = P.type
 		chambered.newshot()
 
-/obj/item/weapon/gun/energy/laser/chameleon/proc/set_chameleon_gun(obj/item/weapon/gun/G , passthrough = TRUE)
+/obj/item/gun/energy/laser/chameleon/proc/set_chameleon_gun(obj/item/gun/G , passthrough = TRUE)
 	if(!istype(G))
-		CRASH("[G] is not /obj/item/weapon/gun!")
+		CRASH("[G] is not /obj/item/gun!")
 		return FALSE
 	for(var/V in gun_copy_vars)
 		if(vars[V] && G.vars[V])
 			chameleon_gun_vars[V] = G.vars[V]
 			vars[V] = G.vars[V]
 	if(passthrough)
-		if(istype(G, /obj/item/weapon/gun/ballistic))
-			var/obj/item/weapon/gun/ballistic/BG = G
+		if(istype(G, /obj/item/gun/ballistic))
+			var/obj/item/gun/ballistic/BG = G
 			var/obj/item/ammo_box/AB = new BG.mag_type(G)
 			qdel(BG)
 			if(!istype(AB)||!AB.ammo_type)
@@ -507,53 +507,53 @@
 				return FALSE
 			var/obj/item/ammo_casing/AC = new AB.ammo_type(G)
 			set_chameleon_ammo(AC)
-		else if(istype(G, /obj/item/weapon/gun/magic))
-			var/obj/item/weapon/gun/magic/MG = G
+		else if(istype(G, /obj/item/gun/magic))
+			var/obj/item/gun/magic/MG = G
 			var/obj/item/ammo_casing/AC = new MG.ammo_type(G)
 			set_chameleon_ammo(AC)
-		else if(istype(G, /obj/item/weapon/gun/energy))
-			var/obj/item/weapon/gun/energy/EG = G
+		else if(istype(G, /obj/item/gun/energy))
+			var/obj/item/gun/energy/EG = G
 			if(islist(EG.ammo_type) && EG.ammo_type.len)
 				var/obj/item/ammo_casing/AC = EG.ammo_type[1]
 				set_chameleon_ammo(AC)
-		else if(istype(G, /obj/item/weapon/gun/syringe))
+		else if(istype(G, /obj/item/gun/syringe))
 			var/obj/item/ammo_casing/AC = new /obj/item/ammo_casing/syringegun(src)
 			set_chameleon_ammo(AC)
 
-/obj/item/weapon/gun/energy/laser/chameleon/proc/get_chameleon_projectile(guntype)
+/obj/item/gun/energy/laser/chameleon/proc/get_chameleon_projectile(guntype)
 	reset_chameleon_vars()
-	var/obj/item/weapon/gun/G = new guntype(src)
+	var/obj/item/gun/G = new guntype(src)
 	set_chameleon_gun(G)
 	qdel(G)
 
-/obj/item/weapon/storage/backpack/chameleon
+/obj/item/storage/backpack/chameleon
 	name = "backpack"
 	var/datum/action/item_action/chameleon/change/chameleon_action
 
-/obj/item/weapon/storage/backpack/chameleon/New()
+/obj/item/storage/backpack/chameleon/New()
 	..()
 	chameleon_action = new(src)
-	chameleon_action.chameleon_type = /obj/item/weapon/storage/backpack
+	chameleon_action.chameleon_type = /obj/item/storage/backpack
 	chameleon_action.chameleon_name = "Backpack"
 	chameleon_action.initialize_disguises()
 
-/obj/item/weapon/storage/backpack/chameleon/emp_act(severity)
+/obj/item/storage/backpack/chameleon/emp_act(severity)
 	chameleon_action.emp_randomise()
 
-/obj/item/weapon/storage/belt/chameleon
+/obj/item/storage/belt/chameleon
 	name = "toolbelt"
 	desc = "Holds tools."
 	silent = 1
 	var/datum/action/item_action/chameleon/change/chameleon_action
 
-/obj/item/weapon/storage/belt/chameleon/New()
+/obj/item/storage/belt/chameleon/New()
 	..()
 	chameleon_action = new(src)
-	chameleon_action.chameleon_type = /obj/item/weapon/storage/belt
+	chameleon_action.chameleon_type = /obj/item/storage/belt
 	chameleon_action.chameleon_name = "Belt"
 	chameleon_action.initialize_disguises()
 
-/obj/item/weapon/storage/belt/chameleon/emp_act(severity)
+/obj/item/storage/belt/chameleon/emp_act(severity)
 	chameleon_action.emp_randomise()
 
 /obj/item/device/radio/headset/chameleon

code/modules/clothing/clothing.dm

@@ -29,7 +29,7 @@
 	var/list/user_vars_to_edit = list() //VARNAME = VARVALUE eg: "name" = "butts"
 	var/list/user_vars_remembered = list() //Auto built by the above + dropped() + equipped()
 
-	var/obj/item/weapon/storage/internal/pocket/pockets = null
+	var/obj/item/storage/internal/pocket/pockets = null
 
 	//These allow head/mask items to dynamically alter the user's hair
 	// and facial hair, checking hair_extensions.dmi and facialhair_extensions.dmi
@@ -193,7 +193,6 @@
 	var/invis_view = SEE_INVISIBLE_LIVING
 	var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
 	var/lighting_alpha
-	var/emagged = FALSE
 	var/list/icon/current = list() //the current hud icons
 	var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
 	strip_delay = 20
@@ -341,7 +340,7 @@ BLIND     // can't see anything
 		src.icon_state = initial(icon_state)
 		gas_transfer_coefficient = initial(gas_transfer_coefficient)
 		permeability_coefficient = initial(permeability_coefficient)
-		flags |= visor_flags
+		flags_1 |= visor_flags
 		flags_inv |= visor_flags_inv
 		flags_cover |= visor_flags_cover
 		to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
@@ -351,7 +350,7 @@ BLIND     // can't see anything
 		to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
 		gas_transfer_coefficient = null
 		permeability_coefficient = null
-		flags &= ~visor_flags
+		flags_1 &= ~visor_flags
 		flags_inv &= ~visor_flags_inv
 		flags_cover &= ~visor_flags_cover
 		if(adjusted_flags)
@@ -435,7 +434,7 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/suits.dmi'
 	name = "suit"
 	var/fire_resist = T0C+100
-	allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen)
+	allowed = list(/obj/item/tank/internals/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	slot_flags = SLOT_OCLOTHING
 	var/blood_overlay_type = "suit"
@@ -470,11 +469,13 @@ BLIND     // can't see anything
 	name = "space helmet"
 	icon_state = "spaceold"
 	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
 	item_state = "spaceold"
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
@@ -494,9 +495,9 @@ BLIND     // can't see anything
 	w_class = WEIGHT_CLASS_BULKY
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals)
+	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
 	slowdown = 1
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -785,7 +786,7 @@ BLIND     // can't see anything
 
 /obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags
 	up = !up
-	flags ^= visor_flags
+	flags_1 ^= visor_flags
 	flags_inv ^= visor_flags_inv
 	flags_cover ^= initial(flags_cover)
 	icon_state = "[initial(icon_state)][up ? "up" : ""]"

code/modules/clothing/ears/ears.dm

@@ -15,11 +15,7 @@
 	strip_delay = 15
 	equip_delay_other = 25
 	resistance_flags = FLAMMABLE
-
-/obj/item/clothing/ears/earmuffs/Initialize(mapload)
-	. = ..()
-	SET_SECONDARY_FLAG(src, BANG_PROTECT)
-	SET_SECONDARY_FLAG(src, HEALS_EARS)
+	flags_2 = BANG_PROTECT_2|HEALS_EARS_2
 
 /obj/item/clothing/ears/headphones
 	name = "headphones"

code/modules/clothing/glasses/glasses.dm

@@ -280,7 +280,7 @@
 	name = "thermoncle"
 	desc = "Never before has seeing through walls felt so gentlepersonly."
 	icon_state = "thermoncle"
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	flags_1 = null //doesn't protect eyes because it's a monocle, duh
 
 /obj/item/clothing/glasses/thermal/monocle/examine(mob/user) //Different examiners see a different description!
 	var/desk = desc
@@ -331,10 +331,10 @@
 	vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
 	darkness_view = 8
 	scan_reagents = 1
-	flags = NODROP
+	flags_1 = NODROP_1
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
-/obj/item/clothing/glasses/godeye/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, src) && W != src && W.loc == user)
 		if(W.icon_state == "godeye")
 			W.icon_state = "doublegodeye"

code/modules/clothing/glasses/hud.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses/hud
 	name = "HUD"
 	desc = "A heads-up display that provides important info in (almost) real time."
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	flags_1 = null //doesn't protect eyes because it's a monocle, duh
 	origin_tech = "magnets=3;biotech=2"
 	var/hud_type = null
 

code/modules/clothing/gloves/color.dm

@@ -49,8 +49,8 @@
 /obj/item/clothing/gloves/color/black/ce
 	item_color = "chief"		//Exists for washing machines. Is not different from black gloves in any way.
 
-/obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wirecutters))
+/obj/item/clothing/gloves/color/black/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/wirecutters))
 		if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
 			to_chat(user, "<span class='notice'>You snip the fingertips off of [src].</span>")
 			playsound(user.loc, W.usesound, rand(10,50), 1)

code/modules/clothing/head/collectable.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm	(rejected hunks)
-@@ -4,7 +4,6 @@
- /obj/item/clothing/head/collectable
- 	name = "collectable hat"
- 	desc = "A rare collectable hat."
--	dynamic_hair_suffix = "+detective"
- 
- 
- /obj/item/clothing/head/collectable/petehat

code/modules/clothing/head/hardhat.dm

@@ -46,7 +46,7 @@
 	item_color = "red"
 	dog_fashion = null
 	name = "firefighter helmet"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
 	cold_protection = HEAD
@@ -56,7 +56,7 @@
 	icon_state = "hardhat0_white"
 	item_state = "hardhat0_white"
 	item_color = "white"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
 	cold_protection = HEAD
@@ -76,7 +76,7 @@
 	dog_fashion = null
 	name = "atmospheric technician's firefighting helmet"
 	desc = "A firefighter's helmet, able to keep the user cool in any situation."
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT

code/modules/clothing/head/helmet.dm

@@ -13,13 +13,13 @@
 	resistance_flags = 0
 	flags_cover = HEADCOVERSEYES
 	flags_inv = HIDEHAIR
+	flags_2 = BANG_PROTECT_2
 
 	dog_fashion = /datum/dog_fashion/head/helmet
 
 
 /obj/item/clothing/head/helmet/Initialize()
 	..()
-	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/clothing/head/helmet/sec
 	can_flashlight = 1
@@ -65,7 +65,7 @@
 		if(world.time > cooldown + toggle_cooldown)
 			cooldown = world.time
 			up = !up
-			flags ^= visor_flags
+			flags_1 ^= visor_flags
 			flags_inv ^= visor_flags_inv
 			flags_cover ^= visor_flags_cover
 			icon_state = "[initial(icon_state)][up ? "up" : ""]"
@@ -110,7 +110,7 @@
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	strip_delay = 80
 	dog_fashion = null
 
@@ -191,11 +191,11 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	strip_delay = 80
 	dog_fashion = null
+	// old knight helmets do not offer protection against loud noises
+	flags_2 = NONE
 
 /obj/item/clothing/head/helmet/knight/Initialize(mapload)
 	..()
-	// old knight helmets do not offer protection against loud noises
-	CLEAR_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/clothing/head/helmet/knight/blue
 	icon_state = "knight_blue"
@@ -266,7 +266,7 @@
 					A.Grant(user)
 		return
 
-	if(istype(I, /obj/item/weapon/screwdriver))
+	if(istype(I, /obj/item/screwdriver))
 		if(F)
 			for(var/obj/item/device/flashlight/seclite/S in src)
 				to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")

code/modules/clothing/head/jobs.dm

@@ -79,7 +79,7 @@
 	desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat."
 	icon_state = "detective"
 	var/candy_cooldown = 0
-	pockets = /obj/item/weapon/storage/internal/pocket/small/detective
+	pockets = /obj/item/storage/internal/pocket/small/detective
 	dog_fashion = /datum/dog_fashion/head/detective
 
 /obj/item/clothing/head/fedora/det_hat/AltClick()
@@ -87,7 +87,7 @@
 	if(ismob(loc))
 		var/mob/M = loc
 		if(candy_cooldown < world.time)
-			var/obj/item/weapon/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(src)
+			var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src)
 			M.put_in_hands(CC)
 			to_chat(M, "You slip a candy corn from your hat.")
 			candy_cooldown = world.time+1200
@@ -110,7 +110,7 @@
 
 /obj/item/clothing/head/beret/highlander
 	desc = "That was white fabric. <i>Was.</i>"
-	flags = NODROP
+	flags_1 = NODROP_1
 	dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
 
 //Security

code/modules/clothing/head/misc.dm

@@ -185,7 +185,7 @@
 	item_state = "fedora"
 	armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50)
 	desc = "A really cool hat if you're a mobster. A really lame hat if you're not."
-	pockets = /obj/item/weapon/storage/internal/pocket/small
+	pockets = /obj/item/storage/internal/pocket/small
 
 /obj/item/clothing/head/fedora/suicide_act(mob/user)
 	if(user.gender == FEMALE)
@@ -219,7 +219,7 @@
 	icon_state = "shamebrero"
 	item_state = "shamebrero"
 	desc = "Once it's on, it never comes off."
-	flags = NODROP
+	flags_1 = NODROP_1
 	dog_fashion = null
 
 /obj/item/clothing/head/cone

code/modules/clothing/head/misc.dm.rej

@@ -1,16 +0,0 @@
-diff a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm	(rejected hunks)
-@@ -250,7 +250,7 @@
- 	name = "jester hat"
- 	desc = "A hat with bells, to add some merriness to the suit."
- 	icon_state = "jester_hat"
--	dynamic_hair_suffix = "null"
-+	dynamic_hair_suffix = ""
- 
- /obj/item/clothing/head/rice_hat
- 	name = "rice hat"
-@@ -302,4 +302,4 @@
- 	name = "jester hat"
- 	desc = "A hat with bells, to add some merriness to the suit."
- 	icon_state = "jester_hat2"
--	dynamic_hair_suffix = "null"
-+	dynamic_hair_suffix = ""

code/modules/clothing/head/misc_special.dm

@@ -125,17 +125,18 @@
 	desc = "A pair of kitty ears. Meow!"
 	icon_state = "kitty"
 	color = "#999999"
-	dynamic_hair_suffix = ""
+	dynamic_hair_suffix = ""
 
 	dog_fashion = /datum/dog_fashion/head/kitty
 
-/obj/item/clothing/head/kitty/equipped(mob/user, slot)
-	if(user && slot == slot_head)
+/obj/item/clothing/head/kitty/equipped(mob/living/carbon/human/user, slot)
+	if(ishuman(user) && slot == slot_head)
 		update_icon(user)
+		user.update_inv_head() //Color might have been changed by update_icon.
 	..()
 
 /obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user)
-	if(istype(user))
+	if(ishuman(user))
 		add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)
 
 /obj/item/clothing/head/kitty/genuine
@@ -151,7 +152,7 @@
 	flags_inv = 0
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	brightness_on = 1 //luminosity when on
-	dynamic_hair_suffix = ""
+	dynamic_hair_suffix = ""
 
 	dog_fashion = /datum/dog_fashion/head/reindeer
 

code/modules/clothing/head/vg_hats.dm

@@ -10,7 +10,7 @@
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	strip_delay = 80
 	dog_fashion = null
 

code/modules/clothing/masks/breath.dm

@@ -4,8 +4,8 @@
 	icon_state = "breath"
 	item_state = "m_mask"
 	body_parts_covered = 0
-	flags = MASKINTERNALS
-	visor_flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
+	visor_flags = MASKINTERNALS_1
 	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.10
 	permeability_coefficient = 0.50

code/modules/clothing/masks/gasmask.dm

@@ -2,7 +2,7 @@
 	name = "gas mask"
 	desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
 	icon_state = "gas_alt"
-	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_NORMAL
 	item_state = "gas_alt"
@@ -52,7 +52,7 @@
 /obj/item/clothing/mask/gas/clown_hat
 	name = "clown wig and mask"
 	desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "clown"
 	item_state = "clown_hat"
 	flags_cover = MASKCOVERSEYES
@@ -84,7 +84,7 @@
 /obj/item/clothing/mask/gas/sexyclown
 	name = "sexy-clown wig and mask"
 	desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "sexyclown"
 	item_state = "sexyclown"
 	flags_cover = MASKCOVERSEYES
@@ -93,7 +93,7 @@
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
 	desc = "The traditional mime's mask. It has an eerie facial posture."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "mime"
 	item_state = "mime"
 	flags_cover = MASKCOVERSEYES
@@ -125,7 +125,7 @@
 /obj/item/clothing/mask/gas/monkeymask
 	name = "monkey mask"
 	desc = "A mask used when acting as a monkey."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "monkeymask"
 	item_state = "monkeymask"
 	flags_cover = MASKCOVERSEYES
@@ -134,7 +134,7 @@
 /obj/item/clothing/mask/gas/sexymime
 	name = "sexy mime mask"
 	desc = "A traditional female mime's mask."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "sexymime"
 	item_state = "sexymime"
 	flags_cover = MASKCOVERSEYES
@@ -155,7 +155,7 @@
 	name = "owl mask"
 	desc = "Twoooo!"
 	icon_state = "owl"
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	flags_cover = MASKCOVERSEYES
 	resistance_flags = FLAMMABLE