Feat: Aesthetics. Part 1 (#27)

## About The Pull Request Полная переделка эстетики, часть первая. Весь модуль был удалён и будет сделан по новой. Заменены: - Стены - Окна - Двери - Полы ![image](https://github.com/ss220club/bandastation/assets/69762909/820ae7bf-68da-4e5a-af6d-6daf9ec4de59) ![image](https://github.com/ss220club/bandastation/assets/69762909/0b1a49c6-1c5d-40bc-8549-5fb34cfa6626) ![image](https://github.com/ss220club/bandastation/assets/69762909/d773c94c-b3b3-47db-9a7e-5670b90475be) ## Why It's Good For The Game ЭСТЕТИКА
ss220club · Nov 13, 2023 · e1cc2ed · e1cc2ed
1 parent fa52bf3
commit e1cc2ed
Show file tree

Hide file tree

Showing 105 changed files with 294 additions and 961 deletions.
diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme
@@ -1,43 +1,19 @@
 #include "_aesthetics.dm"
 
-#include "airalarm\code\airalarm.dm"
-#include "airlocks\code\airlock.dm"
-#include "airlocks\code\airlock_types.dm"
-#include "airlocks\code\airlock_assembly_types.dm"
-#include "apc\code\apc.dm"
-// #include "atm\code\atm.dm" // Unused
-// #include "atmospherics\code\atmospherics.dm" // Need more sprites
-// #include "better_ids\code\better_ids.dm" // Need to change a lot
-#include "blastdoor\code\blastdoor.dm"
-// #include "boxes\code\boxes.dm" // Need to change a lot
-#include "cameras\code\cameras.dm"
-// #include "chairs\code\chairs.dm" // TG already uses these
-// #include "decals\code\decals.dm" // Didn't check this new one
-// #include "defib\code\defib.dm" // TG already uses these
-#include "dirwindows\code\dirwindows.dm"
-// #include "door_control\code\door_control.dm" // Unused
-// #include "extinguisher\code\extinguisher.dm" // Need more sprites
-// #include "firealarm\code\firealarm.dm" // Need more sprites
-// #include "floors\code\floors.dm" // Need to change a lot
-// #include "floors\code\tile_types.dm" // Need to change a lot
-// #include "hydroponics\code\hydroponics.dm" // TG already uses these
-// #include "intercom\code\intercom.dm" // TG already uses these
-#include "keycard\code\keycard.dm"
-#include "labeler\code\labeler.dm"
-// #include "library\code\library.dm" // TG already uses these
-#include "light_switch\code\light_switch.dm"
-#include "newscaster\code\newscaster.dm"
-// #include "piano\code\piano.dm" // Unused
-#include "racks\code\racks.dm"
-#include "requests_console\code\requests_console.dm"
-// #include "safe\code\safe.dm" // TG already uses these
-#include "shutters\code\shutters.dm"
-// #include "soap\code\soap.dm" // Unused
-#include "surgery_table\code\surgery_table.dm"
-// #include "toolboxes\code\toolboxes.dm" // TG already uses these
-// #include "wallcloset\code\wallcloset.dm" // Unused
-#include "walls\code\walls.dm"
-#include "windoor\code\windoor.dm"
-// #include "windows\code\windows.dm" // Need more sprites and fixes
-// #include "windowtint\code\windowtint.dm" // Unused?
-// #include "zippo\code\zippo.dm" // Unused
+// Airlocks
+#include "airlocks/code/airlock.dm"
+#include "airlocks/code/airlock_types.dm"
+#include "airlocks/code/airlock_assembly_types.dm"
+
+// Walls
+#include "walls/code/walls.dm"
+
+// Windows
+#include "windows/code/full_tile_windows.dm"
+#include "windows/code/directional_windows.dm"
+
+// WinDoors
+#include "windoors/code/windoors.dm"
+
+// Floors
+#include "floors/code/floors.dm"
diff --git a/modular_bandastation/aesthetics/airalarm/code/airalarm.dm b/modular_bandastation/aesthetics/airalarm/code/airalarm.dm
diff --git a/modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi b/modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi
diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock.dm b/modular_bandastation/aesthetics/airlocks/code/airlock.dm
@@ -8,6 +8,7 @@
 	boltUp = 'modular_bandastation/aesthetics/airlocks/sound/bolts_up.ogg'
 	boltDown = 'modular_bandastation/aesthetics/airlocks/sound/bolts_down.ogg'
 
+
 /obj/machinery/door/airlock/update_overlays()
 	. = ..()
 	if(!lights || !hasPower())
@@ -19,10 +20,9 @@
 				light_state = "poweron"
 		if(AIRLOCK_OPEN)
 			if(locked)
-				light_state = AIRLOCK_LIGHT_BOLTS
+				light_state = "bolts_open"
 			else if(emergency)
-				light_state = AIRLOCK_LIGHT_EMERGENCY
+				light_state = "emergency_open"
 			else
-				light_state = "poweron"
-			light_state = "[light_state]_open"
+				light_state = "poweron_open"
 	. += get_airlock_overlay("lights_[light_state]", overlays_file, src, em_block = FALSE)
diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock_assembly_types.dm b/modular_bandastation/aesthetics/airlocks/code/airlock_assembly_types.dm
@@ -1,3 +1,4 @@
+// Station airlocks assembly
 /obj/structure/door_assembly
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/public.dmi'
 	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/station/overlays.dmi'
@@ -11,24 +12,45 @@
 
 /obj/structure/door_assembly/door_assembly_cap
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/cap.dmi'
+	base_name = "captain airlock"
+	airlock_type = /obj/machinery/door/airlock/command/cap
+	glass_type = /obj/machinery/door/airlock/command/cap/glass
 
 /obj/structure/door_assembly/door_assembly_hop
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/hop.dmi'
+	base_name = "head of personnel airlock"
+	airlock_type = /obj/machinery/door/airlock/command/hop
+	glass_type = /obj/machinery/door/airlock/command/hop/glass
 
 /obj/structure/door_assembly/door_assembly_cmo
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/cmo.dmi'
+	base_name = "chief medical officer airlock"
+	airlock_type = /obj/machinery/door/airlock/command/cmo
+	glass_type = /obj/machinery/door/airlock/command/cmo/glass
 
 /obj/structure/door_assembly/door_assembly_rd
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/rd.dmi'
+	base_name = "research director airlock"
+	airlock_type = /obj/machinery/door/airlock/command/rd
+	glass_type = /obj/machinery/door/airlock/command/rd/glass
 
 /obj/structure/door_assembly/door_assembly_hos
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/hos.dmi'
+	base_name = "head of security airlock"
+	airlock_type = /obj/machinery/door/airlock/command/hos
+	glass_type = /obj/machinery/door/airlock/command/hos/glass
 
 /obj/structure/door_assembly/door_assembly_qm
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/qm.dmi'
+	base_name = "quartermaster airlock"
+	airlock_type = /obj/machinery/door/airlock/command/qm
+	glass_type = /obj/machinery/door/airlock/command/qm/glass
 
 /obj/structure/door_assembly/door_assembly_ce
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/ce.dmi'
+	base_name = "chief engineer airlock"
+	airlock_type = /obj/machinery/door/airlock/command/ce
+	glass_type = /obj/machinery/door/airlock/command/ce/glass
 
 /obj/structure/door_assembly/door_assembly_sec
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/security.dmi'
@@ -56,21 +78,21 @@
 
 /obj/structure/door_assembly/door_assembly_hydro
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/botany.dmi'
-
-/obj/structure/door_assembly/door_assembly_eva
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/eva.dmi'
+	base_name = "hydroponics airlock"
+	airlock_type = /obj/machinery/door/airlock/hydroponics
+	glass_type = /obj/machinery/door/airlock/hydroponics/glass
 
 /obj/structure/door_assembly/door_assembly_service
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/service.dmi'
-
-/obj/structure/door_assembly/door_assembly_psych
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/psych.dmi'
+	base_name = "service airlock"
+	airlock_type = /obj/machinery/door/airlock/service
+	glass_type = /obj/machinery/door/airlock/service/glass
 
 /obj/structure/door_assembly/door_assembly_bathroom
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bathroom.dmi'
-
-/obj/structure/door_assembly/door_assembly_lawyer
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/corporate.dmi'
+	base_name = "bathroom airlock"
+	airlock_type = /obj/machinery/door/airlock/bathroom
+	noglass = TRUE
 
 /obj/structure/door_assembly/door_assembly_mai
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/maintenance.dmi'
@@ -97,16 +119,15 @@
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/highsec/highsec.dmi'
 	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/highsec/overlays.dmi'
 
-/* Unused
-/obj/structure/door_assembly/multi_tile
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/glass_large.dmi'
-	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi'
-*/
-
 /obj/structure/door_assembly/door_assembly_centcom
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi'
 	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi'
 
+/obj/structure/door_assembly/door_assembly_grunge
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi'
+	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi'
+
+// Mineral airlocks
 /obj/structure/door_assembly/door_assembly_gold
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/gold.dmi'
 
@@ -125,13 +146,45 @@
 /obj/structure/door_assembly/door_assembly_bananium
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bananium.dmi'
 
-/* Unused
 /obj/structure/door_assembly/door_assembly_tranquillite
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/tranquilite.dmi'
-*/
 
 /obj/structure/door_assembly/door_assembly_sandstone
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/sandstone.dmi'
 
 /obj/structure/door_assembly/door_assembly_wood
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/wood.dmi'
+
+// Multi-tile airlocks
+/obj/structure/door_assembly/multi_tile
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/glass_large.dmi'
+	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi'
+
+/obj/structure/door_assembly/multi_tile/command
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi'
+	airlock_type = /obj/machinery/door/airlock/multi_tile/command
+	glass_type = /obj/machinery/door/airlock/multi_tile/command/glass
+
+/obj/structure/door_assembly/multi_tile/security
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi'
+	base_name = "security large airlock"
+	airlock_type = /obj/machinery/door/airlock/multi_tile/security
+	glass_type = /obj/machinery/door/airlock/multi_tile/security/glass
+
+/obj/structure/door_assembly/multi_tile/engineering
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi'
+	base_name = "engineering large airlock"
+	airlock_type = /obj/machinery/door/airlock/multi_tile/engineering
+	glass_type = /obj/machinery/door/airlock/multi_tile/engineering/glass
+
+/obj/structure/door_assembly/multi_tile/atmospheric
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi'
+	base_name = "atmospheric large airlock"
+	airlock_type = /obj/machinery/door/airlock/multi_tile/atmospheric
+	glass_type = /obj/machinery/door/airlock/multi_tile/atmospheric/glass
+
+/obj/structure/door_assembly/multi_tile/supply
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi'
+	base_name = "supply large airlock"
+	airlock_type = /obj/machinery/door/airlock/multi_tile/supply
+	glass_type = /obj/machinery/door/airlock/multi_tile/supply/glass