Batch pr pull (#12554)

* https://github.com/tgstation/tgstation/pull/65814 * https://github.com/tgstation/tgstation/pull/65832 * https://github.com/tgstation/tgstation/pull/65850 * https://github.com/tgstation/tgstation/pull/65689 * https://github.com/tgstation/tgstation/pull/65579 * https://github.com/tgstation/tgstation/pull/65760
2025-12-11 10:11:09 +00:00 · 2022-04-06 19:26:58 +01:00
parent 9917ff2643
commit ad0b6e4e67
51 changed files with 485 additions and 239 deletions
--- a/code/__DEFINES/dye_keys.dm
+++ b/code/__DEFINES/dye_keys.dm
@@ -1,6 +1,7 @@
 #define DYE_REGISTRY_UNDER "under"
 #define DYE_REGISTRY_JUMPSKIRT "jumpskirt"
 #define DYE_REGISTRY_GLOVES "gloves"
+#define DYE_REGISTRY_BANDANA "bandana"
 #define DYE_REGISTRY_SNEAKERS "sneakers"
 #define DYE_REGISTRY_FANNYPACK "fannypack"
 #define DYE_REGISTRY_BEDSHEET "bedsheet"
--- a/code/__DEFINES/logging.dm
+++ b/code/__DEFINES/logging.dm
@@ -4,6 +4,7 @@
 #define INVESTIGATE_BOTANY "botany"
 #define INVESTIGATE_CARGO "cargo"
 #define INVESTIGATE_CRAFTING "crafting"
+#define INVESTIGATE_ENGINE "engine"
 #define INVESTIGATE_EXONET "exonet"
 #define INVESTIGATE_EXPERIMENTOR "experimentor"
 #define INVESTIGATE_GRAVITY "gravity"
@@ -14,8 +15,6 @@
 #define INVESTIGATE_RADIATION "radiation"
 #define INVESTIGATE_RECORDS "records"
 #define INVESTIGATE_RESEARCH "research"
-#define INVESTIGATE_SINGULO "singulo"
-#define INVESTIGATE_SUPERMATTER "supermatter"
 #define INVESTIGATE_TELESCI "telesci"
 #define INVESTIGATE_WIRES "wires"

--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -37,7 +37,7 @@

 /datum/crafting_recipe/durathread_bandana
 	name = "Durathread Bandana"
-	result = /obj/item/clothing/mask/bandana/durathread
+	result = /obj/item/clothing/mask/bandana/color/durathread
 	reqs = list(/obj/item/stack/sheet/durathread = 1)
 	time = 25
 	category = CAT_CLOTHING
--- a/code/datums/components/singularity.dm
+++ b/code/datums/components/singularity.dm
@@ -323,7 +323,7 @@
 	var/turf/spawned_turf = get_turf(parent)
 	message_admins("A singulo has been created at [ADMIN_VERBOSEJMP(spawned_turf)].")
 	var/atom/atom_parent = parent
-	atom_parent.investigate_log("was made a singularity at [AREACOORD(spawned_turf)].", INVESTIGATE_SINGULO)
+	atom_parent.investigate_log("was made a singularity at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE)

 /// Fired when the singularity is fired at with the BSA and deletes it
 /datum/component/singularity/proc/bluespace_reaction()
@@ -332,7 +332,7 @@
 		return

 	var/atom/atom_parent = parent
-	atom_parent.investigate_log("has been shot by bluespace artillery and destroyed.", INVESTIGATE_SINGULO)
+	atom_parent.investigate_log("has been shot by bluespace artillery and destroyed.", INVESTIGATE_ENGINE)
 	qdel(parent)

 #undef CHANCE_TO_MOVE_TO_TARGET
--- a/code/datums/greyscale/config_types/greyscale_configs.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -456,3 +456,62 @@
 	json_config = 'code/datums/greyscale/json_configs/moth_coat_winter_worn.json'


+/datum/greyscale_config/bandana
+	name = "Bandana"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandana.json'
+
+/datum/greyscale_config/bandana_up
+	name = "Bandana Up"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandana_up.json'
+
+/datum/greyscale_config/bandana_worn
+	name = "Worn Bandana"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandana_worn.json'
+
+/datum/greyscale_config/bandana_worn_up
+	name = "Worn Bandana Up"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandana_worn_up.json'
+
+/datum/greyscale_config/bandstriped
+	name = "Striped Bandana"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandstriped.json'
+
+/datum/greyscale_config/bandstriped_up
+	name = "Striped Bandana Up"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandstriped_up.json'
+
+/datum/greyscale_config/bandstriped_worn
+	name = "Worn Striped Bandana"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandstriped_worn.json'
+
+/datum/greyscale_config/bandstriped_worn_up
+	name = "Worn Striped Bandana Up"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandstriped_worn_up.json'
+
+/datum/greyscale_config/bandskull
+	name = "Skull Bandana"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandskull.json'
+
+/datum/greyscale_config/bandskull_up
+	name = "Skull Bandana Up"
+	icon_file = 'icons/obj/clothing/masks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandskull_up.json'
+
+/datum/greyscale_config/bandskull_worn
+	name = "Worn Skull Bandana"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandskull_worn.json'
+
+/datum/greyscale_config/bandskull_worn_up
+	name = "Worn Skull Bandana Up"
+	icon_file = 'icons/mob/clothing/mask.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandskull_worn_up.json'
--- a/code/datums/greyscale/json_configs/bandana.json
+++ b/code/datums/greyscale/json_configs/bandana.json
@@ -0,0 +1,10 @@
+{
+    "bandana": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandana_up.json
+++ b/code/datums/greyscale/json_configs/bandana_up.json
@@ -0,0 +1,10 @@
+{
+    "bandana_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandana_worn.json
+++ b/code/datums/greyscale/json_configs/bandana_worn.json
@@ -0,0 +1,10 @@
+{
+    "bandana_worn": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandana_worn_up.json
+++ b/code/datums/greyscale/json_configs/bandana_worn_up.json
@@ -0,0 +1,10 @@
+{
+    "bandana_worn_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandskull.json
+++ b/code/datums/greyscale/json_configs/bandskull.json
@@ -0,0 +1,16 @@
+{
+    "bandskull": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_skull",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandskull_up.json
+++ b/code/datums/greyscale/json_configs/bandskull_up.json
@@ -0,0 +1,16 @@
+{
+    "bandskull_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_skull_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandskull_worn.json
+++ b/code/datums/greyscale/json_configs/bandskull_worn.json
@@ -0,0 +1,16 @@
+{
+    "bandskull_worn": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_skull_worn",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandskull_worn_up.json
+++ b/code/datums/greyscale/json_configs/bandskull_worn_up.json
@@ -0,0 +1,16 @@
+{
+    "bandskull_worn_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_skull_worn_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandstriped.json
+++ b/code/datums/greyscale/json_configs/bandstriped.json
@@ -0,0 +1,16 @@
+{
+    "bandstriped": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_stripe",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandstriped_up.json
+++ b/code/datums/greyscale/json_configs/bandstriped_up.json
@@ -0,0 +1,16 @@
+{
+    "bandstriped_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_stripe_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandstriped_worn.json
+++ b/code/datums/greyscale/json_configs/bandstriped_worn.json
@@ -0,0 +1,16 @@
+{
+    "bandstriped_worn": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_stripe_worn",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/datums/greyscale/json_configs/bandstriped_worn_up.json
+++ b/code/datums/greyscale/json_configs/bandstriped_worn_up.json
@@ -0,0 +1,16 @@
+{
+    "bandstriped_worn_up": [
+        {
+            "type": "icon_state",
+            "icon_state": "bandana_cloth_worn_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "bandana_stripe_worn_up",
+            "blend_mode": "overlay",
+            "color_ids": [ 2 ]
+        }
+    ]
+}
--- a/code/game/area/space_station_13_areas.dm
+++ b/code/game/area/space_station_13_areas.dm
@@ -1419,7 +1419,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station

 /area/cargo/miningdock
 	name = "\improper Mining Dock"
-	icon_state = "mining"
+	icon_state = "mining_dock"
+
+/area/cargo/miningdock/cafeteria
+	name = "\improper Mining Cafeteria"
+	icon_state = "mining_cafe"
+
+/area/cargo/miningdock/oresilo
+	name = "\improper Mining Ore Silo Storage"
+	icon_state = "mining_silo"

 /area/cargo/miningoffice
 	name = "\improper Mining Office"
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -536,6 +536,11 @@
 	if(!.)
 		return FALSE

+	var/turf/user_turf = get_turf(user)
+	var/turf/machine_turf = get_turf(src)
+	if(!(user_turf in machine_turf.atmos_adjacent_turfs))
+		return FALSE
+
 	if((interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SIGHT) && user.is_blind())
 		to_chat(user, span_warning("This machine requires sight to use."))
 		return FALSE
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -70,6 +70,18 @@ GLOBAL_LIST_INIT(dye_registry, list(
 		DYE_SYNDICATE = /obj/item/clothing/gloves/combat,
 		DYE_CENTCOM = /obj/item/clothing/gloves/combat
 	),
+	DYE_REGISTRY_BANDANA = list(
+		DYE_RED = /obj/item/clothing/mask/bandana/color/red,
+		DYE_ORANGE = /obj/item/clothing/mask/bandana/color/orange,
+		DYE_YELLOW = /obj/item/clothing/mask/bandana/color/gold,
+		DYE_GREEN = /obj/item/clothing/mask/bandana/color/green,
+	DYE_BLUE = /obj/item/clothing/mask/bandana/color/blue,
+		DYE_PURPLE = /obj/item/clothing/mask/bandana/color/purple,
+		DYE_BLACK = /obj/item/clothing/mask/bandana/color/black,
+		DYE_WHITE = /obj/item/clothing/mask/bandana/color/white,
+		DYE_MIME = /obj/item/clothing/mask/bandana/color/striped/black,
+		DYE_SYNDICATE = /obj/item/clothing/mask/bandana/color/skull/black
+	),
 	DYE_REGISTRY_SNEAKERS = list(
 		DYE_RED = /obj/item/clothing/shoes/sneakers/red,
 		DYE_ORANGE = /obj/item/clothing/shoes/sneakers/orange,
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
 /obj/item/stack/sheet/mineral/bamboo/get_main_recipes()
 	. = ..()
 	. += GLOB.bamboo_recipes
-	
+
 /obj/item/stack/sheet/mineral/bamboo/fifty
 	amount = 50

@@ -387,6 +387,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \
 	new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/sneakers/white, 2), \
 	new/datum/stack_recipe("white scarf", /obj/item/clothing/neck/scarf, 1), \
+	new/datum/stack_recipe("white bandana", /obj/item/clothing/mask/bandana/color/white, 2), \
 	null, \
 	new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \
 	new/datum/stack_recipe("duffel bag", /obj/item/storage/backpack/duffelbag, 6), \
@@ -448,7 +449,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
-	new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
+	new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/color/durathread, 1, time = 25), \
 	))

 /obj/item/stack/sheet/durathread
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -203,10 +203,10 @@
 		var/mob/user = throwingdatum.thrower
 		log_combat(throwingdatum?.thrower, hit_atom, "consumed", src)
 		message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)], thrown by [key_name_admin(user)].")
-		investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", INVESTIGATE_SUPERMATTER)
+		investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", INVESTIGATE_ENGINE)
 	else
 		message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)] via throw impact.")
-		investigate_log("has consumed [key_name(victim)] via throw impact.", INVESTIGATE_SUPERMATTER)
+		investigate_log("has consumed [key_name(victim)] via throw impact.", INVESTIGATE_ENGINE)
 	victim.visible_message(span_danger("As [victim] is hit by [src], both flash into dust and silence fills the room..."),\
 		span_userdanger("You're hit by [src] and everything suddenly goes silent.\n[src] flashes into dust, and soon as you can register this, you do as well."),\
 		span_hear("Everything suddenly goes silent."))
@@ -321,11 +321,11 @@
 			return
 		victim.dust()
 		message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)].")
-		investigate_log("has consumed [key_name(victim)].", INVESTIGATE_SUPERMATTER)
+		investigate_log("has consumed [key_name(victim)].", INVESTIGATE_ENGINE)
 	else if(istype(AM, /obj/singularity))
 		return
 	else
-		investigate_log("has consumed [AM].", INVESTIGATE_SUPERMATTER)
+		investigate_log("has consumed [AM].", INVESTIGATE_ENGINE)
 		qdel(AM)
 	if (user)
 		log_combat(user, AM, "consumed", sliver, "via [src]")
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -130,7 +130,7 @@
 		/obj/item/clothing/shoes/jackboots = 3,
 		/obj/item/clothing/head/beret/sec = 3,
 		/obj/item/clothing/head/soft/sec = 3,
-		/obj/item/clothing/mask/bandana/red = 2)
+		/obj/item/clothing/mask/bandana/color/red = 2)
 	generate_items_inside(items_inside,src)
 	return

@@ -217,9 +217,9 @@
 		/obj/item/clothing/head/soft/black = 2)
 	generate_items_inside(items_inside,src)
 	if(prob(40))
-		new /obj/item/clothing/mask/bandana/skull(src)
+		new /obj/item/clothing/mask/bandana/color/skull/black(src)
 	if(prob(40))
-		new /obj/item/clothing/mask/bandana/skull(src)
+		new /obj/item/clothing/mask/bandana/color/skull/black(src)
 	return


--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -45,10 +45,10 @@
 		new /obj/item/clothing/head/that(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/soft/black(src)
-	new /obj/item/clothing/mask/bandana/black(src)
-	new /obj/item/clothing/mask/bandana/black(src)
+	new /obj/item/clothing/mask/bandana/color/black(src)
+	new /obj/item/clothing/mask/bandana/color/black(src)
 	if(prob(40))
-		new /obj/item/clothing/mask/bandana/skull(src)
+		new /obj/item/clothing/mask/bandana/color/skull/black(src)
 	return


@@ -63,8 +63,8 @@
 		new /obj/item/clothing/under/color/jumpskirt/green(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
-	new /obj/item/clothing/mask/bandana/green(src)
-	new /obj/item/clothing/mask/bandana/green(src)
+	new /obj/item/clothing/mask/bandana/color/green(src)
+	new /obj/item/clothing/mask/bandana/color/green(src)
 	return


@@ -94,8 +94,8 @@
 		new /obj/item/clothing/under/color/jumpskirt/yellow(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
+	new /obj/item/clothing/mask/bandana/color/gold(src)
+	new /obj/item/clothing/mask/bandana/color/gold(src)
 	return


@@ -144,8 +144,8 @@
 	if(prob(50))
 		new /obj/item/storage/backpack/duffelbag(src)
 	if(prob(40))
-		new /obj/item/clothing/mask/bandana/black(src)
-		new /obj/item/clothing/mask/bandana/black(src)
+		new /obj/item/clothing/mask/bandana/color/black(src)
+		new /obj/item/clothing/mask/bandana/color/black(src)
 	if(prob(40))
 		new /obj/item/clothing/under/misc/assistantformal(src)
 	if(prob(40))
@@ -185,9 +185,9 @@
 	new /obj/item/clothing/under/color/jumpskirt/teal(src)
 	new /obj/item/clothing/under/color/lightpurple(src)
 	new /obj/item/clothing/under/color/jumpskirt/lightpurple(src)
-	new /obj/item/clothing/mask/bandana/red(src)
-	new /obj/item/clothing/mask/bandana/blue(src)
-	new /obj/item/clothing/mask/bandana/gold(src)
+	new /obj/item/clothing/mask/bandana/color/red(src)
+	new /obj/item/clothing/mask/bandana/color/blue(src)
+	new /obj/item/clothing/mask/bandana/color/gold(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -16,6 +16,7 @@
 		INVESTIGATE_BOTANY,
 		INVESTIGATE_CARGO,
 		INVESTIGATE_CRAFTING,
+		INVESTIGATE_ENGINE,
 		INVESTIGATE_EXONET,
 		INVESTIGATE_EXPERIMENTOR,
 		INVESTIGATE_GRAVITY,
@@ -26,8 +27,6 @@
 		INVESTIGATE_RADIATION,
 		INVESTIGATE_RECORDS,
 		INVESTIGATE_RESEARCH,
-		INVESTIGATE_SINGULO,
-		INVESTIGATE_SUPERMATTER,
 		INVESTIGATE_TELESCI,
 		INVESTIGATE_WIRES,
 	)
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -215,7 +215,7 @@
 	check_flags = AB_CHECK_CONSCIOUS
 	button_icon_state = "recruit"
 	icon_icon = 'icons/obj/gang/actions.dmi'
-	cooldown_time = 60 SECONDS // SKYRAT EDIT: 30 SECONDS -> 60 SECONDS
+	cooldown_time = 300
 	/// The family antagonist datum of the "owner" of this action.
 	var/datum/antagonist/gang/my_gang_datum

@@ -298,7 +298,7 @@
 	acceptable_clothes = list(/obj/item/clothing/under/suit/checkered,
 		/obj/item/clothing/head/fedora,
 		/obj/item/clothing/neck/scarf/green,
-		/obj/item/clothing/mask/bandana/green)
+		/obj/item/clothing/mask/bandana/color/green)
 	free_clothes = list(/obj/item/clothing/head/fedora,
 		/obj/item/clothing/under/suit/checkered,
 		/obj/item/toy/crayon/spraycan)
@@ -321,7 +321,7 @@
 	gang_id = "TS"
 	acceptable_clothes = list(/obj/item/clothing/under/pants/classicjeans,
 		/obj/item/clothing/suit/jacket,
-		/obj/item/clothing/mask/bandana/skull)
+		/obj/item/clothing/mask/bandana/color/skull/black)
 	free_clothes = list(/obj/item/clothing/suit/jacket,
 		/obj/item/clothing/under/pants/classicjeans,
 		/obj/item/toy/crayon/spraycan)
@@ -346,7 +346,7 @@
 		/obj/item/clothing/under/suit/henchmen,
 		/obj/item/clothing/neck/scarf/yellow,
 		/obj/item/clothing/head/beanie/yellow,
-		/obj/item/clothing/mask/bandana/gold,
+		/obj/item/clothing/mask/bandana/color/gold,
 		/obj/item/storage/backpack/henchmen)
 	free_clothes = list(/obj/item/storage/backpack/henchmen,
 		/obj/item/clothing/under/suit/henchmen,
@@ -372,7 +372,7 @@
 		/obj/item/clothing/shoes/yakuza,
 		/obj/item/clothing/neck/scarf/yellow,
 		/obj/item/clothing/head/beanie/yellow,
-		/obj/item/clothing/mask/bandana/gold,
+		/obj/item/clothing/mask/bandana/color/gold,
 		/obj/item/clothing/head/hardhat,
 		/obj/item/clothing/suit/yakuza)
 	free_clothes = list(/obj/item/clothing/under/costume/yakuza,
@@ -401,7 +401,7 @@
 		/obj/item/clothing/under/costume/jackbros,
 		/obj/item/clothing/shoes/jackbros,
 		/obj/item/clothing/head/jackbros,
-		/obj/item/clothing/mask/bandana/blue)
+		/obj/item/clothing/mask/bandana/color/blue)
 	free_clothes = list(/obj/item/clothing/under/costume/jackbros,
 		/obj/item/clothing/shoes/jackbros,
 		/obj/item/clothing/head/jackbros,
@@ -428,7 +428,7 @@
 		/obj/item/clothing/under/costume/dutch,
 		/obj/item/clothing/suit/dutch,
 		/obj/item/clothing/head/bowler,
-		/obj/item/clothing/mask/bandana/black)
+		/obj/item/clothing/mask/bandana/color/black)
 	free_clothes = list(/obj/item/clothing/under/costume/dutch,
 		/obj/item/clothing/head/bowler,
 		/obj/item/clothing/suit/dutch,
--- a/code/modules/antagonists/thief/thief.dm
+++ b/code/modules/antagonists/thief/thief.dm
@@ -93,7 +93,7 @@
 	glasses = /obj/item/clothing/glasses/night
 	gloves = /obj/item/clothing/gloves/color/latex
 	back = /obj/item/storage/backpack/duffelbag/syndie
-	mask = /obj/item/clothing/mask/bandana/red
+	mask = /obj/item/clothing/mask/bandana/color/red

 /datum/outfit/thief/post_equip(mob/living/carbon/human/thief, visualsOnly=FALSE)
 	// This outfit is used by the assets SS, which is ran before the atoms SS
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
@@ -232,7 +232,7 @@
 			var/obj/creation = new path(get_step(src, SOUTH))
 			creation.name = "[quality_control] [creation.name]"
 			if(selected_recipe.dangerous)
-				investigate_log("has been created in the crystallizer.", INVESTIGATE_SUPERMATTER)
+				investigate_log("has been created in the crystallizer.", INVESTIGATE_ENGINE)
 				message_admins("[src] has been created in the crystallizer [ADMIN_JMP(src)].")


--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -76,7 +76,7 @@
 					/obj/item/clothing/suit/jacket/leather/overcoat,
 					/obj/item/clothing/gloves/color/black,
 					/obj/item/clothing/head/soft,
-					/obj/item/clothing/mask/bandana/skull)//so you can properly #cargoniabikergang
+					/obj/item/clothing/mask/bandana/color/skull)//so you can properly #cargoniabikergang
 	crate_name = "Biker Kit"
 	crate_type = /obj/structure/closet/crate/large

