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/effects/aliens.dm

@@ -338,6 +338,7 @@ Alien plants should do something if theres a lot of poison
 
 	var/health = 100
 	var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive
+	flags = PROXMOVE
 
 /obj/effect/alien/egg/New()
 	if(config.aliens_allowed)

code/game/objects/effects/effect_system.dm

@@ -198,11 +198,11 @@ steam.start() -- spawns the effect
 	if (istype(M))
 		return 0
 	if (M.internal != null)
-		if(M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+		if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
 			return 0
 		if(istype(M,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
-			if(H.head && (H.head.flags & AIRTIGHT))
+			if(H.head && (H.head.item_flags & AIRTIGHT))
 				return 0
 		return 0
 	return 1

code/game/objects/effects/spawners/vaultspawner.dm

@@ -1,26 +0,0 @@
-/obj/effect/vaultspawner
-	var/maxX = 6
-	var/maxY = 6
-	var/minX = 2
-	var/minY = 2
-
-/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY,var/type = null)
-	if(!type)
-		type = pick("sandstone","rock","alien")
-
-	var/lowBoundX = location.x
-	var/lowBoundY = location.y
-
-	var/hiBoundX = location.x + rand(lX,uX)
-	var/hiBoundY = location.y + rand(lY,uY)
-
-	var/z = location.z
-
-	for(var/i = lowBoundX,i<=hiBoundX,i++)
-		for(var/j = lowBoundY,j<=hiBoundY,j++)
-			if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
-				new /turf/simulated/wall/vault(locate(i,j,z),type)
-			else
-				new /turf/simulated/floor/vault(locate(i,j,z),type)
-
-	qdel(src)

code/game/objects/items.dm

@@ -25,9 +25,13 @@
 	var/action_button_name //It is also the text which gets displayed on the action button. If not set it defaults to 'Use [name]'. If it's not set, there'll be no button.
 	var/action_button_is_hands_free = 0 //If 1, bypass the restrained, lying, and stunned checks action buttons normally test for
 
-	//Since any item can now be a piece of clothing, this has to be put here so all items share it.
-	var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
+	//This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
+	//It should be used purely for appearance. For gameplay effects caused by items covering body parts, use body_parts_covered.
+	var/flags_inv = 0
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
+	
+	var/item_flags = 0 //Miscellaneous flags pertaining to equippable objects.
+	
 	//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
 	var/permeability_coefficient = 1 // for chemicals/diseases
@@ -418,14 +422,12 @@ var/list/global/slot_flags_enumeration = list(
 /obj/item/proc/eyestab(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 
 	var/mob/living/carbon/human/H = M
-	if(istype(H) && ( \
-			(H.head && H.head.flags & HEADCOVERSEYES) || \
-			(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
-			(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
-		))
-		// you can't stab someone in the eyes wearing a mask!
-		user << "<span class='warning'>You're going to need to remove the eye covering first.</span>"
-		return
+	if(istype(H))
+		for(var/obj/item/protection in list(H.head, H.wear_mask, H.glasses))
+			if(protection && (protection.body_parts_covered & EYES))
+				// you can't stab someone in the eyes wearing a mask!
+				user << "<span class='warning'>You're going to need to remove the eye covering first.</span>"
+				return
 
 	if(!M.has_eyes())
 		user << "<span class='warning'>You cannot locate any eyes on [M]!</span>"

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

@@ -40,7 +40,7 @@
 	var/mob/living/bot/secbot/active 	// the active bot; if null, show bot list
 	var/list/botstatus			// the status signal sent by the bot
 
-	var/control_freq = AI_FREQ
+	var/control_freq = BOT_FREQ
 
 	// create a new QM cartridge, and register to receive bot control & beacon message
 	New()
@@ -112,7 +112,7 @@
 	var/list/beacons
 
 	var/beacon_freq = 1400
-	var/control_freq = AI_FREQ
+	var/control_freq = BOT_FREQ
 
 	// create a new QM cartridge, and register to receive bot control & beacon message
 	New()

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

@@ -46,7 +46,7 @@
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/item/device/aicard/Topic(href, href_list, nowindow, state)
+/obj/item/device/aicard/Topic(href, href_list, state)
 	if(..())
 		return 1
 

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

@@ -19,7 +19,7 @@
 
 	matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
 
-	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 
 /obj/item/device/debugger/is_used_on(obj/O, mob/user)

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

@@ -51,7 +51,7 @@
 		var/mob/living/carbon/human/H = M	//mob has protective eyewear
 		if(istype(H))
 			for(var/obj/item/clothing/C in list(H.head,H.wear_mask,H.glasses))
-				if(istype(C) && C.flags & (HEADCOVERSEYES|MASKCOVERSEYES|GLASSESCOVERSEYES))
+				if(istype(C) && (C.body_parts_covered & EYES))
 					user << "<span class='warning'>You're going to need to remove [C.name] first.</span>"
 					return
 

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

@@ -4,212 +4,193 @@
 	icon_state = "labeler1"
 	item_state = "flight"
 
-	var/mode_nice = "standard"
-	var/mode = "floor"
-	var/tile_dir_mode = 0
+	var/decal =        "remove all decals"
+	var/paint_dir =    "precise"
+	var/paint_colour = "white"
 
-	// mode 0  ignore direction; sets dir=0
-	// mode 1  all-direction
-	// mode 2  corner selecting the side CW from the selected corner
-	// mode 3  cardinal
-	// mode 4  warningcorner and warnwhitecorner direction fix
-	// mode 5  Opposite corner tiles where the second icon_state is "[mode]_inv"
-/obj/item/device/floor_painter/afterattack(atom/A, mob/user as mob, proximity)
+	var/list/decals = list(
+		"quarter-turf" =      list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
+		"hazard stripes" =    list("path" = /obj/effect/floor_decal/industrial/warning),
+		"corner, hazard" =    list("path" = /obj/effect/floor_decal/industrial/warning/corner),
+		"hatched marking" =   list("path" = /obj/effect/floor_decal/industrial/hatch),
+		"dotted outline" =    list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1),
+		"loading sign" =      list("path" = /obj/effect/floor_decal/industrial/loading),
+		"1" =                 list("path" = /obj/effect/floor_decal/sign),
+		"2" =                 list("path" = /obj/effect/floor_decal/sign/two),
+		"A" =                 list("path" = /obj/effect/floor_decal/sign/a),
+		"B" =                 list("path" = /obj/effect/floor_decal/sign/b),
+		"C" =                 list("path" = /obj/effect/floor_decal/sign/c),
+		"D" =                 list("path" = /obj/effect/floor_decal/sign/d),
+		"Ex" =                list("path" = /obj/effect/floor_decal/sign/ex),
+		"M" =                 list("path" = /obj/effect/floor_decal/sign/m),
+		"CMO" =               list("path" = /obj/effect/floor_decal/sign/cmo),
+		"V" =                 list("path" = /obj/effect/floor_decal/sign/v),
+		"Psy" =               list("path" = /obj/effect/floor_decal/sign/p),
+		"remove all decals" = list("path" = /obj/effect/floor_decal/reset)
+		)
+	var/list/paint_dirs = list(
+		"north" =       NORTH,
+		"northwest" =   NORTHWEST,
+		"west" =        WEST,
+		"southwest" =   SOUTHWEST,
+		"south" =       SOUTH,
+		"southeast" =   SOUTHEAST,
+		"east" =        EAST,
+		"northeast" =   NORTHEAST,
+		"precise" = 0
+		)
+	var/list/paint_colours = list(
+		"white" =            COLOR_WHITE,
+		"light gray" =       COLOR_SILVER,
+		"dark gray" =        COLOR_GRAY,
+		"blue-grey" =        "#6A97B0",
+		"pale blue-grey" =   "#8BBBD5",
+		"green-grey" =       "#8DAF6A",
+		"pale green-gray" =  "#AED18B",
+		"red-gray" =         "#AA5F61",
+		"pale red-gray" =    "#CC9090",
+		"purple-gray" =      "#A2819E",
+		"pale purple-gray" = "#BDA2BA",
+		"black" =             COLOR_BLACK,
+		"red" =               COLOR_RED,
+		"dark red" =          COLOR_MAROON,
+		"yellow" =            COLOR_YELLOW,
+		"dark yellow" =       COLOR_OLIVE,
+		"green" =             COLOR_LIME,
+		"dark green" =        COLOR_GREEN,
+		"cyan" =              COLOR_CYAN,
+		"teal" =              COLOR_TEAL,
+		"blue" =              COLOR_BLUE,
+		"dark blue" =         COLOR_NAVY,
+		"magenta" =           COLOR_PINK,
+		"purple" =            COLOR_PURPLE,
+		"orange" =            COLOR_ORANGE,
+		"dark orange" =       "#B95A00",
+		"dark brown" =        "#917448",
+		"brown" =             "#B19664",
+		"pale brown" =        "#CEB689"
+		)
+
+/obj/item/device/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params)
 	if(!proximity)
 		return
 
-	if(istype(A, /turf/simulated/floor))
-		var/turf/simulated/floor/F = A
+	var/turf/simulated/floor/F = A
+	if(!istype(F))
+		user << "<span class='warning'>\The [src] can only be used on station flooring.</span>"
+		return
 
-		if(F.is_steel_floor()) // only tiled floors
-			if(tile_dir_mode)
-				var/D = get_dir(usr, F)
-				if(usr.loc == F)
-					D = usr.dir
+	if(!F.flooring || !F.flooring.can_paint || F.broken || F.burnt)
+		user << "<span class='warning'>\The [src] cannot paint broken or missing tiles.</span>"
+		return
 
-				switch(tile_dir_mode)
-					if(1) // All directions accepted
-						F.set_dir(D)
-						F.icon_state = mode
-					if(2) // Corner mode - diagonal directions converted CW around.
-						switch(D)
-							if(NORTHEAST)
-								D = EAST
-							if(SOUTHEAST)
-								D = SOUTH
-							if(SOUTHWEST)
-								D = WEST
-							if(NORTHWEST)
-								D = NORTH
-						F.set_dir(D)
-						F.icon_state = mode
-					if(3) // cardinal directions only. I've adjusted diagonals the same way the facing code does.
-						switch(D)
-							if(NORTHEAST)
-								D = EAST
-							if(SOUTHEAST)
-								D = EAST
-							if(SOUTHWEST)
-								D = WEST
-							if(NORTHWEST)
-								D = WEST
-						F.set_dir(D)
-						F.icon_state = mode
-					if(4) // floors.dmi icon_states "warningcorner" and "warnwhitecorner" are incorrect, this fixes it
-						var/D2
-						switch(D)
-							if(NORTHEAST)
-								D2 = WEST
-							if(SOUTHEAST)
-								D2 = SOUTH
-							if(SOUTHWEST)
-								D2 = NORTH
-							if(NORTHWEST)
-								D2 = EAST
-						F.set_dir(D2)
-						F.icon_state = mode
-					if(5)
-						F.set_dir(0)
-						if(D == NORTH || D == SOUTH || D == NORTHEAST || D == SOUTHWEST)
-							F.icon_state = mode
-						else
-							F.icon_state = "[mode]_inv"
-			else
-				F.set_dir(0)
-				F.icon_state = mode
+	var/list/decal_data = decals[decal]
+	var/config_error
+	if(!islist(decal_data))
+		config_error = 1
+	var/painting_decal
+	if(!config_error)
+		painting_decal = decal_data["path"]
+		if(!ispath(painting_decal))
+			config_error = 1
+
+	if(config_error)
+		user << "<span class='warning'>\The [src] flashes an error light. You might need to reconfigure it.</span>"
+		return
+
+	if(F.decals && F.decals.len > 5 && painting_decal != /obj/effect/floor_decal/reset)
+		user << "<span class='warning'>\The [F] has been painted too much; you need to clear it off.</span>"
+		return
+
+	var/painting_dir = 0
+	if(paint_dir == "precise")
+		if(!decal_data["precise"])
+			painting_dir = user.dir
 		else
-			usr << "You can't paint that!"
+			var/list/mouse_control = params2list(params)
+			var/mouse_x = text2num(mouse_control["icon-x"])
+			var/mouse_y = text2num(mouse_control["icon-y"])
+			if(isnum(mouse_x) && isnum(mouse_y))
+				if(mouse_x <= 16)
+					if(mouse_y <= 16)
+						painting_dir = WEST
+					else
+						painting_dir = NORTH
+				else
+					if(mouse_y <= 16)
+						painting_dir = SOUTH
+					else
+						painting_dir = EAST
+			else
+				painting_dir = user.dir
+	else if(paint_dirs[paint_dir])
+		painting_dir = paint_dirs[paint_dir]
+
+	var/painting_colour
+	if(paint_colour && !isnull(paint_colours[paint_colour]) && decal_data["coloured"])
+		painting_colour = paint_colours[paint_colour]
+
+	new painting_decal(F, painting_dir, painting_colour)
 
 /obj/item/device/floor_painter/attack_self(mob/user as mob)
-	var/type = input("What type of floor?", "Floor painter", "solid") in list("solid", "corner", "opposite corners", "side/three corners", "special", "letters")
 
-	tile_dir_mode = 0
+	var/choice = input("Do you wish to change the decal type, paint direction, or paint colour?") as null|anything in list("Decal","Direction", "Colour")
 
-	switch(type)
-		if("solid")
-			tile_dir_mode = 0
-			var/design = input("Which color?", "Floor painter") in list("standard", "dark", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple", "freezer", "hydro", "showroom")
-			if(design == "standard")
-				mode = "floor"
-				mode_nice = "standard"
-				return
-			if(design == "white")
-				mode = "white"
-				mode_nice = "white"
-				return
-			if(design == "dark")
-				mode = "dark"
-				mode_nice = "dark"
-				return
-			if(design == "showroom" || design == "hydro" || design == "freezer")
-				mode = "[design]floor"
-				mode_nice = design
-				return
-			mode_nice = design
-			mode = "[replacetext(design, "-", "")]full"
-		if("corner")
-			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
-			mode_nice = "[design] corner"
-			mode = "[replacetext(design, "-", "")]corner"
-			tile_dir_mode = 2
-		if("opposite corners")
-			var/design = input("Which design?", "Floor painter") in list("bar", "cmo", "yellowpatch", "cafeteria", "red-yellow", "red-blue", "red-green", "green-yellow", "green-blue", "blue-yellow")
-			mode_nice = design
-			if(design == "bar" || design == "cmo" || design == "yellowpatch" || design == "cafeteria")
-				mode = design
-			else
-				mode = "[replacetext(design, "-", "")]full"
-			if(design == "yellowpatch")
-				tile_dir_mode = 5
-			else
-				tile_dir_mode = 0
-		if("side/three corners")
-			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple", "red-yellow", "red-blue", "blue-red", "red-green", "green-yellow", "green-blue", "blue-yellow")
-			if(design == "white")
-				mode = "whitehall"
-				mode_nice = "white side"
-			else if(design == "black") // because SOMEONE made the black/grey side/corner sprite have the same name as the 'empty space' sprite :(
-				mode = "blackfloor"
-				mode_nice = design
-			else
-				mode_nice = design
-				mode = replacetext(design, "-", "")
-			tile_dir_mode = 1
-		if("special")
-			var/design = input("Which design?", "Floor painter") in list("arrival", "escape", "caution", "warning", "white-warning", "white-blue-green", "loadingarea", "delivery", "bot", "white-delivery", "white-bot")
-			if(design == "white-blue-green")
-				mode_nice = design
-				mode = "whitebluegreencorners"
-				tile_dir_mode = 2
-			else if(design == "delivery" || design == "bot" || design == "white-delivery" || design == "white-bot")
-				mode_nice = design
-				mode = replacetext(design, "-", "")
-				tile_dir_mode = 0
-			else if(design == "loadingarea")
-				mode_nice = design
-				mode = design
-				tile_dir_mode = 3
-			else
-				if(design == "white-warning")
-					mode_nice = design
-					design = "warnwhite"
-				var/s_corner = alert("Do you want to paint a single corner of the tile?", "Floor painter","Yes","No") == "Yes"
-				if(s_corner)
-					mode_nice = "[design] corner"
-					mode = "[design]corner"
-					if(design == "warning" || design == "white-warning") // sprites for these are weird, need to fix dirs (icons/turf/floors.dmi, "warningcorner" and "warnwhitecorner")
-						tile_dir_mode = 4
-					else
-						tile_dir_mode = 2
-				else
-					mode_nice = design
-					mode = design
-					tile_dir_mode = 1
-		if("letters")
-			var/which = input("Which letters/design?", "Floor painter") in list("A1", "A2", "DI", "SA", "SA (red)", "SB", "SB (red)", "SC", "SC (red)", "W (red)", "V (green)", "Psy", "Ex", "Ex (blue)", "CMO", "O (OP)", "P (OP)")
-			mode_nice = which
-			switch(which)
-				if("A1")
-					mode = "white_1"
-				if("A2")
-					mode = "white_2"
-				if("DI")
-					mode = "white_d"
-				if("SA")
-					mode = "white_a"
-				if("SA (red)")
-					mode = "whitered_a"
-					tile_dir_mode = 3
-				if("SB")
-					mode = "white_b"
-				if("SB (red)")
-					mode = "whitered_b"
-					tile_dir_mode = 3
-				if("SC")
-					mode = "white_c"
-				if("SC (red)")
-					mode = "whitered_c"
-					tile_dir_mode = 3
-				if("W (red)")
-					mode = "whitered_w"
-					tile_dir_mode = 3
-				if("V (green)")
-					mode = "whitegreen_v"
-					tile_dir_mode = 3
-				if("Psy")
-					mode = "white_p"
-				if("Ex")
-					mode = "white_ex"
-				if("Ex (blue)")
-					mode = "whiteblue_ex"
-					tile_dir_mode = 3
-				if("CMO") // yes this is also in "opposite corners" choices, but it's a different icon_state  (!!)
-					mode = "white_cmo"
-				if("O (OP)")
-					mode = "white_halfo"
-				if("P (OP)")
-					mode = "white_halfp"
+	if(choice == "Decal")
+		var/new_decal = input("Select a decal.") as null|anything in decals
+		if(new_decal && !isnull(decals[new_decal]))
+			decal = new_decal
+			user << "<span class='notice'>You set \the [src] decal to '[decal]'.</span>"
+	else if(choice == "Direction")
+		var/new_dir = input("Select a direction.") as null|anything in paint_dirs
+		if(new_dir && !isnull(paint_dirs[new_dir]))
+			paint_dir = new_dir
+			user << "<span class='notice'>You set \the [src] direction to '[paint_dir]'.</span>"
+	else if(choice == "Colour")
+		var/new_colour = input("Select a colour.") as null|anything in paint_colours
+		if(new_colour && !isnull(paint_colours[new_colour]))
+			paint_colour = new_colour
+			user << "<span class='notice'>You set \the [src] colour to '[paint_colour]'.</span>"
 
 /obj/item/device/floor_painter/examine(mob/user)
 	..(user)
-	user << "It is in [mode_nice] mode."
+	user << "It is configured to produce the '[decal]' decal with a direction of '[paint_dir]' using [paint_colour] paint."
+
+/obj/item/device/floor_painter/verb/choose_colour(new_colour in paint_colours)
+	set name = "Choose Colour"
+	set desc = "Choose a floor painter colour."
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+
+	if(new_colour && !isnull(paint_colours[new_colour]))
+		paint_colour = new_colour
+		usr << "<span class='notice'>You set \the [src] colour to '[paint_colour]'.</span>"
+
+/obj/item/device/floor_painter/verb/choose_decal(new_decal in decals)
+	set name = "Choose Decal"
+	set desc = "Choose a floor painter decal."
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+
+	if(new_decal && !isnull(decals[new_decal]))
+		decal = new_decal
+		usr << "<span class='notice'>You set \the [src] decal to '[decal]'.</span>"
+
+/obj/item/device/floor_painter/verb/choose_direction(new_dir in paint_dirs)
+	set name = "Choose Direction"
+	set desc = "Choose a floor painter direction."
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+
+	if(new_dir && !isnull(paint_dirs[new_dir]))
+		paint_dir = new_dir
+		usr << "<span class='notice'>You set \the [src] direction to '[paint_dir]'.</span>"

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

@@ -18,6 +18,6 @@
 
 	matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
 
-	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 	var/obj/machinery/clonepod/connecting //same for cryopod linkage

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

@@ -16,16 +16,11 @@
 /obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity)
 		return
-	
+
 	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
 		return
 	var/obj/machinery/atmospherics/pipe/P = A
 
-	var/turf/T = P.loc
-	if (P.level < 2 && T.level==1 && isturf(T) && T.intact)
-		user << "<span class='warning'>You must remove the plating first.</span>"
-		return
-
 	P.change_color(pipe_colors[mode])
 
 /obj/item/device/pipe_painter/attack_self(mob/user as mob)

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

@@ -22,7 +22,7 @@
 	var/mode = 0					// 0 = off, 1=clamped (off), 2=operating
 	var/drained_this_tick = 0		// This is unfortunately necessary to ensure we process powersinks BEFORE other machinery such as APCs.
 
-	var/datum/powernet/PN			// Our powernet
+	var/datum/powernet/PN			// Our powernet
 	var/obj/structure/cable/attached		// the attached cable
 
 /obj/item/device/powersink/Destroy()
@@ -34,7 +34,7 @@
 	if(istype(I, /obj/item/weapon/screwdriver))
 		if(mode == 0)
 			var/turf/T = loc
-			if(isturf(T) && !T.intact)
+			if(isturf(T) && !!T.is_plating())
 				attached = locate() in T
 				if(!attached)
 					user << "No exposed cable here to attach to."

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

@@ -67,3 +67,10 @@
 			icon_state = "intercom-p"
 		else
 			icon_state = "intercom"
+
+/obj/item/device/radio/intercom/locked
+    freerange = 1
+    var/locked_frequency
+    
+/obj/item/device/radio/intercom/locked/set_frequency()
+    ..(locked_frequency)

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

@@ -8,6 +8,7 @@ MASS SPECTROMETER
 REAGENT SCANNER
 */
 
+
 /obj/item/device/healthanalyzer
 	name = "health analyzer"
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
@@ -200,7 +201,7 @@ REAGENT SCANNER
 
 	matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
 
-	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 
 /obj/item/device/analyzer/atmosanalyze(var/mob/user)
 	var/air = user.return_air()

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

@@ -14,7 +14,7 @@
 	throw_range = 15
 	throw_speed = 3
 
-	origin_tech = list(TECH_DATA = 1, TECH_ENGINERING = 1, TECH_ILLEGAL = 3)
+	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3)
 
 	var/obj/item/device/radio/spy/radio
 	var/obj/machinery/camera/spy/camera
@@ -53,7 +53,7 @@
 
 	w_class = 2.0
 
-	origin_tech = list(TECH_DATA = 1, TECH_ENGINERING = 1, TECH_ILLEGAL = 3)
+	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3)
 
 	var/operating = 0
 	var/obj/item/device/radio/spy/radio

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

@@ -8,7 +8,7 @@
 	w_class = 2
 	item_state = "electronic"
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
-	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 
 	var/scan_range = 1
 
@@ -61,10 +61,10 @@
 		user_client.images += overlay
 
 	//Remove stale overlays
-	for(var/obj/O in update_remove) 
+	for(var/obj/O in update_remove)
 		user_client.images -= active_scanned[O]
 		active_scanned -= O
-	
+
 	//Flicker effect
 	for(var/obj/O in active_scanned)
 		var/image/overlay = active_scanned[O]
@@ -76,19 +76,19 @@
 
 //creates a new overlay for a scanned object
 /obj/item/device/t_scanner/proc/get_overlay(obj/scanned)
-	//Use a cache so we don't create a whole bunch of new images just because someone's walking back and forth in a room. 
+	//Use a cache so we don't create a whole bunch of new images just because someone's walking back and forth in a room.
 	//Also means that images are reused if multiple people are using t-rays to look at the same objects.
 	if(scanned in overlay_cache)
 		. = overlay_cache[scanned]
 	else
 		var/image/I = image(loc = scanned, icon = scanned.icon, icon_state = scanned.icon_state, layer = HUD_LAYER)
-		
+
 		//Pipes are special
 		if(istype(scanned, /obj/machinery/atmospherics/pipe))
 			var/obj/machinery/atmospherics/pipe/P = scanned
 			I.color = P.pipe_color
 			I.overlays += P.overlays
-		
+
 		I.alpha = 128
 		I.mouse_opacity = 0
 		. = I
@@ -100,12 +100,12 @@
 
 /obj/item/device/t_scanner/proc/get_scanned_objects(var/scan_dist)
 	. = list()
-	
+
 	var/turf/center = get_turf(src.loc)
 	if(!center) return
-	
+
 	for(var/turf/T in range(scan_range, center))
-		if(!T.intact)
+		if(!!T.is_plating())
 			continue
 
 		for(var/obj/O in T.contents)

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

@@ -9,6 +9,7 @@
 	var/mob/attacher = null
 	var/valve_open = 0
 	var/toggle = 1
+	flags = PROXMOVE
 
 /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
 
@@ -69,7 +70,7 @@
 
 /obj/item/device/transfer_valve/attack_self(mob/user as mob)
 	ui_interact(user)
-	
+
 /obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 
 	// this is the data which will be sent to the ui
@@ -80,7 +81,7 @@
 	data["valveOpen"] = valve_open ? 1 : 0
 
 	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)	
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm

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

@@ -15,6 +15,9 @@
 /datum/uplink_category/ammunition
 	name = "Ammunition"
 
+/datum/uplink_category/grenades
+	name = "Grenades and Thrown Objects"
+
 /datum/uplink_category/visible_weapons
 	name = "Highly Visible and Dangerous Weapons"
 
@@ -36,5 +39,8 @@
 /datum/uplink_category/hardsuit_modules
 	name = "Hardsuit Modules"
 
+/datum/uplink_category/services
+	name = "Services"
+
 /datum/uplink_category/badassery
 	name = "Badassery"

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

@@ -9,6 +9,7 @@ var/datum/uplink/uplink = new()
 	items_assoc = list()
 	items = init_subtypes(/datum/uplink_item)
 	categories = init_subtypes(/datum/uplink_category)
+	categories = dd_sortedObjectList(categories)
 
 	for(var/datum/uplink_item/item in items)
 		if(!item.name)
@@ -38,15 +39,31 @@ var/datum/uplink/uplink = new()
 	..()
 	antag_roles = list()
 
-/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user)
-	purchase_log(U)
-	var/cost = cost(U.uses)
-	var/goods = get_goods(U, get_turf(user))
 
