diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index e1e9d738f25..88d86be9e74 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -1,7 +1,7 @@ /obj/machinery/button name = "button" desc = "A remote control switch." - icon = 'icons/obj/stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi'//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "doorctrl" var/skin = "doorctrl" power_channel = AREA_USAGE_ENVIRON diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 5f4784ac819..188ab1fb66a 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -5,7 +5,7 @@ /obj/machinery/camera name = "security camera" desc = "It's used to monitor rooms." - icon = 'icons/obj/machines/camera.dmi' + icon = 'icons/obj/machines/camera.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "camera" //mapping icon to represent upgrade states. if you want a different base icon, update default_camera_icon as well as this. use_power = ACTIVE_POWER_USE idle_power_usage = 5 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index f32dae6fb02..6a773a8af4a 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -65,6 +65,11 @@ return GLOB.not_incapacitated_state /obj/machinery/computer/operating/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "OperatingComputer", name) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index fecd6aa78c7..3a32617e27b 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -22,6 +22,11 @@ return ..() /obj/machinery/computer/aifixer/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 150) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "AiRestorer", name) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 8c1435010bd..8edd3aea230 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -40,6 +40,11 @@ return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/ai_monitored) && !(APC.area.area_flags & NO_ALERTS) /obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END operator = user ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 4094bb029ad..8e04d4d796f 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -20,6 +20,11 @@ return ..() /obj/machinery/computer/atmos_alert/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "AtmosAlertConsole", name) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 0d31f096354..78c710a4125 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -179,6 +179,11 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) return ..() /obj/machinery/computer/atmos_control/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "AtmosControlConsole", name) diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 458daf9882c..af29ea5f73a 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -52,6 +52,11 @@ return pad /obj/machinery/computer/launchpad/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "LaunchpadConsole", name) diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index 88d3c765cbf..6da78d77ace 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -108,6 +108,11 @@ return pad /obj/machinery/computer/mechpad/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "MechpadConsole", name) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 9bc3af8e22d..42b80d6c394 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -24,8 +24,10 @@ /obj/machinery/computer/med_data/ui_interact(mob/user) . = ..() + /* - SKYRAT EDIT REMOVAL - AESTHETICS if(isliving(user)) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + */ var/dat if(temp) dat = text("[temp]

