Skip to content

Commit

Permalink
Feat: Aesthetics. Part 2 (tgstation#76)
Browse files Browse the repository at this point in the history
## About The Pull Request
Продолжение - ss220club#27
Fixes #4 

Новая спрайты для кучки говна. 
Надо ещё много отсмотреть и поменять, так шо пока драфт.
Из самого главного:
Полы, лобби, настенный огнетушитель, выключатель света и... чёт ещё
<details><summary> Игра </summary>


![image](https://github.com/ss220club/Bandastation/assets/69762909/376c72b0-8dcc-4890-a500-1b2fe96d8566)

</details>
<details><summary> Лобби </summary>


![image](https://github.com/ss220club/Bandastation/assets/69762909/70985d6d-97c3-48ab-a728-ada36ff20f4b)

![image](https://github.com/ss220club/Bandastation/assets/69762909/b732acb1-6f26-4998-bbc8-2c5502dce74e)

![image](https://github.com/ss220club/Bandastation/assets/69762909/4e171c91-eeae-4664-ab11-a492f7b6cf84)

</details>

## TODO

- [x] Keycard Auth
- [x] Венты и скрабберы (Ну его нахуй, слишком много работы из-за того
что у наших вентов 55 кадров!)
- [x] Лампочки
- [x] Наушники и рации с пары
- [x] Мусорки

## Why It's Good For The Game
Привычные спрайты
  • Loading branch information
AyIong authored Apr 18, 2024
1 parent a94bed3 commit 6fc067c
Show file tree
Hide file tree
Showing 40 changed files with 129 additions and 70 deletions.
39 changes: 36 additions & 3 deletions modular_bandastation/aesthetics/_aesthetics.dme
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
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 not shown.
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
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions modular_bandastation/aesthetics/apc/code/apc.dm
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
Binary file not shown.
3 changes: 3 additions & 0 deletions modular_bandastation/aesthetics/blastdoor/code/blastdoor.dm
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 not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_bandastation/aesthetics/cameras/code/cameras.dm
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 not shown.
8 changes: 8 additions & 0 deletions modular_bandastation/aesthetics/disposal/code/disposal.dm
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 not shown.
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 not shown.
Binary file modified modular_bandastation/aesthetics/floors/icons/floors.dmi
Binary file not shown.
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 not shown.
22 changes: 22 additions & 0 deletions modular_bandastation/aesthetics/lights/code/lights.dm
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 not shown.
Binary file not shown.
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 not shown.
Binary file not shown.
11 changes: 11 additions & 0 deletions modular_bandastation/aesthetics/lobby/code/lobby.dm
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 26 additions & 0 deletions modular_bandastation/aesthetics/radio/code/radio.dm
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 not shown.
Binary file not shown.

0 comments on commit 6fc067c

Please sign in to comment.