--- a/code/modules/clothing/masks/bandana.dm
+++ b/code/modules/clothing/masks/bandana.dm
@@ -1,6 +1,4 @@
 /obj/item/clothing/mask/bandana
-	name = "botany bandana"
-	desc = "A fine bandana with nanotech lining and a hydroponics pattern."
 	w_class = WEIGHT_CLASS_TINY
 	flags_cover = MASKCOVERSMOUTH
 	flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
@@ -8,7 +6,6 @@
 	visor_flags_cover = MASKCOVERSMOUTH | PEPPERPROOF
 	slot_flags = ITEM_SLOT_MASK
 	adjusted_flags = ITEM_SLOT_HEAD
-	icon_state = "bandbotany"
 	species_exception = list(/datum/species/golem)

 /obj/item/clothing/mask/bandana/attack_self(mob/user)
@@ -22,61 +19,161 @@

 /obj/item/clothing/mask/bandana/AltClick(mob/user)
 	. = ..()
-	if(iscarbon(user))
+	if(iscarbon(user) && user.is_holding(src))
 		var/mob/living/carbon/C = user
 		if((C.get_item_by_slot(ITEM_SLOT_HEAD == src)) || (C.get_item_by_slot(ITEM_SLOT_MASK) == src))
 			to_chat(user, span_warning("You can't tie [src] while wearing it!"))
 			return
