Merge branch 'dev' into ofMechfabAndPanic

Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm

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

@@ -13,7 +13,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
-	origin_tech = list(TECH_ENGINERING = 4, TECH_MATERIAL = 2)
+	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 50000)
 	var/datum/effect/effect/system/spark_spread/spark_system
 	var/stored_matter = 0
@@ -103,7 +103,7 @@
 	else if(!deconstruct && (istype(T,/turf/space) || istype(T,get_base_turf(T.z))))
 		build_cost =  1
 		build_type =  "floor"
-		build_turf =  /turf/simulated/floor/plating/airless
+		build_turf =  /turf/simulated/floor/airless
 	else if(deconstruct && istype(T,/turf/simulated/wall))
 		var/turf/simulated/wall/W = T
 		build_delay = deconstruct ? 50 : 40

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

@@ -97,27 +97,75 @@
 	var/registered_name = "Unknown" // The name registered_name on the card
 	slot_flags = SLOT_ID
 
+	var/age = "\[UNSET\]"
 	var/blood_type = "\[UNSET\]"
 	var/dna_hash = "\[UNSET\]"
 	var/fingerprint_hash = "\[UNSET\]"
+	var/sex = "\[UNSET\]"
+	var/icon/front
+	var/icon/side
 
 	//alt titles are handled a bit weirdly in order to unobtrusively integrate into existing ID system
 	var/assignment = null	//can be alt title or the actual job
 	var/rank = null			//actual job
-	var/dorm = 0		// determines if this ID has claimed a dorm already
+	var/dorm = 0			// determines if this ID has claimed a dorm already
 