+
+/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user)
+	var/extra_args = extra_args(user)
+	if(!extra_args)
+		return
+
+	if(!can_buy(U))
+		return
+
+	var/cost = cost(U.uses)
+
+	var/goods = get_goods(U, get_turf(user), user, extra_args)
+	if(!goods)
+		return
+
+	purchase_log(U)
 	U.uses -= cost
 	U.used_TC += cost
 	return goods
 
+// Any additional arguments you wish to send to the get_goods
+/datum/uplink_item/proc/extra_args(var/mob/user)
+	return 1
+
 /datum/uplink_item/proc/can_buy(obj/item/device/uplink/U)
 	if(cost(U.uses) > U.uses)
 		return 0
@@ -90,11 +107,14 @@ datum/uplink_item/dd_SortValue()
 
 /********************************
 *                           	*
-*	Physical Uplink Entires		*
+*	Physical Uplink Entries		*
 *                           	*
 ********************************/
 /datum/uplink_item/item/buy(var/obj/item/device/uplink/U, var/mob/user)
 	var/obj/item/I = ..()
+	if(!I)
+		return
+
 	if(istype(I, /list))
 		var/list/L = I
 		if(L.len) I = L[1]
@@ -156,11 +176,6 @@ datum/uplink_item/dd_SortValue()
 /datum/uplink_item/item/visible_weapons
 	category = /datum/uplink_category/visible_weapons
 
