Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Aesthetics. Part 2 #76

Merged
merged 21 commits into from
Apr 18, 2024
Merged

Feat: Aesthetics. Part 2 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c4b22ef
Floors
AyIong Apr 13, 2024
9f8debd
AirAlarm
AyIong Apr 13, 2024
4bb2524
Blastdoor
AyIong Apr 13, 2024
dee2440
apc
AyIong Apr 14, 2024
7fc88df
light switch
AyIong Apr 14, 2024
ff0bbae
extinguisher
AyIong Apr 14, 2024
9eea553
lobby
AyIong Apr 14, 2024
6622106
Update extinguisher.dm
AyIong Apr 14, 2024
f8233f7
Cameras
AyIong Apr 14, 2024
29faf76
Full lobby sprites translate
AyIong Apr 14, 2024
5301480
Update cameras.dmi
AyIong Apr 14, 2024
637da19
fix large airlocks
AyIong Apr 17, 2024
516e79e
Skyrat
AyIong Apr 17, 2024
d110ce0
Да блять, нахуя я это тащил?
AyIong Apr 17, 2024
bbf9e84
Keycard auth
AyIong Apr 17, 2024
28307db
Update keycard_auth.dmi
AyIong Apr 17, 2024
99f6150
Lighting
AyIong Apr 18, 2024
e276cac
Disposal
AyIong Apr 18, 2024
ff11526
Radio
AyIong Apr 18, 2024
8b0e96f
Update radio.dmi
AyIong Apr 18, 2024
f484ee9
UHHHH
AyIong Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 36 additions & 3 deletions modular_bandastation/aesthetics/_aesthetics.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,46 @@
#include "_aesthetics.dm"

// AirAlarm
#include "airalarm/code/airalarm.dm"

// Airlocks
#include "airlocks/code/airlock.dm"
#include "airlocks/code/airlock_types.dm"
#include "airlocks/code/airlock_assembly_types.dm"

// APC
#include "apc/code/apc.dm"

// Blastdoor
#include "blastdoor/code/blastdoor.dm"

// Camera
#include "cameras/code/cameras.dm"

// Disposal
#include "disposal/code/disposal.dm"

// Extinguisher
#include "extinguisher/code/extinguisher.dm"

// Floors
#include "floors/code/floors.dm"

// Keycard Authenticator
#include "keycard_auth/code/keycard_auth.dm"

// Light Switch
#include "lightswitch/code/lightswitch.dm"

// Lights
#include "lights/code/lights.dm"

// Lobby Menu
#include "lobby/code/lobby.dm"

// Radio
#include "radio/code/radio.dm"

// Walls
#include "walls/code/walls.dm"

Expand All @@ -14,6 +50,3 @@

// WinDoors
#include "windoors/code/windoors.dm"

// Floors
#include "floors/code/floors.dm"
2 changes: 2 additions & 0 deletions modular_bandastation/aesthetics/airalarm/code/airalarm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/machinery/airalarm
icon = 'modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi'
Binary file added modular_bandastation/aesthetics/airalarm/icons/airalarm.dmi
View file
Open in desktop
Binary file not shown.
29 changes: 0 additions & 29 deletions modular_bandastation/aesthetics/airlocks/code/airlock_assembly_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,32 +159,3 @@
/obj/structure/door_assembly/multi_tile
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/glass_large.dmi'
overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi'

/obj/structure/door_assembly/multi_tile/command
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi'
airlock_type = /obj/machinery/door/airlock/multi_tile/command
glass_type = /obj/machinery/door/airlock/multi_tile/command/glass

/obj/structure/door_assembly/multi_tile/security
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi'
base_name = "security large airlock"
airlock_type = /obj/machinery/door/airlock/multi_tile/security
glass_type = /obj/machinery/door/airlock/multi_tile/security/glass

/obj/structure/door_assembly/multi_tile/engineering
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi'
base_name = "engineering large airlock"
airlock_type = /obj/machinery/door/airlock/multi_tile/engineering
glass_type = /obj/machinery/door/airlock/multi_tile/engineering/glass

/obj/structure/door_assembly/multi_tile/atmospheric
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi'
base_name = "atmospheric large airlock"
airlock_type = /obj/machinery/door/airlock/multi_tile/atmospheric
glass_type = /obj/machinery/door/airlock/multi_tile/atmospheric/glass

/obj/structure/door_assembly/multi_tile/supply
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi'
base_name = "supply large airlock"
airlock_type = /obj/machinery/door/airlock/multi_tile/supply
glass_type = /obj/machinery/door/airlock/multi_tile/supply/glass
39 changes: 1 addition & 38 deletions modular_bandastation/aesthetics/airlocks/code/airlock_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,43 +174,6 @@
overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi'
note_overlay_file = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi'

/obj/machinery/door/airlock/multi_tile/command
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi'
assemblytype = /obj/structure/door_assembly/multi_tile/command

/obj/machinery/door/airlock/multi_tile/security
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi'
assemblytype = /obj/structure/door_assembly/multi_tile/security

/obj/machinery/door/airlock/multi_tile/engineering
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi'
assemblytype = /obj/structure/door_assembly/multi_tile/engineering

/obj/machinery/door/airlock/multi_tile/atmospheric
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi'
assemblytype = /obj/structure/door_assembly/multi_tile/atmospheric

/obj/machinery/door/airlock/multi_tile/supply
icon = 'modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi'
assemblytype = /obj/structure/door_assembly/multi_tile/supply

// Multi-tile airlocks glass
/obj/machinery/door/airlock/multi_tile/command/glass
opacity = FALSE
glass = TRUE

/obj/machinery/door/airlock/multi_tile/security/glass
opacity = FALSE
glass = TRUE