-/obj/item/weapon/card/id/New()
-	..()
-	spawn(30)
-	if(istype(loc, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = loc
-		blood_type = H.dna.b_type
-		dna_hash = H.dna.unique_enzymes
-		fingerprint_hash = md5(H.dna.uni_identity)
+/obj/item/weapon/card/id/examine(mob/user)
+	set src in oview(1)
+	if(in_range(usr, src))
+		show(usr)
+		usr << desc
+	else
+		usr << "<span class='warning'>It is too far away.</span>"
+
+/obj/item/weapon/card/id/proc/prevent_tracking()
+	return 0
+
+/obj/item/weapon/card/id/proc/show(mob/user as mob)
+	user << browse_rsc(front, "front.png")
+	user << browse_rsc(side, "side.png")
+	var/datum/browser/popup = new(user, "idcard", name, 600, 250)
+	popup.set_content(dat())
+	popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/item/weapon/card/id/proc/update_name()
+	name = "[src.registered_name]'s ID Card ([src.assignment])"
+
+/obj/item/weapon/card/id/proc/set_id_photo(var/mob/M)
+	front = getFlatIcon(M, SOUTH, always_use_defdir = 1)
+	side = getFlatIcon(M, WEST, always_use_defdir = 1)
+
+/obj/item/weapon/card/id/proc/set_owner_info(var/mob/living/carbon/human/H)
+	if(!H || !H.dna)
+		return
+	age 				= H.age
+	blood_type			= H.dna.b_type
+	dna_hash			= H.dna.unique_enzymes
+	fingerprint_hash	= md5(H.dna.uni_identity)
+	registered_name		= H.real_name
+	sex 				= capitalize(H.gender)
+	set_id_photo(H)
+	update_name()
+
+/obj/item/weapon/card/id/proc/dat()
+	var/dat = ("<table><tr><td>")
+	dat += text("Name: []</A><BR>", registered_name)
+	dat += text("Sex: []</A><BR>\n", sex)
+	dat += text("Age: []</A><BR>\n", age)
+	dat += text("Rank: []</A><BR>\n", assignment)
+	dat += text("Fingerprint: []</A><BR>\n", fingerprint_hash)
+	dat += text("Blood Type: []<BR>\n", blood_type)
+	dat += text("DNA Hash: []<BR><BR>\n", dna_hash)
+	if(front && side)
+		dat +="<td align = center valign = top>Photo:<br><img src=front.png height=80 width=80 border=4><img src=side.png height=80 width=80 border=4></td>"
+	dat += "</tr></table>"
+	return dat
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
-	for(var/mob/O in viewers(user, null))
-		O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)
+	user.visible_message("\The [user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\
+		"You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]")
 
 	src.add_fingerprint(user)
 	return
@@ -139,7 +187,6 @@
 	usr << "The fingerprint hash on the card is [fingerprint_hash]."
 	return
 
-
 /obj/item/weapon/card/id/silver
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."
@@ -152,75 +199,6 @@
 	icon_state = "gold"
 	item_state = "gold_id"
 
-/obj/item/weapon/card/id/syndicate
-	name = "agent card"
-	access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
-	origin_tech = list(TECH_ILLEGAL = 3)
-	var/registered_user=null
-
-/obj/item/weapon/card/id/syndicate/New(mob/user as mob)
-	..()
-	if(!isnull(user)) // Runtime prevention on laggy starts or where users log out because of lag at round start.
-		registered_name = ishuman(user) ? user.real_name : user.name
-	else
-		registered_name = "Agent Card"
-	assignment = "Agent"
-	name = "[registered_name]'s ID Card ([assignment])"
-
-/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
-	if(!proximity) return
-	if(istype(O, /obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/I = O
-		src.access |= I.access
-		if(istype(user, /mob/living) && user.mind)
-			if(user.mind.special_role)
-				usr << "<span class='notice'>The card's microscanners activate as you pass it over the ID, copying its access.</span>"
-
-/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
-	if(!src.registered_name)
-		//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
-		var t = sanitizeName(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name), MAX_NAME_LEN)
-		if(!t) //Same as mob/new_player/prefrences.dm
-			alert("Invalid name.")
-			return
-		src.registered_name = t
-
-		var u = sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Agent"), MAX_LNAME_LEN)
-		if(!u)
-			alert("Invalid assignment.")
-			src.registered_name = ""
-			return
-		src.assignment = u
-		src.name = "[src.registered_name]'s ID Card ([src.assignment])"
-		user << "<span class='notice'>You successfully forge the ID card.</span>"
-		registered_user = user
-	else if(!registered_user || registered_user == user)
-
-		if(!registered_user) registered_user = user  //
-
-		switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
-			if("Rename")
-				var t = sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name), 26)
-				if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
-					alert("Invalid name.")
-					return
-				src.registered_name = t
-
-				var u = sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant"))
-				if(!u)
-					alert("Invalid assignment.")
-					return
-				src.assignment = u
-				src.name = "[src.registered_name]'s ID Card ([src.assignment])"
-				user << "<span class='notice'>You successfully forge the ID card.</span>"
-				return
-			if("Show")
-				..()
-	else
-		..()
-
-
-
 /obj/item/weapon/card/id/syndicate_command
 	name = "syndicate ID card"
 	desc = "An ID straight from the Syndicate."
@@ -255,4 +233,4 @@
 
 /obj/item/weapon/card/id/centcom/ERT/New()
 	..()
-	access += get_all_station_access()
+	access |= get_all_station_access()

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