-/datum/uplink_item/item/visible_weapons/emp
-	name = "5xEMP Grenades"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/emps
-
 /datum/uplink_item/item/visible_weapons/energy_sword
 	name = "Energy Sword"
 	item_cost = 4
@@ -452,6 +467,27 @@ datum/uplink_item/dd_SortValue()
 	item_cost = 8
 	path = /obj/item/rig_module/mounted
 
+/***********
+* Grenades *
+************/
+/datum/uplink_item/item/grenades
+	category = /datum/uplink_category/grenades
+
+/datum/uplink_item/item/grenades/anti_photon
+	name = "5xPhoton Disruption Grenades"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/anti_photons
+
+/datum/uplink_item/item/grenades/emp
+	name = "5xEMP Grenades"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/emps
+
+/datum/uplink_item/item/grenades/smoke
+	name = "5xSmoke Grenades"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/smokes
+
 /************
 * Badassery *
 ************/
@@ -531,6 +567,124 @@ datum/uplink_item/dd_SortValue()
 
 	return "\icon[icon]"
 
+/********************************
+*                           	*
+*	Abstract Uplink Entries		*
+*                           	*
+********************************/
+var/image/default_abstract_uplink_icon
+/datum/uplink_item/abstract/log_icon()
+	if(!default_abstract_uplink_icon)
+		default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
+
+	return "\icon[default_abstract_uplink_icon]"
+
+/****************
+* Announcements *
+*****************/
+/datum/uplink_item/abstract/announcements
+	category = /datum/uplink_category/services
+
+/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user)
+	. = ..()
+	if(.)
+		log_and_message_admins("has triggered a falsified [src]", user)
+
+/datum/uplink_item/abstract/announcements/fake_centcom
+	item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 2
+
+/datum/uplink_item/abstract/announcements/fake_centcom/New()
+	..()
+	name = "[command_name()] Update Announcement"
+	desc = "Causes a falsified [command_name()] Update. Triggers immediately after supplying additional data."
+	antag_roles = list(MODE_MERCENARY)
+
+/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
+	command_announcement.Announce(args.["message"], args.["title"])
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_crew_arrival
+	name = "Crew Arrival Announcement/Records"
+	desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!"
+	item_cost = 4
+
+/datum/uplink_item/abstract/announcements/fake_crew_arrival/New()
+	..()
+	antag_roles = list(MODE_MERCENARY)
+
+/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
+	if(!user)
+		return 0
+
+	var/obj/item/weapon/card/id/I = GetIdCard(user)
+	var/datum/data/record/random_general_record
+	var/datum/data/record/random_medical_record
+	if(data_core.general.len)
+		random_general_record	= pick(data_core.general)
+		random_medical_record	= find_medical_record("id", random_general_record.fields["id"])
+
+	var/datum/data/record/general = data_core.CreateGeneralRecord(user)
+	if(I)
+		general.fields["age"] = I.age
+		general.fields["rank"] = I.assignment
+		general.fields["real_rank"] = I.assignment
+		general.fields["name"] = I.registered_name
+		general.fields["sex"] = I.sex
+	else
+		var/mob/living/carbon/human/H
+		if(istype(user,/mob/living/carbon/human))
+			H = user
+			general.fields["age"] = H.age
+		else
+			general.fields["age"] = initial(H.age)
+		var/assignment = GetAssignment(user)
+		general.fields["rank"] = assignment
+		general.fields["real_rank"] = assignment
+		general.fields["name"] = user.real_name
+		general.fields["sex"] = capitalize(user.gender)
+
+	general.fields["species"] = user.get_species()
+	var/datum/data/record/medical = data_core.CreateMedicalRecord(general.fields["name"], general.fields["id"])
+	data_core.CreateSecurityRecord(general.fields["name"], general.fields["id"])
+
+	if(!random_general_record)
+		general.fields["citizenship"]	= random_general_record.fields["citizenship"]
+		general.fields["faction"] 		= random_general_record.fields["faction"]
+		general.fields["fingerprint"] 	= random_general_record.fields["fingerprint"]
+		general.fields["home_system"] 	= random_general_record.fields["home_system"]
+		general.fields["religion"] 		= random_general_record.fields["religion"]
+	if(random_medical_record)
+		medical.fields["b_type"]		= random_medical_record.fields["b_type"]
+		medical.fields["b_dna"]			= random_medical_record.fields["b_type"]
+
+	if(I)
+		general.fields["fingerprint"] 	= I.fingerprint_hash
+		medical.fields["b_type"]	= I.blood_type
+		medical.fields["b_dna"]		= I.dna_hash
+
+	AnnounceArrivalSimple(general.fields["name"], general.fields["rank"])
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_ion_storm
+	name = "Ion Storm Announcement"
+	desc = "Interferes with the station's ion sensors. Triggers immediately upon investment."
+	item_cost = 1
+
+/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc)
+	ion_storm_announcement()
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_radiation
+	name = "Radiation Storm Announcement"
+	desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment."
+	item_cost = 3
+
+/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
+	new/datum/event/radiation_storm/syndicate(EM)
+	return 1
+
+
 /****************
 * Support procs *
 ****************/

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

