From b83f92be0ea008746fb9b01b34ae448a57dd022e Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 13 Nov 2019 06:50:35 +0100
Subject: [PATCH] Unmodularize airlocks.

---
 code/datums/wires/airlock.dm                  | 38 +++++++++++++++++-
 code/game/machinery/doors/airlock.dm          |  1 +
 code/game/machinery/doors/airlock_types.dm    | 10 +++++
 .../code/datums/traits/negative.dm            |  1 -
 modular_citadel/code/datums/wires/airlock.dm  | 40 -------------------
 .../code/game/machinery/doors/airlock.dm      |  2 -
 .../game/machinery/doors/airlock_types.dm     | 29 --------------
 tgstation.dme                                 |  4 --
 8 files changed, 47 insertions(+), 78 deletions(-)
 delete mode 100644 modular_citadel/code/datums/traits/negative.dm
 delete mode 100644 modular_citadel/code/datums/wires/airlock.dm
 delete mode 100644 modular_citadel/code/game/machinery/doors/airlock.dm
 delete mode 100644 modular_citadel/code/game/machinery/doors/airlock_types.dm

diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 26942a1ba6..db6d80f9bb 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -1,10 +1,35 @@
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
-	proper_name = "Airlock"
+	proper_name = "Generic Airlock"
+	var/wiretype
 
 /datum/wires/airlock/secure
 	randomize = TRUE
 
+/datum/wires/airlock/command
+	proper_name = "Command Airlock"
+	wiretype = "commandairlock"
+
+/datum/wires/airlock/security
+	proper_name = "Security Airlock"
+	wiretype = "securityairlock"
+
+/datum/wires/airlock/engineering
+	proper_name = "Engineering Airlock"
+	wiretype = "engineeringairlock"
+
+/datum/wires/airlock/science
+	proper_name = "Science Airlock"
+	wiretype = "scienceairlock"
+
+/datum/wires/airlock/medical
+	proper_name = "Medical Airlock"
+	wiretype = "medicalairlock"
+
+/datum/wires/airlock/cargo
+	proper_name = "Cargo Airlock"
+	wiretype = "cargoairlock"
+
 /datum/wires/airlock/New(atom/holder)
 	wires = list(
 		WIRE_POWER1, WIRE_POWER2,
@@ -14,7 +39,16 @@
 		WIRE_ZAP1, WIRE_ZAP2
 	)
 	add_duds(2)
-	..()
+	. = ..()
+	if(randomize || !wiretype)
+		return
+	if(!GLOB.wire_color_directory[wiretype])
+		colors = list()
+		randomize()
+		GLOB.wire_color_directory[wiretype] = colors
+		GLOB.wire_name_directory[wiretype] = proper_name
+	else
+		colors = GLOB.wire_color_directory[wiretype]
 
 /datum/wires/airlock/interactable(mob/user)
 	var/obj/machinery/door/airlock/A = holder
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 365d19b826..f85fb3f310 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -83,6 +83,7 @@
 	var/boltDown = 'sound/machines/boltsdown.ogg'
 	var/noPower = 'sound/machines/doorclick.ogg'
 	var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
+	var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has.
 	var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
 	var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
 	var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index becd89063f..59b49d5828 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -8,16 +8,19 @@
 /obj/machinery/door/airlock/command
 	icon = 'icons/obj/doors/airlocks/station/command.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_com
+	wiretypepath = /datum/wires/airlock/command
 	normal_integrity = 450
 
 /obj/machinery/door/airlock/security
 	icon = 'icons/obj/doors/airlocks/station/security.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_sec
+	wiretypepath = /datum/wires/airlock/security
 	normal_integrity = 450
 
 /obj/machinery/door/airlock/engineering
 	icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_eng
+	wiretypepath = /datum/wires/airlock/engineering
 
 /obj/machinery/door/airlock/engineering/abandoned
 	abandoned = TRUE
@@ -25,6 +28,7 @@
 /obj/machinery/door/airlock/medical
 	icon = 'icons/obj/doors/airlocks/station/medical.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_med
+	wiretypepath = /datum/wires/airlock/medical
 
 /obj/machinery/door/airlock/maintenance
 	name = "maintenance access"
@@ -44,11 +48,13 @@
 	name = "mining airlock"
 	icon = 'icons/obj/doors/airlocks/station/mining.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_min
+	wiretypepath = /datum/wires/airlock/cargo
 
 /obj/machinery/door/airlock/atmos
 	name = "atmospherics airlock"
 	icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_atmo
+	wiretypepath = /datum/wires/airlock/engineering
 
 /obj/machinery/door/airlock/atmos/abandoned
 	abandoned = TRUE
@@ -56,6 +62,7 @@
 /obj/machinery/door/airlock/research
 	icon = 'icons/obj/doors/airlocks/station/research.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_research
+	wiretypepath = /datum/wires/airlock/science
 
 /obj/machinery/door/airlock/freezer
 	name = "freezer airlock"
@@ -65,10 +72,12 @@
 /obj/machinery/door/airlock/science
 	icon = 'icons/obj/doors/airlocks/station/science.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_science
+	wiretypepath = /datum/wires/airlock/science
 
 /obj/machinery/door/airlock/virology
 	icon = 'icons/obj/doors/airlocks/station/virology.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_viro