@@ -0,0 +1,204 @@
+var/global/list/syndicate_ids = list()
+
+/obj/item/weapon/card/id/syndicate
+	name = "agent card"
+	assignment = "Agent"
+	origin_tech = list(TECH_ILLEGAL = 3)
+	var/electronic_warfare = 1
+	var/registered_user = null
+	var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
+
+/obj/item/weapon/card/id/syndicate/New(mob/user as mob)
+	syndicate_ids += src
+	..()
+	access = initial_access.Copy()
+
+/obj/item/weapon/card/id/syndicate/Destroy()
+	syndicate_ids -= src
+	registered_user = null
+	return ..()
+
+// On mob destruction, ensure any references are cleared
+/mob/Destroy()
+	for(var/obj/item/weapon/card/id/syndicate/SID in syndicate_ids)
+		if(SID.registered_user == src)
+			SID.registered_user = null
+	return ..()
+
+/obj/item/weapon/card/id/syndicate/prevent_tracking()
+	return electronic_warfare
+
+/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
+	if(!proximity) return
+	if(istype(O, /obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/I = O
+		src.access |= I.access
+		if(player_is_antag(user))
+			user << "<span class='notice'>The microscanner activate as you pass it over the ID, copying its access.</span>"
+
+/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
+	if(!registered_user)
+		registered_user = user
+		set_owner_info(user)
+		user << "<span class='notice'>The microscanner marks you as its owner, preventing others some accessing its internals.</span>"
+	if(registered_user == user)
+		switch(alert("Would you like edit the ID, or show it?","Show or Edit?", "Edit","Show"))
+			if("Edit")
+				ui_interact(user)
+			if("Show")
+				..()
+	else
+		..()
+
+/obj/item/weapon/card/id/syndicate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+	var/entries[0]
+	entries[++entries.len] = list("name" = "Age", 				"value" = age)
+	entries[++entries.len] = list("name" = "Appearance",		"value" = "Set")
+	entries[++entries.len] = list("name" = "Assignment",		"value" = assignment)
+	entries[++entries.len] = list("name" = "Blood Type",		"value" = blood_type)
+	entries[++entries.len] = list("name" = "DNA Hash", 			"value" = dna_hash)
+	entries[++entries.len] = list("name" = "Fingerprint Hash",	"value" = fingerprint_hash)
+	entries[++entries.len] = list("name" = "Name", 				"value" = registered_name)
+	entries[++entries.len] = list("name" = "Photo", 			"value" = "Update")
+	entries[++entries.len] = list("name" = "Sex", 				"value" = sex)
+	entries[++entries.len] = list("name" = "Factory Reset",		"value" = "Use With Care")
+	data["electronic_warfare"] = electronic_warfare
+	data["entries"] = entries
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "agent_id_card.tmpl", "Agent id", 600, 400)
+		ui.set_initial_data(data)
+		ui.open()
+
+/obj/item/weapon/card/id/syndicate/CanUseTopic(mob/user)
+	if(user != registered_user)
+		return STATUS_CLOSE
+	return ..()
+
+/obj/item/weapon/card/id/syndicate/Topic(href, href_list, var/datum/topic_state/state)
+	if(..())
+		return 1
+
+	var/user = usr
+	if(href_list["electronic_warfare"])
+		electronic_warfare = text2num(href_list["electronic_warfare"])
+		user << "<span class='notice'>Electronic warfare [electronic_warfare ? "enabled" : "disabled"].</span>"
+	else if(href_list["set"])
+		switch(href_list["set"])
+			if("Age")
+				var/new_age = input(user,"What age would you like to put on this card?","Agent Card Age", age) as null|num
+				if(!isnull(new_age) && CanUseTopic(user, state))
+					if(new_age < 0)
+						age = initial(age)
+					else
+						age = new_age
+					user << "<span class='notice'>Age has been set to '[age]'.</span>"
+					. = 1
+			if("Appearance")
+				var/datum/card_state/choice = input(user, "Select the appearance for this card.", "Agent Card Appearance") as null|anything in id_card_states()
+				if(choice && CanUseTopic(user, state))
+					src.icon_state = choice.icon_state
+					src.item_state = choice.item_state
+					usr << "<span class='notice'>Appearance changed to [choice].</span>"
+					. = 1
+			if("Assignment")
+				var/new_job = sanitize(input(user,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", assignment) as null|text)
+				if(!isnull(new_job) && CanUseTopic(user, state))
+					src.assignment = new_job
+					user << "<span class='notice'>Occupation changed to '[new_job]'.</span>"
+					update_name()
+					. = 1
+			if("Blood Type")
+				var/default = blood_type
+				if(default == initial(blood_type) && ishuman(user))
+					var/mob/living/carbon/human/H = user
+					if(H.dna)
+						default = H.dna.b_type
+				var/new_blood_type = sanitize(input(user,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text)
+				if(!isnull(new_blood_type) && CanUseTopic(user, state))
+					src.blood_type = new_blood_type
+					user << "<span class='notice'>Blood type changed to '[new_blood_type]'.</span>"
+					. = 1
+			if("DNA Hash")
+				var/default = dna_hash
+				if(default == initial(dna_hash) && ishuman(user))
+					var/mob/living/carbon/human/H = user
+					if(H.dna)
+						default = H.dna.unique_enzymes
+				var/new_dna_hash = sanitize(input(user,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text)
+				if(!isnull(new_dna_hash) && CanUseTopic(user, state))
+					src.dna_hash = new_dna_hash
+					user << "<span class='notice'>DNA hash changed to '[new_dna_hash]'.</span>"
+					. = 1
+			if("Fingerprint Hash")
+				var/default = fingerprint_hash
+				if(default == initial(fingerprint_hash) && ishuman(user))
+					var/mob/living/carbon/human/H = user
+					if(H.dna)
+						default = md5(H.dna.uni_identity)
+				var/new_fingerprint_hash = sanitize(input(user,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text)
+				if(!isnull(new_fingerprint_hash) && CanUseTopic(user, state))
+					src.fingerprint_hash = new_fingerprint_hash
+					user << "<span class='notice'>Fingerprint hash changed to '[new_fingerprint_hash]'.</span>"
+					. = 1
+			if("Name")
+				var/new_name = sanitizeName(input(user,"What name would you like to put on this card?","Agent Card Name", registered_name) as null|text)
+				if(!isnull(new_name) && CanUseTopic(user, state))
+					src.registered_name = new_name
+					update_name()
+					user << "<span class='notice'>Name changed to '[new_name]'.</span>"
+					. = 1
+			if("Photo")
+				set_id_photo(user)
+				user << "<span class='notice'>Photo changed.</span>"
+				. = 1
+			if("Sex")
+				var/new_sex = sanitize(input(user,"What sex would you like to put on this card?","Agent Card Sex", sex) as null|text)
+				if(!isnull(new_sex) && CanUseTopic(user, state))
+					src.sex = new_sex
+					user << "<span class='notice'>Sex changed to '[new_sex]'.</span>"
+					. = 1
+			if("Factory Reset")
+				if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && CanUseTopic(user, state))
+					age = initial(age)
+					access = initial_access.Copy()
+					assignment = initial(assignment)
+					blood_type = initial(blood_type)
+					dna_hash = initial(dna_hash)
+					electronic_warfare = initial(electronic_warfare)
+					fingerprint_hash = initial(fingerprint_hash)
+					icon_state = initial(icon_state)
+					name = initial(name)
+					registered_name = initial(registered_name)
+					registered_user = null
+					sex = initial(sex)
+					user << "<span class='notice'>All information has been deleted from \the [src].</span>"
+					. = 1
+
+	// Always update the UI, or buttons will spin indefinitely
+	nanomanager.update_uis(src)
+
+/var/global/list/id_card_states
+/proc/id_card_states()
+	if(!id_card_states)
+		id_card_states = list()
+		for(var/path in typesof(/obj/item/weapon/card/id))
+			var/obj/item/weapon/card/id/ID = path
+			var/datum/card_state/CS = new()
+			CS.icon_state = initial(ID.icon_state)
+			CS.item_state = initial(ID.item_state)
+			CS.name = initial(ID.name) + " - " + initial(ID.icon_state)
+			id_card_states += CS
+		id_card_states = dd_sortedObjectList(id_card_states)
+
+	return id_card_states
+
+/datum/card_state
+	var/name
+	var/icon_state
+	var/item_state
+
+/datum/card_state/dd_SortValue()
+	return name

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

@@ -139,11 +139,6 @@
 	build_path = /obj/machinery/computer/crew
 	origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MAGNET = 2)
 
-/obj/item/weapon/circuitboard/mech_bay_power_console
-	name = T_BOARD("mech bay power control console")
-	build_path = /obj/machinery/computer/mech_bay_power_console
-	origin_tech = list(TECH_DATA = 2, TECH_POWER = 3)
-
 /obj/item/weapon/circuitboard/operating
 	name = T_BOARD("patient monitoring console")
 	build_path = /obj/machinery/computer/operating
@@ -195,4 +190,4 @@
 /obj/item/weapon/circuitboard/rcon_console
 	name = T_BOARD("RCON remote control console")
 	build_path = /obj/machinery/computer/rcon
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 3, TECH_POWER = 5)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_POWER = 5)

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

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

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

@@ -6,7 +6,7 @@
 	name = T_BOARD("mining drill head")
 	build_path = "/obj/machinery/mining/drill"
 	board_type = "machine"
-	origin_tech = list(TECH_DATA = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/capacitor" = 1,
 							"/obj/item/weapon/cell" = 1,

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

@@ -6,7 +6,7 @@
 	name = T_BOARD("PACMAN-type generator")
 	build_path = "/obj/machinery/power/port_gen/pacman"
 	board_type = "machine"
-	origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINERING = 3)
+	origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/stock_parts/micro_laser" = 1,
@@ -16,9 +16,9 @@
 /obj/item/weapon/circuitboard/pacman/super
 	name = T_BOARD("SUPERPACMAN-type generator")
 	build_path = "/obj/machinery/power/port_gen/pacman/super"
-	origin_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4)
 
 /obj/item/weapon/circuitboard/pacman/mrs
 	name = T_BOARD("MRSPACMAN-type generator")
 	build_path = "/obj/machinery/power/port_gen/pacman/mrs"
-	origin_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINERING = 5)
+	origin_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5)

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

