Merge branch 'master' into corporate-comms

code/game/objects/items/control_wand.dm

@@ -1,6 +1,7 @@
 #define WAND_OPEN "Open Door"
 #define WAND_BOLT "Toggle Bolts"
 #define WAND_EMERGENCY "Toggle Emergency Access"
+#define WAND_SPEED "Change Closing Speed"
 
 /obj/item/door_remote
 	icon_state = "gangtool-white"
@@ -21,7 +22,7 @@
 	for(var/region in region_access)
 		ID.access += get_region_accesses(region)
 	ID.access += additional_access
-	ID.access = uniquelist(ID.access)	//remove duplicates
+	ID.access = uniquelist(ID.access)
 
 /obj/item/door_remote/Destroy()
 	QDEL_NULL(ID)
@@ -34,8 +35,11 @@
 		if(WAND_BOLT)
 			mode = WAND_EMERGENCY
 		if(WAND_EMERGENCY)
+			mode = WAND_SPEED
+		if(WAND_SPEED)
 			mode = WAND_OPEN
-	to_chat(user, "Now in mode: [mode].")
+
+	to_chat(user, "<span class='notice'>Now in mode: [mode].</span>")
 
 /obj/item/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user)
 	if(!istype(D))
@@ -64,10 +68,13 @@
 					D.lock()
 			if(WAND_EMERGENCY)
 				if(D.emergency)
-					D.emergency = 0
+					D.emergency = FALSE
 				else
-					D.emergency = 1
+					D.emergency = TRUE
 				D.update_icon()
+			if(WAND_SPEED)
+				D.normalspeed = !D.normalspeed
+				to_chat(user, "<span class='notice'>[D] is now in [D.normalspeed ? "normal" : "fast"] mode.</span>")
 	else
 		to_chat(user, "<span class='danger'>[src] does not have access to this door.</span>")
 
@@ -144,3 +151,4 @@
 #undef WAND_OPEN
 #undef WAND_BOLT
 #undef WAND_EMERGENCY
+#undef WAND_SPEED

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

@@ -10,11 +10,16 @@
 	throw_range	= 20
 	origin_tech = "syndicate=1;engineering=3"
 	/// Integrated camera console to serve UI data
-	var/obj/machinery/computer/security/integrated_console
+	var/obj/machinery/computer/security/camera_bug/integrated_console
+
+/obj/machinery/computer/security/camera_bug
+	name = "invasive camera utility"
+	desc = "How did this get here?! Please report this as a bug to github"
+	use_power = NO_POWER_USE
 
 /obj/item/camera_bug/Initialize(mapload)
 	. = ..()
-	integrated_console = new
+	integrated_console = new(src)
 	integrated_console.parent = src
 	integrated_console.network = list("SS13")
 

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

@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(leather_recipes, list (
 	new/datum/stack_recipe("leather satchel", /obj/item/storage/backpack/satchel, 5),
 	new/datum/stack_recipe("bandolier", /obj/item/storage/belt/bandolier, 5),
 	new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7),
-	new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2),
+	new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/leather, 2),
 	new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10),
 	new/datum/stack_recipe("hide mantle", /obj/item/clothing/suit/unathi/mantle, 4)))