Merge remote-tracking branch 'upstream/dev' into newpaint

Conflicts: code/game/objects/items/weapons/paint.dm
2026-08-22 03:26:21 +01:00 · 2015-02-01 23:04:18 +01:00
parent 4d8dd50cea 06756ac2fc
commit 6577cd2a55
271 changed files with 774 additions and 992 deletions
@@ -949,7 +949,7 @@ var/global/floorIsLava = 0
 			return 2
 		return 1
 	if(M.mind in ticker.mode.syndicates)
-		if (ticker.mode.config_tag == "nuclear")
+		if (ticker.mode.config_tag == "mercenary")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.wizards)
@@ -1,18 +1,8 @@
-#define AHELP_ADMIN 1
-#define AHELP_MENTOR 2
-#define AHELP_DEV 3

 //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
 var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")

-var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHELP_MENTOR,\
-									 "Admin - Rule/Gameplay issue" = AHELP_ADMIN,\
-									 "Dev - Bug report" = AHELP_DEV)
-
-/client/proc/adminhelp_admin(message)
-	adminhelp("Admin - Rule/Gameplay issue", message)
-
-/client/verb/adminhelp(selected_type in adminhelp_categories, msg as text)
+/client/verb/adminhelp(msg as text)
 	set category = "Admin"
 	set name = "Adminhelp"

@@ -27,18 +17,6 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE

 	adminhelped = 1 //Determines if they get the message to reply by clicking the name.

-	/**src.verbs -= /client/verb/adminhelp
-
-	spawn(1200)
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
-	**/
-
-	if(!msg || alert("The following message will be sent to staff that administers\n the '[selected_type]' category:\n\n[msg]\n", "Admin Help", "Ok", "Cancel") == "Cancel")
-		return
-
-	var/selected_upper = uppertext(selected_type)
-
 	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return

@@ -109,62 +87,12 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
 	var/ai_cl
 	if(ai_found)
 		ai_cl = " (<A HREF='?_src_=holder;adminchecklaws=\ref[mob]'>CL</A>)"
-	var/mentor_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 0, 0, 1, 0)][ai_cl]:</b> [msg]"
-	var/dev_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 3, 0, 1, 0)][ai_cl]:</b> [msg]"
-	msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 2, 1, 1)][ai_cl]:</b> [msg]"
+	var/mentor_msg = "\blue <b><font color=red>Request for Help: </font>[get_options_bar(mob, 0, 0, 1, 0)][ai_cl]:</b> [msg]"
+	msg = "\blue <b><font color=red>Request for Help:: </font>[get_options_bar(mob, 2, 1, 1)][ai_cl]:</b> [msg]"

 	var/admin_number_afk = 0

-	var/list/mentorholders = list()
-	var/list/debugholders = list()
-	var/list/adminholders = list()
 	for(var/client/X in admins)
-		if(R_MENTOR & X.holder.rights && !(R_ADMIN & X.holder.rights)) // we don't want to count admins twice. This list should be JUST mentors
-			mentorholders += X
-			if(X.is_afk())
-				admin_number_afk++
-		if(R_DEBUG & X.holder.rights) // Looking for anyone with +Debug which will be admins, developers, and developer mentors
-			debugholders += X
-			if(!(R_ADMIN & X.holder.rights))
-				if(X.is_afk())
-					admin_number_afk++
-		if(R_ADMIN | R_MOD & X.holder.rights) // just admins here please
-			adminholders += X
-			if(X.is_afk())
-				admin_number_afk++
-
-	switch(adminhelp_categories[selected_type])
-		if(AHELP_MENTOR)
-			if(mentorholders.len)
-				for(var/client/X in mentorholders) // Mentors get a message without buttons and no character name
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << mentor_msg
-			if(adminholders.len)
-				for(var/client/X in adminholders) // Admins get the full monty
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
-		if(AHELP_ADMIN)
-			if(adminholders.len)
-				for(var/client/X in adminholders) // Admins of course get everything in their helps
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
-		if(AHELP_DEV)
-			if(debugholders.len)
-				for(var/client/X in debugholders)
-					if(R_ADMIN | R_MOD & X.holder.rights) // Admins get every button & special highlights in theirs
-						if(X.prefs.toggles & SOUND_ADMINHELP)
-							X << 'sound/effects/adminhelp.ogg'
-						X << msg
-					else
-						if (R_DEBUG & X.holder.rights) // Just devs or devmentors get non-highlighted names, but they do get JMP and VV for their bug reports.
-							if(X.prefs.toggles & SOUND_ADMINHELP)
-								X << 'sound/effects/adminhelp.ogg'
-						X << dev_msg
-
-	/*for(var/client/X in admins)
 		if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
 			if(X.is_afk())
 				admin_number_afk++
@@ -173,20 +101,17 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
 			if(X.holder.rights == R_MENTOR)
 				X << mentor_msg		// Mentors won't see coloring of names on people with special_roles (Antags, etc.)
 			else
-				X << msg*/
+				X << msg

 	//show it to the person adminhelping too
-	src << "<font color='blue'>PM to-<b>Staff ([selected_type])</b>: [original_msg]</font>"
+	src << "<font color='blue'>PM to-<b>Staff </b>: [original_msg]</font>"

 	var/admin_number_present = admins.len - admin_number_afk
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
-		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
+		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
 	else
-		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)]")
+		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

-#undef AHELP_ADMIN
-#undef AHELP_MENTOR
-#undef AHELP_DEV
@@ -96,7 +96,7 @@
 					if(sender)
 						C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
 					else
-						adminhelp_admin(reply)													//sender has left, adminhelp instead
+						adminhelp(reply)													//sender has left, adminhelp instead
 				return
 	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "PM", src) + " to <span class='name'>[get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
 	C << "<span class='pm'><span class='in'>" + create_text_tag("pm_in", "", C) + " <b>\[[recieve_pm_type] PM\]</b> <span class='name'>[get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
@@ -3,7 +3,7 @@
 	desc = "A small electronic device that should never exist."
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	w_class = 2.0
 	matter = list("metal" = 100)
 	throwforce = 2
@@ -6,7 +6,7 @@
 	w_class = 3.0
 	throw_speed = 2
 	throw_range = 4
-	flags = FPRINT | TABLEPASS| CONDUCT //Copied this from old code, so this may or may not be necessary
+	flags = CONDUCT //Copied this from old code, so this may or may not be necessary
 	var/status = 0   //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 phoron tank
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = "holder"
 	item_state = "assembly"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	throwforce = 5
 	w_class = 2.0
 	throw_speed = 3
@@ -168,7 +168,6 @@
 	var/visible = 0.0
 	var/left = null
 	anchored = 1.0
-	flags = TABLEPASS


 /obj/effect/beam/i_beam/proc/hit()
@@ -6,7 +6,7 @@
 	var/obj/item/device/radio/electropack/part2 = null
 	var/status = 0
 	w_class = 5.0
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT

 /obj/item/assembly/shock_kit/Del()
 	del(part1)
@@ -44,6 +44,9 @@
 	return 1

 /obj/item/clothing/proc/refit_for_species(var/target_species)
+	if(!species_restricted)
+		return //this item doesn't use the species_restricted system
+
 	//Set species_restricted list
 	switch(target_species)
 		if("Human", "Skrell")	//humanoid bodytypes
@@ -63,6 +66,9 @@
 		icon = initial(icon)

 /obj/item/clothing/head/helmet/refit_for_species(var/target_species)
+	if(!species_restricted)
+		return //this item doesn't use the species_restricted system
+	
 	//Set species_restricted list
 	switch(target_species)
 		if("Skrell")
@@ -225,7 +231,7 @@ BLIND     // can't see anything
 		user.visible_message("\red [user] cuts the fingertips off of the [src].","\red You cut the fingertips off of the [src].")

 		clipped = 1
-		name = "mangled [name]"
+		name = "modified [name]"
 		desc = "[desc]<br>They have had the fingertips cut off of them."
 		if("exclude" in species_restricted)
 			species_restricted -= "Unathi"
@@ -365,7 +371,6 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/suits.dmi'
 	name = "suit"
 	var/fire_resist = T0C+100
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -386,7 +391,6 @@ BLIND     // can't see anything
 	name = "under"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	permeability_coefficient = 0.90
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_ICLOTHING
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	w_class = 3
@@ -531,7 +535,7 @@ BLIND     // can't see anything
 		else
 			body_parts_covered = initial(body_parts_covered)
 			item_color = initial(item_color)
-		
+
 		update_clothing_icon()
 	else
 		usr << "<span class='notice'>You cannot roll down the uniform!</span>"