/obj/machinery/door/airlock/multi_tile/engineering/glass
opacity = FALSE
glass = TRUE

/obj/machinery/door/airlock/multi_tile/atmospheric/glass
opacity = FALSE
glass = TRUE

/obj/machinery/door/airlock/multi_tile/supply/glass
/obj/machinery/door/airlock/multi_tile/public/glass
opacity = FALSE
glass = TRUE
Binary file removed modular_bandastation/aesthetics/airlocks/icons/glass_large/atmospheric_glass_large.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_bandastation/aesthetics/airlocks/icons/glass_large/command_glass_large.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_bandastation/aesthetics/airlocks/icons/glass_large/engineering_glass_large.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_bandastation/aesthetics/airlocks/icons/glass_large/glass_large.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_bandastation/aesthetics/airlocks/icons/glass_large/overlays.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_bandastation/aesthetics/airlocks/icons/glass_large/security_glass_large.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_bandastation/aesthetics/airlocks/icons/glass_large/supply_glass_large.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions modular_bandastation/aesthetics/apc/code/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/machinery/power/apc
icon = 'modular_bandastation/aesthetics/apc/icons/apc.dmi'
Binary file added modular_bandastation/aesthetics/apc/icons/apc.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions modular_bandastation/aesthetics/blastdoor/code/blastdoor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/machinery/door/poddoor
icon = 'modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi'
animation_sound = 'modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg'
Binary file added modular_bandastation/aesthetics/blastdoor/icons/blastdoor.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/blastdoor/sound/blastdoor.ogg
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_bandastation/aesthetics/cameras/code/cameras.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/obj/machinery/camera
icon = 'modular_bandastation/aesthetics/cameras/icons/cameras.dmi'

/obj/item/wallframe/camera
icon = 'modular_bandastation/aesthetics/cameras/icons/cameras.dmi'
Binary file added modular_bandastation/aesthetics/cameras/icons/cameras.dmi
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions modular_bandastation/aesthetics/disposal/code/disposal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/obj/machinery/disposal/bin
icon = 'modular_bandastation/aesthetics/disposal/icons/disposals.dmi'

/obj/machinery/disposal/delivery_chute
icon = 'modular_bandastation/aesthetics/disposal/icons/disposals.dmi'

/obj/structure/disposaloutlet
icon = 'modular_bandastation/aesthetics/disposal/icons/disposals.dmi'
Binary file added modular_bandastation/aesthetics/disposal/icons/disposals.dmi
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/obj/structure/extinguisher_cabinet
icon = 'modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi'

/obj/item/wallframe/extinguisher_cabinet
icon = 'modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi'
Binary file added modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_bandastation/aesthetics/floors/icons/floors.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions modular_bandastation/aesthetics/keycard_auth/code/keycard_auth.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/machinery/keycard_auth
icon = 'modular_bandastation/aesthetics/keycard_auth/icons/keycard_auth.dmi'
Binary file added modular_bandastation/aesthetics/keycard_auth/icons/keycard_auth.dmi
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions modular_bandastation/aesthetics/lights/code/lights.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/obj/machinery/light
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
overlay_icon = 'modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi'

/obj/machinery/light/small
icon = 'icons/obj/lighting.dmi'

/obj/machinery/light/floor
icon = 'icons/obj/lighting.dmi'
overlay_icon = 'icons/obj/lighting_overlay.dmi'

/obj/structure/light_construct
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'

/obj/structure/light_construct/small
icon = 'icons/obj/lighting.dmi'

/obj/item/wallframe/light_fixture
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'

/obj/item/wallframe/light_fixture/small
icon = 'icons/obj/lighting.dmi'
Binary file added modular_bandastation/aesthetics/lights/icons/lighting.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions modular_bandastation/aesthetics/lightswitch/code/lightswitch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/machinery/light_switch
icon = 'modular_bandastation/aesthetics/lightswitch/icons/lightswitch.dmi'

/obj/machinery/light_switch/interact(mob/user)
. = ..()
playsound(src, 'modular_bandastation/aesthetics/lightswitch/sound/lightswitch.ogg', 100, 1)
Binary file added modular_bandastation/aesthetics/lightswitch/icons/lightswitch.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/lightswitch/sound/lightswitch.ogg
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions modular_bandastation/aesthetics/lobby/code/lobby.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/atom/movable/screen/lobby/button/ready
icon = 'modular_bandastation/aesthetics/lobby/icons/ready.dmi'

/atom/movable/screen/lobby/button/join
icon = 'modular_bandastation/aesthetics/lobby/icons/join.dmi'

/atom/movable/screen/lobby/button/observe
icon = 'modular_bandastation/aesthetics/lobby/icons/observe.dmi'

/atom/movable/screen/lobby/button/character_setup
icon = 'modular_bandastation/aesthetics/lobby/icons/character_setup.dmi'
Binary file added modular_bandastation/aesthetics/lobby/icons/character_setup.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/lobby/icons/join.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/lobby/icons/observe.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/lobby/icons/ready.dmi
View file
Open in desktop
Binary file not shown.
26 changes: 26 additions & 0 deletions modular_bandastation/aesthetics/radio/code/radio.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/obj/item/radio/headset
icon = 'modular_bandastation/aesthetics/radio/icons/headsets.dmi'

/obj/item/radio
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/implant/radio
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/uplink
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/implant/uplink
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/antag_spawner/nuke_ops
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/nuclear_challenge
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/beacon
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'

/obj/item/sbeacondrop
icon = 'modular_bandastation/aesthetics/radio/icons/radio.dmi'
Binary file added modular_bandastation/aesthetics/radio/icons/headsets.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/aesthetics/radio/icons/radio.dmi
View file
Open in desktop
Binary file not shown.
Loading