-	if(slot_flags & ITEM_SLOT_HEAD)
-		to_chat(user, span_warning("You must undo [src] before you can tie it into a neckerchief!"))
-	else
-		if(user.is_holding(src))
-			var/obj/item/clothing/neck/neckerchief/nk = new(src)
-			nk.name = "[name] neckerchief"
-			nk.desc = "[desc] It's tied up like a neckerchief."
-			nk.icon_state = icon_state
-			nk.item_flags = item_flags
-			nk.worn_icon = 'icons/misc/hidden.dmi' //hide underlying neckerchief object while it applies its own mutable appearance
-			nk.sourceBandanaType = src.type
-			var/currentHandIndex = user.get_held_index_of_item(src)
-			user.transferItemToLoc(src, null)
-			user.put_in_hand(nk, currentHandIndex)
-			user.visible_message(span_notice("[user] ties [src] up like a neckerchief."), span_notice("You tie [src] up like a neckerchief."))
-			qdel(src)
+		if(slot_flags & ITEM_SLOT_HEAD)
+			to_chat(user, span_warning("You must undo [src] before you can tie it into a neckerchief!"))
+			return
+		if(slot_flags & ITEM_SLOT_NECK)
+			name = initial(name)
+			desc = initial(desc)
+			slot_flags = initial(slot_flags)
+			worn_y_offset = initial(worn_y_offset)
+			user.visible_message(span_notice("[user] unties the neckercheif back into a [name]."), span_notice("You untie the neckercheif back into a [name]."))
 		else