@@ -1,87 +0,0 @@
-/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user)
-	if(istype(src, /obj/item/clothing/gloves/boxing))			//quick fix for stunglove overlay not working nicely with boxing gloves.
-		user << "<span class='notice'>That won't work.</span>"	//i'm not putting my lips on that!
-		..()
-		return
-
-	//add wires
-	if(istype(W, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = W
-		if (clipped)
-			user << "<span class='notice'>The [src] are too badly mangled for wiring.</span>"
-			return
-
-		if(wired)
-			user << "<span class='notice'>The [src] are already wired.</span>"
-			return
-
-		if(C.get_amount() < 2)
-			user << "<span class='notice'>There is not enough wire to cover the [src].</span>"
-			return
-
-		C.use(2)
-		wired = 1
-		siemens_coefficient = 3.0
-		user << "<span class='notice'>You wrap some wires around the [src].</span>"
-		update_icon()
-		return
-
-	//add cell
-	else if(istype(W, /obj/item/weapon/cell))
-		if(!wired)
-			user << "<span class='notice'>The [src] need to be wired first.</span>"
-		else if(!cell)
-			user.drop_item()
-			W.loc = src
-			cell = W
-			user << "<span class='notice'>You attach the [cell] to the [src].</span>"
-			update_icon()
-		else
-			user << "<span class='notice'>A [cell] is already attached to the [src].</span>"
-		return
-
-	else if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
-
-		//stunglove stuff
-		if(cell)
-			cell.updateicon()
-			user << "<span class='notice'>You cut the [cell] away from the [src].</span>"
-			cell.loc = get_turf(src.loc)
-			cell = null
-			update_icon()
-			return
-		if(wired) //wires disappear into the void because fuck that shit
-			wired = 0
-			siemens_coefficient = initial(siemens_coefficient)
-			user << "<span class='notice'>You cut the wires away from the [src].</span>"
-			update_icon()
-			return
-
-		//clipping fingertips
-		if(!clipped)
-			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
-			user.visible_message("\red [user] cuts the fingertips off of the [src].","\red You cut the fingertips off of the [src].")
-
-			clipped = 1
-			name = "mangled [name]"
-			desc = "[desc]<br>They have had the fingertips cut off of them."
-			if("exclude" in species_restricted)
-				species_restricted -= "Unathi"
-				species_restricted -= "Tajara"
-			return
-		else
-			user << "<span class='notice'>The [src] have already been clipped!</span>"
-			update_icon()
-			return
-
-		return
-
-	..()
-
-/obj/item/clothing/gloves/update_icon()
-	..()
-	overlays.Cut()
-	if(wired)
-		overlays += "gloves_wire"
-	if(cell)
-		overlays += "gloves_cell"
@@ -2,7 +2,6 @@
 	name = "hard hat"
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
 	icon_state = "hardhat0_yellow"
-	flags = FPRINT | TABLEPASS
 	item_state = "hardhat0_yellow"
 	brightness_on = 4 //luminosity when on
 	light_overlay = "hardhat_light"
@@ -21,7 +20,7 @@
 	item_state = "hardhat0_red"
 	item_color = "red"
 	name = "firefighter helmet"
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE

@@ -29,7 +28,7 @@
 	icon_state = "hardhat0_white"
 	item_state = "hardhat0_white"
 	item_color = "white"
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE

@@ -2,7 +2,7 @@
 	name = "helmet"
 	desc = "Standard Security gear. Protects the head from impacts."
 	icon_state = "helmet"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | THICKMATERIAL
+	flags = HEADCOVERSEYES | THICKMATERIAL
 	item_state = "helmet"
 	armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
@@ -39,7 +39,7 @@
 	desc = "It's a helmet specifically designed to protect against close range attacks."
 	icon_state = "riot"
 	item_state = "helmet"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
@@ -48,7 +48,7 @@
 	name = "\improper SWAT helmet"
 	desc = "They're often used by highly trained Swat Members."
 	icon_state = "swat"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	item_state = "swat"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
@@ -60,7 +60,7 @@
 	name = "\improper Thunderdome helmet"
 	desc = "<i>'Let the battle commence!'</i>"
 	icon_state = "thunderdome"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	item_state = "thunderdome"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
 	cold_protection = HEAD
@@ -71,7 +71,7 @@
 	name = "gladiator helmet"
 	desc = "Ave, Imperator, morituri te salutant."
 	icon_state = "gladiator"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	item_state = "gladiator"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 1
@@ -81,7 +81,7 @@
 	desc = "An armored helmet capable of being fitted with a multitude of attachments."
 	icon_state = "swathelm"
 	item_state = "helmet"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	sprite_sheets = list(
 		"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
@@ -95,7 +95,7 @@
 	name = "Augment Array"
 	desc = "A helmet with optical and cranial augments coupled to it."
 	icon_state = "v62"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	item_state = "v62"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
@@ -6,7 +6,6 @@
 	icon_state = "chefhat"
 	item_state = "chefhat"
 	desc = "The commander in chef's head wear."
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 //Captain: This probably shouldn't be space-worthy
@@ -14,7 +13,6 @@
 	name = "captain's hat"
 	icon_state = "captain"
 	desc = "It's good being the king."
-	flags = FPRINT|TABLEPASS
 	item_state = "caphat"
 	siemens_coefficient = 0.9

@@ -23,7 +21,6 @@
 	name = "captain's cap"
 	desc = "You fear to wear it for the negligence it brings."
 	icon_state = "capcap"
-	flags = FPRINT|TABLEPASS
 	flags_inv = 0
 	body_parts_covered = 0
 	cold_protection = HEAD
@@ -36,7 +33,7 @@
 	name = "chaplain's hood"
 	desc = "It's hood that covers the head. It keeps you warm during the space winters."
 	icon_state = "chaplain_hood"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR
+	flags = HEADCOVERSEYES|BLOCKHAIR
 	siemens_coefficient = 0.9
 	body_parts_covered = HEAD|EYES

@@ -45,7 +42,7 @@
 	name = "nun hood"
 	desc = "Maximum piety in this star system."
 	icon_state = "nun_hood"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR
+	flags = HEADCOVERSEYES|BLOCKHAIR
 	siemens_coefficient = 0.9

 //Mime
@@ -53,7 +50,6 @@
 	name = "beret"
 	desc = "A beret, an artists favorite headwear."
 	icon_state = "beret"
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9
 	body_parts_covered = 0

@@ -62,32 +58,26 @@
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
 	icon_state = "beret_badge"
-	flags = FPRINT | TABLEPASS
 /obj/item/clothing/head/beret/sec/alt
 	name = "officer beret"
 	desc = "A navy blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "officerberet"
-	flags = FPRINT | TABLEPASS
 /obj/item/clothing/head/beret/sec/hos
 	name = "officer beret"
 	desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "hosberet"
-	flags = FPRINT | TABLEPASS
 /obj/item/clothing/head/beret/sec/warden
 	name = "warden beret"
 	desc = "A navy blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "wardenberet"
-	flags = FPRINT | TABLEPASS
 /obj/item/clothing/head/beret/eng
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
 	icon_state = "e_beret_badge"
-	flags = FPRINT | TABLEPASS
 /obj/item/clothing/head/beret/jan
 	name = "purple beret"
 	desc = "A stylish, if purple, beret."
 	icon_state = "purpleberet"
-	flags = FPRINT | TABLEPASS


 //Medical
@@ -95,7 +85,7 @@
 	name = "surgical cap"
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
 	icon_state = "surgcap_blue"
-	flags = FPRINT | TABLEPASS | BLOCKHEADHAIR
+	flags = BLOCKHEADHAIR

 /obj/item/clothing/head/surgery/purple
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."
@@ -4,7 +4,6 @@
 	name = "\improper CentComm. hat"
 	icon_state = "centcom"
 	desc = "It's good to be emperor."
-	flags = FPRINT|TABLEPASS
 	item_state = "centhat"
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
@@ -14,7 +13,6 @@
 	icon_state = "hairflower"
 	desc = "Smells nice."
 	item_state = "hairflower"
-	flags = FPRINT|TABLEPASS
 	slot_flags = SLOT_HEAD | SLOT_EARS
 	body_parts_covered = 0

@@ -29,7 +27,6 @@
 	desc = "It's an amish looking hat."
 	icon_state = "tophat"
 	item_state = "that"
-	flags = FPRINT|TABLEPASS
 	siemens_coefficient = 0.9
 	body_parts_covered = 0

@@ -37,21 +34,18 @@
 	name = "redcoat's hat"
 	icon_state = "redcoat"
 	desc = "<i>'I guess it's a redhead.'</i>"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = 0

 /obj/item/clothing/head/mailman
 	name = "station cap"
 	icon_state = "mailman"
 	desc = "<i>Choo-choo</i>!"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = 0

 /obj/item/clothing/head/plaguedoctorhat
 	name = "plague doctor's hat"
 	desc = "These were once used by Plague doctors. They're pretty much useless."
 	icon_state = "plaguedoctor"
-	flags = FPRINT | TABLEPASS
 	permeability_coefficient = 0.01
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
@@ -60,14 +54,13 @@
 	name = "hastur's hood"
 	desc = "It's unspeakably stylish"
 	icon_state = "hasturhood"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR
+	flags = HEADCOVERSEYES|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES

 /obj/item/clothing/head/nursehat
 	name = "nurse's hat"
 	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
-	flags = FPRINT|TABLEPASS
 	siemens_coefficient = 0.9
 	body_parts_covered = 0

@@ -76,7 +69,7 @@
 	icon_state = "syndicate"
 	item_state = "syndicate"
 	desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	siemens_coefficient = 2.0
 	body_parts_covered = HEAD|FACE|EYES
@@ -85,7 +78,7 @@
 	name = "cueball helmet"
 	desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
 	icon_state = "cueball"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	item_state="cueball"
 	flags_inv = 0
 	body_parts_covered = HEAD|FACE|EYES
@@ -95,7 +88,6 @@
 	desc = "It's a green bandana with some fine nanotech lining."
 	icon_state = "greenbandana"
 	item_state = "greenbandana"
-	flags = FPRINT|TABLEPASS
 	flags_inv = 0
 	body_parts_covered = 0

@@ -104,7 +96,7 @@
 	desc = "A helmet made out of a box."
 	icon_state = "cardborg_h"
 	item_state = "cardborg_h"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH
+	flags = HEADCOVERSEYES | HEADCOVERSMOUTH
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = HEAD|FACE|EYES

@@ -113,7 +105,7 @@
 	desc = "fight for what's righteous!"
 	icon_state = "justicered"
 	item_state = "justicered"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR

 /obj/item/clothing/head/justice/blue
 	icon_state = "justiceblue"
@@ -135,7 +127,6 @@
 	name = "rabbit ears"
 	desc = "Wearing these makes you looks useless, and only good for your sex appeal."
 	icon_state = "bunny"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = 0

 /obj/item/clothing/head/flatcap
@@ -170,7 +161,6 @@
 	desc = "Gentleman, elite aboard!"
 	icon_state = "bowler"
 	item_state = "bowler"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = 0

 //stylish bs12 hats
@@ -180,7 +170,6 @@
 	icon_state = "bowler_hat"
 	item_state = "bowler_hat"
 	desc = "For the gentleman of distinction."
-	flags = FPRINT|TABLEPASS
 	body_parts_covered = 0

 /obj/item/clothing/head/beaverhat
@@ -188,35 +177,30 @@
 	icon_state = "beaver_hat"
 	item_state = "beaver_hat"
 	desc = "Soft felt makes this hat both comfortable and elegant."
-	flags = FPRINT|TABLEPASS

 /obj/item/clothing/head/boaterhat
 	name = "boater hat"
 	icon_state = "boater_hat"
 	item_state = "boater_hat"
 	desc = "The ultimate in summer fashion."
-	flags = FPRINT|TABLEPASS

 /obj/item/clothing/head/fedora
 	name = "\improper fedora"
 	icon_state = "fedora"
 	item_state = "fedora"
 	desc = "A sharp, stylish hat."
-	flags = FPRINT|TABLEPASS

 /obj/item/clothing/head/feathertrilby
 	name = "\improper feather trilby"
 	icon_state = "feather_trilby"
 	item_state = "feather_trilby"
 	desc = "A sharp, stylish hat with a feather."
-	flags = FPRINT|TABLEPASS

 /obj/item/clothing/head/fez
 	name = "\improper fez"
 	icon_state = "fez"
 	item_state = "fez"
 	desc = "You should wear a fez. Fezzes are cool."
-	flags = FPRINT|TABLEPASS

 //end bs12 hats

@@ -225,7 +209,7 @@
 	desc = "Eeeee~heheheheheheh!"
 	icon_state = "witch"
 	item_state = "witch"
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	siemens_coefficient = 2.0

 /obj/item/clothing/head/chicken
@@ -233,7 +217,7 @@
 	desc = "Bkaw!"
 	icon_state = "chickenhead"
 	item_state = "chickensuit"
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	siemens_coefficient = 0.7
 	body_parts_covered = HEAD|FACE|EYES

@@ -242,7 +226,7 @@
 	desc = "Fuzzy."
 	icon_state = "bearpelt"
 	item_state = "bearpelt"
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	siemens_coefficient = 0.7

 /obj/item/clothing/head/xenos
@@ -250,7 +234,7 @@
 	icon_state = "xenos"
 	item_state = "xenos_helm"
 	desc = "A helmet made out of chitinous alien hide."
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	siemens_coefficient = 2.0
 	body_parts_covered = HEAD|FACE|EYES
@@ -260,7 +244,7 @@
 	desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
 	icon_state = "philosopher_wig"
 	item_state = "philosopher_wig"
-	flags = FPRINT | TABLEPASS | BLOCKHAIR
+	flags = BLOCKHAIR
 	siemens_coefficient = 2.0 //why is it so conductive?!
 	body_parts_covered = 0

@@ -15,7 +15,7 @@
 	name = "welding helmet"
 	desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
 	icon_state = "welding"
-	flags = (FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH)
+	flags = HEADCOVERSEYES | HEADCOVERSMOUTH
 	item_state = "welding"
 	matter = list("metal" = 3000, "glass" = 1000)
 	var/up = 0
@@ -58,7 +58,7 @@
 	name = "cake-hat"
 	desc = "It's tasty looking!"
 	icon_state = "cake0"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	var/onfire = 0.0
 	var/status = 0
 	var/fire_resist = T0C+1300	//this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
@@ -123,7 +123,7 @@
 	icon_state = "hardhat0_pumpkin"//Could stand to be renamed
 	item_state = "hardhat0_pumpkin"
 	item_color = "pumpkin"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = HEAD|EYES
 	brightness_on = 2
@@ -137,7 +137,6 @@
 	name = "kitty ears"
 	desc = "A pair of kitty ears. Meow!"
 	icon_state = "kitty"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = 0
 	var/icon/mob
 	var/icon/mob2
@@ -2,7 +2,7 @@
 	name = "cargo cap"
 	desc = "It's a baseball hat in a tasteless yellow color."
 	icon_state = "cargosoft"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	item_state = "helmet"
 	item_color = "cargo"
 	var/flipped = 0
@@ -3,7 +3,7 @@
 	desc = "LOADSAMONEY"
 	icon_state = "balaclava"
 	item_state = "balaclava"
-	flags = FPRINT|TABLEPASS|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 	body_parts_covered = FACE
 	w_class = 2
@@ -17,7 +17,7 @@
 	desc = "Designed to both hide identities and keep your face comfy and warm."
 	icon_state = "swatclava"
 	item_state = "balaclava"
-	flags = FPRINT|TABLEPASS|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 	w_class = 2
 	sprite_sheets = list(
@@ -30,7 +30,7 @@
 	desc = "Worn by robust fighters, flying high to defeat their foes!"
 	icon_state = "luchag"
 	item_state = "luchag"
-	flags = FPRINT|TABLEPASS|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 	body_parts_covered = HEAD|FACE
 	w_class = 2
@@ -3,7 +3,7 @@
 	name = "breath mask"
 	icon_state = "breath"
 	item_state = "breath"
-	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | AIRTIGHT
+	flags = MASKCOVERSMOUTH | AIRTIGHT
 	body_parts_covered = 0
 	w_class = 2
 	gas_transfer_coefficient = 0.10
@@ -2,7 +2,7 @@
 	name = "gas mask"
 	desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air."
 	icon_state = "gas_alt"
-	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
+	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = FACE|EYES
 	w_class = 3.0
@@ -3,7 +3,7 @@
 	desc = "To stop that awful noise."
 	icon_state = "muzzle"
 	item_state = "muzzle"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	body_parts_covered = 0
 	w_class = 2
 	gas_transfer_coefficient = 0.90
@@ -20,7 +20,7 @@
 	icon_state = "sterile"
 	item_state = "sterile"
 	w_class = 2
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	body_parts_covered = 0
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.01
@@ -30,7 +30,6 @@
 	name = "fake moustache"
 	desc = "Warning: moustache is fake."
 	icon_state = "fake-moustache"
-	flags = FPRINT|TABLEPASS
 	flags_inv = HIDEFACE
 	body_parts_covered = 0

@@ -38,7 +37,6 @@
 	name = "Snorkel"
 	desc = "For the Swimming Savant."
 	icon_state = "snorkel"
-	flags = FPRINT|TABLEPASS
 	flags_inv = HIDEFACE
 	body_parts_covered = 0

@@ -49,7 +47,7 @@
 	desc = "A blue neck scarf."
 	icon_state = "blueneckscarf"
 	item_state = "blueneckscarf"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90

@@ -58,7 +56,7 @@
 	desc = "A red and white checkered neck scarf."
 	icon_state = "redwhite_scarf"
 	item_state = "redwhite_scarf"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90

@@ -67,7 +65,7 @@
 	desc = "A green neck scarf."
 	icon_state = "green_scarf"
 	item_state = "green_scarf"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90

@@ -76,7 +74,7 @@
 	desc = "A stealthy, dark scarf."
 	icon_state = "ninja_scarf"
 	item_state = "ninja_scarf"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
 	siemens_coefficient = 0
@@ -86,7 +84,7 @@
 	desc = "A rubber pig mask."
 	icon_state = "pig"
 	item_state = "pig"
-	flags = FPRINT|TABLEPASS|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 	w_class = 2
 	siemens_coefficient = 0.9
@@ -97,7 +95,7 @@
 	desc = "A mask made of soft vinyl and latex, representing the head of a horse."
 	icon_state = "horsehead"
 	item_state = "horsehead"
-	flags = FPRINT|TABLEPASS|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 	body_parts_covered = HEAD|FACE|EYES
 	w_class = 2
@@ -4,7 +4,7 @@
 	icon_state = "capspace"
 	item_state = "capspacehelmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
 	flags_inv = HIDEFACE
 	permeability_coefficient = 0.01
 	armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
@@ -18,7 +18,7 @@
 	w_class = 4
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
@@ -17,7 +17,7 @@
 	w_class = 4
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
@@ -34,7 +34,7 @@
 	icon_state = "deathsquad"
 	item_state = "deathsquad"
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60)
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
 	siemens_coefficient = 0.6

 /obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -42,7 +42,7 @@
 	desc = "An armored beret commonly used by special operations officers."
 	icon_state = "beret_badge"
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
 	siemens_coefficient = 0.9

 //Space santa outfit suit
@@ -50,7 +50,7 @@
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
 	body_parts_covered = HEAD

 /obj/item/clothing/suit/space/santa
@@ -59,7 +59,7 @@
 	icon_state = "santa"
 	item_state = "santa"
 	slowdown = 0
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE
 	allowed = list(/obj/item) //for stuffing exta special presents


@@ -70,7 +70,7 @@
 	icon_state = "pirate"
 	item_state = "pirate"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
 	body_parts_covered = 0
 	siemens_coefficient = 0.9

@@ -111,6 +111,16 @@
 	gun.Fire(target,holder.wearer)
 	return 1

+/obj/item/rig_module/mounted/egun
+
+	name = "mounted energy gun"
+	desc = "A forearm-mounted energy projector."
+
+	interface_name = "mounted energy gun"
+	interface_desc = "A forearm-mounted suit-powered energy gun."
+
+	gun_type = /obj/item/weapon/gun/energy/gun/mounted
+
 /obj/item/rig_module/mounted/taser

 	name = "mounted taser"
@@ -124,7 +134,7 @@
 	interface_name = "mounted energy gun"
 	interface_desc = "A shoulder-mounted cell-powered energy gun."

-	gun_type = /obj/item/weapon/gun/energy/gun/mounted
+	gun_type = /obj/item/weapon/gun/energy/taser/mounted

 /obj/item/rig_module/mounted/energy_blade

@@ -334,6 +334,7 @@

 	var/atom/interfaced_with // Currently draining power from this device.
 	var/total_power_drained = 0
+	var/drain_loc

 /obj/item/rig_module/power_sink/deactivate()

@@ -373,6 +374,7 @@

 	H << "<span class = 'danger'>You begin draining power from [target]!</span>"
 	interfaced_with = target
+	drain_loc = interfaced_with.loc

 	holder.spark_system.start()
 	playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1)
@@ -406,7 +408,7 @@
 		drain_complete(H)
 		return

-	if(!interfaced_with || !interfaced_with.Adjacent(H))
+	if(!interfaced_with || !interfaced_with.Adjacent(H) || !(interfaced_with.loc == drain_loc))
 		H << "<span class = 'warning'>Your power sink retracts into its casing.</span>"
 		drain_complete(H)
 		return
@@ -427,8 +429,6 @@
 	holder.cell.give(target_drained * CELLRATE)
 	total_power_drained += target_drained

-
-
 	return 1

 /obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M)
@@ -439,5 +439,6 @@
 		if(M) M << "<font color='blue'><b>Total power drained from [interfaced_with]:</b> [round(total_power_drained/1000)]kJ.</font>"
 		interfaced_with.drain_power(0,1,0) // Damage the victim.

+	drain_loc = null
 	interfaced_with = null
 	total_power_drained = 0
@@ -147,6 +147,14 @@
 		usr << "<span class='warning'>The suit is not initialized.</span>"
 		return 0

+	if(usr.lying || usr.stat || usr.stunned || usr.paralysis)
+		usr << "<span class='warning'>You cannot use the suit in this state.</span>"
+		return 0
+
+	if(holder.wearer && holder.wearer.lying)
+		usr << "<span class='warning'>The suit cannot function while the wearer is prone.</span>"
+		return 0
+
 	if(holder.security_check_enabled && !holder.check_suit_access(usr))
 		usr << "<span class='danger'>Access denied.</span>"
 		return
@@ -19,6 +19,7 @@
 	use_power_cost = 5
 	active_power_cost = 1
 	passive_power_cost = 0
+	module_cooldown = 30

 	activate_string = "Enable Cloak"
 	deactivate_string = "Disable Cloak"
@@ -0,0 +1,51 @@
+//Weapon types intended to be used with rig modules
+
+/obj/item/weapon/gun/energy/lasercannon/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				in_chamber = new /obj/item/projectile/beam/heavylaser(src)
+				return 1
+	return 0
+
+/obj/item/weapon/gun/energy/gun/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				var/prog_path = text2path(projectile_type)
+				in_chamber = new prog_path(src)
+				return 1
+	return 0
+
+/obj/item/weapon/gun/energy/taser/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				var/prog_path = text2path(projectile_type)
+				in_chamber = new prog_path(src)
+				return 1
+	return 0
@@ -251,13 +251,13 @@
 								else
 									helmet.flags &= ~AIRTIGHT
 								helmet.update_light(wearer)
-					
+
 					//sealed pieces become airtight, protecting against diseases
 					if (!seal_target)
 						piece.armor["bio"] = 100
 					else
 						piece.armor["bio"] = src.armor["bio"]
-					
+
 				else
 					failed_to_seal = 1

@@ -515,6 +515,8 @@
 		return

 	if(href_list["toggle_piece"])
+		if(ishuman(usr) && (usr.stat || usr.stunned || usr.lying))
+			return 0
 		toggle_piece(href_list["toggle_piece"], usr)
 	else if(href_list["toggle_seals"])
 		toggle_seals(usr)
@@ -543,7 +545,7 @@

 	usr.set_machine(src)
 	src.add_fingerprint(usr)
-	return
+	return 1

 /obj/item/weapon/rig/proc/notify_ai(var/message)
 	if(!message || !installed_modules || !installed_modules.len)
@@ -579,6 +581,9 @@
 	if(!istype(wearer) || !wearer.back == src)
 		return

+	if(usr == wearer && (usr.stat||usr.paralysis||usr.stunned)) // If the usr isn't wearing the suit it's probably an AI.
+		return
+
 	var/obj/item/check_slot
 	var/equip_to
 	var/obj/item/use_obj
@@ -180,7 +180,7 @@
 					installed_modules -= removed
 					update_icon()

-			return
+		return

 	// If we've gotten this far, all we have left to do before we pass off to root procs
 	// is check if any of the loaded modules want to use the item we've been given.
@@ -4,7 +4,7 @@

 /obj/item/clothing/head/helmet/space/rig
 	name = "helmet"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | THICKMATERIAL
+	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | THICKMATERIAL
 	flags_inv = 		 HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = HEAD|FACE|EYES
 	heat_protection =    HEAD|FACE|EYES
@@ -14,7 +14,7 @@

 /obj/item/clothing/gloves/rig
 	name = "gauntlets"
-	flags = FPRINT | TABLEPASS | THICKMATERIAL
+	flags = THICKMATERIAL
 	body_parts_covered = HANDS
 	heat_protection =    HANDS
 	cold_protection =    HANDS
@@ -36,7 +36,7 @@
 	heat_protection =    UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	cold_protection =    UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv =          HIDEJUMPSUIT|HIDETAIL
-	flags =              FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT
+	flags =              STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT
 	slowdown = 0
 	breach_threshold = 35
 	can_breach = 1
@@ -120,8 +120,8 @@

 /obj/item/weapon/rig/verb/toggle_seals_verb()

-	set name = "Toggle Seals"
-	set desc = "Activates or deactivates your rig seals."
+	set name = "Toggle Hardsuit"
+	set desc = "Activates or deactivates your rig."
 	set category = "Hardsuit"
 	set src = usr.contents

@@ -208,6 +208,8 @@
 	var/obj/item/rig_module/module = input("Which module do you wish to select?") as null|anything in selectable

 	if(!istype(module))
+		selected_module = null
+		usr << "<font color='blue'><b>Primary system is now: deselected.</b></font>"
 		return

 	selected_module = module
@@ -23,7 +23,6 @@
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/datajack,
-		/obj/item/rig_module/mounted
 		)

 /obj/item/weapon/rig/ert/engineer