@@ -44,7 +44,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/a357)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/heavysniper, 15, 0)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/sniperammo, 15, 0)
-	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/emp, 50)
+	items += new/datum/uplink_random_item(/datum/uplink_item/item/grenades/emp, 50)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/crossbow, 33)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/energy_sword, 75)
 

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

@@ -4,7 +4,7 @@
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	icon = 'icons/obj/nanopaste.dmi'
 	icon_state = "tube"
-	origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINERING = 3)
+	origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
 	amount = 10
 
 

code/game/objects/items/stacks/sheets/light.dm

@@ -1,33 +0,0 @@
-/obj/item/stack/light_w
-	name = "wired glass tile"
-	singular_name = "wired glass floor tile"
-	desc = "A glass tile, which is wired, somehow."
-	icon_state = "glass_wire"
-	w_class = 3.0
-	force = 3.0
-	throwforce = 5.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
-
-/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	..()
-	if(istype(O,/obj/item/weapon/wirecutters))
-		var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
-		CC.amount = 5
-		amount--
-		new/obj/item/stack/material/glass(user.loc)
-		if(amount <= 0)
-			user.drop_from_inventory(src)
-			qdel(src)
-
-	if(istype(O,/obj/item/stack/material) && O.get_material_name() == DEFAULT_WALL_MATERIAL)
-		var/obj/item/stack/M = O
-		if (M.use(1))
-			use(1)
-			new/obj/item/stack/tile/light(get_turf(user))
-			user << "<span class='notice'>You make a light tile.</span>"
-		else
-			user << "<span class='warning'>You need one metal sheet to finish the light tile.</span>"
-		return