+	wiretypepath = /datum/wires/airlock/medical
 
 //////////////////////////////////
 /*
@@ -376,6 +385,7 @@
 	icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
 	overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_vault
+	wiretypepath = /datum/wires/airlock/secure
 	explosion_block = 2
 	normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original
 	security_level = 6
diff --git a/modular_citadel/code/datums/traits/negative.dm b/modular_citadel/code/datums/traits/negative.dm
deleted file mode 100644
index c0cbe57b5a..0000000000
--- a/modular_citadel/code/datums/traits/negative.dm
+++ /dev/null
@@ -1 +0,0 @@
-// Citadel-specific Negative Traits
diff --git a/modular_citadel/code/datums/wires/airlock.dm b/modular_citadel/code/datums/wires/airlock.dm
deleted file mode 100644
index 0c89f70d22..0000000000
--- a/modular_citadel/code/datums/wires/airlock.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-/datum/wires/airlock
-	proper_name = "Generic Airlock"
-	var/wiretype
-
-/datum/wires/airlock/command
-	proper_name = "Command Airlock"
-	wiretype = "commandairlock"
-
-/datum/wires/airlock/security
-	proper_name = "Security Airlock"
-	wiretype = "securityairlock"
-
-/datum/wires/airlock/engineering
-	proper_name = "Engineering Airlock"
-	wiretype = "engineeringairlock"
-
-/datum/wires/airlock/science
-	proper_name = "Science Airlock"
-	wiretype = "scienceairlock"
-
-/datum/wires/airlock/medical
-	proper_name = "Medical Airlock"
-	wiretype = "medicalairlock"
-
-/datum/wires/airlock/cargo
-	proper_name = "Cargo Airlock"
-	wiretype = "cargoairlock"
-
-/datum/wires/airlock/New(atom/holder)
-	. = ..()
-	if(randomize)
-		return
-	if(wiretype)
-		if(!GLOB.wire_color_directory[wiretype])
-			colors = list()
-			randomize()
-			GLOB.wire_color_directory[wiretype] = colors
-			GLOB.wire_name_directory[wiretype] = proper_name
-		else
-			colors = GLOB.wire_color_directory[wiretype]
diff --git a/modular_citadel/code/game/machinery/doors/airlock.dm b/modular_citadel/code/game/machinery/doors/airlock.dm
deleted file mode 100644
index 346c50d4e1..0000000000
--- a/modular_citadel/code/game/machinery/doors/airlock.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/machinery/door/airlock
-	var/wiretypepath = /datum/wires/airlock
diff --git a/modular_citadel/code/game/machinery/doors/airlock_types.dm b/modular_citadel/code/game/machinery/doors/airlock_types.dm
deleted file mode 100644
index 29a1b4be16..0000000000
--- a/modular_citadel/code/game/machinery/doors/airlock_types.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/obj/machinery/door/airlock/command
-	wiretypepath = /datum/wires/airlock/command
-
-/obj/machinery/door/airlock/security
-	wiretypepath = /datum/wires/airlock/security
-
-/obj/machinery/door/airlock/engineering
-	wiretypepath = /datum/wires/airlock/engineering
-
-/obj/machinery/door/airlock/medical
-	wiretypepath = /datum/wires/airlock/medical
-
-/obj/machinery/door/airlock/mining
-	wiretypepath = /datum/wires/airlock/cargo
-
-/obj/machinery/door/airlock/atmos
-	wiretypepath = /datum/wires/airlock/engineering
-
-/obj/machinery/door/airlock/research
-	wiretypepath = /datum/wires/airlock/science
-
-/obj/machinery/door/airlock/science
-	wiretypepath = /datum/wires/airlock/science
-
-/obj/machinery/door/airlock/virology
-	wiretypepath = /datum/wires/airlock/medical
-
-/obj/machinery/door/airlock/vault
-	wiretypepath = /datum/wires/airlock/secure
diff --git a/tgstation.dme b/tgstation.dme
index 9e52889df7..d5ee59ca50 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2973,8 +2973,6 @@
 #include "modular_citadel\code\datums\mutations\hulk.dm"
 #include "modular_citadel\code\datums\status_effects\chems.dm"
 #include "modular_citadel\code\datums\status_effects\debuffs.dm"
-#include "modular_citadel\code\datums\traits\negative.dm"
-#include "modular_citadel\code\datums\wires\airlock.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
 #include "modular_citadel\code\game\area\cit_areas.dm"
 #include "modular_citadel\code\game\gamemodes\gangs\dominator.dm"
@@ -2997,8 +2995,6 @@
 #include "modular_citadel\code\game\machinery\vending.dm"
 #include "modular_citadel\code\game\machinery\wishgranter.dm"
 #include "modular_citadel\code\game\machinery\computer\card.dm"
-#include "modular_citadel\code\game\machinery\doors\airlock.dm"
-#include "modular_citadel\code\game\machinery\doors\airlock_types.dm"
 #include "modular_citadel\code\game\objects\cit_screenshake.dm"
 #include "modular_citadel\code\game\objects\items.dm"
 #include "modular_citadel\code\game\objects\tools.dm"