@@ -62,5 +61,5 @@
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/grenade_launcher,
-		/obj/item/rig_module/mounted
+		/obj/item/rig_module/mounted/egun,
 		)
@@ -7,7 +7,7 @@
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell)
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	slowdown = 0
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
 	offline_slowdown = 0
 	offline_vision_restriction = 0

@@ -46,7 +46,7 @@

 /obj/item/clothing/head/helmet/space/rig/mask
 	name = "mask"
-	flags = FPRINT | TABLEPASS | THICKMATERIAL
+	flags = THICKMATERIAL

 /obj/item/weapon/rig/light/ninja
 	name = "ominous suit control module"
@@ -6,7 +6,7 @@
 	name = "Space helmet"
 	icon_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT
+	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT
 	item_state = "space"
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
@@ -53,7 +53,7 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)
 	slowdown = 3
@@ -55,6 +55,13 @@
 	var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
 	var/obj/item/clothing/head/helmet/helmet = null   // Deployable helmet, if any.

+/obj/item/clothing/suit/space/void/refit_for_species(var/target_species)
+	..()
+	if(istype(helmet))
+		helmet.refit_for_species(target_species)
+	if(istype(boots))
+		boots.refit_for_species(target_species)
+
 /obj/item/clothing/suit/space/void/equipped(mob/M)
 	..()