@@ -6,14 +6,14 @@
 	name = T_BOARD("superconductive magnetic energy storage")
 	build_path = "/obj/machinery/power/smes/buildable"
 	board_type = "machine"
-	origin_tech = list(TECH_POWER = 6, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4)
 	req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30)
 
 /obj/item/weapon/circuitboard/batteryrack
 	name = T_BOARD("battery rack PSU")
 	build_path = "/obj/machinery/power/smes/batteryrack"
 	board_type = "machine"
-	origin_tech = list(TECH_POWER = 3, TECH_ENGINERING = 2)
+	origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2)
 	req_components = list("/obj/item/weapon/cell" = 3)
 
 /obj/item/weapon/circuitboard/ghettosmes

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

@@ -6,7 +6,7 @@
 	name = T_BOARD("cyborg recharging station")
 	build_path = "/obj/machinery/recharge_station"
 	board_type = "machine"
-	origin_tech = list(TECH_DATA = 3, TECH_ENGINERING = 3)
+	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 5,
 							"/obj/item/weapon/stock_parts/capacitor" = 2,

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

@@ -15,7 +15,7 @@ obj/item/weapon/circuitboard/rdserver
 	name = T_BOARD("destructive analyzer")
 	build_path = "/obj/machinery/r_n_d/destructive_analyzer"
 	board_type = "machine"