-			to_chat(user, span_warning("You must be holding [src] in order to tie it!"))
+			name = "[name] neckerchief"
+			desc = "[desc] It's tied up like a neckerchief."
+			slot_flags = ITEM_SLOT_NECK
+			worn_y_offset = -3
+			user.visible_message(span_notice("[user] ties [src] up like a neckerchief."), span_notice("You tie [src] up like a neckerchief."))
+	else
+		to_chat(user, span_warning("You must be holding [src] in order to tie it!"))

-/obj/item/clothing/mask/bandana/red
+/obj/item/clothing/mask/bandana/color
+	dying_key = DYE_REGISTRY_BANDANA
+	flags_1 = IS_PLAYER_COLORABLE_1
+	name = "bandana"
+	desc = "A fine bandana with nanotech lining."
+	icon_state = "bandana"
+	worn_icon_state = "bandana_worn"
+	greyscale_config = /datum/greyscale_config/bandana
+	greyscale_config_worn = /datum/greyscale_config/bandana_worn
+	var/greyscale_config_up = /datum/greyscale_config/bandana_up
+	var/greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up
+	greyscale_colors = "#2e2e2e"
+
+/obj/item/clothing/mask/bandana/color/attack_self(mob/user)
+	if(slot_flags & ITEM_SLOT_NECK)
+		to_chat(user, span_warning("You must undo [src] in order to push it into a hat!"))
+		return
+	adjustmask(user)
+	if(greyscale_config == initial(greyscale_config) && greyscale_config_worn == initial(greyscale_config_worn))
+		worn_icon_state += "_up"
+		set_greyscale(
+			new_config = greyscale_config_up,
+			new_worn_config = greyscale_config_worn_up
+		)
+	else
+		worn_icon_state = initial(worn_icon_state)
+		set_greyscale(
+			new_config = initial(greyscale_config),
+			new_worn_config = initial(greyscale_config_worn)
+		)
+
+/obj/item/clothing/mask/bandana/color/red
 	name = "red bandana"
 	desc = "A fine red bandana with nanotech lining."
-	icon_state = "bandred"
+	greyscale_colors = "#A02525"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/blue
+/obj/item/clothing/mask/bandana/color/blue
 	name = "blue bandana"
 	desc = "A fine blue bandana with nanotech lining."
-	icon_state = "bandblue"
+	greyscale_colors = "#294A98"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/green
+/obj/item/clothing/mask/bandana/color/purple
+	name = "purple bandana"
+	desc = "A fine purple bandana with nanotech lining."
+	greyscale_colors = "#8019a0"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/green
 	name = "green bandana"
 	desc = "A fine green bandana with nanotech lining."
-	icon_state = "bandgreen"
+	greyscale_colors = "#3D9829"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/gold
+/obj/item/clothing/mask/bandana/color/gold
 	name = "gold bandana"
 	desc = "A fine gold bandana with nanotech lining."
-	icon_state = "bandgold"
+	greyscale_colors = "#DAC20E"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/black
+/obj/item/clothing/mask/bandana/color/orange
+	name = "orange bandana"
+	desc = "A fine orange bandana with nanotech lining."
+	greyscale_colors = "#da930e"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/black
 	name = "black bandana"
 	desc = "A fine black bandana with nanotech lining."
-	icon_state = "bandblack"
+	greyscale_colors = "#2e2e2e"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/skull
-	name = "skull bandana"
-	desc = "A fine black bandana with nanotech lining and a skull emblem."
-	icon_state = "bandskull"
+/obj/item/clothing/mask/bandana/color/white
+	name = "white bandana"
+	desc = "A fine white bandana with nanotech lining."
+	greyscale_colors = "#DCDCDC"
+	flags_1 = NONE

-/obj/item/clothing/mask/bandana/durathread
+/obj/item/clothing/mask/bandana/color/durathread
 	name = "durathread bandana"
 	desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