@@ -68,20 +75,15 @@
 	if(helmet)
 		if(H.head)
 			M << "You are unable to deploy your suit's helmet as \the [H.head] is in the way."
-		else
+		else if (H.equip_to_slot_if_possible(helmet, slot_head))
 			M << "Your suit's helmet deploys with a hiss."
-			//TODO: Species check, skull damage for forcing an unfitting helmet on?
-			helmet.loc = H
-			H.equip_to_slot(helmet, slot_head)
 			helmet.canremove = 0

 	if(boots)
 		if(H.shoes)
 			M << "You are unable to deploy your suit's magboots as \the [H.shoes] are in the way."
-		else
+		else if (H.equip_to_slot_if_possible(boots, slot_shoes))
 			M << "Your suit's boots deploy with a hiss."
-			boots.loc = H
-			H.equip_to_slot(boots, slot_shoes)
 			boots.canremove = 0

 /obj/item/clothing/suit/space/void/dropped()
@@ -132,12 +134,10 @@
 		if(H.head)
 			H << "<span class='danger'>You cannot deploy your helmet while wearing another helmet.</span>"
 			return
-		//TODO: Species check, skull damage for forcing an unfitting helmet on?
-		helmet.loc = H
-		helmet.pickup(H)
-		H.equip_to_slot(helmet, slot_head)
-		helmet.canremove = 0
-		H << "<font color='blue'><b>You deploy your suit helmet, sealing you off from the world.</b></font>"
+		if(H.equip_to_slot_if_possible(helmet, slot_head))
+			helmet.pickup(H)
+			helmet.canremove = 0
+			H << "<font color='blue'><b>You deploy your suit helmet, sealing you off from the world.</b></font>"
 	helmet.update_light(H)

 /obj/item/clothing/suit/space/void/attackby(obj/item/W as obj, mob/user as mob)
@@ -2,7 +2,7 @@
 /obj/item/clothing/suit/armor
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-	flags = FPRINT | TABLEPASS | THICKMATERIAL
+	flags = THICKMATERIAL

 	cold_protection = UPPER_TORSO|LOWER_TORSO
 	min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE
@@ -17,7 +17,7 @@
 	icon_state = "armor"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = ONESIZEFITSALL
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)

 /obj/item/clothing/suit/armor/vest/security
@@ -71,7 +71,7 @@
 	item_state = "swat_suit"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1
@@ -98,7 +98,7 @@
 	icon_state = "detective-armor"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)

@@ -113,7 +113,6 @@
 	item_state = "reactiveoff"
 	blood_overlay_type = "armor"
 	slowdown = 1
-	flags = FPRINT | TABLEPASS
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/suit/armor/reactive/IsShield()
@@ -4,7 +4,7 @@
 	icon_state = "bio"
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	body_parts_covered = HEAD|FACE|EYES
@@ -18,7 +18,6 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 1.0
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
@@ -36,7 +36,6 @@
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|ARMS


@@ -45,7 +44,6 @@
 	desc = "Yarr."
 	icon_state = "hgpirate"
 	item_state = "hgpirate"
-	flags = FPRINT | TABLEPASS
 	flags_inv = HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS

@@ -55,7 +53,7 @@
 	desc = "Suit for a cyborg costume."
 	icon_state = "death"
 	item_state = "death"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	fire_resist = T0C+5200
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

@@ -65,7 +63,6 @@
 	desc = "A heavy great coat"
 	icon_state = "nazi"
 	item_state = "nazi"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/suit/johnny_coat
@@ -73,7 +70,6 @@
 	desc = "Johnny~~"
 	icon_state = "johnny"
 	item_state = "johnny"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/suit/justice
@@ -81,7 +77,6 @@
 	desc = "This pretty much looks ridiculous."
 	icon_state = "justice"
 	item_state = "justice"
-	flags = FPRINT | TABLEPASS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET

@@ -91,7 +86,6 @@
 	desc = "This robe commands authority."
 	icon_state = "judge"
 	item_state = "judge"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash)
 	flags_inv = HIDEJUMPSUIT
@@ -120,7 +114,6 @@
 	item_state = "space_suit_syndicate"
 	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
 	w_class = 3
-	flags = FPRINT | TABLEPASS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
@@ -223,21 +216,18 @@
 	desc = "A long, thick black leather coat."
 	icon_state = "leathercoat"
 	item_state = "leathercoat"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/suit/browncoat
 	name = "brown leather coat"
 	desc = "A long, brown leather coat."
 	icon_state = "browncoat"
 	item_state = "browncoat"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/suit/neocoat
 	name = "black coat"
 	desc = "A flowing, black coat."
 	icon_state = "neocoat"
 	item_state = "neocoat"
-	flags = FPRINT | TABLEPASS

 //stripper
 /obj/item/clothing/under/stripper
@@ -361,7 +351,6 @@
 	desc = "A thick, well-worn WW2 leather bomber jacket."
 	icon_state = "bomber"
 	item_state = "bomber"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|ARMS
 	min_cold_protection_temperature = T0C - 20
@@ -21,7 +21,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
 	slowdown = 1.0
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = STOPSPRESSUREDMAGE
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
@@ -47,7 +47,7 @@
 	name = "bomb hood"
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	body_parts_covered = HEAD|FACE|EYES
@@ -62,7 +62,6 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS
 	slowdown = 2
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT|HIDETAIL
@@ -89,7 +88,7 @@
 	name = "Radiation Hood"
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)

@@ -3,7 +3,6 @@
 	icon_state = "black"
 	item_state = "bl_suit"
 	item_color = "black"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/blackf
 	name = "feminine black jumpsuit"
@@ -17,21 +16,18 @@
 	icon_state = "blue"
 	item_state = "b_suit"
 	item_color = "blue"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
 	item_state = "g_suit"
 	item_color = "green"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
 	item_state = "gy_suit"
 	item_color = "grey"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
@@ -41,35 +37,30 @@
 	item_color = "orange"
 	has_sensor = 2
 	sensor_mode = 3
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
 	item_state = "p_suit"
 	item_color = "pink"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
 	item_state = "r_suit"
 	item_color = "red"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
 	item_color = "white"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
 	item_state = "y_suit"
 	item_color = "yellow"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/psyche
 	name = "psychedelic jumpsuit"
@@ -88,7 +79,6 @@
 	desc = "aqua"
 	icon_state = "aqua"
 	item_color = "aqua"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/purple
 	name = "purple jumpsuit"
@@ -120,14 +110,12 @@
 	desc = "lightbrown"
 	icon_state = "lightbrown"
 	item_color = "lightbrown"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/brown
 	name = "brown jumpsuit"
 	desc = "brown"
 	icon_state = "brown"
 	item_color = "brown"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/yellowgreen
 	name = "yellowgreen jumpsuit"
@@ -140,7 +128,6 @@
 	desc = "darkblue"
 	icon_state = "darkblue"
 	item_color = "darkblue"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/lightred
 	name = "lightred jumpsuit"
@@ -153,4 +140,3 @@
 	desc = "darkred"
 	icon_state = "darkred"
 	item_color = "darkred"
-	flags = FPRINT | TABLEPASS
@@ -6,7 +6,6 @@
 	icon_state = "ba_suit"
 	item_state = "ba_suit"
 	item_color = "ba_suit"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -15,7 +14,6 @@
 	icon_state = "captain"
 	item_state = "caparmor"
 	item_color = "captain"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/cargo
@@ -32,7 +30,6 @@
 	icon_state = "cargotech"
 	item_state = "lb_suit"
 	item_color = "cargo"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS


@@ -42,7 +39,6 @@
 	icon_state = "chaplain"
 	item_state = "bl_suit"
 	item_color = "chapblack"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/chef
@@ -50,7 +46,6 @@
 	name = "chef's uniform"
 	icon_state = "chef"
 	item_color = "chef"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/clown
@@ -59,7 +54,6 @@
 	icon_state = "clown"
 	item_state = "clown"
 	item_color = "clown"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/head_of_personnel
@@ -68,7 +62,6 @@
 	icon_state = "hop"
 	item_state = "b_suit"
 	item_color = "hop"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/head_of_personnel_whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -76,7 +69,6 @@
 	icon_state = "hopwhimsy"
 	item_state = "hopwhimsy"
 	item_color = "hopwhimsy"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/hydroponics
@@ -86,7 +78,6 @@
 	item_state = "g_suit"
 	item_color = "hydroponics"
 	permeability_coefficient = 0.50
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/internalaffairs
@@ -95,7 +86,6 @@
 	icon_state = "internalaffairs"
 	item_state = "internalaffairs"
 	item_color = "internalaffairs"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/janitor
@@ -104,13 +94,11 @@
 	icon_state = "janitor"
 	item_color = "janitor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/lawyer
 	desc = "Slick threads."
 	name = "Lawyer suit"
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/lawyer/black
@@ -176,7 +164,6 @@
 	icon_state = "mime"
 	item_state = "mime"
 	item_color = "mime"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
@@ -6,7 +6,6 @@
 	item_state = "g_suit"
 	item_color = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -14,7 +13,6 @@
 	icon_state = "atmos"
 	item_state = "atmos_suit"
 	item_color = "atmos"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -23,7 +21,6 @@
 	item_state = "engi_suit"
 	item_color = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -8,7 +8,6 @@
 	item_state = "g_suit"
 	item_color = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/research_director/rdalt
 	desc = "A dress suit and slacks stained with hard work and dedication to science. Perhaps other things as well, but mostly hard work and dedication."
@@ -17,7 +16,6 @@
 	item_state = "rdalt"
 	item_color = "rdalt"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/research_director/dress_rd
 	name = "research director dress uniform"
@@ -25,7 +23,6 @@
 	icon_state = "dress_rd"
 	item_color = "dress_rd"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

 /obj/item/clothing/under/rank/scientist
@@ -36,7 +33,6 @@
 	item_color = "sciencewhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/chemist
@@ -68,7 +64,6 @@
 	item_color = "geneticswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/virologist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -116,28 +111,24 @@
 	item_color = "medical"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
 	icon_state = "scrubsblue"
 	item_color = "scrubsblue"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/medical/green
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
 	icon_state = "scrubsgreen"
 	item_color = "scrubsgreen"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/medical/purple
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
 	icon_state = "scrubspurple"
 	item_color = "scrubspurple"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/psych
 	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
@@ -145,7 +136,6 @@
 	icon_state = "psych"
 	item_state = "w_suit"
 	item_color = "psych"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/psych/turtleneck
 	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
@@ -153,7 +143,6 @@
 	icon_state = "psychturtle"
 	item_state = "b_suit"
 	item_color = "psychturtle"
-	flags = FPRINT | TABLEPASS


 /*
@@ -15,7 +15,6 @@
 	item_state = "r_suit"
 	item_color = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 /obj/item/clothing/under/rank/security
@@ -25,7 +24,6 @@
 	item_state = "r_suit"
 	item_color = "secred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 /obj/item/clothing/under/rank/dispatch
@@ -35,7 +33,6 @@
 	item_state = "dispatch"
 	item_color = "dispatch"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 	siemens_coefficient = 0.9

@@ -46,7 +43,6 @@
 	item_state = "r_suit"
 	item_color = "redshirt2"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 /obj/item/clothing/under/rank/security/corp
@@ -66,7 +62,6 @@
 	item_state = "swatunder"
 	item_color = "swatunder"
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 /*
@@ -79,7 +74,6 @@
 	item_state = "det"
 	item_color = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.9

 /obj/item/clothing/under/det/black
@@ -122,7 +116,6 @@
 	item_state = "r_suit"
 	item_color = "hosred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 	siemens_coefficient = 0.8

 /obj/item/clothing/under/rank/head_of_security/corp
@@ -134,7 +127,7 @@
 	name = "Head of Security Hat"
 	desc = "The hat of the Head of Security. For showing the officers who's in charge."
 	icon_state = "hoscap"
-	flags = FPRINT | TABLEPASS | HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
 	flags_inv = HIDEEARS
 	body_parts_covered = 0
@@ -31,7 +31,6 @@
 	name = "amish suit"
 	icon_state = "sl_suit"
 	item_color = "sl_suit"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/waiter
 	name = "waiter's outfit"
@@ -39,7 +38,6 @@
 	icon_state = "waiter"
 	item_state = "waiter"
 	item_color = "waiter"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/mailman
 	name = "mailman's jumpsuit"
@@ -93,7 +91,6 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected.
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -106,7 +103,6 @@
 	desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
@@ -118,7 +114,6 @@
 	desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
 	icon_state = "owl"
 	item_color = "owl"
-	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/johnny
 	name = "johnny~~ jumpsuit"
@@ -2,7 +2,6 @@
 	name = "athletic shorts"
 	desc = "95% Polyester, 5% Spandex!"
 	gender = PLURAL
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = LOWER_TORSO

 /obj/item/clothing/under/shorts/red
@@ -5,7 +5,6 @@
 	icon_state = "bluetie"
 	item_state = ""	//no inhands
 	item_color = "bluetie"
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_TIE
 	w_class = 2.0
 	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
@@ -407,7 +407,6 @@
 	item_state = "ciglit"
 	w_class = 1
 	body_parts_covered = null
-	flags = FPRINT|TABLEPASS

 //Strange penlight, Nerezza: Asher Spock

@@ -787,7 +786,6 @@
 	name = "colonial marine beret"
 	desc = "A well-worn navy blue beret. The insignia of the Martian Colonial Marine Corps is affixed to the front."
 	icon_state = "officerberet"
-	flags = FPRINT | TABLEPASS

 ////////////////////////////// Serithi - Adapted Security Helmet //////////////////////////////

@@ -841,7 +839,6 @@

 /obj/item/weapon/reagent_containers/glass/bottle/fluff/nashi_bottle
 	icon = 'icons/obj/chemical.dmi'
-	flags = FPRINT | TABLEPASS //Starting them with lids on them.  Safety first!
 	New(loc, var/color, var/labeled)
 		..()
 		name = "[labeled] bottle"
@@ -1073,7 +1070,6 @@
 	item_color = "jane_sid_suit"
 	has_sensor = 2
 	sensor_mode = 3
-	flags = FPRINT | TABLEPASS

 //Suit roll-down toggle.
 /obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
@@ -1137,7 +1133,6 @@
 	icon_state = "radi_pendant"
 	item_state = "radi_pendant"
 	item_color = "radi_pendant"
-	flags = FPRINT|TABLEPASS
 	w_class = 2.0

 //////////// Masks ////////////
@@ -1149,7 +1144,7 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "flagmask"
 	item_state = "flagmask"
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	flags = MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
 */
