Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ indent_size = 2
[*.py]
indent_style = space

[/tgui/**/*.{js,styl,ract,json,html}]
[/tgui/**/*.{js,ts,tsx,jsx,scss,json,html}]
indent_style = space
indent_size = 2

[*.ts]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
run: |
ls -h $HOME/
source $HOME/BYOND/byond/bin/byondsetup
DreamMaker roguetown.dme
tools/build/build.sh

- name: Check for errors
id: check-errors
Expand Down
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ __pycache__/
# Distribution / packaging
.Python
env/
build/
/build/
develop-eggs/
dist/
downloads/
eggs/
/lib/
/lib64/
.eggs/
lib/
lib64/
parts/
sdist/
var/
Expand Down Expand Up @@ -197,6 +197,7 @@ Temporary Items
*.vscode/*
!/.vscode/extensions.json
!/.vscode/launch.json
!/.vscode/tasks.json
tools/MapAtmosFixer/MapAtmosFixer/obj/*
tools/MapAtmosFixer/MapAtmosFixer/bin/*

Expand Down Expand Up @@ -227,3 +228,5 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
!/config/title_music/sounds/title1.ogg
/config/title_screens/images/*
!/config/title_screens/images/exclude

*.test.dme
86 changes: 86 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "process",
"command": "tools/build/build.sh",
"windows": {
"command": ".\\tools\\build\\build.bat"
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build",
"isDefault": true
},
"dependsOn": "dm: reparse",
"label": "Build All"
},
{
"type": "dreammaker",
"dme": "tgstation.dme",
"problemMatcher": ["$dreammaker"],
"group": "build",
"label": "dm: build - tgstation.dme"
},
{
"command": "${command:dreammaker.reparse}",
"group": "build",
"label": "dm: reparse"
},
{
"type": "shell",
"command": "bin/tgui-build",
"windows": {
"command": ".\\bin\\tgui-build.cmd"
},
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: build"
},
{
"type": "shell",
"command": "bin/tgui-dev",
"windows": {
"command": ".\\bin\\tgui-dev.cmd"
},
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: dev server"
},
{
"type": "shell",
"command": "bin/tgfont",
"windows": {
"command": ".\\bin\\tgfont.cmd"
},
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: rebuild tgfont"
},
{
"type": "process",
"command": "tools/build/build.sh",
"args": ["-DLOWMEMORYMODE"],
"windows": {
"command": ".\\tools\\build\\build.bat",
"args": ["-DLOWMEMORYMODE"]
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build"
},
"dependsOn": "dm: reparse",
"label": "Build All (low memory mode)"
},
]
}
2 changes: 2 additions & 0 deletions BUILD.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\tools\build\build.bat" --wait-on-error build %*
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ This is the codebase for Solaris Ridge; a new high-fantasy take on [Space Statio
**Please note that this repository contains sexually explicit content and is not suitable for those under the age of 18.**

## Compilation
At the moment, Solaris Ridge **does not use juke build**. In order to build the repository, you presently need to compile it within DreamMaker!

**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.

**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.

**Building tgstation in DreamMaker directly is deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.

**[How to compile in VSCode and other build options](tools/build/README.md).**


## LICENSE

Expand Down
2 changes: 2 additions & 0 deletions bin/build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error build %*
2 changes: 2 additions & 0 deletions bin/clean.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error clean-all %*
2 changes: 2 additions & 0 deletions bin/server.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error server %*
2 changes: 2 additions & 0 deletions bin/test.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error dm-test %*
2 changes: 2 additions & 0 deletions bin/tgfont.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tg-font %*
3 changes: 3 additions & 0 deletions bin/tgui-bench.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-bench %*
pause
2 changes: 2 additions & 0 deletions bin/tgui-build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui tgui-lint tgui-test %*
2 changes: 2 additions & 0 deletions bin/tgui-dev.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-dev %*
2 changes: 2 additions & 0 deletions bin/tgui-sonar.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-sonar %*
2 changes: 2 additions & 0 deletions code/__DEFINES/_helpers.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// Takes a datum as input, returns its ref string
#define text_ref(datum) ref(datum)
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
#define COMSIG_PREQDELETED "parent_preqdeleted"
/// just before a datum's Destroy() is called: (force), at this point none of the other components chose to interrupt qdel and Destroy will be called
#define COMSIG_QDELETING "parent_qdeleting"
/// from datum ui_act (usr, action)
#define COMSIG_UI_ACT "COMSIG_UI_ACT"
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_tgui.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// Window is fully visible and we can make fragile calls
#define COMSIG_TGUI_WINDOW_VISIBLE "tgui_window_visible"
3 changes: 3 additions & 0 deletions code/__DEFINES/interaction_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
#define INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND (1<<7)
/// adds hiddenprints instead of fingerprints on interact
#define INTERACT_ATOM_NO_FINGERPRINT_INTERACT (1<<8)
/// ignores mobility check
#define INTERACT_ATOM_IGNORE_MOBILITY (1<<9)


/// attempt pickup on attack_hand for items
#define INTERACT_ITEM_ATTACK_HAND_PICKUP (1<<0)
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ GLOBAL_LIST_INIT(our_forest_sex, typecacheof(list(

#define isslime(A) (istype(A, /mob/living/simple_animal/slime))

#define isdrone(A) (istype(A, /mob/living/simple_animal/drone))

#define iscat(A) (istype(A, /mob/living/simple_animal/pet/cat))

#define isdog(A) (istype(A, /mob/living/simple_animal/pet/dog))
Expand Down
Loading
Loading