-	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINERING = 2, TECH_DATA = 2)
+	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -25,7 +25,7 @@ obj/item/weapon/circuitboard/rdserver
 	name = T_BOARD("autolathe")
 	build_path = "/obj/machinery/autolathe"
 	board_type = "machine"
-	origin_tech = list(TECH_ENGINERING = 2, TECH_DATA = 2)
+	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 3,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -35,7 +35,7 @@ obj/item/weapon/circuitboard/rdserver
 	name = T_BOARD("protolathe")
 	build_path = "/obj/machinery/r_n_d/protolathe"
 	board_type = "machine"
-	origin_tech = list(TECH_ENGINERING = 2, TECH_DATA = 2)
+	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 2,
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
@@ -46,7 +46,7 @@ obj/item/weapon/circuitboard/rdserver
 	name = T_BOARD("circuit imprinter")
 	build_path = "/obj/machinery/r_n_d/circuit_imprinter"
 	board_type = "machine"
-	origin_tech = list(TECH_ENGINERING = 2, TECH_DATA = 2)
+	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -56,7 +56,7 @@ obj/item/weapon/circuitboard/rdserver
 	name = "Circuit board (Exosuit Fabricator)"
 	build_path = "/obj/machinery/mecha_part_fabricator"
 	board_type = "machine"