@@ -1159,7 +1154,6 @@
 	desc = "A silver and emerald shamrock pendant. It has the initials \"M.K.\" engraved on the back."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "mara_kilpatrick_1"
-	flags = FPRINT|TABLEPASS
 	w_class = 2

 /////////////// Oen'g Issek Medical Mask //////////////////////////
@@ -1182,7 +1176,6 @@
 	item_state = "altair_locket"
 	item_color = "altair_locket"
 	slot_flags = 0
-	flags = FPRINT|TABLEPASS
 	w_class = 2
 	slot_flags = SLOT_MASK | SLOT_TIE

@@ -1196,7 +1189,6 @@
 	item_state = "konaahirano"
 	item_color = "konaahirano"
 	slot_flags = 0
-	flags = FPRINT|TABLEPASS
 	w_class = 2
 	slot_flags = SLOT_MASK | SLOT_TIE
 	var/obj/item/held //Item inside locket.
@@ -1226,7 +1218,6 @@
 	desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "nasir_khayyam_1"
-	flags = FPRINT|TABLEPASS
 	w_class = 2
 	slot_flags = SLOT_MASK | SLOT_TIE

@@ -1237,7 +1228,6 @@
 	desc = "A brass necklace with a green emerald placed at the end. It has a small inscription on the top of the chain, saying \'Foster\'"
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "ty_foster"
-	flags = FPRINT|TABLEPASS
 	w_class = 2

 ////// Apollon Pendant - Michael Guess - Dragor23
@@ -1246,7 +1236,6 @@
 	desc = "A pendant with the form of a sacrificial tripod, used in acient greece. It's a symbol of the Olympian Apollon, a god associated with oracles, poetry, the sun and healing."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "michael_guess_1"
-	flags = FPRINT|TABLEPASS
 	w_class = 2
 	slot_flags = SLOT_MASK
 	body_parts_covered = 0
@@ -122,6 +122,18 @@
 	throw_speed = 3
 	throw_range = 5

+/obj/item/weapon/f_card/add_fingerprint(mob/living/M as mob, ignoregloves = 0)
+	if(..())
+		var/mob/living/carbon/human/H = M
+		var/full_print = md5(H.dna.uni_identity)
+		fingerprints[full_print] = full_print
+
+/obj/item/weapon/f_card/examine(mob/user)
+	..()
+	if(fingerprints.len)
+		user << "<span class='notice'>Fingerprints on this card:</span>"
+		for(var/print in fingerprints)
+			user << "<span class='notice'>\t[fingerprints[print]]</span>"

 /obj/item/weapon/fcardholder
 	name = "fingerprint card case"
@@ -23,7 +23,7 @@
 	possible_transfer_amounts = list(5)
 	volume = 5
 	can_be_placed_into = null
-	flags = FPRINT | TABLEPASS | OPENCONTAINER | NOBLUDGEON
+	flags = OPENCONTAINER | NOBLUDGEON

 /obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
 	return
@@ -70,4 +70,12 @@ atom/proc/add_fibers(mob/living/carbon/human/M)
 	fields["blood"] = blood

 	fields["area"] = other.fields["area"]
-	fields["time"] = other.fields["time"]
+	fields["time"] = other.fields["time"]
+
+/datum/data/record/forensic/proc/update_prints(var/list/o_prints)
+	var/list/prints = fields["fprints"]
+	for(var/print in o_prints)
+		if(prints[print])
+			prints[print] = stringmerge(prints[print], o_prints[print])
+			.=1
+	fields["fprints"] = prints
@@ -5,7 +5,7 @@
 	var/list/stored = list()
 	w_class = 3.0
 	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
+	flags = CONDUCT | NOBLUDGEON
 	slot_flags = SLOT_BELT

 /obj/item/device/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
@@ -104,4 +104,12 @@
 	if(old)
 		fresh.merge(old)
 		. = 1
-	stored["\ref [A]"] = fresh
+	stored["\ref [A]"] = fresh
+
+/obj/item/device/detective_scanner/verb/wipe()
+	set name = "Wipe Forensic Data"
+	set category = "Object"
+	set src in view(1)
+	if (alert("Are you sure you want to wipe all data from [src]?",,"Yes","No") == "Yes")
+		stored = list()
+		usr << "<span class='notice'>Forensic data erase complete.</span>"
@@ -59,17 +59,23 @@
 		fresh.fields["label"] = old.fields["label"]
 	files[fresh.uid] = fresh

+	//updating partial prints on other things
+	var/list/fprints = fresh.fields["fprints"]
+	if(fprints.len)
+		for(var/id in files)
+			var/datum/data/record/forensic/rec = files[id]
+			if(rec.update_prints(fprints))
+				files[id] = rec
+
 /obj/machinery/computer/forensic_scanning/proc/process_card(var/obj/item/weapon/f_card/card)
 	if(card.fingerprints)
 		usr << "<span class='notice'>\The [src] sucks in \the [card] and whirrs, scanning it.</span>"
 		var/found = 0
 		for(var/id in files)
 			var/datum/data/record/forensic/rec = files[id]
-			var/list/prints = rec.fields["fprints"]
-			for(var/master_print in card.fingerprints)
-				if(prints[master_print])
-					prints[master_print] = master_print
-					found = 1
+			found = rec.update_prints(card.fingerprints)
+			if (found)
+				files[id] = rec
 		if(found)
 			usr << "<span class='notice'>Complete match found.</span>"
 		else
@@ -189,7 +195,7 @@
 					dat += "<br>NO RECORD SELECTED"
 				else
 					dat += get_printable_data(current)
-					dat += "<b>Labels:</b> "
+					dat += "<br><b>Labels:</b> "
 					dat += "<a href='?src=\ref[src];operation=label'>[current.fields["label"] ? current.fields["label"] : "None"]</a><br>"
 					dat += "<a href='?src=\ref[src];operation=print'>Print record</a><br>"

@@ -302,4 +308,4 @@
 			ping("Scan complete.")
 			var/datum/data/record/forensic/fresh = new(scanning)
 			add_record(fresh)
-			updateUsrDialog()
+			updateUsrDialog()
@@ -40,7 +40,6 @@
 	icon = 'icons/obj/harvest.dmi'
 	icon_state = "logs"
 	force = 5
-	flags = TABLEPASS
 	throwforce = 5
 	w_class = 3.0
 	throw_speed = 3
@@ -71,7 +70,6 @@
 	icon_state = "sunflower"
 	damtype = "fire"
 	force = 0
-	flags = TABLEPASS
 	throwforce = 1
 	w_class = 1.0
 	throw_speed = 1
@@ -89,7 +87,6 @@
 	icon_state = "nettle"
 	damtype = "fire"
 	force = 15
-	flags = TABLEPASS
 	throwforce = 1
 	w_class = 2.0
 	throw_speed = 1
@@ -168,7 +168,7 @@
 /obj/item/weapon/plantspray
 	icon = 'icons/obj/hydroponics.dmi'
 	item_state = "spray"
-	flags = TABLEPASS | FPRINT | NOBLUDGEON
+	flags = NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 4
 	w_class = 2.0
@@ -220,7 +220,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "hoe"
 	item_state = "hoe"
-	flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
+	flags = CONDUCT | NOBLUDGEON
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
@@ -236,7 +236,6 @@
 	name = "bottle of weedkiller"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
-	flags = FPRINT |  TABLEPASS
 	var/toxicity = 0
 	var/weed_kill_str = 0

@@ -244,7 +243,6 @@
 	name = "bottle of glyphosate"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
-	flags = FPRINT |  TABLEPASS
 	toxicity = 4
 	weed_kill_str = 2

@@ -252,7 +250,6 @@
 	name = "bottle of triclopyr"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle18"
-	flags = FPRINT |  TABLEPASS
 	toxicity = 6
 	weed_kill_str = 4

@@ -260,7 +257,6 @@
 	name = "bottle of 2,4-D"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle15"
-	flags = FPRINT |  TABLEPASS
 	toxicity = 8
 	weed_kill_str = 7

@@ -274,7 +270,7 @@
 	desc = "A small glass bottle. Can hold up to 10 units."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
-	flags = FPRINT |  TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	possible_transfer_amounts = null
 	w_class = 2.0

@@ -314,7 +310,7 @@
 	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "hatchet"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	force = 12.0
 	w_class = 2.0
 	throwforce = 15.0
@@ -347,7 +343,7 @@
 	throw_speed = 1
 	throw_range = 3
 	w_class = 4.0
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = NOSHIELD
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -3,7 +3,6 @@
 	name = "packet of seeds"
 	icon = 'icons/obj/seeds.dmi'
 	icon_state = "seed"