code/game/objects/items/stacks/tiles/light.dm

@@ -1,36 +0,0 @@
-/obj/item/stack/tile/light
-	name = "light tile"
-	singular_name = "light floor tile"
-	desc = "A floor tile, made out off glass. It produces light."
-	icon_state = "tile_e"
-	w_class = 3.0
-	force = 3.0
-	throwforce = 5.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
-	var/on = 1
-	var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken
-
-/obj/item/stack/tile/light/New(var/loc, var/amount=null)
-	..()
-	if(prob(5))
-		state = 3 //broken
-	else if(prob(5))
-		state = 2 //breaking
-	else if(prob(10))
-		state = 1 //flickering occasionally
-	else
-		state = 0 //fine
-
-/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	..()
-	if(istype(O,/obj/item/weapon/crowbar))
-		new/obj/item/stack/material/steel(user.loc)
-		amount--
-		new/obj/item/stack/light_w(user.loc)
-		if(amount <= 0)
-			user.drop_from_inventory(src)
-			qdel(src)

code/game/objects/items/stacks/tiles/plasteel.dm

@@ -1,34 +0,0 @@
-/obj/item/stack/tile/steel
-	name = "floor tile"
-	singular_name = "floor tile"
-	desc = "Those could work as a pretty decent throwing weapon" //why?
-	icon_state = "tile"
-	force = 6.0
-	matter = list(DEFAULT_WALL_MATERIAL = 937.5)
-	throwforce = 15.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-
-/obj/item/stack/tile/steel/New(var/loc, var/amount=null)
-	..()
-	src.pixel_x = rand(1, 14)
-	src.pixel_y = rand(1, 14)
-	return
-
-/obj/item/stack/tile/steel/cyborg
-	name = "floor tile synthesizer"
-	desc = "A device that makes floor tiles."
-	gender = NEUTER
-	matter = null
-	uses_charge = 1
-	charge_costs = list(250)
-	stacktype = /obj/item/stack/tile/steel
-	build_type = /obj/item/stack/tile/steel
-
-/obj/item/stack/tile/steel/proc/build(turf/S as turf)
-	if (istype(S,/turf/space))
-		S.ChangeTurf(/turf/simulated/floor/plating/airless)
-	else
-		S.ChangeTurf(/turf/simulated/floor/plating)
-	return

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -5,7 +5,7 @@
  *		Wood
  *		Carpet
  */
