forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 34
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.
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 1 #27
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
60aeee3
That's trash
AyIong 4bcfad3
Walls and windows
AyIong 66efb2c
Windoors & dirwindows
AyIong 3497767
Airlocks
AyIong 8786110
Floors
AyIong e06adac
Airlock fix
AyIong 001233c
Grunge airlock fix and cleanup
AyIong 10c0284
Test fix?
AyIong 49cc2b0
???
AyIong 499c560
ДА ЕБИСЬ ТЫ СУКА В РОТ. СОРТИРОВКА ЕМУ БЛЯТЬ НЕ НРАВИТСЯ
AyIong 0c33c99
Miss some floors
AyIong febfca8
Frosted
AyIong 84518a8
Not paintable plasma/tinted windows
AyIong File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,19 @@ | ||
| #include "_aesthetics.dm" | ||
|
|
||
| #include "airalarm\code\airalarm.dm" | ||
| #include "airlocks\code\airlock.dm" | ||
| #include "airlocks\code\airlock_types.dm" | ||
| #include "airlocks\code\airlock_assembly_types.dm" | ||
| #include "apc\code\apc.dm" | ||
| // #include "atm\code\atm.dm" // Unused | ||
| // #include "atmospherics\code\atmospherics.dm" // Need more sprites | ||
| // #include "better_ids\code\better_ids.dm" // Need to change a lot | ||
| #include "blastdoor\code\blastdoor.dm" | ||
| // #include "boxes\code\boxes.dm" // Need to change a lot | ||
| #include "cameras\code\cameras.dm" | ||
| // #include "chairs\code\chairs.dm" // TG already uses these | ||
| // #include "decals\code\decals.dm" // Didn't check this new one | ||
| // #include "defib\code\defib.dm" // TG already uses these | ||
| #include "dirwindows\code\dirwindows.dm" | ||
| // #include "door_control\code\door_control.dm" // Unused | ||
| // #include "extinguisher\code\extinguisher.dm" // Need more sprites | ||
| // #include "firealarm\code\firealarm.dm" // Need more sprites | ||
| // #include "floors\code\floors.dm" // Need to change a lot | ||
| // #include "floors\code\tile_types.dm" // Need to change a lot | ||
| // #include "hydroponics\code\hydroponics.dm" // TG already uses these | ||
| // #include "intercom\code\intercom.dm" // TG already uses these | ||
| #include "keycard\code\keycard.dm" | ||
| #include "labeler\code\labeler.dm" | ||
| // #include "library\code\library.dm" // TG already uses these | ||
| #include "light_switch\code\light_switch.dm" | ||
| #include "newscaster\code\newscaster.dm" | ||
| // #include "piano\code\piano.dm" // Unused | ||
| #include "racks\code\racks.dm" | ||
| #include "requests_console\code\requests_console.dm" | ||
| // #include "safe\code\safe.dm" // TG already uses these | ||
| #include "shutters\code\shutters.dm" | ||
| // #include "soap\code\soap.dm" // Unused | ||
| #include "surgery_table\code\surgery_table.dm" | ||
| // #include "toolboxes\code\toolboxes.dm" // TG already uses these | ||
| // #include "wallcloset\code\wallcloset.dm" // Unused | ||
| #include "walls\code\walls.dm" | ||
| #include "windoor\code\windoor.dm" | ||
| // #include "windows\code\windows.dm" // Need more sprites and fixes | ||
| // #include "windowtint\code\windowtint.dm" // Unused? | ||
| // #include "zippo\code\zippo.dm" // Unused | ||
| // Airlocks | ||
| #include "airlocks/code/airlock.dm" | ||
| #include "airlocks/code/airlock_types.dm" | ||
| #include "airlocks/code/airlock_assembly_types.dm" | ||
|
|
||
| // Walls | ||
| #include "walls/code/walls.dm" | ||
|
|
||
| // Windows | ||
| #include "windows/code/full_tile_windows.dm" | ||
| #include "windows/code/directional_windows.dm" | ||
|
|
||
| // WinDoors | ||
| #include "windoors/code/windoors.dm" | ||
|
|
||
| // Floors | ||
| #include "floors/code/floors.dm" |
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Есть же дефайны для этого, нет?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ну, могу в дефайны вынести, только толку?
А те дефайны что есть не для тех стейтов