-	origin_tech = list(TECH_DATA = 3, TECH_ENGINERING = 3)
+	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 2,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,

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

@@ -8,7 +8,7 @@
 /obj/item/weapon/circuitboard/telecomms/receiver
 	name = T_BOARD("subspace receiver")
 	build_path = "/obj/machinery/telecomms/receiver"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 3, TECH_BLUESPACE = 2)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/subspace/ansible" = 1,
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
@@ -18,7 +18,7 @@
 /obj/item/weapon/circuitboard/telecomms/hub
 	name = T_BOARD("hub mainframe")
 	build_path = "/obj/machinery/telecomms/hub"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 2,
@@ -27,7 +27,7 @@
 /obj/item/weapon/circuitboard/telecomms/relay
 	name = T_BOARD("relay mainframe")
 	build_path = "/obj/machinery/telecomms/relay"
-	origin_tech = list(TECH_DATA = 3, TECH_ENGINERING = 4, TECH_BLUESPACE = 3)
+	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 2,
@@ -36,7 +36,7 @@
 /obj/item/weapon/circuitboard/telecomms/bus
 	name = T_BOARD("bus mainframe")
 	build_path = "/obj/machinery/telecomms/bus"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,
@@ -45,7 +45,7 @@
 /obj/item/weapon/circuitboard/telecomms/processor
 	name = T_BOARD("processor unit")
 	build_path = "/obj/machinery/telecomms/processor"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 3,
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
@@ -57,7 +57,7 @@
 /obj/item/weapon/circuitboard/telecomms/server
 	name = T_BOARD("telecommunication server")
 	build_path = "/obj/machinery/telecomms/server"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 4)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,
@@ -66,7 +66,7 @@
 /obj/item/weapon/circuitboard/telecomms/broadcaster
 	name = T_BOARD("subspace broadcaster")
 	build_path = "/obj/machinery/telecomms/broadcaster"
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINERING = 4, TECH_BLUESPACE = 2)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2)
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,

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

@@ -16,7 +16,7 @@
 /obj/item/weapon/circuitboard/unary_atmos/heater
 	name = T_BOARD("gas heating system")
 	build_path = "/obj/machinery/atmospherics/unary/heater"
-	origin_tech = list(TECH_POWER = 2, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1)
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 5,
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
@@ -25,7 +25,7 @@
 /obj/item/weapon/circuitboard/unary_atmos/cooler
 	name = T_BOARD("gas cooling system")
 	build_path = "/obj/machinery/atmospherics/unary/freezer"
-	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINERING = 2)
+	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 2,
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,

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

@@ -0,0 +1,23 @@
+/obj/item/weapon/grenade/anti_photon
+	desc = "An experimental device for temporarily removing light in a limited area."
+	name = "pgoton disruption grenade"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "emp"
+	item_state = "emp"
+	det_time = 20
+	origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
+
+/obj/item/weapon/grenade/anti_photon/prime()
+	playsound(src.loc, 'sound/effects/phasein.ogg', 50, 1, 5)
+	set_light(10, -10, "#FFFFFF")
+
+	var/extra_delay = rand(0,90)
+
+	spawn(extra_delay)
+		spawn(200)
+			if(prob(10+extra_delay))
+				set_light(10, 10, "#[num2hex(rand(64,255))][num2hex(rand(64,255))][num2hex(rand(64,255))]")
+		spawn(210)
+			..()
+			playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5)
+			qdel(src)

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

