diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 8253ad4..ab13b2f 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -462,6 +462,7 @@ BLIND     // can't see anything
 	var/down_gas_transfer_coefficient = 0
 	var/down_body_parts_covered = 0
 	var/down_icon_state = 0
+	var/down_item_state = 0
 	var/down_item_flags = 0
 	var/down_flags_inv = 0
 	var/pull_mask = 0
@@ -492,6 +493,7 @@ BLIND     // can't see anything
 				gas_transfer_coefficient = down_gas_transfer_coefficient
 				body_parts_covered = down_body_parts_covered
 				icon_state = down_icon_state
+				item_state = down_item_state
 				item_flags = down_item_flags
 				flags_inv = down_flags_inv
 				to_chat(usr, "You pull the [src] below your chin.")
@@ -499,6 +501,7 @@ BLIND     // can't see anything
 				gas_transfer_coefficient = initial(gas_transfer_coefficient)
 				body_parts_covered = initial(body_parts_covered)
 				icon_state = initial(icon_state)
+				item_state = initial(item_state)
 				item_flags = initial(item_flags)
 				flags_inv = initial(flags_inv)
 				to_chat(usr, "You pull the [src] up to cover your face.")
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 52fa896..d7ef03a 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -12,6 +12,7 @@
 	down_body_parts_covered = null
 	down_item_flags = FLEXIBLEMATERIAL
 	down_icon_state = "breathdown"
+	down_item_state = "breathdown"
 	pull_mask = 1
 
 /obj/item/clothing/mask/breath/medical
@@ -27,7 +28,7 @@
 	icon_state = "medical"
 	item_state = "medical"
 	permeability_coefficient = 0.01
-	
+
 /obj/item/clothing/mask/breath/emergency
 	desc = "A close-fitting  mask that is used by the wallmounted emergency oxygen pump."
 	name = "emergency mask"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 33c1e25..393603b 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -2,7 +2,7 @@
 	name = "gas mask"
 	desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air."
 	icon_state = "fullgas"
-	item_state = "gas_alt"
+	item_state = "fullgas"
 	item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = FACE|EYES
@@ -33,6 +33,12 @@
 	icon_state = "halfgas"
 	item_state = "halfgas"
 	siemens_coefficient = 0.7
+	down_gas_transfer_coefficient = 1
+	down_body_parts_covered = null
+	down_item_flags = FLEXIBLEMATERIAL
+	down_icon_state = "halfgas_up"
+	down_item_state = "halfgasdown"
+	pull_mask = 1
 	body_parts_covered = FACE
 	w_class = ITEM_SIZE_SMALL
 	armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 55, rad = 0)
@@ -45,7 +51,7 @@
 	name = "plague doctor mask"
 	desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
-	item_state = "gas_mask"
+	item_state = "plaguedoctor"
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -53,6 +59,7 @@
 	name = "\improper SWAT mask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
 	icon_state = "swat"
+	item_state = "swat"
 	siemens_coefficient = 0.7
 	body_parts_covered = FACE|EYES
 	armor = list(melee = 15, bullet = 15, laser = 15, energy = 0, bomb = 0, bio = 75, rad = 0)
@@ -67,6 +74,7 @@
 	name = "tactical mask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
 	icon_state = "swat"
+	item_state = "swat"
 	siemens_coefficient = 0.7
 	armor = list(melee = 15, bullet = 15, laser = 15, energy = 0, bomb = 0, bio = 75, rad = 0)
 
@@ -74,7 +82,7 @@
 	name = "clown wig and mask"
 	desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask."
 	icon_state = "clown"
-	item_state = "clown_hat"
+	item_state = "clown"
 
 /obj/item/clothing/mask/gas/sexyclown
 	name = "sexy-clown wig and mask"
@@ -111,11 +119,13 @@
 	name = "cyborg visor"
 	desc = "Beep boop!"
 	icon_state = "death"
+	item_state = "death"
 
 /obj/item/clothing/mask/gas/owl_mask
 	name = "owl mask"
 	desc = "Twoooo!"
 	icon_state = "owl"
+	item_state = "owl"
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/mask/gas/vox
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 21adc1d..efeb269 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -41,6 +41,7 @@
 	down_gas_transfer_coefficient = 1
 	down_body_parts_covered = null
 	down_icon_state = "steriledown"
+	down_item_state = "steriledown"
 	pull_mask = 1
 
 /obj/item/clothing/mask/fakemoustache
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index d76c98c..79b89f8 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -73,7 +73,7 @@
 /obj/item/clothing/accessory/armorplate/merc
 	name = "heavy armor plate"
 	desc = "A ceramics-reinforced synthetic armor plate, providing state of of the art protection. Attaches to a plate carrier."
-	icon_state = "armor_heavy"
+	icon_state = "armor_merc"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
 
 //Arm guards
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index d261431..d4ba5b3 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -132,8 +132,6 @@
 /obj/machinery/power/apc/connect_to_network()
 	//Override because the APC does not directly connect to the network; it goes through a terminal.
 	//The terminal is what the power computer looks for anyway.
-	if(!terminal)
-		make_terminal()
 	if(terminal)
 		terminal.connect_to_network()
 
@@ -225,6 +223,8 @@
 
 /obj/machinery/power/apc/proc/init_round_start()
 	has_electronics = 2 //installed and secured
+	if(!terminal)
+		make_terminal() //wired
 	// is starting with a power cell installed, create it and set its charge level
 	if(cell_type)
 		src.cell = new cell_type(src)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 830626d..bef49a9 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -42,7 +42,7 @@ var/global/list/light_type_cache = list()
 		if(istype(fixture, /obj/machinery/light))
 			fixture_type = fixture.type
 		fixture.transfer_fingerprints_to(src)
-		stage = 2
+		stage = 1
 
 	update_icon()
 
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 0558dea..0b3f567 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/maps/torch/icons/mob/slim/solgov-accessory.dmi b/maps/torch/icons/mob/slim/solgov-accessory.dmi
new file mode 100644
index 0000000..04f8c8e
Binary files /dev/null and b/maps/torch/icons/mob/slim/solgov-accessory.dmi differ
diff --git a/maps/torch/icons/mob/slim/solgov-head.dmi b/maps/torch/icons/mob/slim/solgov-head.dmi
new file mode 100644
index 0000000..4d9a839
Binary files /dev/null and b/maps/torch/icons/mob/slim/solgov-head.dmi differ
diff --git a/maps/torch/icons/mob/slim/solgov-suit.dmi b/maps/torch/icons/mob/slim/solgov-suit.dmi
new file mode 100644
index 0000000..d63f136
Binary files /dev/null and b/maps/torch/icons/mob/slim/solgov-suit.dmi differ
diff --git a/maps/torch/icons/mob/slim/solgov-under.dmi b/maps/torch/icons/mob/slim/solgov-under.dmi
new file mode 100644
index 0000000..aa42007
Binary files /dev/null and b/maps/torch/icons/mob/slim/solgov-under.dmi differ