- 
+
 /obj/item/stack/tile
 	name = "tile"
 	singular_name = "tile"
@@ -14,6 +14,11 @@
 	max_amount = 60
 	var/build_type = null
 
+/obj/item/stack/tile/New()
+	..()
+	pixel_x = rand(-7, 7)
+	pixel_y = rand(-7, 7)
+
 /*
  * Grass
  */
@@ -64,3 +69,59 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
+
+/obj/item/stack/tile/floor
+	name = "floor tile"
+	singular_name = "floor tile"
+	desc = "Those could work as a pretty decent throwing weapon" //why?
+	icon_state = "tile"
+	force = 6.0
+	matter = list(DEFAULT_WALL_MATERIAL = 937.5)
+	throwforce = 15.0
+	throw_speed = 5
+	throw_range = 20
+	flags = CONDUCT
+
+/obj/item/stack/tile/floor_red
+	name = "red floor tile"
+	singular_name = "red floor tile"
+	icon_state = "tile_red"
+
+/obj/item/stack/tile/floor_steel
+	name = "steel floor tile"
+	singular_name = "steel floor tile"
+	icon_state = "tile_steel"
+	matter = list("plasteel" = 937.5)
+
+/obj/item/stack/tile/floor_white
+	name = "white floor tile"
+	singular_name = "white floor tile"
+	icon_state = "tile_white"
+	matter = list("plastic" = 937.5)
+
+/obj/item/stack/tile/floor_yellow
+	name = "yellow floor tile"
+	singular_name = "yellow floor tile"
+	icon_state = "tile_yellow"
+
+/obj/item/stack/tile/floor_dark
+	name = "dark floor tile"
+	singular_name = "dark floor tile"
+	icon_state = "fr_tile"
+	matter = list("plasteel" = 937.5)
+
+/obj/item/stack/tile/floor_freezer
+	name = "freezer floor tile"
+	singular_name = "freezer floor tile"
+	icon_state = "tile_freezer"
+	matter = list("plastic" = 937.5)
+
+/obj/item/stack/tile/floor/cyborg
+	name = "floor tile synthesizer"
+	desc = "A device that makes floor tiles."
+	gender = NEUTER
+	matter = null
+	uses_charge = 1
+	charge_costs = list(250)
+	stacktype = /obj/item/stack/tile/floor
+	build_type = /obj/item/stack/tile/floor

