Merge branch 'master' of https://github.com/PolarisSS13/Polaris into emp_slug

code/game/atoms_movable.dm

@@ -1,5 +1,6 @@
 /atom/movable
 	layer = 3
+	appearance_flags = TILE_BOUND
 	var/last_move = null
 	var/anchored = 0
 	// var/elevation = 2    - not used anywhere

code/game/machinery/doors/multi_tile.dm

@@ -1,6 +1,7 @@
 //Terribly sorry for the code doubling, but things go derpy otherwise.
 /obj/machinery/door/airlock/multi_tile
 	width = 2
+	appearance_flags = 0
 
 /obj/machinery/door/airlock/multi_tile/New()
 	..()

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

@@ -110,7 +110,7 @@
 				<br>
 				<h2>SUPERMATTER HANDLING</h2>
 				<li>Do not expose supermatter to oxygen.</li>
-				<li>Do not <del>touch supermatter</del> <del>without gloves</del> <del>without exosuit protection</del> allow supermatter to contact any solid object apart from specially-designed supporting pallet.</li>
+				<li>Do not allow supermatter to contact any solid object apart from specially-designed supporting pallet.</li>
 				<li>Do not directly view supermatter without meson goggles.</li>
 				<li>While handles on pallet allow moving the supermatter via pulling, pushing should not be attempted.</li>
 				<br>
@@ -118,7 +118,7 @@
 				<ol>
 				<li>Fill reactor loop and radiator loop with two (2) standard canisters of nitrogen gas each.</li>
 				<li>Ensure that pumps and filters are on and operating at maximum power.</li>
-				<li>Fire <del>5</del> <del>15</del> <del>2</del> <del>UNKNOWN</del> 8-12 pulses from emitter at supermatter crystal. Reactor blast doors must be open for this procedure.</li>
+				<li>Fire 8-9 pulses from emitter at supermatter crystal. Reactor blast doors must be open for this procedure.</li>
 				</ol>
 				<br>
 				<h2>OPERATION AND MAINTENANCE</h2>

code/game/objects/structures/barsign.dm

@@ -1,6 +1,7 @@
 /obj/structure/sign/double/barsign
 	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
+	appearance_flags = 0
 	anchored = 1
 	var/cult = 0
 

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -28,6 +28,14 @@
 	display_name = "armband, science"
 	path = /obj/item/clothing/accessory/armband/science
 
+/datum/gear/accessory/colored
+	display_name = "armband"
+	path = /obj/item/clothing/accessory/armband/med/color
+
+/datum/gear/accessory/colored/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/accessory/wallet
 	display_name = "wallet, orange"
 	path = /obj/item/weapon/storage/wallet/random

code/modules/clothing/under/accessories/armband.dm

@@ -29,6 +29,10 @@
 	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white."
 	icon_state = "med"
 
+/obj/item/clothing/accessory/armband/med/color
+	name = "armband"
+	desc = "A fancy armband."
+
 /obj/item/clothing/accessory/armband/medgreen
 	name = "EMT armband"
 	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."

code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm

@@ -8,6 +8,7 @@
 /obj/machinery/drone_fabricator
 	name = "drone fabricator"
 	desc = "A large automated factory for producing maintenance drones."
+	appearance_flags = 0
 
 	density = 1
 	anchored = 1