@@ -61,7 +61,6 @@
 	throw_speed = 1
 	throw_range = 3
 	w_class = 4
-	flags = NOSHIELD
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")

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

@@ -61,8 +61,14 @@
 	return ..()
 
 /obj/item/weapon/material/shard/Crossed(AM as mob|obj)
+	..()
+	
 	if(ismob(AM))
 		var/mob/M = AM
+		
+		if(M.buckled) //wheelchairs, office chairs, rollerbeds
+			return
+		
 		M << "<span class='danger'>You step on \the [src]!</span>"
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))
@@ -71,18 +77,24 @@
 			if(H.species.siemens_coefficient<0.5) //Thick skin.
 				return
 
-			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
-				var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
-				if(!affecting)
+			if( H.shoes || ( H.wear_suit && (H.wear_suit.body_parts_covered & FEET) ) )
+				return
+			
+			var/list/check = list("l_foot", "r_foot")
+			while(check.len)
+				var/picked = pick(check)
+				var/obj/item/organ/external/affecting = H.get_organ(picked)
+				if(affecting)
+					if(affecting.status & ORGAN_ROBOT)
+						return
+					if(affecting.take_damage(5, 0))
+						H.UpdateDamageIcon()
+					H.updatehealth()
+					if(!(H.species.flags & NO_PAIN))
+						H.Weaken(3)
 					return
-				if(affecting.status & ORGAN_ROBOT)
-					return
-				if(affecting.take_damage(5, 0))
-					H.UpdateDamageIcon()
-				H.updatehealth()
-				if(!(H.species && (H.species.flags & NO_PAIN)))
-					H.Weaken(3)
-	..()
+				check -= picked
+			return
 
 // Preset types - left here for the code that uses them
 /obj/item/weapon/material/shard/shrapnel/New(loc)

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

@@ -187,7 +187,6 @@
 	force_wielded = 30
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
-	flags = NOSHIELD
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharp = 1
@@ -228,7 +227,6 @@
 	throw_speed = 3
 	edge = 1
 	sharp = 1
-	flags = NOSHIELD
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	default_material = "glass"

code/game/objects/items/weapons/melee/energy.dm

@@ -74,7 +74,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3
-	flags = CONDUCT | NOSHIELD | NOBLOODY
+	flags = CONDUCT | NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	sharp = 1
@@ -110,7 +110,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2
-	flags = NOSHIELD | NOBLOODY
+	flags = NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	sharp = 1
 	edge = 1
@@ -181,7 +181,7 @@
 	throw_speed = 1
 	throw_range = 1
 	w_class = 4.0//So you can't hide it in your pocket or some such.
-	flags = NOSHIELD | NOBLOODY
+	flags = NOBLOODY
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/mob/living/creator
 	var/datum/effect/effect/system/spark_spread/spark_system

code/game/objects/items/weapons/storage/boxes.dm

@@ -298,6 +298,31 @@
 		new /obj/item/weapon/grenade/empgrenade(src)
 		new /obj/item/weapon/grenade/empgrenade(src)
 
+/obj/item/weapon/storage/box/smokes
+	name = "box of smoke bombs"
+	desc = "A box containing 5 smoke bombs."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/smokes/New()
+		..()
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+
+/obj/item/weapon/storage/box/anti_photons
+	name = "box of anti-photon grenades"
+	desc = "A box containing 5 experimental photon disruption grenades."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/anti_photon/New()
+		..()
+		new /obj/item/weapon/grenade/anti_photon(src)
+		new /obj/item/weapon/grenade/anti_photon(src)
+		new /obj/item/weapon/grenade/anti_photon(src)
+		new /obj/item/weapon/grenade/anti_photon(src)
+		new /obj/item/weapon/grenade/anti_photon(src)
 
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
@@ -638,4 +663,4 @@
 	max_w_class = 3
 	can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/food, /obj/item/weapon/reagent_containers/glass)
 	max_storage_space = 21
