diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme index 10130ed3b9ca1..fdc5af8331dbc 100644 --- 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 deleted file mode 100644 index 092473ebbc4e7..0000000000000 --- a/modular_bandastation/aesthetics/airalarm/code/airalarm.dm +++ /dev/null @@ -1,18 +0,0 @@ -/obj/machinery/airalarm - icon = 'modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi' - layer = ABOVE_WINDOW_LAYER - -/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild) - . = ..() - switch(dir) // TODO: do it in dmi - if(NORTH) - dir = SOUTH - if(SOUTH) - dir = NORTH - if(EAST) - dir = WEST - if(WEST) - dir = EAST - -/obj/item/wallframe/airalarm - icon = 'modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi' diff --git a/modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi b/modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi deleted file mode 100644 index 3f607849c6998..0000000000000 Binary files a/modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock.dm b/modular_bandastation/aesthetics/airlocks/code/airlock.dm index 66a2ebc07cb16..0b58a2d6363e5 100644 --- 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 index c821e533b859e..0d9bea8f7dca9 100644 --- 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 diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm b/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm index 611a44eb257b4..ae6113bc258c5 100644 --- a/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm +++ b/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm @@ -1,37 +1,7 @@ -/* - Station Airlocks Regular -*/ +// Station airlocks /obj/machinery/door/airlock/command icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/command.dmi' -/obj/machinery/door/airlock/command/cap - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/cap.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_cap - -/obj/machinery/door/airlock/command/hop - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/hop.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_hop - -/obj/machinery/door/airlock/command/cmo - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/cmo.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_cmo - -/obj/machinery/door/airlock/command/rd - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/rd.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_rd - -/obj/machinery/door/airlock/command/hos - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/hos.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_hos - -/obj/machinery/door/airlock/command/qm - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/qm.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_qm - -/obj/machinery/door/airlock/command/ce - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/heads/ce.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_ce - /obj/machinery/door/airlock/security icon = 'modular_bandastation/aesthetics/airlocks/icons/station/security.dmi' @@ -69,29 +39,20 @@ icon = 'modular_bandastation/aesthetics/airlocks/icons/station/botany.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_hydro -/obj/machinery/door/airlock/eva - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/eva.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_eva - /obj/machinery/door/airlock/service icon = 'modular_bandastation/aesthetics/airlocks/icons/station/service.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_service -/obj/machinery/door/airlock/psych - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/psych.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_psych - /obj/machinery/door/airlock/bathroom icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bathroom.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_bathroom -/obj/machinery/door/airlock/lawyer - icon = 'modular_bandastation/aesthetics/airlocks/icons/station/corporate.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_lawyer +/obj/machinery/door/airlock/grunge + icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi' + overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_grunge -/* - Station Airlocks Glass -*/ +// Station airlocks glass /obj/machinery/door/airlock/command/cap/glass opacity = 0 glass = TRUE @@ -147,9 +108,7 @@ opacity = 0 glass = TRUE -/* - Station Airlocks Mineral -*/ +// Mineral airlocks /obj/machinery/door/airlock/gold icon = 'modular_bandastation/aesthetics/airlocks/icons/station/gold.dmi' @@ -168,10 +127,8 @@ /obj/machinery/door/airlock/bananium icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bananium.dmi' -/* Unused /obj/machinery/door/airlock/tranquillite icon = 'modular_bandastation/aesthetics/airlocks/icons/station/tranquilite.dmi' -*/ /obj/machinery/door/airlock/sandstone icon = 'modular_bandastation/aesthetics/airlocks/icons/station/sandstone.dmi' @@ -179,31 +136,23 @@ /obj/machinery/door/airlock/wood icon = 'modular_bandastation/aesthetics/airlocks/icons/station/wood.dmi' -/* - Station2 Airlocks -*/ +// Station2 airlocks /obj/machinery/door/airlock/public icon = 'modular_bandastation/aesthetics/airlocks/icons/station2/glass.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/station2/overlays.dmi' -/* - External Airlocks -*/ +// External airlocks /obj/machinery/door/airlock/external icon = 'modular_bandastation/aesthetics/airlocks/icons/external/external.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi' note_overlay_file = 'modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi' -/* - CentCom Airlocks -*/ +// Centcom airlocks /obj/machinery/door/airlock/centcom icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi' -/* - Hatch Airlocks -*/ +// Hatch airlocks /obj/machinery/door/airlock/hatch icon = 'modular_bandastation/aesthetics/airlocks/icons/hatch/centcom.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi' @@ -214,20 +163,54 @@ overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi' note_overlay_file = 'modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi' -/* - High Security Airlocks -*/ +// High security airlocks /obj/machinery/door/airlock/highsecurity icon = 'modular_bandastation/aesthetics/airlocks/icons/highsec/highsec.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/highsec/overlays.dmi' -/* - Misc Airlocks -*/ - -/* Unused? +// Multi-tile airlocks /obj/machinery/door/airlock/multi_tile icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/glass_large.dmi' overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi' note_overlay_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi' -*/ + +/obj/machinery/door/airlock/multi_tile/command + icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/command + +/obj/machinery/door/airlock/multi_tile/security + icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/security + +/obj/machinery/door/airlock/multi_tile/engineering + icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/engineering + +/obj/machinery/door/airlock/multi_tile/atmospheric + icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/atmospheric + +/obj/machinery/door/airlock/multi_tile/supply + icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/supply + +// Multi-tile airlocks glass +/obj/machinery/door/airlock/multi_tile/command/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/multi_tile/security/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/multi_tile/engineering/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/multi_tile/atmospheric/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/multi_tile/supply/glass + opacity = FALSE + glass = TRUE diff --git a/modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi b/modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi index 20e02d7a6c1cb..40127faa983e8 100644 Binary files a/modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi and b/modular_bandastation/aesthetics/airlocks/icons/external/overlays.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi new file mode 100644 index 0000000000000..d02dd456027a5 Binary files /dev/null and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi new file mode 100644 index 0000000000000..e9b28dcf83bf4 Binary files /dev/null and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi new file mode 100644 index 0000000000000..24be6b72687ea Binary files /dev/null and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi index bf5be7bccd4f1..95dda7db35d73 100644 Binary files a/modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi new file mode 100644 index 0000000000000..bd9885421cd78 Binary files /dev/null and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi b/modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi new file mode 100644 index 0000000000000..d4c76b17e497e Binary files /dev/null and b/modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi b/modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi index c426986694954..de967de4462c0 100644 Binary files a/modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi and b/modular_bandastation/aesthetics/airlocks/icons/hatch/overlays.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/station/overlays.dmi b/modular_bandastation/aesthetics/airlocks/icons/station/overlays.dmi index f385bd385a317..16c27e55cbe62 100644 Binary files a/modular_bandastation/aesthetics/airlocks/icons/station/overlays.dmi and b/modular_bandastation/aesthetics/airlocks/icons/station/overlays.dmi differ diff --git a/modular_bandastation/aesthetics/airlocks/icons/station2/overlays.dmi b/modular_bandastation/aesthetics/airlocks/icons/station2/overlays.dmi index 910a58b0d31f1..b442751412861 100644 Binary files a/modular_bandastation/aesthetics/airlocks/icons/station2/overlays.dmi and b/modular_bandastation/aesthetics/airlocks/icons/station2/overlays.dmi differ diff --git a/modular_bandastation/aesthetics/apc/code/apc.dm b/modular_bandastation/aesthetics/apc/code/apc.dm deleted file mode 100644 index 8df6f9ac7a9a7..0000000000000 --- a/modular_bandastation/aesthetics/apc/code/apc.dm +++ /dev/null @@ -1,6 +0,0 @@ -/obj/machinery/power/apc - icon = 'modular_bandastation/aesthetics/apc/icons/apc.dmi' - layer = ABOVE_WINDOW_LAYER - -/obj/item/wallframe/apc - icon = 'modular_bandastation/aesthetics/apc/icons/apc.dmi' diff --git a/modular_bandastation/aesthetics/apc/icons/apc.dmi b/modular_bandastation/aesthetics/apc/icons/apc.dmi deleted file mode 100644 index ce12d55fca863..0000000000000 Binary files a/modular_bandastation/aesthetics/apc/icons/apc.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/atm/code/atm.dm b/modular_bandastation/aesthetics/atm/code/atm.dm deleted file mode 100644 index 4dd1a708a855d..0000000000000 --- a/modular_bandastation/aesthetics/atm/code/atm.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/economy/atm - icon = 'modular_bandastation/aesthetics/atm/icons/atm.dmi' diff --git a/modular_bandastation/aesthetics/atm/icons/atm.dmi b/modular_bandastation/aesthetics/atm/icons/atm.dmi deleted file mode 100644 index 23e9a29ce8a6c..0000000000000 Binary files a/modular_bandastation/aesthetics/atm/icons/atm.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/atmospherics/code/atmospherics.dm b/modular_bandastation/aesthetics/atmospherics/code/atmospherics.dm deleted file mode 100644 index 0082fb87677b6..0000000000000 --- a/modular_bandastation/aesthetics/atmospherics/code/atmospherics.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/machinery/atmospherics/components/unary/vent_pump - icon = 'modular_bandastation/aesthetics/atmospherics/icons/vent_pump.dmi' - -/obj/machinery/atmospherics/components/unary/vent_scrubber - icon = 'modular_bandastation/aesthetics/atmospherics/icons/vent_scrubber.dmi' diff --git a/modular_bandastation/aesthetics/atmospherics/icons/vent_pump.dmi b/modular_bandastation/aesthetics/atmospherics/icons/vent_pump.dmi deleted file mode 100644 index 52aeaf450ac27..0000000000000 Binary files a/modular_bandastation/aesthetics/atmospherics/icons/vent_pump.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/atmospherics/icons/vent_scrubber.dmi b/modular_bandastation/aesthetics/atmospherics/icons/vent_scrubber.dmi deleted file mode 100644 index 4639f470fa517..0000000000000 Binary files a/modular_bandastation/aesthetics/atmospherics/icons/vent_scrubber.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/better_ids/code/better_ids.dm b/modular_bandastation/aesthetics/better_ids/code/better_ids.dm deleted file mode 100644 index 6ba748960047c..0000000000000 --- a/modular_bandastation/aesthetics/better_ids/code/better_ids.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/card - icon = 'modular_bandastation/aesthetics/better_ids/icons/better_ids.dmi' - -/obj/item/nanomob_card - icon = 'modular_bandastation/aesthetics/better_ids/icons/better_ids.dmi' diff --git a/modular_bandastation/aesthetics/better_ids/icons/better_ids.dmi b/modular_bandastation/aesthetics/better_ids/icons/better_ids.dmi deleted file mode 100644 index f66a128decab9..0000000000000 Binary files a/modular_bandastation/aesthetics/better_ids/icons/better_ids.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/blastdoor/code/blastdoor.dm b/modular_bandastation/aesthetics/blastdoor/code/blastdoor.dm deleted file mode 100644 index 804b6f7ec105b..0000000000000 --- a/modular_bandastation/aesthetics/blastdoor/code/blastdoor.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/machinery/door/poddoor - icon = 'modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi' - animation_sound = 'modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg' diff --git a/modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi b/modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi deleted file mode 100644 index 672c161c10ed7..0000000000000 Binary files a/modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg b/modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg deleted file mode 100644 index 93e53513985a4..0000000000000 Binary files a/modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/boxes/code/boxes.dm b/modular_bandastation/aesthetics/boxes/code/boxes.dm deleted file mode 100644 index 5864c48233d04..0000000000000 --- a/modular_bandastation/aesthetics/boxes/code/boxes.dm +++ /dev/null @@ -1,287 +0,0 @@ -/obj/item/storage/box/survival - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "civ_box" - -/obj/item/storage/box/survival_vox - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "vox_box" - -/obj/item/storage/box/survival_plasmaman - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "plasma_box" - -/obj/item/storage/box/engineer - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "eng_box" - -/obj/item/storage/box/survival_mining - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "min_box" - -/obj/item/storage/box/survival_syndi - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syndie_box" - -/obj/item/storage/box/gloves - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "latex_box" - -/obj/item/storage/box/masks - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "sterile_box" - -/obj/item/storage/box/syringes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syringe_box" - -/obj/item/storage/box/beakers - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "beaker_box" - -/obj/item/storage/box/beakers/bluespace - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "beaker_bluespace_box" - -/obj/item/storage/box/iv_bags - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "iv_box" - -/obj/item/storage/box/injectors - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syringe_box" - -/obj/item/storage/box/flashbangs - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flashbang_box" - -/obj/item/storage/box/flashes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flash_box" - -/obj/item/storage/box/teargas - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "teargas_box" - -/obj/item/storage/box/emps - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "emp_box" - -/obj/item/storage/box/trackimp - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/minertracker - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/chemimp - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/exileimp - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/deathimp - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/tapes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "tape_box" - -/obj/item/storage/box/rxglasses - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "glasses_box" - -/obj/item/storage/box/drinkingglasses - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/condimentbottles - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/cups - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "cup_box" - -/obj/item/storage/box/donkpockets - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "donk_box" - -/obj/item/storage/box/syndidonkpockets - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_syndie_box" // TODO: Need new icon - -/obj/item/storage/box/monkeycubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "monkey_box" - -/obj/item/storage/box/monkeycubes/neaeracubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "neaera_box" - -/obj/item/storage/box/monkeycubes/stokcubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "stok_box" - -/obj/item/storage/box/monkeycubes/farwacubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "farwa_box" - -/obj/item/storage/box/monkeycubes/wolpincubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "wolpin_box" - -/obj/item/storage/box/permits - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/ids - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/prisoner - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/seccarts - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "pda_box" - -/obj/item/storage/box/holobadge - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "badge_box" - -/obj/item/storage/box/evidence - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "evidence_box" - -/obj/item/storage/box/handcuffs - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "handcuff_box" - -/obj/item/storage/box/zipties - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "zipties_box" - -/obj/item/storage/box/alienhandcuffs - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "alien_handcuff_box" - -/obj/item/storage/box/fakesyndiesuit - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "doom_box" - -/obj/item/storage/box/enforcer_rubber - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/enforcer_lethal - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/bartender_rare_ingredients_kit - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/chef_rare_ingredients_kit - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/mousetraps - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "mousetraps_box" - -/obj/item/storage/box/pillbottles - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "pill_box" - -/obj/item/storage/box/patch_packs - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "patch_box" - -/obj/item/storage/box/bodybags - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "bodybag_box" - -/obj/item/storage/box/autoinjectors - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "injector_box" - -/obj/item/storage/box/lights - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "light_box" - -/obj/item/storage/box/lights/tubes - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "lighttube_box" - -/obj/item/storage/box/lights/mixed - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "lightmixed_box" - -/obj/item/storage/box/barber - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/lip_stick - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/centcomofficer - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/responseteam - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/deathsquad - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "doom_box" - -/obj/item/storage/box/soviet - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "soviet_box" - -/obj/item/storage/box/clown - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "clown_box" - -/obj/item/storage/box/emptysandbags - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/rndboards - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/stockparts - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/hug - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "hug_box" - -/obj/item/storage/box/wizard - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "wizard_box" - -/obj/item/storage/box/breaching - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flashbang_box" - -/obj/item/storage/box/mindshield - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/dish_drive - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/disks_plantgene - icon = 'modular_bandastation/aesthetics/boxes/icons/boxes.dmi' - icon_state = "disk_box" diff --git a/modular_bandastation/aesthetics/boxes/icons/boxes.dmi b/modular_bandastation/aesthetics/boxes/icons/boxes.dmi deleted file mode 100644 index 97467e6f3b1da..0000000000000 Binary files a/modular_bandastation/aesthetics/boxes/icons/boxes.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/cameras/code/cameras.dm b/modular_bandastation/aesthetics/cameras/code/cameras.dm deleted file mode 100644 index 68cec7d461d6e..0000000000000 --- a/modular_bandastation/aesthetics/cameras/code/cameras.dm +++ /dev/null @@ -1,15 +0,0 @@ -/obj/machinery/camera - icon = 'modular_bandastation/aesthetics/cameras/icons/cameras.dmi' - // TODO: camera_in_use - -/obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/old_assembly) - . = ..() - switch(dir) // TODO: do it in dmi - if(NORTH) - dir = SOUTH - if(SOUTH) - dir = NORTH - if(EAST) - dir = WEST - if(WEST) - dir = EAST diff --git a/modular_bandastation/aesthetics/cameras/icons/cameras.dmi b/modular_bandastation/aesthetics/cameras/icons/cameras.dmi deleted file mode 100644 index 26b8700a147c4..0000000000000 Binary files a/modular_bandastation/aesthetics/cameras/icons/cameras.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/chairs/code/chairs.dm b/modular_bandastation/aesthetics/chairs/code/chairs.dm deleted file mode 100644 index 356b81c6d89e6..0000000000000 --- a/modular_bandastation/aesthetics/chairs/code/chairs.dm +++ /dev/null @@ -1,35 +0,0 @@ -/obj/structure/chair/comfy - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - -/obj/structure/chair/comfy/GetArmrest() - return mutable_appearance('modular_bandastation/aesthetics/chairs/icons/chairs.dmi', "[icon_state]_armrest") - -/obj/structure/chair/comfy/corp - icon = 'icons/obj/chairs.dmi' - -/obj/structure/chair/comfy/shuttle - icon = 'icons/obj/chairs.dmi' - -/obj/structure/chair/office/dark - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - -/obj/structure/chair/office/light - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - -/obj/structure/chair/e_chair - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - -//TODO: Support or chairs - -/obj/item/chair/stool/bar/dark - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - icon_state = "bar_toppled_dark" - item_state = "stool_bar_dark" - origin_type = /obj/structure/chair/stool/bar/dark - lefthand_file = 'modular_bandastation/aesthetics/chairs/icons/chairs_lefthand.dmi' - righthand_file = 'modular_bandastation/aesthetics/chairs/icons/chairs_righthand.dmi' - -/obj/structure/chair/stool/bar/dark - icon = 'modular_bandastation/aesthetics/chairs/icons/chairs.dmi' - icon_state = "bar_dark" - item_chair = /obj/item/chair/stool/bar/dark diff --git a/modular_bandastation/aesthetics/chairs/icons/chairs.dmi b/modular_bandastation/aesthetics/chairs/icons/chairs.dmi deleted file mode 100644 index 6aba9bf8697ab..0000000000000 Binary files a/modular_bandastation/aesthetics/chairs/icons/chairs.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/chairs/icons/chairs_lefthand.dmi b/modular_bandastation/aesthetics/chairs/icons/chairs_lefthand.dmi deleted file mode 100644 index f3238b0616ba9..0000000000000 Binary files a/modular_bandastation/aesthetics/chairs/icons/chairs_lefthand.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/chairs/icons/chairs_righthand.dmi b/modular_bandastation/aesthetics/chairs/icons/chairs_righthand.dmi deleted file mode 100644 index ac882e8ebf82b..0000000000000 Binary files a/modular_bandastation/aesthetics/chairs/icons/chairs_righthand.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/decals/code/decals.dm b/modular_bandastation/aesthetics/decals/code/decals.dm deleted file mode 100644 index 07fdc75819380..0000000000000 --- a/modular_bandastation/aesthetics/decals/code/decals.dm +++ /dev/null @@ -1,78 +0,0 @@ -// SIDING -/obj/effect/turf_decal/siding/wood - icon = 'modular_bandastation/aesthetics/decals/icons/siding.dmi' - icon_state = "siding_wood_line" - color = "#55391A" - -/obj/effect/turf_decal/siding/wood/corner - icon_state = "siding_wood_corner" - -/obj/effect/turf_decal/siding/wood/end - icon_state = "siding_wood_end" - -/obj/effect/turf_decal/siding - icon = 'modular_bandastation/aesthetics/decals/icons/siding.dmi' - icon_state = "siding_line" - -/obj/effect/turf_decal/siding/white - color = "#BCBCBC" - -/obj/effect/turf_decal/siding/white/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/white/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/red - color = "#DE3A3A" - -/obj/effect/turf_decal/siding/red/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/red/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/green - color = "#9FED58" - -/obj/effect/turf_decal/siding/green/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/green/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/blue - color = "#52B4E9" - -/obj/effect/turf_decal/siding/blue/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/blue/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/yellow - color = "#EFB341" - -/obj/effect/turf_decal/siding/yellow/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/yellow/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/purple - color = "#D381C9" - -/obj/effect/turf_decal/siding/purple/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/purple/end - icon_state = "siding_end" - -/obj/effect/turf_decal/siding/brown - color = "#A46106" - -/obj/effect/turf_decal/siding/brown/corner - icon_state = "siding_corner" - -/obj/effect/turf_decal/siding/brown/end - icon_state = "siding_end" diff --git a/modular_bandastation/aesthetics/decals/icons/siding.dmi b/modular_bandastation/aesthetics/decals/icons/siding.dmi deleted file mode 100644 index f3ac9b02751ad..0000000000000 Binary files a/modular_bandastation/aesthetics/decals/icons/siding.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/defib/code/defib.dm b/modular_bandastation/aesthetics/defib/code/defib.dm deleted file mode 100644 index 4687a9b237d58..0000000000000 --- a/modular_bandastation/aesthetics/defib/code/defib.dm +++ /dev/null @@ -1,6 +0,0 @@ -/obj/item/defibrillator - icon = 'modular_bandastation/aesthetics/defib/icons/defib.dmi' - -/obj/item/defibrillator/compact - icon = 'icons/obj/defib.dmi' - //TODO: Compact defibs diff --git a/modular_bandastation/aesthetics/defib/icons/defib.dmi b/modular_bandastation/aesthetics/defib/icons/defib.dmi deleted file mode 100644 index f4fbe3712d4e6..0000000000000 Binary files a/modular_bandastation/aesthetics/defib/icons/defib.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/dirwindows/code/dirwindows.dm b/modular_bandastation/aesthetics/dirwindows/code/dirwindows.dm deleted file mode 100644 index 68774c2056786..0000000000000 --- a/modular_bandastation/aesthetics/dirwindows/code/dirwindows.dm +++ /dev/null @@ -1,14 +0,0 @@ -/obj/structure/window - icon = 'modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi' - -/obj/structure/window/reinforced - icon = 'modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi' - -/obj/structure/window/plasma - icon = 'modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi' - -/obj/structure/window/reinforced/tinted - icon = 'modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi' - -/obj/structure/window/reinforced/tinted/frosted - icon = 'modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi' diff --git a/modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi b/modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi deleted file mode 100644 index c9aa5b12d9115..0000000000000 Binary files a/modular_bandastation/aesthetics/dirwindows/icons/dirwindows.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/door_control/code/door_control.dm b/modular_bandastation/aesthetics/door_control/code/door_control.dm deleted file mode 100644 index 4e7c60ff77e58..0000000000000 --- a/modular_bandastation/aesthetics/door_control/code/door_control.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/door_control - layer = ABOVE_WINDOW_LAYER diff --git a/modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm b/modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm deleted file mode 100644 index 4999d73d21b72..0000000000000 --- a/modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/structure/extinguisher_cabinet - icon = 'modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi' - //TODO: Frame, advanced, crafted, unlocked/locked? diff --git a/modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi b/modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi deleted file mode 100644 index a1041de37c230..0000000000000 Binary files a/modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/firealarm/code/firealarm.dm b/modular_bandastation/aesthetics/firealarm/code/firealarm.dm deleted file mode 100644 index f380c19cc1fec..0000000000000 --- a/modular_bandastation/aesthetics/firealarm/code/firealarm.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/machinery/firealarm - icon = 'modular_bandastation/aesthetics/firealarm/icons/firealarm.dmi' - layer = ABOVE_WINDOW_LAYER - //TODO: Detect - -/obj/item/mounted/frame/firealarm - icon = 'modular_bandastation/aesthetics/firealarm/icons/firealarm.dmi' diff --git a/modular_bandastation/aesthetics/firealarm/icons/firealarm.dmi b/modular_bandastation/aesthetics/firealarm/icons/firealarm.dmi deleted file mode 100644 index 03fa8022c7149..0000000000000 Binary files a/modular_bandastation/aesthetics/firealarm/icons/firealarm.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/floors/code/floors.dm b/modular_bandastation/aesthetics/floors/code/floors.dm index e3ab11f14ad80..ee028616484ae 100644 --- a/modular_bandastation/aesthetics/floors/code/floors.dm +++ b/modular_bandastation/aesthetics/floors/code/floors.dm @@ -1,55 +1,2 @@ /turf/open/floor icon = 'modular_bandastation/aesthetics/floors/icons/floors.dmi' - -// WOODEN FLOORS -/turf/simulated/floor/wood/oak - icon_state = "wood-oak" - floor_tile = /obj/item/stack/tile/wood/oak - broken_states = list("wood-oak-broken", "wood-oak-broken2", "wood-oak-broken3", "wood-oak-broken4", "wood-oak-broken5", "wood-oak-broken6", "wood-oak-broken7") - -/turf/simulated/floor/wood/birch - icon_state = "wood-birch" - floor_tile = /obj/item/stack/tile/wood/birch - broken_states = list("wood-birch-broken", "wood-birch-broken2", "wood-birch-broken3", "wood-birch-broken4", "wood-birch-broken5", "wood-birch-broken6", "wood-birch-broken7") - -/turf/simulated/floor/wood/cherry - icon_state = "wood-cherry" - floor_tile = /obj/item/stack/tile/wood/cherry - broken_states = list("wood-cherry-broken", "wood-cherry-broken2", "wood-cherry-broken3", "wood-cherry-broken4", "wood-cherry-broken5", "wood-cherry-broken6", "wood-cherry-broken7") - -/turf/simulated/floor/wood/fancy/oak - icon_state = "fancy-wood-oak" - floor_tile = /obj/item/stack/tile/wood/fancy/oak - broken_states = list("fancy-wood-oak-broken", "fancy-wood-oak-broken2", "fancy-wood-oak-broken3", "fancy-wood-oak-broken4", "fancy-wood-oak-broken5", "fancy-wood-oak-broken6", "fancy-wood-oak-broken7") - -/turf/simulated/floor/wood/fancy/birch - icon_state = "fancy-wood-birch" - floor_tile = /obj/item/stack/tile/wood/fancy/birch - broken_states = list("fancy-wood-birch-broken", "fancy-wood-birch-broken2", "fancy-wood-birch-broken3", "fancy-wood-birch-broken4", "fancy-wood-birch-broken5", "fancy-wood-birch-broken6", "fancy-wood-birch-broken7") - -/turf/simulated/floor/wood/fancy/cherry - icon_state = "fancy-wood-cherry" - floor_tile = /obj/item/stack/tile/wood/fancy/cherry - broken_states = list("fancy-wood-cherry-broken", "fancy-wood-cherry-broken2", "fancy-wood-cherry-broken3", "fancy-wood-cherry-broken4", "fancy-wood-cherry-broken5", "fancy-wood-cherry-broken6", "fancy-wood-cherry-broken7") - -/turf/simulated/floor/wood/fancy/light - icon_state = "light-fancy-wood" - floor_tile = /obj/item/stack/tile/wood/fancy/light - broken_states = list("light-fancy-wood-broken", "light-fancy-wood-broken2", "light-fancy-wood-broken3", "light-fancy-wood-broken4", "light-fancy-wood-broken5", "light-fancy-wood-broken6", "light-fancy-wood-broken7") - -// LIGHT FLOORS -/turf/simulated/floor/light/red - color = "#f23030" - light_color = "#f23030" - -/turf/simulated/floor/light/green - color = "#30f230" - light_color = "#30f230" - -/turf/simulated/floor/light/blue - color = "#3030f2" - light_color = "#3030f2" - -/turf/simulated/floor/light/purple - color = "#9130f2" - light_color = "#9130f2" diff --git a/modular_bandastation/aesthetics/floors/code/tile_types.dm b/modular_bandastation/aesthetics/floors/code/tile_types.dm deleted file mode 100644 index d4bf3fa165ae0..0000000000000 --- a/modular_bandastation/aesthetics/floors/code/tile_types.dm +++ /dev/null @@ -1,42 +0,0 @@ -// WOOD -/obj/item/stack/tile/wood/oak - name = "oak wood floor tiles" - singular_name = "oak wood floor tile" - icon_state = "tile-wood-oak" - turf_type = /turf/simulated/floor/wood/oak - -/obj/item/stack/tile/wood/birch - name = "birch wood floor tiles" - singular_name = "birch wood floor tile" - icon_state = "tile-wood-birch" - turf_type = /turf/simulated/floor/wood/birch - -/obj/item/stack/tile/wood/cherry - name = "cherry wood floor tiles" - singular_name = "cherry wood floor tile" - icon_state = "tile-wood-cherry" - turf_type = /turf/simulated/floor/wood/cherry - -/obj/item/stack/tile/wood/fancy/oak - name = "fancy oak wood floor tiles" - singular_name = "fancy oak wood floor tile" - icon_state = "tile-wood-fancy-oak" - turf_type = /turf/simulated/floor/wood/fancy/oak - -/obj/item/stack/tile/wood/fancy/birch - name = "fancy birch wood floor tiles" - singular_name = "fancy birch wood floor tile" - icon_state = "tile-wood-fancy-birch" - turf_type = /turf/simulated/floor/wood/fancy/birch - -/obj/item/stack/tile/wood/fancy/cherry - name = "fancy cherry wood floor tiles" - singular_name = "fancy cherry wood floor tile" - icon_state = "tile-wood-fancy-cherry" - turf_type = /turf/simulated/floor/wood/fancy/cherry - -/obj/item/stack/tile/wood/fancy/light - name = "fancy light oak wood floor tiles" - singular_name = "fancy light oak wood floor tile" - icon_state = "tile-wood-fancy-light" - turf_type = /turf/simulated/floor/wood/fancy/light diff --git a/modular_bandastation/aesthetics/floors/icons/floors.dmi b/modular_bandastation/aesthetics/floors/icons/floors.dmi index 90ef6b41c8add..fdbf6b54181e3 100644 Binary files a/modular_bandastation/aesthetics/floors/icons/floors.dmi and b/modular_bandastation/aesthetics/floors/icons/floors.dmi differ diff --git a/modular_bandastation/aesthetics/hydroponics/code/hydroponics.dm b/modular_bandastation/aesthetics/hydroponics/code/hydroponics.dm deleted file mode 100644 index b757b8df2e8e5..0000000000000 --- a/modular_bandastation/aesthetics/hydroponics/code/hydroponics.dm +++ /dev/null @@ -1,23 +0,0 @@ -/* Unused -/obj/machinery/plantgenes - icon = 'modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi' - -/obj/machinery/plantgenes/update_overlays() - . = ..() - if(disk) - . += "dnamod-disk" - -/obj/machinery/plantgenes/add_disk(obj/item/disk/plantgene/new_disk, mob/user) - . = ..() - update_icon(UPDATE_OVERLAYS) - -/obj/machinery/plantgenes/update_genes() - . = ..() - update_icon(UPDATE_OVERLAYS) -*/ - -/obj/item/storage/bag/plants - icon = 'modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi' - -/obj/structure/loom - icon = 'modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi' diff --git a/modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi b/modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi deleted file mode 100644 index 82d7d663b9f0d..0000000000000 Binary files a/modular_bandastation/aesthetics/hydroponics/icons/hydroponics.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/intercom/code/intercom.dm b/modular_bandastation/aesthetics/intercom/code/intercom.dm deleted file mode 100644 index 3b0e1a9ca48a1..0000000000000 --- a/modular_bandastation/aesthetics/intercom/code/intercom.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/radio/intercom - icon = 'modular_bandastation/aesthetics/intercom/icons/intercom.dmi' diff --git a/modular_bandastation/aesthetics/intercom/icons/intercom.dmi b/modular_bandastation/aesthetics/intercom/icons/intercom.dmi deleted file mode 100644 index 3e9fbfd93583b..0000000000000 Binary files a/modular_bandastation/aesthetics/intercom/icons/intercom.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/keycard/code/keycard.dm b/modular_bandastation/aesthetics/keycard/code/keycard.dm deleted file mode 100644 index 282b7ee22be88..0000000000000 --- a/modular_bandastation/aesthetics/keycard/code/keycard.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/machinery/keycard_auth - icon = 'modular_bandastation/aesthetics/keycard/icons/keycard.dmi' - // TODO: update auth_on - -/obj/machinery/keycard_auth/Initialize(mapload) - . = ..() - switch(dir) // TODO: do it in dmi - if(NORTH) - dir = SOUTH - if(SOUTH) - dir = NORTH - if(EAST) - dir = WEST - if(WEST) - dir = EAST - -/obj/machinery/readybutton - icon = 'modular_bandastation/aesthetics/keycard/icons/keycard.dmi' - -/obj/machinery/readybutton/Initialize(mapload) - . = ..() - switch(dir) // TODO: do it in dmi - if(NORTH) - dir = SOUTH - if(SOUTH) - dir = NORTH - if(EAST) - dir = WEST - if(WEST) - dir = EAST diff --git a/modular_bandastation/aesthetics/keycard/icons/keycard.dmi b/modular_bandastation/aesthetics/keycard/icons/keycard.dmi deleted file mode 100644 index 39bdcf13f9628..0000000000000 Binary files a/modular_bandastation/aesthetics/keycard/icons/keycard.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/labeler/code/labeler.dm b/modular_bandastation/aesthetics/labeler/code/labeler.dm deleted file mode 100644 index 5395293450587..0000000000000 --- a/modular_bandastation/aesthetics/labeler/code/labeler.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/hand_labeler - icon = 'modular_bandastation/aesthetics/labeler/icons/labeler.dmi' diff --git a/modular_bandastation/aesthetics/labeler/icons/labeler.dmi b/modular_bandastation/aesthetics/labeler/icons/labeler.dmi deleted file mode 100644 index 74946042a96af..0000000000000 Binary files a/modular_bandastation/aesthetics/labeler/icons/labeler.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/library/code/library.dm b/modular_bandastation/aesthetics/library/code/library.dm deleted file mode 100644 index 9d7531aab9411..0000000000000 --- a/modular_bandastation/aesthetics/library/code/library.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/structure/bookcase - icon = 'modular_bandastation/aesthetics/library/icons/library.dmi' - -/obj/machinery/bookbinder - icon = 'modular_bandastation/aesthetics/library/icons/library.dmi' diff --git a/modular_bandastation/aesthetics/library/icons/library.dmi b/modular_bandastation/aesthetics/library/icons/library.dmi deleted file mode 100644 index ef1556c35bc70..0000000000000 Binary files a/modular_bandastation/aesthetics/library/icons/library.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/light_switch/code/light_switch.dm b/modular_bandastation/aesthetics/light_switch/code/light_switch.dm deleted file mode 100644 index d33b7182510f8..0000000000000 --- a/modular_bandastation/aesthetics/light_switch/code/light_switch.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/light_switch - layer = ABOVE_WINDOW_LAYER diff --git a/modular_bandastation/aesthetics/newscaster/code/newscaster.dm b/modular_bandastation/aesthetics/newscaster/code/newscaster.dm deleted file mode 100644 index 9b7fc4f710533..0000000000000 --- a/modular_bandastation/aesthetics/newscaster/code/newscaster.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/newscaster - layer = ABOVE_WINDOW_LAYER diff --git a/modular_bandastation/aesthetics/piano/code/piano.dm b/modular_bandastation/aesthetics/piano/code/piano.dm deleted file mode 100644 index 5bd6b58a40b10..0000000000000 --- a/modular_bandastation/aesthetics/piano/code/piano.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/structure/musician/piano - icon = 'modular_bandastation/aesthetics/piano/icons/piano.dmi' - icon_state = "minipiano" diff --git a/modular_bandastation/aesthetics/piano/icons/piano.dmi b/modular_bandastation/aesthetics/piano/icons/piano.dmi deleted file mode 100644 index c37a392395cea..0000000000000 Binary files a/modular_bandastation/aesthetics/piano/icons/piano.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/racks/code/racks.dm b/modular_bandastation/aesthetics/racks/code/racks.dm deleted file mode 100644 index c7a488e4ebf84..0000000000000 --- a/modular_bandastation/aesthetics/racks/code/racks.dm +++ /dev/null @@ -1,75 +0,0 @@ -/obj/structure/rack - icon = 'modular_bandastation/aesthetics/racks/icons/racks.dmi' - -/obj/structure/rack/gunrack - name = "gun rack" - desc = "A gun rack for storing guns." - icon_state = "gunrack" - -/obj/item/gun - var/on_rack = FALSE - -/obj/item/gun/proc/place_on_rack() - on_rack = TRUE - var/matrix/M = matrix() - M.Turn(-90) - transform = M - -/obj/item/gun/proc/remove_from_rack() - if(on_rack) - var/matrix/M = matrix() - transform = M - on_rack = FALSE - -/obj/item/gun/pickup(mob/user) - . = ..() - remove_from_rack() - -/obj/structure/rack/gunrack/MouseDrop_T(obj/O, mob/user) - if(!(istype(O, /obj/item/gun))) - to_chat(user, span_warning("This item doesn't fit!")) - return - . = ..() - if(.) - add_fingerprint(user) - var/obj/item/gun/our_gun = O - our_gun.place_on_rack() - -/obj/structure/rack/gunrack/attackby(obj/item/W, mob/living/user, params) - if(!isgun(W)) - to_chat(user, span_warning("This item doesn't fit!")) - return - . = ..() - if(.) - add_fingerprint(user) - var/obj/item/gun/our_gun = W - our_gun.place_on_rack() - var/list/click_params = params2list(params) - //Center the icon where the user clicked. - if(!click_params || !click_params["icon-x"] || !click_params["icon-y"]) - return - //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf) - W.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) - W.pixel_y = 0 - -/obj/structure/rack/gunrack/Initialize(mapload) - . = ..() - if(!mapload) - return - for(var/obj/item/gun/gun_inside in loc.contents) - gun_inside.place_on_rack() - -/obj/structure/rack/gunrack/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - density = FALSE - var/obj/item/rack_parts/gun_rack/newparts = new(loc) - transfer_fingerprints_to(newparts) - for(var/obj/item/I in loc.contents) - if(isgun(I)) - var/obj/item/gun/to_remove = I - to_remove.remove_from_rack() - qdel(src) - -/obj/item/rack_parts/gun_rack - name = "gun rack parts" - desc = "Parts of a gun rack." diff --git a/modular_bandastation/aesthetics/racks/icons/racks.dmi b/modular_bandastation/aesthetics/racks/icons/racks.dmi deleted file mode 100644 index e19295aa1cae8..0000000000000 Binary files a/modular_bandastation/aesthetics/racks/icons/racks.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/requests_console/code/requests_console.dm b/modular_bandastation/aesthetics/requests_console/code/requests_console.dm deleted file mode 100644 index ec7ab62294694..0000000000000 --- a/modular_bandastation/aesthetics/requests_console/code/requests_console.dm +++ /dev/null @@ -1,4 +0,0 @@ -/obj/machinery/requests_console - icon = 'modular_bandastation/aesthetics/requests_console/icons/reqcomp.dmi' - layer = ABOVE_WINDOW_LAYER - //TODO: rewired icon diff --git a/modular_bandastation/aesthetics/requests_console/icons/reqcomp.dmi b/modular_bandastation/aesthetics/requests_console/icons/reqcomp.dmi deleted file mode 100644 index 2ebb80eba2fb8..0000000000000 Binary files a/modular_bandastation/aesthetics/requests_console/icons/reqcomp.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/safe/code/safe.dm b/modular_bandastation/aesthetics/safe/code/safe.dm deleted file mode 100644 index bb7f6a7e69fda..0000000000000 --- a/modular_bandastation/aesthetics/safe/code/safe.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/storage/secure/safe - icon = 'modular_bandastation/aesthetics/safe/icons/safe.dmi' diff --git a/modular_bandastation/aesthetics/safe/icons/safe.dmi b/modular_bandastation/aesthetics/safe/icons/safe.dmi deleted file mode 100644 index 7f185fcf48009..0000000000000 Binary files a/modular_bandastation/aesthetics/safe/icons/safe.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/shutters/code/shutters.dm b/modular_bandastation/aesthetics/shutters/code/shutters.dm deleted file mode 100644 index 6e86256b7c470..0000000000000 --- a/modular_bandastation/aesthetics/shutters/code/shutters.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/machinery/door/poddoor/shutters - // icon = 'modular_bandastation/aesthetics/shutters/icons/shutters.dmi' // TG already uses these - var/door_open_sound = 'modular_bandastation/aesthetics/shutters/sound/shutters_open.ogg' - var/door_close_sound = 'modular_bandastation/aesthetics/shutters/sound/shutters_close.ogg' - -/obj/machinery/door/poddoor/shutters/do_animate(animation) - switch(animation) - if("opening") - flick("opening", src) - playsound(src, door_open_sound, 50, TRUE) - if("closing") - flick("closing", src) - playsound(src, door_close_sound, 50, TRUE) diff --git a/modular_bandastation/aesthetics/shutters/icons/shutters.dmi b/modular_bandastation/aesthetics/shutters/icons/shutters.dmi deleted file mode 100644 index 1cc727cdbf7a4..0000000000000 Binary files a/modular_bandastation/aesthetics/shutters/icons/shutters.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/shutters/sound/shutters_close.ogg b/modular_bandastation/aesthetics/shutters/sound/shutters_close.ogg deleted file mode 100644 index 548cea96c5936..0000000000000 Binary files a/modular_bandastation/aesthetics/shutters/sound/shutters_close.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/shutters/sound/shutters_open.ogg b/modular_bandastation/aesthetics/shutters/sound/shutters_open.ogg deleted file mode 100644 index b8e0869c53892..0000000000000 Binary files a/modular_bandastation/aesthetics/shutters/sound/shutters_open.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/soap/code/soap.dm b/modular_bandastation/aesthetics/soap/code/soap.dm deleted file mode 100644 index 0077236f36038..0000000000000 --- a/modular_bandastation/aesthetics/soap/code/soap.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/soap - //TODO: what is this soap? diff --git a/modular_bandastation/aesthetics/soap/icons/soap.dmi b/modular_bandastation/aesthetics/soap/icons/soap.dmi deleted file mode 100644 index a090b49a9b8c1..0000000000000 Binary files a/modular_bandastation/aesthetics/soap/icons/soap.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/surgery_table/code/surgery_table.dm b/modular_bandastation/aesthetics/surgery_table/code/surgery_table.dm deleted file mode 100644 index a91df4a3ad2a9..0000000000000 --- a/modular_bandastation/aesthetics/surgery_table/code/surgery_table.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/structure/table/optable - icon = 'modular_bandastation/aesthetics/surgery_table/icons/surgery_table.dmi' diff --git a/modular_bandastation/aesthetics/surgery_table/icons/surgery_table.dmi b/modular_bandastation/aesthetics/surgery_table/icons/surgery_table.dmi deleted file mode 100644 index a45047c7d93a5..0000000000000 Binary files a/modular_bandastation/aesthetics/surgery_table/icons/surgery_table.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/toolboxes/code/toolboxes.dm b/modular_bandastation/aesthetics/toolboxes/code/toolboxes.dm deleted file mode 100644 index 1d8e12f13f0a9..0000000000000 --- a/modular_bandastation/aesthetics/toolboxes/code/toolboxes.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/storage/toolbox - icon = 'modular_bandastation/aesthetics/toolboxes/icons/toolboxes.dmi' diff --git a/modular_bandastation/aesthetics/toolboxes/icons/toolboxes.dmi b/modular_bandastation/aesthetics/toolboxes/icons/toolboxes.dmi deleted file mode 100644 index c52f97b55bc9a..0000000000000 Binary files a/modular_bandastation/aesthetics/toolboxes/icons/toolboxes.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/wallcloset/code/wallcloset.dm b/modular_bandastation/aesthetics/wallcloset/code/wallcloset.dm deleted file mode 100644 index 81345aeb2b2a3..0000000000000 --- a/modular_bandastation/aesthetics/wallcloset/code/wallcloset.dm +++ /dev/null @@ -1 +0,0 @@ -//TODO no wall lockers? diff --git a/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_emerg.dmi b/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_emerg.dmi deleted file mode 100644 index 5c7ea64ae3738..0000000000000 Binary files a/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_emerg.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_fire.dmi b/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_fire.dmi deleted file mode 100644 index 8c0e9ff870e9b..0000000000000 Binary files a/modular_bandastation/aesthetics/wallcloset/icons/wallcloset_fire.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/walls/code/walls.dm b/modular_bandastation/aesthetics/walls/code/walls.dm index 3bab8afcbee36..e2157784b3cdb 100644 --- a/modular_bandastation/aesthetics/walls/code/walls.dm +++ b/modular_bandastation/aesthetics/walls/code/walls.dm @@ -1,11 +1,35 @@ /turf/closed/wall icon = 'modular_bandastation/aesthetics/walls/icons/wall.dmi' + icon_state = "wall-0" + base_icon_state = "wall" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + +/turf/closed/wall/rust + icon = 'modular_bandastation/aesthetics/walls/icons/wall.dmi' + icon_state = "wall-0" + base_icon_state = "wall" /turf/closed/wall/r_wall icon = 'modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi' + icon_state = "reinforced_wall-0" + base_icon_state = "reinforced_wall" + +/turf/closed/wall/r_wall/rust + icon = 'modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi' + icon_state = "reinforced_wall-0" + base_icon_state = "reinforced_wall" /obj/structure/falsewall icon = 'modular_bandastation/aesthetics/walls/icons/wall.dmi' + icon_state = "wall-0" + base_icon_state = "wall" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS /obj/structure/falsewall/reinforced + icon_state = "reinforced_wall-0" + base_icon_state = "reinforced_wall" icon = 'modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi' + +/turf/closed/wall/mineral/titanium + smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS diff --git a/modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi b/modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi index 683c0a339825f..d08446795e711 100644 Binary files a/modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi and b/modular_bandastation/aesthetics/walls/icons/reinforced_wall.dmi differ diff --git a/modular_bandastation/aesthetics/windoor/code/windoor.dm b/modular_bandastation/aesthetics/windoor/code/windoor.dm deleted file mode 100644 index a736629e6f913..0000000000000 --- a/modular_bandastation/aesthetics/windoor/code/windoor.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/structure/windoor_assembly - icon = 'modular_bandastation/aesthetics/windoor/icons/windoor.dmi' - -/obj/machinery/door/window - icon = 'modular_bandastation/aesthetics/windoor/icons/windoor.dmi' diff --git a/modular_bandastation/aesthetics/windoors/code/windoors.dm b/modular_bandastation/aesthetics/windoors/code/windoors.dm new file mode 100644 index 0000000000000..c2bd47262be97 --- /dev/null +++ b/modular_bandastation/aesthetics/windoors/code/windoors.dm @@ -0,0 +1,2 @@ +/obj/machinery/door/window + icon = 'modular_bandastation/aesthetics/windoors/icons/windoors.dmi' diff --git a/modular_bandastation/aesthetics/windoor/icons/windoor.dmi b/modular_bandastation/aesthetics/windoors/icons/windoors.dmi similarity index 100% rename from modular_bandastation/aesthetics/windoor/icons/windoor.dmi rename to modular_bandastation/aesthetics/windoors/icons/windoors.dmi diff --git a/modular_bandastation/aesthetics/windows/code/directional_windows.dm b/modular_bandastation/aesthetics/windows/code/directional_windows.dm new file mode 100644 index 0000000000000..80904fe6c77c0 --- /dev/null +++ b/modular_bandastation/aesthetics/windows/code/directional_windows.dm @@ -0,0 +1,44 @@ +/obj/structure/window + icon = 'modular_bandastation/aesthetics/windows/icons/directional.dmi' + icon_state = "window" + color = "#99BBFF" + +/obj/structure/window/reinforced + icon = 'modular_bandastation/aesthetics/windows/icons/directional.dmi' + icon_state = "r_window" + color = "#99BBFF" + +/obj/structure/window/reinforced/tinted + icon = 'modular_bandastation/aesthetics/windows/icons/directional.dmi' + icon_state = "r_window" + flags_1 = UNPAINTABLE_1 + color = "#5A6E82" + +/obj/structure/window/reinforced/tinted/frosted + icon_state = "r_window" + color = "#5A6E82" + +/obj/structure/window/plasma + icon = 'modular_bandastation/aesthetics/windows/icons/directional.dmi' + icon_state = "window" + flags_1 = UNPAINTABLE_1 + color = "#C800FF" + +/obj/structure/window/reinforced/plasma + icon = 'modular_bandastation/aesthetics/windows/icons/directional.dmi' + icon_state = "r_window" + flags_1 = UNPAINTABLE_1 + color = "#C800FF" + +// Delete colors +/obj/structure/window/bronze + color = null + +/obj/structure/window/paperframe + color = null + +/obj/structure/window/reinforced/shuttle + color = null + +/obj/structure/window/reinforced/survival_pod + color = null diff --git a/modular_bandastation/aesthetics/windows/code/full_tile_windows.dm b/modular_bandastation/aesthetics/windows/code/full_tile_windows.dm new file mode 100644 index 0000000000000..79d89b9f5b7bc --- /dev/null +++ b/modular_bandastation/aesthetics/windows/code/full_tile_windows.dm @@ -0,0 +1,79 @@ +/obj/structure/window + layer = ABOVE_WINDOW_LAYER + /// Used to define what file the edging sprite is contained within + var/edge_overlay_file + /// Tracks the edging appearence sprite + var/mutable_appearance/edge_overlay + +/obj/structure/window/update_overlays(updates=ALL) + . = ..() + if(!edge_overlay_file) + return + + edge_overlay = mutable_appearance(edge_overlay_file, "[smoothing_junction]", layer + 0.1, appearance_flags = RESET_COLOR) + . += edge_overlay + +/obj/structure/window/fulltile + icon = 'modular_bandastation/aesthetics/windows/icons/window.dmi' + edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/window_edges.dmi' + icon_state = "window-0" + base_icon_state = "window" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + color = "#99BBFF" + +/obj/structure/window/reinforced/fulltile + icon = 'modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi' + edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/reinforced_window_edges.dmi' + icon_state = "reinforced_window-0" + base_icon_state = "reinforced_window" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + color = "#99BBFF" + +/obj/structure/window/reinforced/tinted/fulltile + icon = 'modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi' + edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/reinforced_window_edges.dmi' + icon_state = "reinforced_window-0" + base_icon_state = "reinforced_window" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + flags_1 = UNPAINTABLE_1 + color = "#5A6E82" + +/obj/structure/window/plasma/fulltile + icon = 'modular_bandastation/aesthetics/windows/icons/window.dmi' + edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/window_edges.dmi' + icon_state = "window-0" + base_icon_state = "window" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + flags_1 = UNPAINTABLE_1 + color = "#C800FF" + +/obj/structure/window/reinforced/plasma/fulltile + icon = 'modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi' + edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/reinforced_window_edges.dmi' + icon_state = "reinforced_window-0" + base_icon_state = "reinforced_window" + canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS + flags_1 = UNPAINTABLE_1 + color = "#C800FF" + +/obj/structure/window/reinforced/shuttle + canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS + +// Spawners +/* Доделать если всё таки соберёмся маппить... +/obj/effect/spawner/structure/window + icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' + icon_state = "window_spawner" + +/obj/effect/spawner/structure/window/reinforced + icon_state = "r_window_spawner" + +/obj/effect/spawner/structure/window/reinforced/tinted + icon_state = "t_window_spawner" + +/obj/effect/spawner/structure/window/plasma + icon_state = "p_window_spawner" + +/obj/effect/spawner/structure/window/reinforced/plasma + icon_state = "rp_window_spawner" +*/ diff --git a/modular_bandastation/aesthetics/windows/code/windows.dm b/modular_bandastation/aesthetics/windows/code/windows.dm deleted file mode 100644 index 528d2c0e71776..0000000000000 --- a/modular_bandastation/aesthetics/windows/code/windows.dm +++ /dev/null @@ -1,47 +0,0 @@ -/obj/structure/window/fulltile - icon = 'modular_bandastation/aesthetics/windows/icons/window.dmi' - edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/window_edges.dmi' - -/obj/structure/window/reinforced/fulltile - icon = 'modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi' - edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/reinforced_window_edges.dmi' - -/obj/structure/window/reinforced/tinted/fulltile - icon = 'modular_bandastation/aesthetics/windows/icons/tinted_window.dmi' - -/obj/structure/window/plasma/fulltile - icon = 'modular_bandastation/aesthetics/windows/icons/plasma_window.dmi' - edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/window_edges.dmi' - -/obj/structure/window/reinforced/plasma/fulltile - icon = 'modular_bandastation/aesthetics/windows/icons/rplasma_window.dmi' - edge_overlay_file = 'modular_bandastation/aesthetics/windows/icons/reinforced_window_edges.dmi' - -// TODO: rice window, shuttle window, plastitanium, paperframe, bronze - -//WINDOW SPAWNERS -/obj/effect/spawner/structure/window - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' - -/obj/effect/spawner/structure/window/reinforced - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' - -/obj/effect/spawner/structure/window/reinforced/tinted - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' - -/* Unused -/obj/effect/spawner/structure/window/reinforced/polarized - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' -*/ - -/obj/effect/spawner/structure/window/plasma - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' - -/obj/effect/spawner/structure/window/reinforced/plasma - icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi' - -/obj/effect/spawner/structure/window/plastitanium - icon = 'icons/obj/structures_spawners.dmi' - -/obj/effect/spawner/structure/window/shuttle - icon = 'icons/obj/structures_spawners.dmi' diff --git a/modular_bandastation/aesthetics/windows/icons/directional.dmi b/modular_bandastation/aesthetics/windows/icons/directional.dmi new file mode 100644 index 0000000000000..6415b34a98ce3 Binary files /dev/null and b/modular_bandastation/aesthetics/windows/icons/directional.dmi differ diff --git a/modular_bandastation/aesthetics/windows/icons/plasma_window.dmi b/modular_bandastation/aesthetics/windows/icons/plasma_window.dmi deleted file mode 100644 index 11c08011a67c6..0000000000000 Binary files a/modular_bandastation/aesthetics/windows/icons/plasma_window.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi b/modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi index 8433522914aed..1785db782f643 100644 Binary files a/modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi and b/modular_bandastation/aesthetics/windows/icons/reinforced_window.dmi differ diff --git a/modular_bandastation/aesthetics/windows/icons/rplasma_window.dmi b/modular_bandastation/aesthetics/windows/icons/rplasma_window.dmi deleted file mode 100644 index 665a04402505f..0000000000000 Binary files a/modular_bandastation/aesthetics/windows/icons/rplasma_window.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/windows/icons/spawners.dmi b/modular_bandastation/aesthetics/windows/icons/spawners.dmi index 3a0106b5a2643..ebe7e5cbb80c8 100644 Binary files a/modular_bandastation/aesthetics/windows/icons/spawners.dmi and b/modular_bandastation/aesthetics/windows/icons/spawners.dmi differ diff --git a/modular_bandastation/aesthetics/windows/icons/tinted_window.dmi b/modular_bandastation/aesthetics/windows/icons/tinted_window.dmi deleted file mode 100644 index a17c392440109..0000000000000 Binary files a/modular_bandastation/aesthetics/windows/icons/tinted_window.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/windows/icons/window.dmi b/modular_bandastation/aesthetics/windows/icons/window.dmi index ff049fad0d511..2d6fb48ec1a00 100644 Binary files a/modular_bandastation/aesthetics/windows/icons/window.dmi and b/modular_bandastation/aesthetics/windows/icons/window.dmi differ diff --git a/modular_bandastation/aesthetics/windowtint/code/windowtint.dm b/modular_bandastation/aesthetics/windowtint/code/windowtint.dm deleted file mode 100644 index 8456697e95014..0000000000000 --- a/modular_bandastation/aesthetics/windowtint/code/windowtint.dm +++ /dev/null @@ -1,22 +0,0 @@ -/obj/machinery/button/windowtint - icon = 'modular_bandastation/aesthetics/windowtint/icons/polarizer.dmi' - icon_state = "polarizer-0" - layer = ABOVE_WINDOW_LAYER - -/obj/machinery/button/windowtint/attack_hand(mob/user) - if(!allowed(user) && !user.can_advanced_admin_interact()) - to_chat(user, span_warning("Access Denied.")) - flick("polarizer-denied",src) - playsound(src, pick('modular_bandastation/aesthetics/windowtint/sound/button.ogg', 'modular_bandastation/aesthetics/windowtint/sound/button_alternate.ogg', 'modular_bandastation/aesthetics/windowtint/sound/button_meloboom.ogg'), 20) - return 1 - - toggle_tint() - icon_state= "polarizer-turning_on" - addtimer(CALLBACK(src, PROC_REF(update_windowtint_icon)), 0.5 SECONDS) - - if(!active) - icon_state= "polarizer-turning_off" - addtimer(CALLBACK(src, PROC_REF(update_windowtint_icon)), 0.5 SECONDS) - -/obj/machinery/button/windowtint/proc/update_windowtint_icon() - icon_state = "polarizer-[active]" diff --git a/modular_bandastation/aesthetics/windowtint/icons/polarizer.dmi b/modular_bandastation/aesthetics/windowtint/icons/polarizer.dmi deleted file mode 100644 index 1af5616fd9e9a..0000000000000 Binary files a/modular_bandastation/aesthetics/windowtint/icons/polarizer.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/windowtint/sound/button.ogg b/modular_bandastation/aesthetics/windowtint/sound/button.ogg deleted file mode 100644 index 23b4f15265aaf..0000000000000 Binary files a/modular_bandastation/aesthetics/windowtint/sound/button.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/windowtint/sound/button_alternate.ogg b/modular_bandastation/aesthetics/windowtint/sound/button_alternate.ogg deleted file mode 100644 index e35c6d69498f7..0000000000000 Binary files a/modular_bandastation/aesthetics/windowtint/sound/button_alternate.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/windowtint/sound/button_meloboom.ogg b/modular_bandastation/aesthetics/windowtint/sound/button_meloboom.ogg deleted file mode 100644 index 80d5cfa894a26..0000000000000 Binary files a/modular_bandastation/aesthetics/windowtint/sound/button_meloboom.ogg and /dev/null differ diff --git a/modular_bandastation/aesthetics/zippo/code/zippo.dm b/modular_bandastation/aesthetics/zippo/code/zippo.dm deleted file mode 100644 index 7418e76c4f136..0000000000000 --- a/modular_bandastation/aesthetics/zippo/code/zippo.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/item/lighter/zippo - icon = 'modular_bandastation/aesthetics/zippo/icons/zippo.dmi' - //TODO: give heads their zippos diff --git a/modular_bandastation/aesthetics/zippo/icons/zippo.dmi b/modular_bandastation/aesthetics/zippo/icons/zippo.dmi deleted file mode 100644 index 5113914135c9b..0000000000000 Binary files a/modular_bandastation/aesthetics/zippo/icons/zippo.dmi and /dev/null differ