-	flags = FPRINT | TABLEPASS
 	w_class = 2.0

 	var/seed_type
@@ -126,7 +126,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3		 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
-	flags = FPRINT | TABLEPASS
 	attack_verb = list("bashed", "whacked", "educated")
 	var/dat			 // Actual page content
 	var/due_date = 0 // Game time in 1/10th seconds
@@ -254,7 +253,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this
 	var/obj/item/weapon/book/book	 //  Currently scanned book
 	var/mode = 0 					// 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/items.dmi'
 	name = "Coin"
 	icon_state = "coin"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 0.0
 	throwforce = 0.0
 	w_class = 1.0
@@ -52,7 +52,7 @@
 	name = "pickaxe"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pickaxe"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 15.0
 	throwforce = 4.0
@@ -150,7 +150,7 @@
 	desc = "A large tool for digging and moving dirt."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "shovel"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 8.0
 	throwforce = 4.0
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/storage.dmi'
 	name = "Money bag"
 	icon_state = "moneybag"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 10.0
 	throwforce = 2.0
 	w_class = 4.0
@@ -40,8 +40,9 @@
 /mob/living/var/holder_type

 /mob/living/proc/get_scooped(var/mob/living/carbon/grabber)
-	if(!holder_type)
+	if(!holder_type || buckled || pinned.len)
 		return
+
 	var/obj/item/weapon/holder/H = new holder_type(loc)
 	src.loc = H
 	H.name = loc.name
@@ -7,6 +7,7 @@
 	pass_flags = PASSTABLE
 	health = 100
 	maxHealth = 100
+	mob_size = 4

 	var/adult_form
 	var/dead_icon
@@ -3,7 +3,6 @@
 	health = 400 //They need to live awhile longer than other organs.
 	desc = "A piece of juicy meat found in a person's head."
 	icon_state = "brain2"
-	flags = TABLEPASS
 	force = 1.0
 	w_class = 2.0
 	throwforce = 1.0
@@ -15,7 +15,7 @@ var/const/MAX_ACTIVE_TIME = 400
 	icon_state = "facehugger"
 	item_state = "facehugger"
 	w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
-	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
+	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
 	body_parts_covered = FACE|EYES
 	throw_range = 5

@@ -37,4 +37,5 @@

 	var/tod = null // Time of death
 	var/update_slimes = 1
-	var/silent = null 		//Can't talk. Value goes down every life proc.
+	var/silent = null 		// Can't talk. Value goes down every life proc.
+	var/mob_size            // Used by lockers.
@@ -7,10 +7,16 @@ var/datum/cameranet/cameranet = new()
 /datum/cameranet
 	// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
 	var/list/cameras = list()
+	var/cameras_unsorted = 1
 	// The chunks of the map, mapping the areas that the cameras can see.
 	var/list/chunks = list()
 	var/ready = 0

+/datum/cameranet/proc/process_sort()
+	if(cameras_unsorted)
+		cameras = dd_sortedObjectList(cameras)
+		cameras_unsorted = 0
+
 // Checks if a chunk has been Generated in x, y, z.
 /datum/cameranet/proc/chunkGenerated(x, y, z)
 	x &= ~0xf
@@ -92,7 +92,13 @@

 /obj/machinery/camera/New()
 	..()
-	cameranet.cameras += src //Camera must be added to global list of all cameras no matter what...
+	//Camera must be added to global list of all cameras no matter what...
+	if(cameranet.cameras_unsorted || !ticker)
+		cameranet.cameras += src
+		cameranet.cameras_unsorted = 1
+	else
+		dd_insertObjectList(cameranet.cameras, src)
+
 	var/list/open_networks = difflist(network,restricted_camera_networks) //...but if all of camera's networks are restricted, it only works for specific camera consoles.
 	if(open_networks.len) //If there is at least one open network, chunk is available for AI usage.
 		cameranet.addCamera(src)
@@ -59,7 +59,7 @@
 			src.sight |= SEE_MOBS
 			src.sight |= SEE_OBJS
 			src.see_in_dark = 8
-			src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+			src.see_invisible = SEE_INVISIBLE_LIVING


 			//Congratulations!  You've found a way for AI's to run without using power!
@@ -6,7 +6,7 @@
 	icon_state = "robotanalyzer"
 	item_state = "analyzer"
 	desc = "A hand-held scanner able to diagnose robotic injuries."
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
@@ -234,3 +234,7 @@
 			sight_mode |= module_state_3:sight_mode
 	else
 		src << "<span class='notice'>You need to disable a module first!</span>"
+
+/mob/living/silicon/robot/put_in_hands(var/obj/item/W) // No hands.
+	W.loc = get_turf(src)
+	return 1
@@ -4,7 +4,7 @@
 	icon_state = "std_module"
 	w_class = 100.0
 	item_state = "electronic"
-	flags = FPRINT|TABLEPASS | CONDUCT
+	flags = CONDUCT
 	var/channels = list()
 	var/list/modules = list()
 	var/obj/item/emag = null
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/apiary_bees_etc.dmi'
 	icon_state = "bees1"
 	icon_dead = "bees1"
+	mob_size = 1
 	var/strength = 1
 	var/feral = 0
 	var/mut = 0
@@ -129,6 +129,7 @@
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	attacktext = "smashed their armoured gauntlet into"
+	mob_size = 20
 	speed = 3
 	wall_smash = 1
 	attack_sound = 'sound/weapons/punch3.ogg'
@@ -259,6 +260,7 @@
 	speed = 5
 	wall_smash = 1
 	attack_sound = 'sound/weapons/punch4.ogg'
+	mob_size = 20
 	var/energy = 0
 	var/max_energy = 1000

@@ -22,6 +22,7 @@
 	minbodytemp = 223		//Below -50 Degrees Celcius
 	maxbodytemp = 323	//Above 50 Degrees Celcius
 	holder_type = /obj/item/weapon/holder/cat
+	mob_size = 5

 /mob/living/simple_animal/cat/Life()
 	//MICE!
@@ -50,7 +51,7 @@
 	if(turns_since_scan > 5)
 		walk_to(src,0)
 		turns_since_scan = 0
-		
+
 		if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
 			movement_target = null
 			stop_automated_movement = 0
@@ -68,7 +69,7 @@
 /mob/living/simple_animal/cat/MouseDrop(atom/over_object)

 	var/mob/living/carbon/H = over_object
-	if(!istype(H)) return ..()
+	if(!istype(H) || !Adjacent(H)) return ..()

 	if(H.a_intent == "help")
 		get_scooped(H)
@@ -18,6 +18,8 @@
 	response_disarm = "bops"
 	response_harm   = "kicks"
 	see_in_dark = 5
+	mob_size = 8
+
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
 	var/facehugger
@@ -17,6 +17,7 @@
 	response_harm   = "stomps"
 	stop_automated_movement = 1
 	friendly = "pinches"
+	mob_size = 5
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask

@@ -14,4 +14,5 @@
 	melee_damage_upper = 2
 	response_help  = "pets"
 	response_disarm = "shoos"
-	response_harm   = "stomps on"
+	response_harm   = "stomps on"
+	mob_size = 1
@@ -28,6 +28,7 @@
 	maxbodytemp = 323	//Above 50 Degrees Celcius
 	universal_speak = 0
 	universal_understand = 1
+	mob_size = 1

 /mob/living/simple_animal/mouse/Life()
 	..()
@@ -5,6 +5,7 @@
 	max_co2 = 0
 	minbodytemp = 0
 	maxbodytemp = 500
+	mob_size = 5

 	var/obj/item/device/radio/borg/radio = null
 	var/mob/living/silicon/ai/connected_ai = null
@@ -130,14 +130,14 @@
 		return 1
 	return 0

-//This is a SAFE proc. Use this instead of equip_to_splot()!
+//This is a SAFE proc. Use this instead of equip_to_slot()!
 //set del_on_fail to have it delete W if it fails to equip
 //set disable_warning to disable the 'you are unable to equip that' warning.
 //unset redraw_mob to prevent the mob from being redrawn at the end.
 /mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, del_on_fail = 0, disable_warning = 0, redraw_mob = 1)
 	if(!istype(W)) return 0

-	if(!W.mob_can_equip(src, slot, disable_warning))
+	if(!W.mob_can_equip(src, slot))
 		if(del_on_fail)
 			del(W)
 		else
@@ -1,7 +1,7 @@

 json_writer
 	proc
-		WriteObject(list/L)
+		WriteObject(list/L, cached_data = null)
 			. = "{"
 			var/i = 1
 			for(var/k in L)
@@ -9,7 +9,9 @@ json_writer
 				. += {"\"[k]\":[write(val)]"}
 				if(i++ < L.len)
 					. += ","
-			.+= "}"
+			if(cached_data)
+				. = copytext(., 1, lentext(.)) + ",\"cached\":[cached_data]}"
+			. += "}"

 		write(val)
 			if(isnum(val))
@@ -7,6 +7,6 @@ proc
 		var/static/json_reader/_jsonr = new()
 		return _jsonr.ReadObject(_jsonr.ScanJson(json))

-	list2json(list/L)
+	list2json(list/L, var/cached_data = null)
 		var/static/json_writer/_jsonw = new()
-		return _jsonw.WriteObject(L)
+		return _jsonw.WriteObject(L, cached_data)
@@ -57,6 +57,8 @@ nanoui is used to open and update nano browser uis
 	// the current status/visibility of the ui
 	var/status = STATUS_INTERACTIVE

+	var/cached_data = null
+
 	// Only allow users with a certain user.stat to get updates. Defaults to 0 (concious)
 	var/allowed_user_stat = 0 // -1 = ignore, 0 = alive, 1 = unconcious or alive, 2 = dead concious or alive

@@ -366,7 +368,7 @@ nanoui is used to open and update nano browser uis
 		template_data_json = list2json(templates)

 	var/list/send_data = get_send_data(initial_data)