-	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
+	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try

code/game/objects/items/weapons/storage/misc.dm

@@ -31,9 +31,7 @@
 	overlays.Cut()
 	var/i = 0
 	for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents)
-		var/image/img = image('icons/obj/food.dmi', D.overlay_state)
-		img.pixel_x = i * 3
-		overlays += img
+		overlays += image('icons/obj/food.dmi', "[i][D.overlay_state]")
 		i++
 
 /obj/item/weapon/storage/box/donut/empty

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

@@ -144,11 +144,11 @@
 				mask_check = 1
 
 		if(mask_check)
-			if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT))
+			if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT))
 				data["maskConnected"] = 1
 			else if(istype(location, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = location
-				if(H.head && (H.head.flags & AIRTIGHT))
+				if(H.head && (H.head.item_flags & AIRTIGHT))
 					data["maskConnected"] = 1
 
 	// update the ui if it exists, returns null if no ui is passed/found
@@ -192,11 +192,11 @@
 			else
 
 				var/can_open_valve
-				if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT))
+				if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT))
 					can_open_valve = 1
 				else if(istype(location,/mob/living/carbon/human))
 					var/mob/living/carbon/human/H = location
-					if(H.head && (H.head.flags & AIRTIGHT))
+					if(H.head && (H.head.item_flags & AIRTIGHT))
 						can_open_valve = 1
 
 				if(can_open_valve)

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

@@ -24,7 +24,7 @@
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
-	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 
@@ -103,7 +103,7 @@
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2.0
-	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 80)
 	attack_verb = list("pinched", "nipped")
 	sharp = 1
@@ -148,7 +148,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 30)
 
 	//R&D tech level
-	origin_tech = list(TECH_ENGINERING = 1)
+	origin_tech = list(TECH_ENGINEERING = 1)
 
 	//Welding tool specific stuff
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
@@ -372,21 +372,21 @@
 /obj/item/weapon/weldingtool/largetank
 	name = "industrial welding tool"
 	max_fuel = 40
-	origin_tech = list(TECH_ENGINERING = 2)
+	origin_tech = list(TECH_ENGINEERING = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 60)
 
 /obj/item/weapon/weldingtool/hugetank
 	name = "upgraded welding tool"
 	max_fuel = 80
 	w_class = 3.0
-	origin_tech = list(TECH_ENGINERING = 3)
+	origin_tech = list(TECH_ENGINEERING = 3)
 	matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120)
 
 /obj/item/weapon/weldingtool/experimental
 	name = "experimental welding tool"
 	max_fuel = 40
 	w_class = 3.0
-	origin_tech = list(TECH_ENGINERING = 4, TECH_PHORON = 3)
+	origin_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3)
 	matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120)
 	var/last_gen = 0
 
@@ -413,7 +413,7 @@
 	throwforce = 7.0
 	item_state = "crowbar"
 	w_class = 2.0
-	origin_tech = list(TECH_ENGINERING = 1)
+	origin_tech = list(TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 

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

@@ -73,7 +73,14 @@
 			return
 
 
-	if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+	var/protected = 0
+	for(var/slot in list(slot_head, slot_wear_mask, slot_glasses))
+		var/obj/item/protection = M.get_equipped_item(slot)
+		if(istype(protection) && (protection.body_parts_covered & FACE))
+			protected = 1
+			break
+	
+	if(protected)
 		M << "<span class='warning'>You get slammed in the face with the tray, against your mask!</span>"
 		if(prob(33))
 			src.add_blood(H)