code/game/objects/items/toys.dm

@@ -344,7 +344,6 @@
 	item_state = "sword0"
 	var/active = 0.0
 	w_class = 2.0
-	flags = NOSHIELD
 	attack_verb = list("attacked", "struck", "hit")
 
 	attack_self(mob/user as mob)

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)

code/game/objects/objs.dm

@@ -19,9 +19,8 @@
 	nanomanager.close_uis(src)
 	return ..()
 
-/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state)
-	// Calling Topic without a corresponding window open causes runtime errors
-	if(!nowindow && ..())
+/obj/Topic(href, href_list, var/datum/topic_state/state = default_state)
+	if(usr && ..())
 		return 1
 
 	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
@@ -126,6 +125,8 @@
 /obj/proc/hide(h)
 	return
 
+/obj/proc/hides_under_flooring()
+	return 0
 
 /obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
 	if(talking_atom)
@@ -142,4 +143,4 @@
 	return
 
 /obj/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
-	return
+	return

code/game/objects/structures/barsign.dm

@@ -3,26 +3,45 @@
 	icon_state = "empty"
 	anchored = 1
 	var/cult = 0
-	New()
-		ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt","thebark","theharmbaton","theharmedbaton","thesingulo","thedrukcarp","thedrunkcarp", "scotch","officerbeersky","on"))
-		return
-	proc/ChangeSign(var/Text)
-		src.icon_state = "[Text]"
-		//on = 0
-		//brightness_on = 4 //uncomment these when the lighting fixes get in
-		return
+
+/obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
+	. = icon_states(icon)
+	. -= "on"
+	. -= "narsiebistro"
+	. -= "empty"
+	if(initial)
+		. -= "Off"
+
+/obj/structure/sign/double/barsign/examine(mob/user)
+	..()
+	switch(icon_state)
+		if("Off")
+			user << "It appears to be switched off."
+		if("narsiebistro")
+			user << "It shows a picture of a large black and red being. Spooky!"
+		if("on", "empty")
+			user << "The lights are on, but there's no picture."
+		else
+			user << "It says '[icon_state]'"
+
+/obj/structure/sign/double/barsign/New()
+	..()
+	icon_state = pick(get_valid_states())
 
 /obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
 	if(cult)