-	icon_state = "banddurathread"
+	greyscale_colors = "#5c6d80"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/striped
+	name = "striped bandana"
+	desc = "A fine bandana with nanotech lining and a stripe across."
+	icon_state = "bandstriped"
+	worn_icon_state = "bandstriped_worn"
+	greyscale_config = /datum/greyscale_config/bandstriped
+	greyscale_config_worn = /datum/greyscale_config/bandstriped_worn
+	greyscale_config_up = /datum/greyscale_config/bandstriped_up
+	greyscale_config_worn_up = /datum/greyscale_config/bandstriped_worn_up
+	greyscale_colors = "#2e2e2e#C6C6C6"
+
+/obj/item/clothing/mask/bandana/color/striped/black
+	name = "striped bandana"
+	desc = "A fine black and white bandana with nanotech lining and a stripe across."
+	greyscale_colors = "#2e2e2e#C6C6C6"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/striped/security
+	name = "striped security bandana"
+	desc = "A fine bandana with nanotech lining, a stripe across and security colors."
+	greyscale_colors = "#A02525#2e2e2e"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/striped/science
+	name = "striped science bandana"
+	desc = "A fine bandana with nanotech lining, a stripe across and science colors."
+	greyscale_colors = "#DCDCDC#8019a0"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/striped/botany
+	name = "striped botany bandana"
+	desc = "A fine bandana with nanotech lining, a stripe across and botany colors."
+	greyscale_colors = "#3D9829#294A98"
+	flags_1 = NONE
+
+/obj/item/clothing/mask/bandana/color/skull
+	name = "skull bandana"
+	desc = "A fine bandana with nanotech lining and a skull emblem."
+	icon_state = "bandskull"
+	worn_icon_state = "bandskull_worn"
+	greyscale_config = /datum/greyscale_config/bandskull
+	greyscale_config_worn = /datum/greyscale_config/bandskull_worn
+	greyscale_config_up = /datum/greyscale_config/bandskull_up
+	greyscale_config_worn_up = /datum/greyscale_config/bandskull_worn_up
+	greyscale_colors = "#2e2e2e#C6C6C6"
+
+/obj/item/clothing/mask/bandana/color/skull/black
+	desc = "A fine black bandana with nanotech lining and a skull emblem."
+	greyscale_colors = "#2e2e2e#C6C6C6"
+	flags_1 = NONE
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -232,35 +232,6 @@
 		to_chat(user, span_warning("There is no export value for [I] or any items within it."))


-/obj/item/clothing/neck/neckerchief
-	icon = 'icons/obj/clothing/masks.dmi' //In order to reuse the bandana sprite
-	w_class = WEIGHT_CLASS_TINY
-	var/sourceBandanaType
-
-/obj/item/clothing/neck/neckerchief/worn_overlays(mutable_appearance/standing, isinhands)
-	. = ..()
-	if(!isinhands)
-		var/mutable_appearance/realOverlay = mutable_appearance('icons/mob/clothing/mask.dmi', icon_state)
-		realOverlay.pixel_y = -3
-		. += realOverlay
-
-/obj/item/clothing/neck/neckerchief/AltClick(mob/user)
-	. = ..()
-	if(iscarbon(user))
-		var/mob/living/carbon/C = user
-		if(C.get_item_by_slot(ITEM_SLOT_NECK) == src)
-			to_chat(user, span_warning("You can't untie [src] while wearing it!"))
-			return
-		if(user.is_holding(src))
-			var/obj/item/clothing/mask/bandana/newBand = new sourceBandanaType(user)
-			var/currentHandIndex = user.get_held_index_of_item(src)
-			var/oldName = src.name
-			qdel(src)
-			user.put_in_hand(newBand, currentHandIndex)
-			user.visible_message(span_notice("You untie [oldName] back into a [newBand.name]."), span_notice("[user] unties [oldName] back into a [newBand.name]."))
-		else
-			to_chat(user, span_warning("You must be holding [src] in order to untie it!"))
-
 /obj/item/clothing/neck/beads
 	name = "plastic bead necklace"
 	desc = "A cheap, plastic bead necklace. Show team spirit! Collect them! Throw them away! The posibilites are endless!"
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -414,7 +414,7 @@

 ///Logs, gibs and returns point values of whatever mob is unfortunate enough to get eaten.
 /mob/living/singularity_act()
-	investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up!
+	investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_ENGINE) //Oh that's where the clown ended up!
 	gib()
 	return 20

--- a/code/modules/mob/living/simple_animal/friendly/trader.dm
+++ b/code/modules/mob/living/simple_animal/friendly/trader.dm
@@ -225,7 +225,7 @@
 	mob_biotypes = MOB_UNDEAD|MOB_HUMANOID
 	products = list(
 		/obj/item/clothing/head/helmet/skull = 150,
-		/obj/item/clothing/mask/bandana/skull = 50,
+		/obj/item/clothing/mask/bandana/color/skull = 50,
 		/obj/item/food/cookie/sugar/spookyskull = 10,
 		/obj/item/instrument/trombone/spectral = 10000,
 		/obj/item/shovel/serrated = 150
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -125,9 +125,9 @@
 /obj/machinery/power/emitter/Destroy()
 	if(SSticker.IsRoundInProgress())
 		var/turf/T = get_turf(src)
-		message_admins("Emitter deleted at [ADMIN_VERBOSEJMP(T)]")
-		log_game("Emitter deleted at [AREACOORD(T)]")
-		investigate_log("<font color='red'>deleted</font> at [AREACOORD(T)]", INVESTIGATE_SINGULO)
+		message_admins("[src] deleted at [ADMIN_VERBOSEJMP(T)]")
+		log_game("[src] deleted at [AREACOORD(T)]")
+		investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_ENGINE)
 	QDEL_NULL(sparks)
 	return ..()

@@ -158,9 +158,9 @@
 		fire_delay = maximum_fire_delay

 	to_chat(user, span_notice("You turn [active ? "on" : "off"] [src]."))