Clear Screen") diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 40c4cbf079e..c7aedc266f1 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -56,6 +56,11 @@ M.close() /obj/machinery/computer/pod/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "MassDriverControl", name) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 68cfefef599..6f880e9e90e 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -22,6 +22,11 @@ return TRUE /obj/machinery/computer/robotics/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "RoboticsControlConsole", name) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ed3bc77d8b9..75fac9b9498 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -34,8 +34,10 @@ //Someone needs to break down the dat += into chunks instead of long ass lines. /obj/machinery/computer/secure_data/ui_interact(mob/user) . = ..() + /* SKYRAT EDIT REMOVAL - AESTHETICS if(isliving(user)) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + */ if(src.z > 6) to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") return diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 839d339e5a7..eca75f5a52b 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -17,6 +17,11 @@ return ..() /obj/machinery/computer/station_alert/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "StationAlertConsole", name) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 5488aaa7c56..42441977e5d 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -34,6 +34,11 @@ return power_station /obj/machinery/computer/teleporter/ui_interact(mob/user, datum/tgui/ui) + //SKYRAT EDIT ADDITON BEGIN - AESTHETICS + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + rand(50, 100) + playsound(src, get_sfx_skyrat(clicksound), clickvol) + //SKYRAT EDIT END ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Teleporter", name) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3e63a2b4a02..35991e39440 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -84,8 +84,8 @@ var/noPower = 'sound/machines/doorclick.ogg' var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass" - var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' - var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE var/cyclelinkeddir = 0 var/obj/machinery/door/airlock/cyclelinkedairlock @@ -430,6 +430,7 @@ icon_state = "nonexistenticonstate" //MADNESS set_airlock_overlays(state) +/* SKYRAT EDIT MOVED TO AIRLOCK.DM IN AESTHETICS MODULE /obj/machinery/door/airlock/proc/set_airlock_overlays(state) var/mutable_appearance/frame_overlay var/mutable_appearance/filling_overlay @@ -577,6 +578,7 @@ add_overlay(note_overlay) add_overlay(seal_overlay) check_unres() +*/ /proc/get_airlock_overlay(icon_state, icon_file) var/obj/machinery/door/airlock/A @@ -586,6 +588,27 @@ if((!(. = airlock_overlays[iconkey]))) . = airlock_overlays[iconkey] = mutable_appearance(icon_file, icon_state) +//SKYRAT EDIT CHANGE BEGIN - AESTHETICS +/obj/machinery/door/airlock/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID + if(hasPower() && unres_sides) + if(unres_sides & NORTH) + var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") + I.pixel_y = 32 + add_overlay(I) + if(unres_sides & SOUTH) + var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") + I.pixel_y = -32 + add_overlay(I) + if(unres_sides & EAST) + var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") + I.pixel_x = 32 + add_overlay(I) + if(unres_sides & WEST) + var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") + I.pixel_x = -32 + add_overlay(I) + +/* - SKYRAT ORIGINAL /obj/machinery/door/airlock/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID if(hasPower() && unres_sides) if(unres_sides & NORTH) @@ -610,7 +633,8 @@ add_overlay(I) else set_light(0) - +*/ +//SKYRAT EDIT END /obj/machinery/door/airlock/do_animate(animation) switch(animation) if("opening") @@ -1113,7 +1137,8 @@ if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density) closeOther.close() else - playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) + //playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) - ORIGINAL + playsound(src, forcedOpen, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS if(autoclose) autoclose_in(normalspeed ? 150 : 15) @@ -1162,7 +1187,8 @@ playsound(src, doorClose, 30, TRUE) else - playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) + //playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) //ORIGINAL + playsound(src, forcedClosed, 30, TRUE) //SKYRAT EDIT ADDITION - AESTHETICS var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src)) if(killthis) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index be8e56ed526..769368dd145 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -2,6 +2,7 @@ Station Airlocks Regular */ +// ALL OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE /obj/machinery/door/airlock/command icon = 'icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index f03c60724c6..0a7d12f3612 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -5,7 +5,7 @@ /obj/machinery/door/firedoor name = "firelock" desc = "Apply crowbar." - icon = 'icons/obj/doors/Doorfireglass.dmi' + icon = 'icons/obj/doors/Doorfireglass.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "door_open" opacity = FALSE density = FALSE @@ -17,7 +17,7 @@ explosion_block = 1 safe = FALSE layer = BELOW_OPEN_DOOR_LAYER - closingLayer = CLOSED_FIREDOOR_LAYER + closingLayer = BELOW_OPEN_DOOR_LAYER //SKYRAT EDIT CHANGE - AESTHETICS - ORIGINAL: CLOSED_FIREDOOR_LAYER assemblytype = /obj/structure/firelock_frame armor = list(MELEE = 10, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 100, RAD = 100, FIRE = 95, ACID = 70) interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN @@ -249,7 +249,7 @@ /obj/machinery/door/firedoor/heavy name = "heavy firelock" - icon = 'icons/obj/doors/Doorfire.dmi' + icon = 'icons/obj/doors/Doorfire.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE glass = FALSE explosion_block = 2 assemblytype = /obj/structure/firelock_frame/heavy @@ -265,7 +265,7 @@ /obj/structure/firelock_frame name = "firelock frame" desc = "A partially completed firelock." - icon = 'icons/obj/doors/Doorfire.dmi' + icon = 'icons/obj/doors/Doorfire.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "frame1" anchored = FALSE density = TRUE diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index d4e208285fb..e72b1c8cb96 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -1,7 +1,7 @@ /obj/machinery/door/poddoor name = "blast door" desc = "A heavy duty blast door that opens mechanically." - icon = 'icons/obj/doors/blastdoor.dmi' + icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "closed" var/id = 1 layer = BLASTDOOR_LAYER @@ -89,10 +89,12 @@ switch(animation) if("opening") flick("opening", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + //playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) ORIGINAL + playsound(src, door_sound, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS if("closing") flick("closing", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + //playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) ORIGINAL + playsound(src, door_sound, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS /obj/machinery/door/poddoor/update_icon_state() if(density) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 2476e970462..4f8c60a8500 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -1,4 +1,4 @@ -#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms +#define FIREALARM_COOLDOWN 80 //SKYRAT EDIT CHANGE - ORIGINAL: 67 - AESTHETIC // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms /obj/item/electronics/firealarm name = "fire alarm electronics" @@ -8,15 +8,14 @@ /obj/item/wallframe/firealarm name = "fire alarm frame" desc = "Used for building fire alarms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/monitors.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "fire_bitem" result_path = /obj/machinery/firealarm /obj/machinery/firealarm name = "fire alarm" desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." - //icon = 'icons/obj/monitors.dmi' //ORIGINAL - icon = 'modular_skyrat/modules/alerts/icons/obj/monitors.dmi' //SKYRAT EDIT CHANGE + icon = 'icons/obj/monitors.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "fire0" max_integrity = 250 integrity_failure = 0.4 @@ -130,7 +129,8 @@ last_alarm = world.time var/area/A = get_area(src) A.firealert(src) - playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) + //playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) ORIGINAL + playsound(loc, alarm_sound, 75) //SKYRAT EDIT CHANGE - AESTHETICS if(user) log_game("[user] triggered a fire alarm at [COORD(src)]") diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 5978c0b7fa3..15150b38854 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -1,7 +1,7 @@ /// The light switch. Can have multiple per area. /obj/machinery/light_switch name = "light switch" - icon = 'icons/obj/power.dmi' + icon = 'icons/obj/power.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "light1" desc = "Make dark." power_channel = AREA_USAGE_LIGHT diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 83441347ea6..ac8cc6a052f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -170,7 +170,7 @@ GLOBAL_LIST_EMPTY(allCasters) fcopy(clean, "[GLOB.log_directory]/photos/[photo_file].png") return photo_file -/obj/item/wallframe/newscaster +/obj/item/wallframe/newscaster //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "newscaster frame" desc = "Used to build newscasters, just secure to the wall." icon_state = "newscaster" @@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster name = "newscaster" desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" - icon = 'icons/obj/terminals.dmi' + icon = 'icons/obj/terminals.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "newscaster_normal" verb_say = "beeps" verb_ask = "beeps" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 12d0b401d13..64132452cc8 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) /obj/machinery/requests_console name = "requests console" desc = "A console intended to send requests to different departments on the station." - icon = 'icons/obj/terminals.dmi' + icon = 'icons/obj/terminals.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "req_comp0" var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department var/list/messages = list() //List of all messages diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 11f12d53fc5..25c77fa4e40 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -251,7 +251,7 @@ /obj/machinery/power/shieldwallgen name = "shield wall generator" desc = "A shield generator." - icon = 'icons/obj/stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "shield_wall_gen" anchored = FALSE density = TRUE diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index ead739c483d..05486a98f34 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -6,7 +6,7 @@ anchored = FALSE density = TRUE interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN - icon = 'icons/obj/atmos.dmi' + icon = 'icons/obj/atmos.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "sheater-off" name = "space heater" desc = "Made by Space Amish using traditional space techniques, this heater/cooler is guaranteed not to set the station on fire. Warranty void if used in engines." diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index a4bc3b779c8..d070383ea45 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -19,7 +19,7 @@ /obj/machinery/status_display name = "status display" desc = null - icon = 'icons/obj/status_display.dmi' + icon = 'icons/obj/status_display.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "frame" density = FALSE use_power = IDLE_POWER_USE diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index da476874229..a4695ce4869 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(dye_registry, list( /obj/machinery/washing_machine name = "washing machine" desc = "Gets rid of those pesky bloodstains, or your money back!" - icon = 'icons/obj/machines/washing_machine.dmi' + icon = 'icons/obj/machines/washing_machine.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "wm_1_0" density = TRUE state_open = TRUE diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 56df3adcd6f..fff479bc9bb 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,4 +1,4 @@ -/obj/item/radio/intercom +/obj/item/radio/intercom //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "station intercom" desc = "Talk through this." icon_state = "intercom" diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index f4902e9cd90..6d63e1bf73e 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,7 +1,7 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "fire_extinguisher0" inhand_icon_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c0f1e37a636..8bfb1983ff8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -42,6 +42,14 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, one_per_turf = TRUE, on_floor = TRUE), \ new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, one_per_turf = TRUE, on_floor = TRUE), \ )), \ + //SKYRAT EDIT ADDITION BEGIN - AESTHETICS + new/datum/stack_recipe_list("bench", list( \ + new /datum/stack_recipe("bench (middle)", /obj/structure/chair/sofa/bench, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("bench (left)", /obj/structure/chair/sofa/bench/left, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("bench (right)", /obj/structure/chair/sofa/bench/right, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("bench (corner)", /obj/structure/chair/sofa/bench/corner, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ + //SKYRAT EDIT END new /datum/stack_recipe_list("chess pieces", list( \ new /datum/stack_recipe("White Pawn", /obj/structure/chess/whitepawn, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \ new /datum/stack_recipe("White Rook", /obj/structure/chess/whiterook, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 4a63540209c..87a6d11660d 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -48,7 +48,7 @@ */ /obj/structure/bed/roller name = "roller bed" - icon = 'icons/obj/rollerbed.dmi' + icon = 'icons/obj/rollerbed.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "down" anchored = FALSE resistance_flags = NONE @@ -108,7 +108,7 @@ /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." - icon = 'icons/obj/rollerbed.dmi' + icon = 'icons/obj/rollerbed.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "folded" w_class = WEIGHT_CLASS_NORMAL // No more excuses, stop getting blood everywhere diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index b4fe9a9e81f..d2a30e53c07 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -1,7 +1,7 @@ /obj/structure/chair name = "chair" desc = "You sit in this. Either by will or force." - icon = 'icons/obj/chairs.dmi' + icon = 'icons/obj/chairs.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "chair" anchored = TRUE can_buckle = TRUE diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 4c92ce90129..9d28f58cdd9 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -1,7 +1,7 @@ /obj/structure/closet/crate name = "crate" desc = "A rectangular steel crate." - icon = 'icons/obj/crates.dmi' + icon = 'icons/obj/crates.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "crate" req_access = null can_weld_shut = FALSE diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 196bdc72fc1..05110a4ce68 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -1,7 +1,7 @@ /obj/structure/extinguisher_cabinet name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." - icon = 'icons/obj/wallmounts.dmi' + icon = 'icons/obj/wallmounts.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "extinguisher_closed" anchored = TRUE density = FALSE @@ -17,7 +17,8 @@ pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27) pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0 opened = TRUE - icon_state = "extinguisher_empty" + //icon_state = "extinguisher_empty" ORIGINAL + icon_state = "extinguisher_empty_open" //SKYRAT EDIT CHANGE - AESTHETICS else stored_extinguisher = new /obj/item/extinguisher(src) @@ -121,6 +122,7 @@ opened = !opened update_icon() +/* SKYRAT EDIT REMOVAL BEGIN - AESTHETICS - MOVED TO MODULAR. /obj/structure/extinguisher_cabinet/update_icon_state() if(!opened) icon_state = "extinguisher_closed" @@ -131,6 +133,7 @@ icon_state = "extinguisher_full" else icon_state = "extinguisher_empty" +*/ /obj/structure/extinguisher_cabinet/obj_break(damage_flag) if(!broken && !(flags_1 & NODECONSTRUCT_1)) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 26f4c03efb9..98c9788da4f 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties. /obj/structure/bodycontainer - icon = 'icons/obj/stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi'//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "morgue1" density = TRUE anchored = TRUE diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 4aae69dcca5..4cd918f5b49 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -2,7 +2,7 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps. Definitely can't get past those. No way." gender = PLURAL - icon = 'icons/obj/stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi'//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "plasticflaps" armor = list(MELEE = 100, BULLET = 80, LASER = 80, ENERGY = 100, BOMB = 50, BIO = 100, RAD = 100, FIRE = 50, ACID = 50) density = FALSE diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index eb1e3158c4a..69b6ecb1633 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -600,7 +600,7 @@ /* Full Tile Windows (more obj_integrity) */ /obj/structure/window/fulltile - icon = 'icons/obj/smooth_structures/window.dmi' + icon = 'icons/obj/smooth_structures/window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "window-0" base_icon_state = "window" dir = FULLTILE_WINDOW_DIR @@ -616,7 +616,7 @@ anchored = FALSE /obj/structure/window/plasma/fulltile - icon = 'icons/obj/smooth_structures/plasma_window.dmi' + icon = 'icons/obj/smooth_structures/plasma_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "plasma_window-0" base_icon_state = "plasma_window" dir = FULLTILE_WINDOW_DIR @@ -632,7 +632,7 @@ anchored = FALSE /obj/structure/window/plasma/reinforced/fulltile - icon = 'icons/obj/smooth_structures/rplasma_window.dmi' + icon = 'icons/obj/smooth_structures/rplasma_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "rplasma_window-0" base_icon_state = "rplasma_window" dir = FULLTILE_WINDOW_DIR @@ -650,7 +650,7 @@ state = WINDOW_OUT_OF_FRAME /obj/structure/window/reinforced/fulltile - icon = 'icons/obj/smooth_structures/reinforced_window.dmi' + icon = 'icons/obj/smooth_structures/reinforced_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "reinforced_window-0" base_icon_state = "reinforced_window" dir = FULLTILE_WINDOW_DIR @@ -668,7 +668,7 @@ state = WINDOW_OUT_OF_FRAME /obj/structure/window/reinforced/tinted/fulltile - icon = 'icons/obj/smooth_structures/tinted_window.dmi' + icon = 'icons/obj/smooth_structures/tinted_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "tinted_window-0" base_icon_state = "tinted_window" dir = FULLTILE_WINDOW_DIR diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index f1d78e1ed03..0335e1e489c 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -56,7 +56,7 @@ /turf/closed/wall/rust name = "rusted wall" desc = "A rusted metal wall." - icon = 'icons/turf/walls/rusty_wall.dmi' + icon = 'icons/turf/walls/rusty_wall.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "rusty_wall-0" base_icon_state = "rusty_wall" smoothing_flags = SMOOTH_BITMASK @@ -68,7 +68,7 @@ /turf/closed/wall/r_wall/rust name = "rusted reinforced wall" desc = "A huge chunk of rusted reinforced metal." - icon = 'icons/turf/walls/rusty_reinforced_wall.dmi' + icon = 'icons/turf/walls/rusty_reinforced_wall.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "rusty_reinforced_wall-0" base_icon_state = "rusty_reinforced_wall" smoothing_flags = SMOOTH_BITMASK diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index f1567fb2912..b96531f5da5 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -1,7 +1,7 @@ /turf/closed/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'icons/turf/walls/reinforced_wall.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" opacity = TRUE diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 12af8b80852..1bfe6d6435e 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -3,7 +3,7 @@ /turf/closed/wall name = "wall" desc = "A huge chunk of metal used to separate rooms." - icon = 'icons/turf/walls/wall.dmi' + icon = 'icons/turf/walls/wall.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "wall-0" base_icon_state = "wall" explosion_block = 1 diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 2aea8dfdf1f..4e9a1218d13 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -3,7 +3,7 @@ //- you should use istype() if you want to find out whether a floor has a certain type //- floor_tile is now a path, and not a tile obj name = "floor" - icon = 'icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE base_icon_state = "floor" baseturfs = /turf/open/floor/plating diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index b4beaffd679..44ae90f4224 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -41,7 +41,7 @@ /obj/item/wallframe/airalarm name = "air alarm frame" desc = "Used for building Air Alarms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/monitors.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "alarm_bitem" result_path = /obj/machinery/airalarm @@ -60,7 +60,7 @@ /obj/machinery/airalarm name = "air alarm" desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/monitors.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "alarm0" use_power = IDLE_POWER_USE idle_power_usage = 4 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 1f5b30fac4c..f92bf1c2fbb 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -16,7 +16,7 @@ /obj/structure/bookcase name = "bookcase" - icon = 'icons/obj/library.dmi' + icon = 'icons/obj/library.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "bookempty" desc = "A great place for storing knowledge." anchored = FALSE diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 739c447a3f6..ea688d0e8a6 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -3,7 +3,7 @@ /obj/machinery/mineral/equipment_vendor name = "mining equipment vendor" desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here." - icon = 'icons/obj/machines/mining_machines.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "mining" density = TRUE circuit = /obj/item/circuitboard/machine/mining_equipment_vendor diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index cad0ef88305..b8dfe687030 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -47,7 +47,7 @@ // controls power to devices in that area // may be opened to change power cell // three different channels (lighting/equipment/environ) - may each be set to on, off, or auto - +//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE /obj/machinery/power/apc name = "area power controller" desc = "A control terminal for the area's electrical systems." @@ -337,7 +337,8 @@ if(APC_NOT_CHARGING) set_light_color(COLOR_SOFT_RED) if(APC_CHARGING) - set_light_color(LIGHT_COLOR_BLUE) + // set_light_color(LIGHT_COLOR_BLUE) ORIGINAL + set_light_color(LIGHT_COLOR_ORANGE)//SKYRAT EDIT CHANGE - AESTHETICS if(APC_FULLY_CHARGED) set_light_color(LIGHT_COLOR_GREEN) set_light(lon_range) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index cd95b790686..bf7c75a2944 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -208,8 +208,8 @@ // the standard tube light fixture /obj/machinery/light name = "light fixture" - icon = 'icons/obj/lighting.dmi' - var/overlayicon = 'icons/obj/lighting_overlay.dmi' + icon = 'icons/obj/lighting.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + var/overlayicon = 'icons/obj/lighting_overlay.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE var/base_state = "tube" // base description and icon_state icon_state = "tube" desc = "A lighting fixture." diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index e1982e7cde3..12c781251c0 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -7,7 +7,7 @@ /obj/machinery/power/rad_collector name = "Radiation Collector Array" desc = "A device which uses Hawking Radiation and plasma to produce power." - icon = 'icons/obj/singularity.dmi' + icon = 'icons/obj/singularity.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "ca" anchored = FALSE density = TRUE diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 9fc37ce4a78..f7e901a56dd 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,7 +3,7 @@ /obj/machinery/field/containment name = "containment field" desc = "An energy field." - icon = 'icons/obj/singularity.dmi' + icon = 'icons/obj/singularity.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "Contain_F" density = FALSE move_resist = INFINITY diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 34dcbc13698..144f6ea1ca2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,7 +1,7 @@ /obj/machinery/power/emitter name = "emitter" desc = "A heavy-duty industrial laser, often used in containment fields and power generation." - icon = 'icons/obj/singularity.dmi' + icon = 'icons/obj/singularity.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "emitter" anchored = FALSE diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 0f7ecdb5bce..4acb0d6ee7c 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -26,7 +26,7 @@ field_generator power level display /obj/machinery/field/generator name = "field generator" desc = "A large thermal battery that projects a high amount of energy when powered." - icon = 'icons/obj/machines/field_generator.dmi' + icon = 'icons/obj/machines/field_generator.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE icon_state = "Field_Gen" anchored = FALSE density = TRUE diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 94e5c422537..c7a2b1c730a 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -61,7 +61,7 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/gun/ballistic/automatic/c20r +/obj/item/gun/ballistic/automatic/c20r //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper C-20r SMG" desc = "A bullpup three-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp." icon_state = "c20r" @@ -132,7 +132,7 @@ mag_display = TRUE rack_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' -/obj/item/gun/ballistic/automatic/m90 +/obj/item/gun/ballistic/automatic/m90 //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper M-90gl Carbine" desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off." icon_state = "m90" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 6c981212cbb..c80e571db61 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -31,7 +31,7 @@ var/obj/item/suppressor/S = new(src) install_suppressor(S) -/obj/item/gun/ballistic/automatic/pistol/m1911 +/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." icon_state = "m1911" diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 7c0eef63b7e..ffbcfec63f9 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -74,7 +74,7 @@ if (current_skin) . += "It can be spun with alt+click" -/obj/item/gun/ballistic/revolver/detective +/obj/item/gun/ballistic/revolver/detective //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper Colt Detective Special" desc = "A classic, if not outdated, law enforcement firearm. Uses .38 Special rounds. \nSome spread rumors that if you loosen the barrel with a wrench, you can \"improve\" it." fire_sound = 'sound/weapons/gun/revolver/shot.ogg' @@ -136,7 +136,7 @@ to_chat(user, "You tighten the barrel of [src]. Now it will fire .38 rounds.") -/obj/item/gun/ballistic/revolver/mateba +/obj/item/gun/ballistic/revolver/mateba //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper Unica 6 auto-revolver" desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo." icon_state = "mateba" diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 00391820392..d151e2eccb0 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -39,7 +39,7 @@ // RIOT SHOTGUN // -/obj/item/gun/ballistic/shotgun/riot //for spawn in the armory +/obj/item/gun/ballistic/shotgun/riot //for spawn in the armory //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "riot shotgun" desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 699353613f7..e14a7c0b16e 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -1,4 +1,4 @@ -/obj/item/gun/energy/e_gun +/obj/item/gun/energy/e_gun //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "energy gun" desc = "A basic hybrid energy gun with two settings: disable and kill." icon_state = "energy" @@ -53,7 +53,6 @@ /obj/item/gun/energy/e_gun/hos name = "\improper X-01 MultiPhase Energy Gun" desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time." - cell_type = /obj/item/stock_parts/cell/hos_gun icon_state = "hoslaser" w_class = WEIGHT_CLASS_NORMAL force = 10 @@ -91,7 +90,7 @@ trigger_guard = TRIGGER_GUARD_NONE ammo_x_offset = 2 -/obj/item/gun/energy/e_gun/nuclear +/obj/item/gun/energy/e_gun/nuclear //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell." icon_state = "nucgun" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ada51c76cd2..a289db27773 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,4 +1,4 @@ -/obj/item/gun/energy/laser +/obj/item/gun/energy/laser //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "laser gun" desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." icon_state = "laser" @@ -79,7 +79,7 @@ ///Laser Cannon -/obj/item/gun/energy/lasercannon +/obj/item/gun/energy/lasercannon//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "accelerator laser cannon" desc = "An advanced laser cannon that does more damage the farther away the target is." icon_state = "lasercannon" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 1a2445187b5..9224207ce6a 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -134,7 +134,7 @@ /obj/projectile/beam/emitter name = "emitter beam" - icon_state = "emitter" + icon_state = "emitter" //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE damage = 30 impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser light_color = LIGHT_COLOR_GREEN diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index f102a92816f..204f60c3f75 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -3,7 +3,7 @@ #define SEND_PRESSURE (0.05*ONE_ATMOSPHERE) /obj/machinery/disposal - icon = 'icons/obj/atmospherics/pipes/disposal.dmi' + icon = 'icons/obj/atmospherics/pipes/disposal.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE density = TRUE armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30) max_integrity = 200 diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 36a807a8a4d..54cce5f80f0 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -1,4 +1,4 @@ -/obj/machinery/vending/wallmed +/obj/machinery/vending/wallmed //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE name = "\improper NanoMed" desc = "Wall-mounted Medical Equipment dispenser." icon_state = "wallmed" diff --git a/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm b/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm new file mode 100644 index 00000000000..57d42fde19c --- /dev/null +++ b/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm @@ -0,0 +1,6 @@ +/obj/machinery/airalarm + icon = 'modular_skyrat/modules/aesthetics/airalarm/icons/airalarm.dmi' + var/light_mask = "alarm-light-mask" + +/obj/item/wallframe/airalarm + icon = 'icons/obj/monitors.dmi' diff --git a/modular_skyrat/modules/aesthetics/airalarm/icons/airalarm.dmi b/modular_skyrat/modules/aesthetics/airalarm/icons/airalarm.dmi new file mode 100644 index 00000000000..68e2e201c82 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airalarm/icons/airalarm.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm new file mode 100644 index 00000000000..89b72713dc4 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm @@ -0,0 +1,473 @@ +//SKYRAT ADDITION BEGIN - AESTHETICS +#define AIRLOCK_LIGHT_POWER 1 +#define AIRLOCK_LIGHT_RANGE 2 +#define AIRLOCK_POWERON_LIGHT_COLOR "#3aa7c2" +#define AIRLOCK_BOLTS_LIGHT_COLOR "#c23b23" +#define AIRLOCK_ACCESS_LIGHT_COLOR "#57e69c" +#define AIRLOCK_EMERGENCY_LIGHT_COLOR "#d1d11d" +#define AIRLOCK_DENY_LIGHT_COLOR "#c23b23" +//SKYRAT ADDITION END +#define AIRLOCK_CLOSED 1 +#define AIRLOCK_CLOSING 2 +#define AIRLOCK_OPEN 3 +#define AIRLOCK_OPENING 4 +#define AIRLOCK_DENY 5 +#define AIRLOCK_EMAG 6 + +/obj/machinery/door/airlock + var/obj/effect/overlay/vis_airlock/vis_overlay1 + var/obj/effect/overlay/vis_airlock/vis_overlay2 + doorOpen = 'modular_skyrat/modules/aesthetics/airlock/sound/open.ogg' + doorClose = 'modular_skyrat/modules/aesthetics/airlock/sound/close.ogg' + doorDeni = 'modular_skyrat/modules/aesthetics/airlock/sound/access_denied.ogg' + boltUp = 'modular_skyrat/modules/aesthetics/airlock/sound/bolts_up.ogg' + boltDown = 'modular_skyrat/modules/aesthetics/airlock/sound/bolts_down.ogg' + //noPower = 'sound/machines/doorclick.ogg' + var/forcedOpen = 'modular_skyrat/modules/aesthetics/airlock/sound/open_force.ogg' //Come on guys, why aren't all the sound files like this. + var/forcedClosed = 'modular_skyrat/modules/aesthetics/airlock/sound/close_force.ogg' + +/obj/machinery/door/airlock/Initialize() + //overlay2 + vis_overlay1 = new() + vis_overlay1.icon = overlays_file + //overlay1 + vis_overlay2 = new() + vis_overlay2.icon = overlays_file + vis_overlay2.layer = layer + vis_overlay2.plane = 1 + vis_contents += vis_overlay1 + vis_contents += vis_overlay2 + set_airlock_overlays() + . = ..() + +/obj/effect/overlay/vis_airlock + layer = EMISSIVE_LAYER + plane = EMISSIVE_PLANE + vis_flags = VIS_INHERIT_ID + +/obj/machinery/door/airlock/Destroy() + . = ..() + vis_contents -= vis_overlay1 + vis_contents -= vis_overlay2 + QDEL_NULL(vis_overlay1) + QDEL_NULL(vis_overlay2) + +/obj/machinery/door/airlock/power_change() + ..() + update_icon() + +/obj/machinery/door/airlock/proc/set_airlock_overlays(state) + var/mutable_appearance/frame_overlay + var/mutable_appearance/filling_overlay + var/lights_overlay = "" + var/mutable_appearance/panel_overlay + var/mutable_appearance/weld_overlay + var/mutable_appearance/damag_overlay + var/mutable_appearance/sparks_overlay + var/mutable_appearance/note_overlay + var/mutable_appearance/seal_overlay + + var/notetype = note_type() + var/pre_light_range = 0 + var/pre_light_power = 0 + var/pre_light_color = "" + + switch(state) + if(AIRLOCK_CLOSED) + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_closed_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(seal) + seal_overlay = get_airlock_overlay("sealed", overlays_file) + if(obj_integrity < integrity_failure * max_integrity) + damag_overlay = get_airlock_overlay("sparks_broken", overlays_file) + else if(obj_integrity < (0.75 * max_integrity)) + damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file) + if(lights && hasPower()) + pre_light_range = AIRLOCK_LIGHT_RANGE + pre_light_power = AIRLOCK_LIGHT_POWER + if(locked) + lights_overlay = "lights_bolts" + pre_light_color = AIRLOCK_BOLTS_LIGHT_COLOR + else if(emergency) + lights_overlay = "lights_emergency" + pre_light_color = AIRLOCK_EMERGENCY_LIGHT_COLOR + else + lights_overlay = "lights_poweron" + pre_light_color = AIRLOCK_POWERON_LIGHT_COLOR + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_DENY) + if(!hasPower()) + return + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_closed_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(obj_integrity < integrity_failure * max_integrity) + damag_overlay = get_airlock_overlay("sparks_broken", overlays_file) + else if(obj_integrity < (0.75 * max_integrity)) + damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(seal) + seal_overlay = get_airlock_overlay("sealed", overlays_file) + if(lights && hasPower()) + pre_light_range = AIRLOCK_LIGHT_RANGE + pre_light_power = AIRLOCK_LIGHT_POWER + lights_overlay = "lights_denied" + pre_light_color = AIRLOCK_DENY_LIGHT_COLOR + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_EMAG) + frame_overlay = get_airlock_overlay("closed", icon) + sparks_overlay = get_airlock_overlay("sparks", overlays_file) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_closed_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(obj_integrity < integrity_failure * max_integrity) + damag_overlay = get_airlock_overlay("sparks_broken", overlays_file) + else if(obj_integrity < (0.75 * max_integrity)) + damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(seal) + seal_overlay = get_airlock_overlay("sealed", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_OPEN) + frame_overlay = get_airlock_overlay("open", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_open", icon) + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_open_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_open", overlays_file) + if(obj_integrity < (0.75 * max_integrity)) + damag_overlay = get_airlock_overlay("sparks_open", overlays_file) + if(lights && hasPower()) + pre_light_range = AIRLOCK_LIGHT_RANGE + pre_light_power = AIRLOCK_LIGHT_POWER + if(locked) + lights_overlay = "lights_bolts_open" + pre_light_color = AIRLOCK_BOLTS_LIGHT_COLOR + else if(emergency) + lights_overlay = "lights_emergency_open" + pre_light_color = AIRLOCK_EMERGENCY_LIGHT_COLOR + else + lights_overlay = "lights_poweron_open" + pre_light_color = AIRLOCK_POWERON_LIGHT_COLOR + if(note) + note_overlay = get_airlock_overlay("[notetype]_open", note_overlay_file) + + if(AIRLOCK_CLOSING) + frame_overlay = get_airlock_overlay("closing", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closing", icon) + if(lights && hasPower()) + pre_light_range = AIRLOCK_LIGHT_RANGE + pre_light_power = AIRLOCK_LIGHT_POWER + //lights_overlay = get_airlock_overlay("lights_opening", overlays_file) + lights_overlay = "lights_closing" + pre_light_color = AIRLOCK_ACCESS_LIGHT_COLOR + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_closing_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_closing", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_closing", note_overlay_file) + + if(AIRLOCK_OPENING) + frame_overlay = get_airlock_overlay("opening", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_opening", icon) + if(lights && hasPower()) + pre_light_range = AIRLOCK_LIGHT_RANGE + pre_light_power = AIRLOCK_LIGHT_POWER + //lights_overlay = get_airlock_overlay("lights_opening", overlays_file) + lights_overlay = "lights_opening" + pre_light_color = AIRLOCK_ACCESS_LIGHT_COLOR + if(panel_open) + if(security_level) + panel_overlay = get_airlock_overlay("panel_opening_protected", overlays_file) + else + panel_overlay = get_airlock_overlay("panel_opening", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_opening", note_overlay_file) + + cut_overlays() + set_light(pre_light_range, pre_light_power, pre_light_color) + add_overlay(frame_overlay) + add_overlay(filling_overlay) + add_overlay(panel_overlay) + add_overlay(weld_overlay) + add_overlay(damag_overlay) + add_overlay(note_overlay) + add_overlay(seal_overlay) + add_overlay(sparks_overlay) + update_vis_overlays(lights_overlay) + check_unres() + + +/obj/machinery/door/airlock/proc/update_vis_overlays(overlay_state) + vis_overlay1.icon_state = overlay_state + vis_overlay2.icon_state = overlay_state + + +//STATION AIRLOCKS +/obj/machinery/door/airlock + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/public.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi' + note_overlay_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi' + +/obj/machinery/door/airlock/command + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/command.dmi' + +/obj/machinery/door/airlock/security + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi' + +/obj/machinery/door/airlock/engineering + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi' + +/obj/machinery/door/airlock/medical + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi' + +/obj/machinery/door/airlock/maintenance + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi' + +/obj/machinery/door/airlock/maintenance/external + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi' + +/obj/machinery/door/airlock/mining + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi' + +/obj/machinery/door/airlock/atmos + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi' + +/obj/machinery/door/airlock/research + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/research.dmi' + +/obj/machinery/door/airlock/freezer + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi' + +/obj/machinery/door/airlock/science + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/science.dmi' + +/obj/machinery/door/airlock/virology + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi' + +//STATION MINERAL AIRLOCKS +/obj/machinery/door/airlock/gold + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi' + +/obj/machinery/door/airlock/silver + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi' + +/obj/machinery/door/airlock/diamond + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi' + +/obj/machinery/door/airlock/uranium + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi' + +/obj/machinery/door/airlock/plasma + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi' + +/obj/machinery/door/airlock/bananium + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi' + +/obj/machinery/door/airlock/sandstone + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi' + +/obj/machinery/door/airlock/wood + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi' + +//STATION 2 AIRLOCKS + +/obj/machinery/door/airlock/public + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi' + +//EXTERNAL AIRLOCKS +/obj/machinery/door/airlock/external + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi' + note_overlay_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi' + +//CENTCOMM +/obj/machinery/door/airlock/centcom + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi' + +/obj/machinery/door/airlock/grunge + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi' + +//VAULT +/obj/machinery/door/airlock/vault + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/vault.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/overlays.dmi' + +//HATCH +/obj/machinery/door/airlock/hatch + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + note_overlay_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + +/obj/machinery/door/airlock/maintenance_hatch + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + note_overlay_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + +//HIGH SEC +/obj/machinery/door/airlock/highsecurity + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi' + +//GLASS +/obj/machinery/door/airlock/glass_large + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/multi_tile.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/overlays.dmi' + +//ASSEMBLYS +/obj/structure/door_assembly/door_assembly_public + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_com + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/command.dmi' + +/obj/structure/door_assembly/door_assembly_sec + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi' + +/obj/structure/door_assembly/door_assembly_eng + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi' + +/obj/structure/door_assembly/door_assembly_min + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi' + +/obj/structure/door_assembly/door_assembly_atmo + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi' + +/obj/structure/door_assembly/door_assembly_research + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/research.dmi' + +/obj/structure/door_assembly/door_assembly_science + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/science.dmi' + +/obj/structure/door_assembly/door_assembly_viro + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi' + +/obj/structure/door_assembly/door_assembly_med + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi' + +/obj/structure/door_assembly/door_assembly_mai + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi' + +/obj/structure/door_assembly/door_assembly_extmai + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi' + +/obj/structure/door_assembly/door_assembly_ext + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_fre + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi' + +/obj/structure/door_assembly/door_assembly_hatch + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_mhatch + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_highsecurity + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_vault + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/vault.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/overlays.dmi' + + +/obj/structure/door_assembly/door_assembly_centcom + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_grunge + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi' + overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi' + +/obj/structure/door_assembly/door_assembly_gold + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi' + +/obj/structure/door_assembly/door_assembly_silver + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi' + +/obj/structure/door_assembly/door_assembly_diamond + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi' + +/obj/structure/door_assembly/door_assembly_uranium + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi' + +/obj/structure/door_assembly/door_assembly_plasma + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi' + +/obj/structure/door_assembly/door_assembly_bananium + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi' + +/obj/structure/door_assembly/door_assembly_sandstone + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi' + +/obj/structure/door_assembly/door_assembly_wood + icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi' + +//SKYRAT EDIT ADDITION BEGIN - AESTHETICS +#undef AIRLOCK_LIGHT_POWER +#undef AIRLOCK_LIGHT_RANGE + +#undef AIRLOCK_POWERON_LIGHT_COLOR +#undef AIRLOCK_BOLTS_LIGHT_COLOR +#undef AIRLOCK_ACCESS_LIGHT_COLOR +#undef AIRLOCK_EMERGENCY_LIGHT_COLOR +#undef AIRLOCK_DENY_LIGHT_COLOR +//SKYRAT EDIT END + +#undef AIRLOCK_CLOSED +#undef AIRLOCK_CLOSING +#undef AIRLOCK_OPEN +#undef AIRLOCK_OPENING +#undef AIRLOCK_DENY +#undef AIRLOCK_EMAG diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi new file mode 100644 index 00000000000..9d45122dd12 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi new file mode 100644 index 00000000000..007b740399d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi new file mode 100644 index 00000000000..cf0c7e78c28 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi new file mode 100644 index 00000000000..3197345499f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi new file mode 100644 index 00000000000..64d15207b59 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi new file mode 100644 index 00000000000..3303591517f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi new file mode 100644 index 00000000000..bd204b5285a Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi new file mode 100644 index 00000000000..eb5e312d93c Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/highsec.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi new file mode 100644 index 00000000000..86e560b141c Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/highsec/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/multi_tile.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/multi_tile.dmi new file mode 100644 index 00000000000..a400cb6c61d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/multi_tile.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/overlays.dmi new file mode 100644 index 00000000000..2f08ff85ea3 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/multi_tile.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/multi_tile.dmi new file mode 100644 index 00000000000..08175c4e7fa Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/multi_tile.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/overlays.dmi new file mode 100644 index 00000000000..7de2b627a45 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile2/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/erokez.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/erokez.dmi new file mode 100644 index 00000000000..da8d47bd152 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/erokez.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/overlays.dmi new file mode 100644 index 00000000000..d418e45f603 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/wagon.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/wagon.dmi new file mode 100644 index 00000000000..c92e9f9199c Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/shuttle/wagon.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi new file mode 100644 index 00000000000..b70c027d293 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi new file mode 100644 index 00000000000..8254c48a5b3 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/command.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/command.dmi new file mode 100644 index 00000000000..affe4c1fd2f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/command.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi new file mode 100644 index 00000000000..e7ec1cffb65 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi new file mode 100644 index 00000000000..79f7ce38c46 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi new file mode 100644 index 00000000000..e0d2c4c5263 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi new file mode 100644 index 00000000000..a2977d95cf9 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi new file mode 100644 index 00000000000..f3f73be3ebc Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi new file mode 100644 index 00000000000..c7d8e6154e8 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi new file mode 100644 index 00000000000..e7e46b61217 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi new file mode 100644 index 00000000000..65abb9f3976 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi new file mode 100644 index 00000000000..0f5f8ebaea2 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi new file mode 100644 index 00000000000..d145d45302d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi new file mode 100644 index 00000000000..a90fa8f0bce Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/public.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/public.dmi new file mode 100644 index 00000000000..4f27d1f8fdb Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/public.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/research.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/research.dmi new file mode 100644 index 00000000000..15743bb656a Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/research.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi new file mode 100644 index 00000000000..ac4dc717905 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/science.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/science.dmi new file mode 100644 index 00000000000..bf9beefbfe9 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/science.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi new file mode 100644 index 00000000000..c7eff23f6c8 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi new file mode 100644 index 00000000000..47105c88bf1 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi new file mode 100644 index 00000000000..d23811bacd4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi new file mode 100644 index 00000000000..27f504db811 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi new file mode 100644 index 00000000000..b5973a7219f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi new file mode 100644 index 00000000000..bd0a6ddb2e1 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi new file mode 100644 index 00000000000..7094966e5ec Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/overlays.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/overlays.dmi new file mode 100644 index 00000000000..bfdd2599990 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/overlays.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/vault.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/vault.dmi new file mode 100644 index 00000000000..9c41b5ac8eb Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/vault/vault.dmi differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/access_denied.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/access_denied.ogg new file mode 100644 index 00000000000..8d2c4a178f8 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/access_denied.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/bolts_down.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/bolts_down.ogg new file mode 100644 index 00000000000..19d62b8acb2 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/bolts_down.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/bolts_up.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/bolts_up.ogg new file mode 100644 index 00000000000..0aac1a44fcc Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/bolts_up.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/close.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/close.ogg new file mode 100644 index 00000000000..db94b73fb4b Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/close.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/close_force.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/close_force.ogg new file mode 100644 index 00000000000..28b190d8e09 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/close_force.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/creaking.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/creaking.ogg new file mode 100644 index 00000000000..ccdc30b3191 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/creaking.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/open.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/open.ogg new file mode 100644 index 00000000000..0b8a0d5f94f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/open.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/open_force.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/open_force.ogg new file mode 100644 index 00000000000..4caefc0b9e4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/open_force.ogg differ diff --git a/modular_skyrat/modules/aesthetics/airlock/sound/toggle.ogg b/modular_skyrat/modules/aesthetics/airlock/sound/toggle.ogg new file mode 100644 index 00000000000..58a06817f00 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/airlock/sound/toggle.ogg differ diff --git a/modular_skyrat/modules/aesthetics/apc/code/apc.dm b/modular_skyrat/modules/aesthetics/apc/code/apc.dm new file mode 100644 index 00000000000..528cedcb7ba --- /dev/null +++ b/modular_skyrat/modules/aesthetics/apc/code/apc.dm @@ -0,0 +1,5 @@ +/obj/machinery/power/apc + icon = 'modular_skyrat/modules/aesthetics/apc/icons/apc.dmi' + +/obj/item/wallframe/apc + icon = 'modular_skyrat/modules/aesthetics/apc/icons/apc.dmi' diff --git a/modular_skyrat/modules/aesthetics/apc/icons/apc.dmi b/modular_skyrat/modules/aesthetics/apc/icons/apc.dmi new file mode 100644 index 00000000000..503466a96d6 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/apc/icons/apc.dmi differ diff --git a/modular_skyrat/modules/aesthetics/bench/code/bench.dm b/modular_skyrat/modules/aesthetics/bench/code/bench.dm new file mode 100644 index 00000000000..b54f215465a --- /dev/null +++ b/modular_skyrat/modules/aesthetics/bench/code/bench.dm @@ -0,0 +1,27 @@ +/obj/structure/chair/sofa/bench + name = "bench" + desc = "Firm and uncomfortable." + icon = 'modular_skyrat/modules/aesthetics/bench/icons/bench.dmi' + icon_state = "benchmiddle" + +/obj/structure/chair/sofa/bench/left + icon_state = "bench_left" + +/obj/structure/chair/sofa/bench/right + icon_state = "bench_right" + +/obj/structure/chair/sofa/bench/corner + icon_state = "benchcorner" + +/* +/obj/structure/chair/sofa/monorail + +/obj/structure/chair/sofa/monorail/left + icon_state = "corp_sofaend_left" + +/obj/structure/chair/sofa/monorail/right + icon_state = "corp_sofaend_right" + +/obj/structure/chair/sofa/monorail/corner + icon_state = "corp_sofacorner" + */ diff --git a/modular_skyrat/modules/aesthetics/bench/icons/bench.dmi b/modular_skyrat/modules/aesthetics/bench/icons/bench.dmi new file mode 100644 index 00000000000..fcf431cb9b0 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/bench/icons/bench.dmi differ diff --git a/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm new file mode 100644 index 00000000000..5cab93c045f --- /dev/null +++ b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm @@ -0,0 +1,16 @@ +/obj/machinery/door/poddoor + icon = 'modular_skyrat/modules/aesthetics/blast_door/icons/blast_door.dmi' + var/door_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/blast_door.ogg' + +/obj/machinery/door/poddoor/shutters + var/door_open_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg' + var/door_close_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg' + +/obj/machinery/door/poddoor/shutters/do_animate(animation) + switch(animation) + if("opening") + flick("opening", src) + playsound(src, door_open_sound, 30, TRUE) + if("closing") + flick("closing", src) + playsound(src, door_close_sound, 30, TRUE) diff --git a/modular_skyrat/modules/aesthetics/blast_door/icons/blast_door.dmi b/modular_skyrat/modules/aesthetics/blast_door/icons/blast_door.dmi new file mode 100644 index 00000000000..672c161c10e Binary files /dev/null and b/modular_skyrat/modules/aesthetics/blast_door/icons/blast_door.dmi differ diff --git a/modular_skyrat/modules/aesthetics/blast_door/sound/blast_door.ogg b/modular_skyrat/modules/aesthetics/blast_door/sound/blast_door.ogg new file mode 100644 index 00000000000..93e53513985 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/blast_door/sound/blast_door.ogg differ diff --git a/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg b/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg new file mode 100644 index 00000000000..548cea96c59 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg differ diff --git a/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg b/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg new file mode 100644 index 00000000000..b8e0869c538 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg differ diff --git a/modular_skyrat/modules/aesthetics/buttons/code/buttons.dm b/modular_skyrat/modules/aesthetics/buttons/code/buttons.dm new file mode 100644 index 00000000000..dd1ba6fda35 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/buttons/code/buttons.dm @@ -0,0 +1,12 @@ +/obj/machinery/button/door + icon = 'modular_skyrat/modules/aesthetics/buttons/icons/buttons.dmi' + var/light_mask = "button-light-mask" + +/obj/machinery/button/door/update_overlays() + . = ..() + if(!light_mask) + return + + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) + if(!(machine_stat & (NOPOWER|BROKEN)) && !panel_open) + SSvis_overlays.add_vis_overlay(src, icon, light_mask, EMISSIVE_LAYER, EMISSIVE_PLANE) diff --git a/modular_skyrat/modules/aesthetics/buttons/icons/buttons.dmi b/modular_skyrat/modules/aesthetics/buttons/icons/buttons.dmi new file mode 100644 index 00000000000..5b9b8effb92 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/buttons/icons/buttons.dmi differ diff --git a/modular_skyrat/modules/aesthetics/camera/code/camera.dm b/modular_skyrat/modules/aesthetics/camera/code/camera.dm new file mode 100644 index 00000000000..4af41cad8be --- /dev/null +++ b/modular_skyrat/modules/aesthetics/camera/code/camera.dm @@ -0,0 +1,2 @@ +/obj/machinery/camera + icon = 'modular_skyrat/modules/aesthetics/camera/icons/camera.dmi' diff --git a/modular_skyrat/modules/aesthetics/camera/icons/camera.dmi b/modular_skyrat/modules/aesthetics/camera/icons/camera.dmi new file mode 100644 index 00000000000..2fd4fef4d93 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/camera/icons/camera.dmi differ diff --git a/modular_skyrat/modules/aesthetics/chairs/code/chair.dm b/modular_skyrat/modules/aesthetics/chairs/code/chair.dm new file mode 100644 index 00000000000..bf8fb6a4914 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/chairs/code/chair.dm @@ -0,0 +1,5 @@ +/obj/structure/chair + icon = 'modular_skyrat/modules/aesthetics/chairs/icons/chairs.dmi' + +/obj/item/chair + icon = 'modular_skyrat/modules/aesthetics/chairs/icons/chairs.dmi' diff --git a/modular_skyrat/modules/aesthetics/chairs/icons/chairs.dmi b/modular_skyrat/modules/aesthetics/chairs/icons/chairs.dmi new file mode 100644 index 00000000000..7be164c99a9 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/chairs/icons/chairs.dmi differ diff --git a/modular_skyrat/modules/aesthetics/computer/code/computer.dm b/modular_skyrat/modules/aesthetics/computer/code/computer.dm new file mode 100644 index 00000000000..16ce7bd0891 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/computer/code/computer.dm @@ -0,0 +1,24 @@ + +/obj/machinery/computer + var/clicksound = "keyboard" + var/clickvol = 40 + var/next_clicksound + +/obj/machinery/computer/interact(mob/user, special_state) + . = ..() + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + 5 + playsound(src, get_sfx_skyrat(clicksound), clickvol) + +/obj/machinery/computer/ui_interact(mob/user, datum/tgui/ui) + if(clicksound && world.time > next_clicksound && isliving(user)) + next_clicksound = world.time + 5 + playsound(src, get_sfx_skyrat(clicksound), clickvol) + . = ..() + +/proc/get_sfx_skyrat(soundin) + if(istext(soundin)) + switch(soundin) + if("keyboard") + soundin = pick('modular_skyrat/modules/aesthetics/computer/sound/keypress1.ogg','modular_skyrat/modules/aesthetics/computer/sound/keypress2.ogg','modular_skyrat/modules/aesthetics/computer/sound/keypress3.ogg','modular_skyrat/modules/aesthetics/computer/sound/keypress4.ogg', 'modular_skyrat/modules/aesthetics/computer/sound/keystroke4.ogg') + return soundin diff --git a/modular_skyrat/modules/aesthetics/computer/sound/keypress1.ogg b/modular_skyrat/modules/aesthetics/computer/sound/keypress1.ogg new file mode 100644 index 00000000000..582a7eaf122 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/computer/sound/keypress1.ogg differ diff --git a/modular_skyrat/modules/aesthetics/computer/sound/keypress2.ogg b/modular_skyrat/modules/aesthetics/computer/sound/keypress2.ogg new file mode 100644 index 00000000000..20f3e6697c6 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/computer/sound/keypress2.ogg differ diff --git a/modular_skyrat/modules/aesthetics/computer/sound/keypress3.ogg b/modular_skyrat/modules/aesthetics/computer/sound/keypress3.ogg new file mode 100644 index 00000000000..852478f06e2 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/computer/sound/keypress3.ogg differ diff --git a/modular_skyrat/modules/aesthetics/computer/sound/keypress4.ogg b/modular_skyrat/modules/aesthetics/computer/sound/keypress4.ogg new file mode 100644 index 00000000000..2cc664bf582 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/computer/sound/keypress4.ogg differ diff --git a/modular_skyrat/modules/aesthetics/computer/sound/keystroke4.ogg b/modular_skyrat/modules/aesthetics/computer/sound/keystroke4.ogg new file mode 100644 index 00000000000..8647c2b310d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/computer/sound/keystroke4.ogg differ diff --git a/modular_skyrat/modules/aesthetics/crates/code/crates.dm b/modular_skyrat/modules/aesthetics/crates/code/crates.dm new file mode 100644 index 00000000000..b7cfce20900 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/crates/code/crates.dm @@ -0,0 +1,2 @@ +/obj/structure/closet/crate + icon = 'modular_skyrat/modules/aesthetics/crates/icons/crates.dmi' diff --git a/modular_skyrat/modules/aesthetics/crates/icons/crates.dmi b/modular_skyrat/modules/aesthetics/crates/icons/crates.dmi new file mode 100644 index 00000000000..df99ede76bd Binary files /dev/null and b/modular_skyrat/modules/aesthetics/crates/icons/crates.dmi differ diff --git a/modular_skyrat/modules/aesthetics/disposals/code/disposals.dm b/modular_skyrat/modules/aesthetics/disposals/code/disposals.dm new file mode 100644 index 00000000000..a3e71eea6a7 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/disposals/code/disposals.dm @@ -0,0 +1,2 @@ +/obj/machinery/disposal + icon = 'modular_skyrat/modules/aesthetics/disposals/icons/disposals.dmi' diff --git a/modular_skyrat/modules/aesthetics/disposals/icons/disposals.dmi b/modular_skyrat/modules/aesthetics/disposals/icons/disposals.dmi new file mode 100644 index 00000000000..984cf9a4bb1 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/disposals/icons/disposals.dmi differ diff --git a/modular_skyrat/modules/aesthetics/emitter/code/emitter.dm b/modular_skyrat/modules/aesthetics/emitter/code/emitter.dm new file mode 100644 index 00000000000..07a02614e06 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/emitter/code/emitter.dm @@ -0,0 +1,16 @@ +/obj/machinery/power/emitter + icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi' + +/obj/machinery/field/containment + icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi' + +/obj/machinery/field/generator + icon = 'modular_skyrat/modules/aesthetics/emitter/icons/field_generator.dmi' + + +/obj/machinery/power/rad_collector + icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi' + +/obj/projectile/beam/emitter + icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi' + icon_state = "emitter_beam" diff --git a/modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi b/modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi new file mode 100644 index 00000000000..fb904121664 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi differ diff --git a/modular_skyrat/modules/aesthetics/emitter/icons/field_generator.dmi b/modular_skyrat/modules/aesthetics/emitter/icons/field_generator.dmi new file mode 100644 index 00000000000..74172add6ee Binary files /dev/null and b/modular_skyrat/modules/aesthetics/emitter/icons/field_generator.dmi differ diff --git a/modular_skyrat/modules/aesthetics/extinguisher/code/extinguisher.dm b/modular_skyrat/modules/aesthetics/extinguisher/code/extinguisher.dm new file mode 100644 index 00000000000..bdcd3782a31 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/extinguisher/code/extinguisher.dm @@ -0,0 +1,46 @@ +/obj/structure/extinguisher_cabinet + icon = 'modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi' + icon_state = "extinguisher_standard_closed" + +/obj/item/wallframe/extinguisher_cabinet + icon = 'modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi' + +/obj/item/extinguisher + icon = 'modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi' + var/random_overlay = 0 + +/obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building) + . = ..() + update_icon() + + +/obj/structure/extinguisher_cabinet/update_icon_state() + if(!opened) + if(stored_extinguisher) + if(istype(stored_extinguisher, /obj/item/extinguisher/mini)) + icon_state = "extinguisher_mini_closed" + else if(istype(stored_extinguisher, /obj/item/extinguisher/advanced)) + icon_state = "extinguisher_advanced_closed" + else + icon_state = "extinguisher_standard_closed" + else + icon_state = "extinguisher_empty_closed" + else if(stored_extinguisher) + if(istype(stored_extinguisher, /obj/item/extinguisher/mini)) + icon_state = "extinguisher_mini_open" + else if(istype(stored_extinguisher, /obj/item/extinguisher/advanced)) + icon_state = "extinguisher_advanced_open" + else + icon_state = "extinguisher_standard_open" + else + icon_state = "extinguisher_empty_open" + +/obj/item/extinguisher/Initialize() + . = ..() + random_overlay = rand(1, 6) + update_icon() + +/obj/item/extinguisher/update_overlays() + . = ..() + if(!istype(src, /obj/item/extinguisher/mini) && !istype(src, /obj/item/extinguisher/advanced)) + . += "ex_overlay_[random_overlay]" diff --git a/modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi b/modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi new file mode 100644 index 00000000000..75b4f07e0a9 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/extinguisher/icons/extinguisher.dmi differ diff --git a/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm b/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm new file mode 100644 index 00000000000..c61b3a1b09e --- /dev/null +++ b/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm @@ -0,0 +1,3 @@ +/obj/machinery/firealarm + icon = 'modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi' + var/alarm_sound = 'modular_skyrat/modules/aesthetics/firealarm/sound/alarm_fire.ogg' diff --git a/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi b/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi new file mode 100644 index 00000000000..a2d5dd4a2df Binary files /dev/null and b/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi differ diff --git a/modular_skyrat/modules/aesthetics/firealarm/sound/alarm_fire.ogg b/modular_skyrat/modules/aesthetics/firealarm/sound/alarm_fire.ogg new file mode 100644 index 00000000000..e9b84e9554d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/firealarm/sound/alarm_fire.ogg differ diff --git a/modular_skyrat/modules/aesthetics/firedoor/code/firedoor.dm b/modular_skyrat/modules/aesthetics/firedoor/code/firedoor.dm new file mode 100644 index 00000000000..02391066747 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/firedoor/code/firedoor.dm @@ -0,0 +1,21 @@ +/obj/machinery/door/firedoor + name = "Emergency Shutter" + desc = "Emergency air-tight shutter, capable of sealing off breached areas. This one has a glass panel." + icon = 'modular_skyrat/modules/aesthetics/firedoor/icons/firedoor_glass.dmi' + var/door_open_sound = 'modular_skyrat/modules/aesthetics/firedoor/sound/firedoor_open.ogg' + var/door_close_sound = 'modular_skyrat/modules/aesthetics/firedoor/sound/firedoor_open.ogg' + +/obj/machinery/door/firedoor/heavy + name = "Heavy Emergency Shutter" + desc = "Emergency air-tight shutter, capable of sealing off breached areas." + icon = 'modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi' + +/obj/structure/firelock_frame + icon = 'modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi' + +/obj/machinery/door/firedoor/open() + playsound(loc, door_open_sound, 90, TRUE) + . = ..() +/obj/machinery/door/firedoor/close() + playsound(loc, door_close_sound, 90, TRUE) + . = ..() diff --git a/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi b/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi new file mode 100644 index 00000000000..794775dce26 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi differ diff --git a/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor_glass.dmi b/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor_glass.dmi new file mode 100644 index 00000000000..5bb382921f2 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/firedoor/icons/firedoor_glass.dmi differ diff --git a/modular_skyrat/modules/aesthetics/firedoor/sound/firedoor_open.ogg b/modular_skyrat/modules/aesthetics/firedoor/sound/firedoor_open.ogg new file mode 100644 index 00000000000..c48a0bd7d6f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/firedoor/sound/firedoor_open.ogg differ diff --git a/modular_skyrat/modules/aesthetics/floors/code/floors.dm b/modular_skyrat/modules/aesthetics/floors/code/floors.dm new file mode 100644 index 00000000000..d83a309f409 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/floors/code/floors.dm @@ -0,0 +1,3 @@ +/turf/open/floor + icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi' + diff --git a/modular_skyrat/modules/aesthetics/floors/icons/colourchange.dmi b/modular_skyrat/modules/aesthetics/floors/icons/colourchange.dmi new file mode 100644 index 00000000000..40431f10a41 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/floors/icons/colourchange.dmi differ diff --git a/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi new file mode 100644 index 00000000000..e9d6f08270f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm new file mode 100644 index 00000000000..777960fca3c --- /dev/null +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -0,0 +1,132 @@ +/obj/item/gun/energy/e_gun + icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + ammo_x_offset = 2 + +/obj/item/gun/energy/ionrifle + icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/energy/laser + icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/energy/e_gun/stun + charge_sections = 5 + ammo_x_offset = 2 + +/obj/item/gun/ballistic/shotgun/riot + name = "peacekeeper shotgun" + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + inhand_icon_state = "riot_shotgun" + inhand_x_dimension = 32 + inhand_y_dimension = 32 + can_suppress = TRUE + suppressed_sound = 'modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg' + suppressed_volume = 100 + vary_fire_sound = TRUE + fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg' + +/obj/item/gun/grenadelauncher + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/ballistic/automatic/pistol/m1911 + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + inhand_icon_state = "colt" + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/ballistic/revolver/mateba + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + +/obj/item/gun/ballistic/automatic/c20r + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + +/obj/item/gun/ballistic/automatic/m90 + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' +/obj/item/gun/ballistic/revolver/detective + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + +/obj/item/gun/ballistic/automatic/pistol/aps + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + +/obj/item/gun/ballistic/automatic/pistol + icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' + +/obj/item/gun/energy/e_gun/nuclear + icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi' + ammo_x_offset = 2 + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/energy/lasercannon + icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi' + fire_sound_volume = 100 + ammo_x_offset = 2 + charge_sections = 5 + inhand_icon_state = "" + lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' + +/obj/item/gun/energy/e_gun/nuclear/rainbow + name = "fantastic energy gun" + desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell. This one seems quite fancy!" + ammo_type = list(/obj/item/ammo_casing/energy/laser/rainbow, /obj/item/ammo_casing/energy/disabler/rainbow) + +/obj/item/ammo_casing/energy/laser/rainbow + icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi' + select_name = "fantastic kill" + projectile_type = /obj/projectile/beam/laser/rainbow + +/obj/projectile/beam/laser/rainbow + icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi' + icon_state = "laser" + +/obj/item/ammo_casing/energy/disabler/rainbow + icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi' + select_name = "fantastic disable" + projectile_type = /obj/projectile/beam/disabler/rainbow + +/obj/projectile/beam/disabler/rainbow + icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi' + icon_state = "laser" + +/obj/item/gun/energy/e_gun/nuclear/emag_act(mob/user, obj/item/card/emag/E) + . = ..() + if(pin) + to_chat(user, "You probably want to do this on a new gun!") + return FALSE + to_chat(user, "The gun suddenly feels quite fantastic!") + new /obj/item/gun/energy/e_gun/nuclear/rainbow(get_turf(user)) + qdel(src) + +/obj/item/gun/energy/e_gun/nuclear/rainbow/update_overlays() + . = ..() + . += "[icon_state]_emagged" + +/obj/item/gun/energy/e_gun/nuclear/rainbow/emag_act(mob/user, obj/item/card/emag/E) + return FALSE + +//BEAM SOUNDS +/obj/item/ammo_casing/energy + fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/laser.ogg' + +/obj/item/ammo_casing/energy/laser/pulse + fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/pulse.ogg' + +/obj/item/gun/energy/xray + fire_sound_volume = 100 + +/obj/item/ammo_casing/energy/xray + fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/xray_laser.ogg' + +/obj/item/ammo_casing/energy/laser/accelerator + fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_fire.ogg' + diff --git a/modular_skyrat/modules/aesthetics/guns/icons/energy.dmi b/modular_skyrat/modules/aesthetics/guns/icons/energy.dmi new file mode 100644 index 00000000000..c0af3aa3923 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/icons/energy.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/icons/guns.dmi b/modular_skyrat/modules/aesthetics/guns/icons/guns.dmi new file mode 100644 index 00000000000..079ac918125 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/icons/guns.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi b/modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi new file mode 100644 index 00000000000..008fc3e02ac Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi b/modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi new file mode 100644 index 00000000000..91b0da23f3d Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi b/modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi new file mode 100644 index 00000000000..bcaeee26cba Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser.ogg new file mode 100644 index 00000000000..4ff9e82ff99 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser2.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser2.ogg new file mode 100644 index 00000000000..68b4134fa79 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser2.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser3.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser3.ogg new file mode 100644 index 00000000000..8bb53db0bb8 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser3.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon.ogg new file mode 100644 index 00000000000..5a81119645c Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_charge.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_charge.ogg new file mode 100644 index 00000000000..0b9abaa90e4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_charge.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_fire.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_fire.ogg new file mode 100644 index 00000000000..6995bf1a862 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_fire.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/laser_rifle.ogg b/modular_skyrat/modules/aesthetics/guns/sound/laser_rifle.ogg new file mode 100644 index 00000000000..8a18d796aa0 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/laser_rifle.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/pulse.ogg b/modular_skyrat/modules/aesthetics/guns/sound/pulse.ogg new file mode 100644 index 00000000000..29c7a977766 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/pulse.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg b/modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg new file mode 100644 index 00000000000..de9d876a796 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg b/modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg new file mode 100644 index 00000000000..c4f0c00dfbe Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg differ diff --git a/modular_skyrat/modules/aesthetics/guns/sound/xray_laser.ogg b/modular_skyrat/modules/aesthetics/guns/sound/xray_laser.ogg new file mode 100644 index 00000000000..de5595bb1d4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/guns/sound/xray_laser.ogg differ diff --git a/modular_skyrat/modules/aesthetics/heater/code/spaceheater.dm b/modular_skyrat/modules/aesthetics/heater/code/spaceheater.dm new file mode 100644 index 00000000000..853560c7ea0 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/heater/code/spaceheater.dm @@ -0,0 +1,2 @@ +/obj/machinery/space_heater + icon = 'modular_skyrat/modules/aesthetics/heater/icons/heater.dmi' diff --git a/modular_skyrat/modules/aesthetics/heater/icons/heater.dmi b/modular_skyrat/modules/aesthetics/heater/icons/heater.dmi new file mode 100644 index 00000000000..41320e01a93 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/heater/icons/heater.dmi differ diff --git a/modular_skyrat/modules/aesthetics/intercom/code/intercom.dm b/modular_skyrat/modules/aesthetics/intercom/code/intercom.dm new file mode 100644 index 00000000000..088dc929cbd --- /dev/null +++ b/modular_skyrat/modules/aesthetics/intercom/code/intercom.dm @@ -0,0 +1,2 @@ +/obj/item/radio/intercom + icon = 'modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi' diff --git a/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi b/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi new file mode 100644 index 00000000000..b5c39c3f1a3 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi differ diff --git a/modular_skyrat/modules/aesthetics/library/code/lib_items.dm b/modular_skyrat/modules/aesthetics/library/code/lib_items.dm new file mode 100644 index 00000000000..bb3bbdf422d --- /dev/null +++ b/modular_skyrat/modules/aesthetics/library/code/lib_items.dm @@ -0,0 +1,3 @@ + +/obj/structure/bookcase + icon = 'modular_skyrat/modules/aesthetics/library/icons/library.dmi' diff --git a/modular_skyrat/modules/aesthetics/library/icons/library.dmi b/modular_skyrat/modules/aesthetics/library/icons/library.dmi new file mode 100644 index 00000000000..ffe45ec1cbd Binary files /dev/null and b/modular_skyrat/modules/aesthetics/library/icons/library.dmi differ diff --git a/modular_skyrat/modules/aesthetics/lights/code/lighting.dm b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm new file mode 100644 index 00000000000..0e2b08260c8 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm @@ -0,0 +1,3 @@ +/obj/machinery/light + icon = 'modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi' + overlayicon = 'modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi' diff --git a/modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi b/modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi new file mode 100644 index 00000000000..bebf01b7b5f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi differ diff --git a/modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi b/modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi new file mode 100644 index 00000000000..f709acff37f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi differ diff --git a/modular_skyrat/modules/aesthetics/lightswitch/code/lightswitch.dm b/modular_skyrat/modules/aesthetics/lightswitch/code/lightswitch.dm new file mode 100644 index 00000000000..93149be1c7d --- /dev/null +++ b/modular_skyrat/modules/aesthetics/lightswitch/code/lightswitch.dm @@ -0,0 +1,2 @@ +/obj/machinery/light_switch + icon = 'modular_skyrat/modules/aesthetics/lightswitch/icons/lightswitch.dmi' diff --git a/modular_skyrat/modules/aesthetics/lightswitch/icons/lightswitch.dmi b/modular_skyrat/modules/aesthetics/lightswitch/icons/lightswitch.dmi new file mode 100644 index 00000000000..7990381d88c Binary files /dev/null and b/modular_skyrat/modules/aesthetics/lightswitch/icons/lightswitch.dmi differ diff --git a/modular_skyrat/modules/aesthetics/mining_shop/code/mining_shop.dm b/modular_skyrat/modules/aesthetics/mining_shop/code/mining_shop.dm new file mode 100644 index 00000000000..ef4166679a0 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/mining_shop/code/mining_shop.dm @@ -0,0 +1,2 @@ +/obj/machinery/mineral/equipment_vendor + icon = 'modular_skyrat/modules/aesthetics/mining_shop/icons/mining_shop.dmi' diff --git a/modular_skyrat/modules/aesthetics/mining_shop/icons/mining_shop.dmi b/modular_skyrat/modules/aesthetics/mining_shop/icons/mining_shop.dmi new file mode 100644 index 00000000000..022c8b3edb9 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/mining_shop/icons/mining_shop.dmi differ diff --git a/modular_skyrat/modules/aesthetics/morgue/code/morgue.dm b/modular_skyrat/modules/aesthetics/morgue/code/morgue.dm new file mode 100644 index 00000000000..96cc2afc816 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/morgue/code/morgue.dm @@ -0,0 +1,2 @@ +/obj/structure/bodycontainer + icon = 'modular_skyrat/modules/aesthetics/morgue/icons/morgue.dmi' diff --git a/modular_skyrat/modules/aesthetics/morgue/icons/morgue.dmi b/modular_skyrat/modules/aesthetics/morgue/icons/morgue.dmi new file mode 100644 index 00000000000..184f8c6d827 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/morgue/icons/morgue.dmi differ diff --git a/modular_skyrat/modules/aesthetics/newscaster/code/newscaster.dm b/modular_skyrat/modules/aesthetics/newscaster/code/newscaster.dm new file mode 100644 index 00000000000..fc6460e16de --- /dev/null +++ b/modular_skyrat/modules/aesthetics/newscaster/code/newscaster.dm @@ -0,0 +1,5 @@ +/obj/machinery/newscaster + icon = 'modular_skyrat/modules/aesthetics/newscaster/icons/newscaster.dmi' + +/obj/item/wallframe/newscaster + icon = 'modular_skyrat/modules/aesthetics/newscaster/icons/newscaster.dmi' diff --git a/modular_skyrat/modules/aesthetics/newscaster/icons/newscaster.dmi b/modular_skyrat/modules/aesthetics/newscaster/icons/newscaster.dmi new file mode 100644 index 00000000000..a65073c8abf Binary files /dev/null and b/modular_skyrat/modules/aesthetics/newscaster/icons/newscaster.dmi differ diff --git a/modular_skyrat/modules/aesthetics/plasticflaps/code/plasticflaps.dm b/modular_skyrat/modules/aesthetics/plasticflaps/code/plasticflaps.dm new file mode 100644 index 00000000000..0141e9c925a --- /dev/null +++ b/modular_skyrat/modules/aesthetics/plasticflaps/code/plasticflaps.dm @@ -0,0 +1,3 @@ +/obj/structure/plasticflaps + icon = 'modular_skyrat/modules/aesthetics/plasticflaps/icons/plasticflaps.dmi' + diff --git a/modular_skyrat/modules/aesthetics/plasticflaps/icons/plasticflaps.dmi b/modular_skyrat/modules/aesthetics/plasticflaps/icons/plasticflaps.dmi new file mode 100644 index 00000000000..16fd0740bd1 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/plasticflaps/icons/plasticflaps.dmi differ diff --git a/modular_skyrat/modules/aesthetics/rack/code/rack.dm b/modular_skyrat/modules/aesthetics/rack/code/rack.dm new file mode 100644 index 00000000000..fd26aec4dd8 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/rack/code/rack.dm @@ -0,0 +1,2 @@ +/obj/structure/rack + icon = 'modular_skyrat/modules/aesthetics/rack/icons/rack.dmi' diff --git a/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi b/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi new file mode 100644 index 00000000000..f2f514555c4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi differ diff --git a/modular_skyrat/modules/aesthetics/readme.md b/modular_skyrat/modules/aesthetics/readme.md new file mode 100644 index 00000000000..86869f377da --- /dev/null +++ b/modular_skyrat/modules/aesthetics/readme.md @@ -0,0 +1,30 @@ +https://github.com/Skyrat-SS13/Skyrat-tg/pull/248 + +## Title: General aesthetic change. + +MODULE ID: AESTHETICS + +### Description: + +This takes a few sprites from TauCeti station and ports them over to us. With a few sound modifications too. + +### TG Proc Changes: + +- Please see changed files on PR. Skyrat tags applied. + + +### Defines: + +- N/A + +### Master file additions + +- N/A + +### Included files that are not contained in this module: + +- N/A + + +### Credits: +Floof Ball#0798 / Kathrin Morrison diff --git a/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm b/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm new file mode 100644 index 00000000000..fff14fb4ed0 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm @@ -0,0 +1,3 @@ +/obj/machinery/requests_console + icon = 'modular_skyrat/modules/aesthetics/requests/icons/requests.dmi' + diff --git a/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi b/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi new file mode 100644 index 00000000000..cbfa65ba473 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi differ diff --git a/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm b/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm new file mode 100644 index 00000000000..b13a0657138 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/rollerbed/code/rollerbed.dm @@ -0,0 +1,5 @@ +/obj/structure/bed/roller + icon = 'modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi' + +/obj/item/roller + icon = 'modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi' diff --git a/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi b/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi new file mode 100644 index 00000000000..08d9996cad8 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/rollerbed/icons/rollerbed.dmi differ diff --git a/modular_skyrat/modules/aesthetics/shieldgen/code/shieldgen.dm b/modular_skyrat/modules/aesthetics/shieldgen/code/shieldgen.dm new file mode 100644 index 00000000000..2f636e7e0fc --- /dev/null +++ b/modular_skyrat/modules/aesthetics/shieldgen/code/shieldgen.dm @@ -0,0 +1,2 @@ +/obj/machinery/power/shieldwallgen + icon = 'modular_skyrat/modules/aesthetics/shieldgen/icons/shieldgen.dmi' diff --git a/modular_skyrat/modules/aesthetics/shieldgen/icons/shieldgen.dmi b/modular_skyrat/modules/aesthetics/shieldgen/icons/shieldgen.dmi new file mode 100644 index 00000000000..d571c7d956f Binary files /dev/null and b/modular_skyrat/modules/aesthetics/shieldgen/icons/shieldgen.dmi differ diff --git a/modular_skyrat/modules/aesthetics/status_display/code/status_display.dm b/modular_skyrat/modules/aesthetics/status_display/code/status_display.dm new file mode 100644 index 00000000000..e0c4b28ea90 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/status_display/code/status_display.dm @@ -0,0 +1,6 @@ +/obj/machinery/status_display + icon = 'modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi' + +/obj/machinery/status_display/LateInitialize() + . = ..() + set_picture("default") diff --git a/modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi b/modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi new file mode 100644 index 00000000000..d90bc65ce1a Binary files /dev/null and b/modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi differ diff --git a/modular_skyrat/modules/aesthetics/tools/code/tools.dm b/modular_skyrat/modules/aesthetics/tools/code/tools.dm new file mode 100644 index 00000000000..3058270706e --- /dev/null +++ b/modular_skyrat/modules/aesthetics/tools/code/tools.dm @@ -0,0 +1,5 @@ +/obj/item/crowbar/power + icon = 'modular_skyrat/modules/aesthetics/tools/icons/tools.dmi' + +/obj/item/screwdriver/power + icon = 'modular_skyrat/modules/aesthetics/tools/icons/tools.dmi' diff --git a/modular_skyrat/modules/aesthetics/tools/icons/tools.dmi b/modular_skyrat/modules/aesthetics/tools/icons/tools.dmi new file mode 100644 index 00000000000..5b09f41cf02 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/tools/icons/tools.dmi differ diff --git a/modular_skyrat/modules/aesthetics/wallmed/code/wallmed.dm b/modular_skyrat/modules/aesthetics/wallmed/code/wallmed.dm new file mode 100644 index 00000000000..2ce4c6a55d7 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/wallmed/code/wallmed.dm @@ -0,0 +1,2 @@ +/obj/machinery/vending/wallmed + icon = 'modular_skyrat/modules/aesthetics/wallmed/icons/wallmed.dmi' diff --git a/modular_skyrat/modules/aesthetics/wallmed/icons/wallmed.dmi b/modular_skyrat/modules/aesthetics/wallmed/icons/wallmed.dmi new file mode 100644 index 00000000000..5205e9622b6 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/wallmed/icons/wallmed.dmi differ diff --git a/modular_skyrat/modules/aesthetics/walls/code/walls.dm b/modular_skyrat/modules/aesthetics/walls/code/walls.dm new file mode 100644 index 00000000000..0ebe5189d95 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/walls/code/walls.dm @@ -0,0 +1,26 @@ +/turf/closed/wall + icon = 'modular_skyrat/modules/aesthetics/walls/icons/wall.dmi' + canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK) + +/turf/closed/wall/r_wall + icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' + +/turf/closed/wall/rust + icon = 'modular_skyrat/modules/aesthetics/walls/icons/wall.dmi' + icon_state = "wall-0" + base_icon_state = "wall" + +/turf/closed/wall/r_wall/rust + icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' + icon_state = "reinforced_wall-0" + base_icon_state = "reinforced_wall" + +/turf/closed/wall/rust/New(loc, ...) + . = ..() + var/mutable_appearance/rust = mutable_appearance(icon, "rust") + add_overlay(rust) + +/turf/closed/wall/r_wall/rust/New(loc, ...) + . = ..() + var/mutable_appearance/rust = mutable_appearance(icon, "rust") + add_overlay(rust) diff --git a/modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi b/modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi new file mode 100644 index 00000000000..9f10b2bc427 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi differ diff --git a/modular_skyrat/modules/aesthetics/walls/icons/wall.dmi b/modular_skyrat/modules/aesthetics/walls/icons/wall.dmi new file mode 100644 index 00000000000..fd48b11b9b1 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/walls/icons/wall.dmi differ diff --git a/modular_skyrat/modules/aesthetics/washing_machine/code/washing_machine.dm b/modular_skyrat/modules/aesthetics/washing_machine/code/washing_machine.dm new file mode 100644 index 00000000000..325bcea5a53 --- /dev/null +++ b/modular_skyrat/modules/aesthetics/washing_machine/code/washing_machine.dm @@ -0,0 +1,2 @@ +/obj/machinery/washing_machine + icon = 'modular_skyrat/modules/aesthetics/washing_machine/icons/washing_machine.dmi' diff --git a/modular_skyrat/modules/aesthetics/washing_machine/icons/washing_machine.dmi b/modular_skyrat/modules/aesthetics/washing_machine/icons/washing_machine.dmi new file mode 100644 index 00000000000..00edb65da87 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/washing_machine/icons/washing_machine.dmi differ diff --git a/modular_skyrat/modules/aesthetics/windows/code/windows.dm b/modular_skyrat/modules/aesthetics/windows/code/windows.dm new file mode 100644 index 00000000000..87115c7ad3b --- /dev/null +++ b/modular_skyrat/modules/aesthetics/windows/code/windows.dm @@ -0,0 +1,27 @@ +/obj/structure/window/fulltile + icon = 'modular_skyrat/modules/aesthetics/windows/icons/window.dmi' + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK) + +/obj/structure/window/reinforced/fulltile + icon = 'modular_skyrat/modules/aesthetics/windows/icons/r_window.dmi' + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK) + +/obj/structure/window/reinforced/tinted/fulltile + icon = 'modular_skyrat/modules/aesthetics/windows/icons/r_window_tinted.dmi' + icon_state = "reinforced_window-0" + base_icon_state = "reinforced_window" + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK) + +/obj/structure/window/plasma/fulltile + icon = 'modular_skyrat/modules/aesthetics/windows/icons/window_plasma.dmi' + icon_state = "window-0" + base_icon_state = "window" + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK) + +/obj/structure/window/plasma/reinforced/fulltile + icon = 'modular_skyrat/modules/aesthetics/windows/icons/r_window_plasma.dmi' + icon_state = "reinforced_window-0" + base_icon_state = "reinforced_window" + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK) + +/obj/structure/window/reinforced/fulltile/ice diff --git a/modular_skyrat/modules/aesthetics/windows/icons/r_window.dmi b/modular_skyrat/modules/aesthetics/windows/icons/r_window.dmi new file mode 100644 index 00000000000..7eeeb246284 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/windows/icons/r_window.dmi differ diff --git a/modular_skyrat/modules/aesthetics/windows/icons/r_window_plasma.dmi b/modular_skyrat/modules/aesthetics/windows/icons/r_window_plasma.dmi new file mode 100644 index 00000000000..8f86e2c3897 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/windows/icons/r_window_plasma.dmi differ diff --git a/modular_skyrat/modules/aesthetics/windows/icons/r_window_tinted.dmi b/modular_skyrat/modules/aesthetics/windows/icons/r_window_tinted.dmi new file mode 100644 index 00000000000..fdbdde498cc Binary files /dev/null and b/modular_skyrat/modules/aesthetics/windows/icons/r_window_tinted.dmi differ diff --git a/modular_skyrat/modules/aesthetics/windows/icons/window.dmi b/modular_skyrat/modules/aesthetics/windows/icons/window.dmi new file mode 100644 index 00000000000..3f9d36a06a4 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/windows/icons/window.dmi differ diff --git a/modular_skyrat/modules/aesthetics/windows/icons/window_plasma.dmi b/modular_skyrat/modules/aesthetics/windows/icons/window_plasma.dmi new file mode 100644 index 00000000000..0842930bb9a Binary files /dev/null and b/modular_skyrat/modules/aesthetics/windows/icons/window_plasma.dmi differ diff --git a/tgstation.dme b/tgstation.dme index b80ca5de448..b339f576824 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3273,6 +3273,42 @@ #include "modular_skyrat\master_files\code\modules\power\lighting.dm" #include "modular_skyrat\modules\admin\code\admin_help.dm" #include "modular_skyrat\modules\admin\code\loud_say.dm" +#include "modular_skyrat\modules\aesthetics\airalarm\code\airalarm.dm" +#include "modular_skyrat\modules\aesthetics\airlock\code\airlock.dm" +#include "modular_skyrat\modules\aesthetics\apc\code\apc.dm" +#include "modular_skyrat\modules\aesthetics\bench\code\bench.dm" +#include "modular_skyrat\modules\aesthetics\blast_door\code\blast_door.dm" +#include "modular_skyrat\modules\aesthetics\buttons\code\buttons.dm" +#include "modular_skyrat\modules\aesthetics\camera\code\camera.dm" +#include "modular_skyrat\modules\aesthetics\chairs\code\chair.dm" +#include "modular_skyrat\modules\aesthetics\computer\code\computer.dm" +#include "modular_skyrat\modules\aesthetics\crates\code\crates.dm" +#include "modular_skyrat\modules\aesthetics\disposals\code\disposals.dm" +#include "modular_skyrat\modules\aesthetics\emitter\code\emitter.dm" +#include "modular_skyrat\modules\aesthetics\extinguisher\code\extinguisher.dm" +#include "modular_skyrat\modules\aesthetics\firealarm\code\firealarm.dm" +#include "modular_skyrat\modules\aesthetics\firedoor\code\firedoor.dm" +#include "modular_skyrat\modules\aesthetics\floors\code\floors.dm" +#include "modular_skyrat\modules\aesthetics\guns\code\guns.dm" +#include "modular_skyrat\modules\aesthetics\heater\code\spaceheater.dm" +#include "modular_skyrat\modules\aesthetics\intercom\code\intercom.dm" +#include "modular_skyrat\modules\aesthetics\library\code\lib_items.dm" +#include "modular_skyrat\modules\aesthetics\lights\code\lighting.dm" +#include "modular_skyrat\modules\aesthetics\lightswitch\code\lightswitch.dm" +#include "modular_skyrat\modules\aesthetics\mining_shop\code\mining_shop.dm" +#include "modular_skyrat\modules\aesthetics\morgue\code\morgue.dm" +#include "modular_skyrat\modules\aesthetics\newscaster\code\newscaster.dm" +#include "modular_skyrat\modules\aesthetics\plasticflaps\code\plasticflaps.dm" +#include "modular_skyrat\modules\aesthetics\rack\code\rack.dm" +#include "modular_skyrat\modules\aesthetics\requests\code\requests_console.dm" +#include "modular_skyrat\modules\aesthetics\rollerbed\code\rollerbed.dm" +#include "modular_skyrat\modules\aesthetics\shieldgen\code\shieldgen.dm" +#include "modular_skyrat\modules\aesthetics\status_display\code\status_display.dm" +#include "modular_skyrat\modules\aesthetics\tools\code\tools.dm" +#include "modular_skyrat\modules\aesthetics\wallmed\code\wallmed.dm" +#include "modular_skyrat\modules\aesthetics\walls\code\walls.dm" +#include "modular_skyrat\modules\aesthetics\washing_machine\code\washing_machine.dm" +#include "modular_skyrat\modules\aesthetics\windows\code\windows.dm" #include "modular_skyrat\modules\alerts\code\config.dm" #include "modular_skyrat\modules\alerts\code\firealarm.dm" #include "modular_skyrat\modules\alerts\code\set_security_level.dm"