+		return ..()
+
+	var/obj/item/weapon/card/id/card = I.GetID()
+	if(istype(card))
+		if(access_bar in card.GetAccess())
+			var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0)
+			if(!sign_type)
+				return
+			icon_state = sign_type
+			user << "<span class='notice'>You change the barsign.</span>"
+		else
+			user << "<span class='warning'>Access denied.</span>"
 		return
 
-	if(istype(I, /obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/card = I
-		if(access_bar in card.GetAccess())
-			var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in list("Off", "Pink Flamingo", "Magma Sea", "Limbo", "Rusty Axe", "Armok Bar", "Broken Drum", "Mead Bay", "The Damn Wall", "The Cavern", "Cindi Kate", "The Orchard", "The Saucy Clown", "The Clowns Head", "Whiskey Implant", "Carpe Carp", "Robust Roadhouse", "Greytide", "The Redshirt", "The Bark", "The Harm Baton", "The Harmed Baton", "The Singulo", "The Druk Carp", "The Drunk Carp", "Scotch", "Officer Beersky", "On")
-			if(sign_type == null)
-				return
-			else
-				sign_type = replacetext(lowertext(sign_type), " ", "") // lowercase, strip spaces - along with choices for user options, avoids huge if-else-else
-				src.ChangeSign(sign_type)
-				user << "You change the barsign."
+	return ..()

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -68,7 +68,7 @@
 	new /obj/item/weapon/cartridge/janitor(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
-	new /obj/item/clothing/head/beret/jan(src)
+	new /obj/item/clothing/head/beret/purple(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -122,7 +122,7 @@
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/clothing/accessory/holster/waist(src)
 		new /obj/item/weapon/melee/telebaton(src)
-		new /obj/item/clothing/head/beret/sec/hos(src)
+		new /obj/item/clothing/head/beret/sec/corporate/hos(src)
 		return
 
 
@@ -159,7 +159,7 @@
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/weapon/storage/box/holobadge(src)
-		new /obj/item/clothing/head/beret/sec/warden(src)
+		new /obj/item/clothing/head/beret/sec/corporate/warden(src)
 		return
 
 

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -26,9 +26,9 @@
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
+	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
+	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
+	new /obj/item/clothing/head/beret/sec/corporate/officer(src)
 	return
 
 
@@ -167,9 +167,9 @@
 	new /obj/item/clothing/head/hardhat/red(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 	new /obj/item/clothing/head/hardhat/red(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/engineering(src)
+	new /obj/item/clothing/head/beret/engineering(src)
+	new /obj/item/clothing/head/beret/engineering(src)
 	return
 
 
@@ -190,9 +190,9 @@
 	new /obj/item/clothing/head/hardhat(src)
 	new /obj/item/clothing/head/hardhat(src)
 	new /obj/item/clothing/head/hardhat(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/engineering(src)
+	new /obj/item/clothing/head/beret/engineering(src)
+	new /obj/item/clothing/head/beret/engineering(src)
 	return
 
 

code/game/objects/structures/curtains.dm

@@ -44,6 +44,14 @@
 	color = "#B8F5E3"
 	alpha = 200
 
+/obj/structure/curtain/open/bed
+	name = "bed curtain"
+	color = "#854636"
+
+/obj/structure/curtain/open/privacy
+	name = "privacy curtain"
+	color = "#B8F5E3"
+
 /obj/structure/curtain/open/shower
 	name = "shower curtain"
 	color = "#ACD1E9"

code/game/objects/structures/girders.dm

@@ -43,6 +43,7 @@
 	return
 
 /obj/structure/girder/proc/reset_girder()
+	anchored = 1
 	cover = initial(cover)
 	health = min(health,initial(health))
 	state = 0

code/game/objects/structures/lattice.dm

@@ -53,7 +53,7 @@
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
 
-	if (istype(C, /obj/item/stack/tile/steel))
+	if (istype(C, /obj/item/stack/tile/floor))
 		var/turf/T = get_turf(src)
 		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
 		return

code/game/objects/structures/safe.dm

@@ -175,12 +175,15 @@ obj/structure/safe/ex_act(severity)
 	level = 1	//underfloor
 	layer = 2.5
 
-
 /obj/structure/safe/floor/initialize()
 	..()
 	var/turf/T = loc
-	hide(T.intact)
-
+	if(istype(T) && !T.is_plating())
+		hide(1)
+	update_icon()
 
 /obj/structure/safe/floor/hide(var/intact)
 	invisibility = intact ? 101 : 0
+
+/obj/structure/safe/floor/hides_under_flooring()
+	return 1

code/game/objects/structures/under_wardrobe.dm

@@ -8,7 +8,7 @@
 /obj/structure/undies_wardrobe/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
 	var/mob/living/carbon/human/H = user
-	if(!ishuman(user) || (H.species && !(H.species.flags & HAS_UNDERWEAR)))
+	if(!ishuman(user) || (H.species && !(H.species.appearance_flags & HAS_UNDERWEAR)))
 		user << "<span class='warning'>Sadly there's nothing in here for you to wear.</span>"
 		return 0
 

code/game/objects/structures/window.dm

@@ -291,6 +291,9 @@
 	set category = "Object"
 	set src in oview(1)
 
+	if(usr.incapacitated())
+		return 0
+	
 	if(anchored)
 		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0
@@ -307,6 +310,9 @@
 	set category = "Object"
 	set src in oview(1)
 
+	if(usr.incapacitated())
+		return 0
+
 	if(anchored)
 		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0

code/game/objects/structures/window_spawner.dm

@@ -68,6 +68,15 @@
 	icon_state = "r-wingrille"
 	win_path = /obj/structure/window/reinforced
 
+/obj/effect/wingrille_spawn/reinforced/crescent
+	name = "Crescent window grille spawner"
+	icon_state = "r-wingrille"
+	win_path = /obj/structure/window/reinforced
+
+/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(var/obj/structure/window/W)
+	W.maxhealth = 1000000
+	W.health = 1000000
+
 /obj/effect/wingrille_spawn/phoron
 	name = "phoron window grille spawner"
 	icon_state = "p-wingrille"