-	message_admins("Emitter turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
-	log_game("Emitter turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
-	investigate_log("turned [active ? "<font color='green'>ON</font>" : "<font color='red'>OFF</font>"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+	message_admins("[src] turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
+	log_game("[src] turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
+	investigate_log("turned [active ? "ON" : "OFF"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
 	update_appearance()

 /obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/user, list/modifiers)
@@ -189,15 +189,15 @@
 		if(powered)
 			powered = FALSE
 			update_appearance()
-			investigate_log("lost power and turned <font color='red'>OFF</font> at [AREACOORD(src)]", INVESTIGATE_SINGULO)
-			log_game("Emitter lost power in [AREACOORD(src)]")
+			investigate_log("lost power and turned OFF at [AREACOORD(src)]", INVESTIGATE_ENGINE)
+			log_game("[src] lost power in [AREACOORD(src)]")
 		return

 	add_load(active_power_usage)
 	if(!powered)
 		powered = TRUE
 		update_appearance()
-		investigate_log("regained power and turned <font color='green'>ON</font> at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+		investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_ENGINE)
 	if(charge <= 80)
 		charge += 2.5 * delta_time
 	if(!check_delay() || manual == TRUE)
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -95,7 +95,7 @@ no power level overlay is currently in the overlays list.
 		span_notice("You turn on [src]."),
 		span_hear("You hear heavy droning."))
 	turn_on()
-	investigate_log("<font color='green'>activated</font> by [key_name(user)].", INVESTIGATE_SINGULO)
+	investigate_log("activated by [key_name(user)].", INVESTIGATE_ENGINE)

 	add_fingerprint(user)

@@ -237,7 +237,7 @@ no power level overlay is currently in the overlays list.
 	else
 		visible_message(span_danger("The [name] shuts down!"), span_hear("You hear something shutting down."))
 		turn_off()
-		investigate_log("ran out of power and <font color='red'>deactivated</font>", INVESTIGATE_SINGULO)
+		investigate_log("ran out of power and DEACTIVATED.", INVESTIGATE_ENGINE)
 		power = 0
 		check_power_level()
 		return FALSE
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -144,7 +144,7 @@
 	switch(severity)
 		if(EXPLODE_DEVASTATE)
 			if(current_size <= STAGE_TWO)
-				investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_SINGULO)
+				investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_ENGINE)
 				qdel(src)
 				return

@@ -264,7 +264,7 @@
 		resolved_singularity.singularity_size = current_size

 	if(current_size == allowed_size)
-		investigate_log("<font color='red'>grew to size [current_size]</font>", INVESTIGATE_SINGULO)
+		investigate_log("grew to size [current_size].", INVESTIGATE_ENGINE)
 		return TRUE
 	else if(current_size < (--temp_allowed_size))
 		expand(temp_allowed_size)
@@ -273,7 +273,7 @@

 /obj/singularity/proc/check_energy()
 	if(energy <= 0)
-		investigate_log("collapsed.", INVESTIGATE_SINGULO)
+		investigate_log("collapsed.", INVESTIGATE_ENGINE)
 		qdel(src)
 		return FALSE
 	switch(energy)//Some of these numbers might need to be changed up later -Mport
@@ -437,7 +437,7 @@
 /obj/singularity/singularity_act()
 	var/gain = (energy/2)
 	var/dist = max((current_size - 2),1)
-	investigate_log("has been destroyed by another singularity.", INVESTIGATE_SINGULO)
+	investigate_log("has been destroyed by another singularity.", INVESTIGATE_ENGINE)
 	explosion(
 		src,
 		devastation_range = dist,
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -152,7 +152,7 @@
 	if(default_deconstruction_crowbar(I))
 		message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
 		log_game("[src] has been deconstructed by [key_name(user)] at [AREACOORD(src)]")
-		investigate_log("SMES deconstructed by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+		investigate_log("deconstructed by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
 		return
 	else if(panel_open && I.tool_behaviour == TOOL_CROWBAR)
 		return
@@ -181,9 +181,9 @@
 /obj/machinery/power/smes/Destroy()
 	if(SSticker.IsRoundInProgress())
 		var/turf/T = get_turf(src)
-		message_admins("SMES deleted at [ADMIN_VERBOSEJMP(T)]")
-		log_game("SMES deleted at [AREACOORD(T)]")
-		investigate_log("<font color='red'>deleted</font> at [AREACOORD(T)]", INVESTIGATE_SINGULO)
+		message_admins("[src] deleted at [ADMIN_VERBOSEJMP(T)]")
+		log_game("[src] deleted at [AREACOORD(T)]")
+		investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_ENGINE)
 	if(terminal)
 		disconnect_terminal()
 	return ..()
@@ -265,7 +265,7 @@

 			if(output_used < 0.0001) // either from no charge or set to 0
 				outputting = FALSE
-				investigate_log("lost power and turned <font color='red'>off</font>", INVESTIGATE_SINGULO)
+				investigate_log("lost power and turned off", INVESTIGATE_ENGINE)
 		else if(output_attempt && charge > output_level && output_level > 0)
 			outputting = TRUE
 		else
@@ -388,7 +388,7 @@
 				log_smes(usr)

 /obj/machinery/power/smes/proc/log_smes(mob/user)
-	investigate_log("input/output; [input_level>output_level?"<font color='green'>":"<font color='red'>"][input_level]/[output_level]</font> | Charge: [charge] | Output-mode: [output_attempt?"<font color='green'>on</font>":"<font color='red'>off</font>"] | Input-mode: [input_attempt?"<font color='green'>auto</font>":"<font color='red'>off</font>"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_SINGULO)
+	investigate_log("Input/Output: [input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"ON":"OFF"] | Input-mode: [input_attempt?"AUTO":"OFF"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_ENGINE)


 /obj/machinery/power/smes/emp_act(severity)
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -261,7 +261,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	radio.keyslot = new radio_key
 	radio.set_listening(FALSE)
 	radio.recalculateChannels()
-	investigate_log("has been created.", INVESTIGATE_SUPERMATTER)
+	investigate_log("has been created.", INVESTIGATE_ENGINE)
 	if(is_main_engine)
 		GLOB.main_supermatter_engine = src

@@ -286,7 +286,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	update_constants()

 /obj/machinery/power/supermatter_crystal/Destroy()
-	investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
+	investigate_log("has been destroyed.", INVESTIGATE_ENGINE)
 	SSair.stop_processing_machine(src)
 	QDEL_NULL(radio)
 	QDEL_NULL(countdown)
@@ -466,14 +466,14 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 		SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "delam", /datum/mood_event/delam)

 	if(combined_gas > MOLE_PENALTY_THRESHOLD)
-		investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER)
+		investigate_log("has collapsed into a singularity.", INVESTIGATE_ENGINE)
 		if(local_turf) //If something fucks up we blow anyhow. This fix is 4 years old and none ever said why it's here. help.
 			var/obj/singularity/created_singularity = new(local_turf)
 			created_singularity.energy = 800
 			created_singularity.consume(src)
 			return //No boom for me sir
 	if(power > POWER_PENALTY_THRESHOLD)
-		investigate_log("has spawned additional energy balls.", INVESTIGATE_SUPERMATTER)
+		investigate_log("has spawned additional energy balls.", INVESTIGATE_ENGINE)
 		if(local_turf)
 			var/obj/energy_ball/created_tesla = new(local_turf)
 			created_tesla.energy = 200 //Gets us about 9 balls
--- a/code/modules/power/supermatter/supermatter_hit_procs.dm
+++ b/code/modules/power/supermatter/supermatter_hit_procs.dm
@@ -16,7 +16,7 @@
 	if(!istype(local_turf))
 		return FALSE
 	if(!istype(projectile.firer, /obj/machinery/power/emitter) && power_changes)
-		investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_SUPERMATTER)
+		investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_ENGINE)
 	if(projectile.armor_flag != BULLET || kiss_power)
 		if(kiss_power)
 			psyCoeff = 1
@@ -24,7 +24,7 @@
 		if(power_changes) //This needs to be here I swear
 			power += projectile.damage * bullet_energy + kiss_power
 			if(!has_been_powered)
-				investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER)
+				investigate_log("has been powered for the first time.", INVESTIGATE_ENGINE)
 				message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
 				has_been_powered = TRUE
 	else if(takes_damage)