-	var/initial_data_json = list2json(send_data)
+	var/initial_data_json = list2json(send_data, cached_data)

 	var/url_parameters_json = list2json(list("src" = "\ref[src]"))

@@ -442,6 +444,19 @@ nanoui is used to open and update nano browser uis

 	winset(user, window_id, "on-close=\"nanoclose [params]\"")

+/**
+ * Appends already processed json txt to the list2json proc when setting initial-data and data pushes
+ * Used for data that is fucking huge like manifests and camera lists that doesn't change often.
+ * And we only want to process them when they change.
+ * Fuck javascript
+ *
+ * @return nothing
+ */
+/datum/nanoui/proc/load_cached_data(var/data)
+	cached_data = data
+	return
+
+
 /**
  * Push data to an already open UI window
  *
@@ -455,7 +470,7 @@ nanoui is used to open and update nano browser uis
 	var/list/send_data = get_send_data(data)

 	//user << list2json(data) // used for debugging
-	user << output(list2params(list(list2json(send_data))),"[window_id].browser:receiveUpdateData")
+	user << output(list2params(list(list2json(send_data,cached_data))),"[window_id].browser:receiveUpdateData")

 /**
  * This Topic() proc is called whenever a user clicks on a link within a Nano UI
@@ -9,7 +9,6 @@
 	throw_range = 10
 	var/obj/item/weapon/pen/haspen		//The stored pen.
 	var/obj/item/weapon/toppaper	//The topmost piece of paper.
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT

 /obj/item/weapon/clipboard/New()
@@ -35,8 +35,9 @@
 		user.drop_from_inventory(P)
 		P.loc = src
 		if(istype(user,/mob/living/carbon/human))
-			user:update_inv_l_hand()
-			user:update_inv_r_hand()
+			var/mob/living/carbon/human/H = user
+			H.update_inv_l_hand()
+			H.update_inv_r_hand()
 	else if(istype(W, /obj/item/weapon/photo))
 		amount++
 		if(screen == 2)
@@ -57,6 +58,8 @@
 		user << "<span class='notice'>You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
 		del(W)
 	else
+		if(istype(W, /obj/item/weapon/tape_roll))
+			return 0
 		if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon))
 			usr << browse("", "window=[name]") //Closes the dialog
 		P = src[page]
@@ -15,7 +15,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "pen"
 	item_state = "pen"
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 0
 	w_class = 1.0
@@ -58,7 +57,7 @@
 */
 /obj/item/weapon/pen/sleepypen
 	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;syndicate=5"

@@ -85,7 +84,7 @@
 * Parapens
 */
 /obj/item/weapon/pen/paralysis
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;syndicate=5"

@@ -57,10 +57,10 @@ var/global/photo_count = 0
 		user << "<span class='notice'>It is too far away.</span>"

 /obj/item/weapon/photo/proc/show(mob/user as mob)
-	user << browse_rsc(img, "tmp_photo.png")
+	user << browse_rsc(img, "tmp_photo_[id].png")
 	user << browse("<html><head><title>[name]</title></head>" \
 		+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
-		+ "<img src='tmp_photo.png' width='[64*photo_size]' style='-ms-interpolation-mode:nearest-neighbor' />" \
+		+ "<img src='tmp_photo_[id].png' width='[64*photo_size]' style='-ms-interpolation-mode:nearest-neighbor' />" \
 		+ "[scribble ? "<br>Written on the back:<br><i>[scribble]</i>" : ""]"\
 		+ "</body></html>", "window=book;size=[64*photo_size]x[scribble ? 400 : 64*photo_size]")
 	onclose(user, "[name]")
@@ -123,7 +123,7 @@ var/global/photo_count = 0
 	icon_state = "camera"
 	item_state = "electropack"
 	w_class = 2.0
-	flags = FPRINT | CONDUCT | TABLEPASS
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	matter = list("metal" = 2000)
 	var/pictures_max = 10
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "stamp-qm"
 	item_state = "stamp"
-	flags = FPRINT | TABLEPASS
 	throwforce = 0
 	w_class = 1.0
 	throw_speed = 7
@@ -206,7 +206,7 @@ proc/cardinalrange(var/center)
 	icon_state = "box"
 	item_state = "electronic"
 	w_class = 4.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	throwforce = 5
 	throw_speed = 1
 	throw_range = 2
@@ -11,7 +11,6 @@
 	//directwired = 0
 	var/icon_state_on = "bbox_on"
 	var/icon_state_off = "bbox_off"
-	flags = FPRINT
 	density = 1
 	anchored = 1
 	var/on = 0
@@ -477,7 +477,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	throw_speed = 2
 	throw_range = 5
 	matter = list("metal" = 50, "glass" = 20)
-	flags = TABLEPASS | FPRINT | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "coil"
 	attack_verb = list("whipped", "lashed", "disciplined", "flogged")
@@ -16,7 +16,7 @@
 	desc = "Used for building lights."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "tube-construct-item"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	var/fixture_type = "tube"
 	var/obj/machinery/light/newlight = null
 	var/sheets_refunded = 2
@@ -63,7 +63,7 @@
 	desc = "Used for building small lights."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "bulb-construct-item"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	fixture_type = "bulb"
 	sheets_refunded = 1

@@ -637,7 +637,6 @@

 /obj/item/weapon/light
 	icon = 'icons/obj/lighting.dmi'
-	flags = FPRINT | TABLEPASS
 	force = 2
 	throwforce = 5
 	w_class = 2
@@ -105,8 +105,11 @@ display round(lastgen) and phorontank amount
 	var/sheet_path = /obj/item/stack/sheet/mineral/phoron
 	var/board_path = "/obj/item/weapon/circuitboard/pacman"
 	var/sheet_left = 0 // How much is left of the sheet
-	var/time_per_sheet = 40
 	var/heat = 0
+	
+	//produces up to 80 kW and lasts for 20 minutes with 50 sheets
+	var/time_per_sheet = 96
+	power_gen = 20000

 /obj/machinery/power/port_gen/pacman/initialize()
 	..()
@@ -329,9 +332,12 @@ display round(lastgen) and phorontank amount
 	name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator"
 	icon_state = "portgen1"
 	sheet_path = /obj/item/stack/sheet/mineral/uranium
-	power_gen = 15000
-	time_per_sheet = 65
 	board_path = "/obj/item/weapon/circuitboard/pacman/super"
+	
+	//produces 80 kW like the PACMAN but 50 sheets will last for 2 hours
+	power_gen = 20000
+	time_per_sheet = 576
+	
 	overheat()
 		explosion(src.loc, 3, 3, 3, -1)

@@ -339,8 +345,11 @@ display round(lastgen) and phorontank amount
 	name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
 	icon_state = "portgen2"
 	sheet_path = /obj/item/stack/sheet/mineral/tritium
-	power_gen = 40000
-	time_per_sheet = 80
 	board_path = "/obj/item/weapon/circuitboard/pacman/mrs"
+	
+	//produces 200 kW and lasts for 1 hour with 50 sheets
+	power_gen = 50000
+	time_per_sheet = 288
+	
 	overheat()
 		explosion(src.loc, 4, 4, 4, -1)
@@ -3,7 +3,7 @@
 	desc = "A bullet casing."
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "s-casing"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 1
 	w_class = 1.0
@@ -52,7 +52,7 @@
 	desc = "A box of ammo"
 	icon_state = "357"
 	icon = 'icons/obj/ammo.dmi'
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "syringe_kit"
 	matter = list("metal" = 50000)
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "detective"
 	item_state = "gun"
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BELT
 	matter = list("metal" = 2000)
 	w_class = 3.0
@@ -77,22 +77,6 @@ obj/item/weapon/gun/energy/laser/retro
 	isHandgun()
 		return 0

-/obj/item/weapon/gun/energy/lasercannon/mounted/load_into_chamber()
-	if(in_chamber)
-		return 1
-	var/obj/item/rig_module/module = loc
-	if(!istype(module))
-		return 0
-	if(module.holder && module.holder.wearer)
-		var/mob/living/carbon/human/H = module.holder.wearer
-		if(istype(H) && H.back)
-			var/obj/item/weapon/rig/suit = H.back
-			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
-				suit.cell.use(250)
-				in_chamber = new /obj/item/projectile/beam/heavylaser(src)
-				return 1
-	return 0
-
 /obj/item/weapon/gun/energy/lasercannon/cyborg/load_into_chamber()
 	if(in_chamber)
 		return 1
@@ -35,23 +35,6 @@
 		else
 			user.update_inv_r_hand()

-/obj/item/weapon/gun/energy/gun/mounted/load_into_chamber()
-	if(in_chamber)
-		return 1
-	var/obj/item/rig_module/module = loc
-	if(!istype(module))
-		return 0
-	if(module.holder && module.holder.wearer)
-		var/mob/living/carbon/human/H = module.holder.wearer
-		if(istype(H) && H.back)
-			var/obj/item/weapon/rig/suit = H.back
-			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
-				suit.cell.use(250)
-				var/prog_path = text2path(projectile_type)
-				in_chamber = new prog_path(src)
-				return 1
-	return 0
-
 /obj/item/weapon/gun/energy/gun/nuclear
 	name = "advanced energy gun"
 	desc = "An energy gun with an experimental miniaturized reactor."
@@ -5,7 +5,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 	origin_tech = "combat=2;magnets=4"
 	w_class = 4.0
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/ion"
@@ -33,7 +33,7 @@ obj/item/weapon/gun/energy/staff
 	icon_state = "staffofchange"
 	item_state = "staffofchange"
 	fire_sound = 'sound/weapons/emitter.ogg'
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	w_class = 4.0
 	charge_cost = 200
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "bolt"
 	item_state = "bolt"
-	flags =  FPRINT | TABLEPASS
 	throwforce = 8
 	w_class = 3.0
 	sharp = 1
@@ -3,7 +3,7 @@
 	desc = "A device that launches things."
 	icon = 'icons/obj/weapons.dmi'
 	w_class = 5.0
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK

 	var/release_force = 0
--- a/Show More
+++ b/Show More