@@ -35,7 +35,7 @@

 /obj/machinery/power/supermatter_crystal/singularity_act()
 	var/gain = 100
-	investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SINGULO)
+	investigate_log("consumed by singularity.", INVESTIGATE_ENGINE)
 	message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
 	visible_message(span_userdanger("[src] is consumed by the singularity!"))
 	for(var/mob/hearing_mob as anything in GLOB.player_list)
@@ -159,7 +159,7 @@
 	if(!cause)
 		cause = "contact"
 	nom.visible_message(vis_msg, mob_msg, span_hear("You hear an unearthly noise as a wave of heat washes over you."))
-	investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_SUPERMATTER)
+	investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_ENGINE)
 	add_memory_in_range(src, 7, MEMORY_SUPERMATTER_DUSTED, list(DETAIL_PROTAGONIST = nom, DETAIL_WHAT_BY = src), story_value = STORY_VALUE_OKAY, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF)
 	playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
 	Consume(nom)
@@ -214,7 +214,7 @@
 		user.visible_message(span_danger("As [user] touches \the [src] with \a [item], silence fills the room..."),\
 			span_userdanger("You touch \the [src] with \the [item], and everything suddenly goes silent.</span>\n<span class='notice'>\The [item] flashes into dust as you flinch away from \the [src]."),\
 			span_hear("Everything suddenly goes silent."))
-		investigate_log("has been attacked ([item]) by [key_name(user)]", INVESTIGATE_SUPERMATTER)
+		investigate_log("has been attacked ([item]) by [key_name(user)]", INVESTIGATE_ENGINE)
 		Consume(item)
 		playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)

@@ -261,7 +261,7 @@
 		if(consumed_mob.status_flags & GODMODE)
 			return
 		message_admins("[src] has consumed [key_name_admin(consumed_mob)] [ADMIN_JMP(src)].")
-		investigate_log("has consumed [key_name(consumed_mob)].", INVESTIGATE_SUPERMATTER)
+		investigate_log("has consumed [key_name(consumed_mob)].", INVESTIGATE_ENGINE)
 		consumed_mob.dust(force = TRUE)
 		if(power_changes)
 			matter_power += 200
@@ -276,7 +276,7 @@
 			if(consumed_object.fingerprintslast)
 				suspicion = "last touched by [consumed_object.fingerprintslast]"
 				message_admins("[src] has consumed [consumed_object], [suspicion] [ADMIN_JMP(src)].")
-			investigate_log("has consumed [consumed_object] - [suspicion].", INVESTIGATE_SUPERMATTER)
+			investigate_log("has consumed [consumed_object] - [suspicion].", INVESTIGATE_ENGINE)
 		qdel(consumed_object)
 	if(!iseffect(consumed_object) && power_changes)
 		matter_power += 200
@@ -284,7 +284,7 @@
 	//Some poor sod got eaten, go ahead and irradiate people nearby.
 	radiation_pulse(src, max_range = 6, threshold = 0.3, chance = 30)
 	for(var/mob/living/near_mob in range(10))
-		investigate_log("has irradiated [key_name(near_mob)] after consuming [consumed_object].", INVESTIGATE_SUPERMATTER)
+		investigate_log("has irradiated [key_name(near_mob)] after consuming [consumed_object].", INVESTIGATE_ENGINE)
 		if (HAS_TRAIT(near_mob, TRAIT_RADIMMUNE) || issilicon(near_mob))
 			continue
 		if(ishuman(near_mob) && SSradiation.wearing_rad_protected_clothing(near_mob))
--- a/code/modules/power/supermatter/supermatter_process.dm
+++ b/code/modules/power/supermatter/supermatter_process.dm
@@ -389,7 +389,7 @@
 			SEND_SIGNAL(src, COMSIG_SUPERMATTER_DELAM_ALARM)
 			lastwarning = REALTIMEOFDAY
 			if(!has_reached_emergency)
-				investigate_log("has reached the emergency point for the first time.", INVESTIGATE_SUPERMATTER)
+				investigate_log("has reached the emergency point for the first time.", INVESTIGATE_ENGINE)
 				message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].")
 				has_reached_emergency = TRUE
 		else if(damage >= damage_archived) // The damage is still going up
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -50,7 +50,7 @@

 		var/turf/spawned_turf = get_turf(src)
 		message_admins("A tesla has been created at [ADMIN_VERBOSEJMP(spawned_turf)].")
-		investigate_log("(tesla) was created at [AREACOORD(spawned_turf)].", INVESTIGATE_SINGULO)
+		investigate_log("(tesla) was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE)

 /obj/energy_ball/Destroy()
 	if(orbiting && istype(orbiting.parent, /obj/energy_ball))
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -108,19 +108,17 @@
 */
 /obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target, mob/user, interaction_key)
 	if(!chassis)
-		return
-	chassis.use_power(energy_drain)
-	. = do_after(user, equip_cooldown, target=target, interaction_key = interaction_key)
-	if(!chassis || !(get_dir(chassis, target) & chassis.dir))
 		return FALSE
+	chassis.use_power(energy_drain)
+	return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target), interaction_key = interaction_key)

 ///Do after wrapper for mecha equipment
 /obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, mob/user, delay)
-	if(!chassis)
-		return
-	. = do_after(user, delay, target=target)
-	if(!chassis || !(get_dir(chassis, target)&chassis.dir))
-		return FALSE
+	return do_after(user, delay, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target))
+
+/// do after checks for the mecha equipment do afters
+/obj/item/mecha_parts/mecha_equipment/proc/do_after_checks(atom/target)
+	return chassis && (get_dir(chassis, target) & chassis.dir)

 /obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/vehicle/sealed/mecha/M, attach_right = FALSE)
 	return default_can_attach(M, attach_right)
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -167,7 +167,7 @@
 					/obj/item/clothing/shoes/sneakers/black = 2,
 					/obj/item/clothing/gloves/fingerless = 2,
 					/obj/item/clothing/head/soft/black = 2,
-					/obj/item/clothing/mask/bandana/skull = 2)
+					/obj/item/clothing/mask/bandana/color/skull = 2)
 	contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2,
 					/obj/item/organ/tongue/robot = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
--- a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm
+++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
 		/obj/item/clothing/head/hardhat/red = 75,
 		/obj/item/clothing/mask/balaclava = 75,
 		/obj/item/clothing/mask/russian_balaclava = 75,
-		/obj/item/clothing/mask/bandana/black = 25,
+		/obj/item/clothing/mask/bandana/color/black = 25,
 		/obj/item/clothing/mask/breath = 100,
 		/obj/item/clothing/mask/fakemoustache = 25,
 		/obj/item/clothing/mask/gas = 200,
--- a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm
@@ -64,55 +64,6 @@
 		adjust_mask(usr)


-
-/obj/item/clothing/mask/bandana/red/ft
-	name = "skin tight red bandana"
-	desc = "A fine red bandana with nanotech lining."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
-/obj/item/clothing/mask/bandana/blue/ft
-	name = "skin tight blue bandana"
-	desc = "A fine blue bandana with nanotech lining."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
-/obj/item/clothing/mask/bandana/green/ft
-	name = "skin tight green bandana"
-	desc = "A fine green bandana with nanotech lining."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
-/obj/item/clothing/mask/bandana/gold/ft
-	name = "skin tight gold bandana"
-	desc = "A fine gold bandana with nanotech lining."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
-/obj/item/clothing/mask/bandana/black/ft
-	name = "skin tight black bandana"
-	desc = "A fine black bandana with nanotech lining."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
-/obj/item/clothing/mask/bandana/skull/ft
-	name = "skin tight skull bandana"
-	desc = "A fine black bandana with nanotech lining and a skull emblem."
-	flags_cover = NONE
-	flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_inv = HIDEFACIALHAIR|HIDESNOUT
-	visor_flags_cover = PEPPERPROOF
-
 /obj/item/clothing/mask/balaclava/threehole
 	name = "three hole balaclava"
 	desc = "Tiocfaidh ar la."
--- a/modular_skyrat/modules/exp_corps/code/clothing.dm
+++ b/modular_skyrat/modules/exp_corps/code/clothing.dm
@@ -56,7 +56,7 @@
 	new /obj/item/binoculars(src)
 	new /obj/item/storage/fancy/cigarettes/cigpack_robust(src)
 	new /obj/item/lighter(src)
-	new /obj/item/clothing/mask/bandana/skull(src)
+	new /obj/item/clothing/mask/bandana/color/skull(src)

 /obj/item/clothing/shoes/combat/expeditionary_corps
 	name = "expeditionary corps boots"
--- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm
@@ -29,27 +29,27 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask)

 /datum/loadout_item/mask/black_bandana
 	name = "Black Bandana"
-	item_path = /obj/item/clothing/mask/bandana/black
+	item_path = /obj/item/clothing/mask/bandana/color/black

 /datum/loadout_item/mask/blue_bandana
 	name = "Blue Bandana"
-	item_path = /obj/item/clothing/mask/bandana/blue
+	item_path = /obj/item/clothing/mask/bandana/color/blue

 /datum/loadout_item/mask/gold_bandana
 	name = "Gold Bandana"
-	item_path = /obj/item/clothing/mask/bandana/gold
+	item_path = /obj/item/clothing/mask/bandana/color/gold

 /datum/loadout_item/mask/green_bandana
 	name = "Green Bandana"
-	item_path = /obj/item/clothing/mask/bandana/green
+	item_path = /obj/item/clothing/mask/bandana/color/green

 /datum/loadout_item/mask/red_bandana
 	name = "Red Bandana"
-	item_path = /obj/item/clothing/mask/bandana/red
+	item_path = /obj/item/clothing/mask/bandana/color/red

 /datum/loadout_item/mask/skull_bandana
 	name = "Skull Bandana"
-	item_path = /obj/item/clothing/mask/bandana/skull
+	item_path = /obj/item/clothing/mask/bandana/color/skull

 /datum/loadout_item/mask/surgical_mask
 	name = "Face Mask"
@@ -107,29 +107,6 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask)
 	name = "Fake moustache"
 	item_path = /obj/item/clothing/mask/fakemoustache

-/datum/loadout_item/mask/bandana_redft
-	name = "Skin Tight Red Bandana"
-	item_path = /obj/item/clothing/mask/bandana/red/ft
-
-/datum/loadout_item/mask/bandana_blueft
-	name = "Skin Tight Blue Bandana"
-	item_path = /obj/item/clothing/mask/bandana/blue/ft
-
-/datum/loadout_item/mask/bandana_greenft
-	name = "Skin Tight Green Bandana"
-	item_path = /obj/item/clothing/mask/bandana/green/ft
-
-/datum/loadout_item/mask/bandana_goldft
-	name = "Skin Tight Gold Bandana"
-	item_path = /obj/item/clothing/mask/bandana/gold/ft
-
-/datum/loadout_item/mask/bandana_blackft
-	name = "Skin Tight Black Bandana"
-	item_path = /obj/item/clothing/mask/bandana/black/ft
-
-/datum/loadout_item/mask/bandana_skullft
-	name = "Skin Tight Skull Bandana"
-	item_path = /obj/item/clothing/mask/bandana/skull/ft

 /datum/loadout_item/mask/gas_glass
 	name = "Glass Gas Mask"
--- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
@@ -98,7 +98,7 @@
 					/obj/item/clothing/shoes/jackboots = 3,
 					/obj/item/clothing/head/beret/sec = 3,
 					/obj/item/clothing/head/soft/sec = 3,
-					/obj/item/clothing/mask/bandana/red = 3,
+					/obj/item/clothing/mask/bandana/color/red = 3,
 					/obj/item/clothing/gloves/color/black = 3,
 					/obj/item/clothing/under/rank/security/officer/skirt = 3,
 					/obj/item/clothing/under/utility/sec/old = 3,
--- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm
+++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm
@@ -126,7 +126,7 @@
 	. = ..()
 	if(master && master.active)
 		master.toggle_power()
-		investigate_log("was moved whilst active; it <font color='red'>powered down</font>.", INVESTIGATE_SINGULO)
+		investigate_log("was moved whilst active; it <font color='red'>powered down</font>.", INVESTIGATE_ENGINE)


 /obj/structure/particle_accelerator/update_icon_state()
--- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm
+++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm
@@ -89,7 +89,7 @@
 		strength_change()

 		log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
-		investigate_log("increased to <font color='red'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+		investigate_log("increased to <font color='red'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)

 /obj/machinery/particle_accelerator/control_box/proc/remove_strength(s)
 	if(assembled && (strength > 0))
@@ -97,7 +97,7 @@
 		strength_change()

 		log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
-		investigate_log("decreased to <font color='green'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+		investigate_log("decreased to <font color='green'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)

 /obj/machinery/particle_accelerator/control_box/power_change()
 	. = ..()
@@ -111,7 +111,7 @@
 	if(active)
 		//a part is missing!
 		if(connected_parts.len < 6)
-			investigate_log("lost a connected part; It <font color='red'>powered down</font>.", INVESTIGATE_SINGULO)
+			investigate_log("lost a connected part; It <font color='red'>powered down</font>.", INVESTIGATE_ENGINE)
 			toggle_power()
 			update_appearance()
 			return
@@ -170,7 +170,7 @@

 /obj/machinery/particle_accelerator/control_box/proc/toggle_power()
 	active = !active
-	investigate_log("turned [active?"<font color='green'>ON</font>":"<font color='red'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+	investigate_log("turned [active?"<font color='green'>ON</font>":"<font color='red'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
 	message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? ADMIN_LOOKUPFLW(usr) : "outside forces"] in [ADMIN_VERBOSEJMP(src)]")
 	log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] at [AREACOORD(src)]")
 	if(active)
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,6 +1,6 @@
 pygit2==1.6
 bidict==0.13.1
-Pillow==8.3.2
+Pillow==9.0.1

 # changelogs
 PyYaml==5.4