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.

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

Re lore #2

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3d8d78b
Create super-linter.yml
Guidesu Oct 21, 2023
e9b983a
Merge branch 'Skyrat-SS13:master' into master
Guidesu Oct 21, 2023
650ed5f
Update README.md
Guidesu Oct 23, 2023
1576e88
Merge branch 'Skyrat-SS13:master' into master
Guidesu Oct 23, 2023
ca760ec
Merge remote-tracking branch 'upstream/master'
Guidesu Oct 23, 2023
87766f9
General lore changes
Guidesu Oct 23, 2023
412a9be
options
Guidesu Oct 23, 2023
2a1b338
Update README.md
Guidesu Oct 23, 2023
3114bb9
Revert "General lore changes"
Guidesu Oct 23, 2023
aa4ba51
Revert "Revert "General lore changes""
Guidesu Oct 23, 2023
04aa760
Merge remote-tracking branch 'upstream/master'
Guidesu Oct 25, 2023
c41502b
Merge remote-tracking branch 'upstream/master'
Guidesu Oct 27, 2023
d977459
Merge remote-tracking branch 'upstream/master'
Guidesu Oct 29, 2023
2e2734e
test
Guidesu Oct 29, 2023
88c3d98
entry 2
Guidesu Oct 29, 2023
1456302
Update jobconfig.toml
Guidesu Oct 29, 2023
46c3d39
3
Guidesu Oct 29, 2023
ab8df35
4
Guidesu Oct 31, 2023
69f4bb6
5
Guidesu Oct 31, 2023
246f942
Revert "5"
Guidesu Oct 31, 2023
f49d3ba
Merge remote-tracking branch 'upstream/master'
Guidesu Oct 31, 2023
a38c0d2
a
Guidesu Oct 31, 2023
e00db5d
Merge branch 'master' into re-lore
Guidesu Oct 31, 2023
686bc1f
Update settings.json
Guidesu Jan 16, 2024
dca6779
nova sector port
Guidesu Jan 16, 2024
4d34ca3
nova sector port
Guidesu Jan 16, 2024
d5b213d
Revert "nova sector port"
Guidesu Jan 16, 2024
52661ff
Revert "nova sector port"
Guidesu Jan 16, 2024
79475aa
Squashed commit of the following:
Guidesu Jan 17, 2024
a98bc2c
nova sector port
Guidesu Jan 17, 2024
92303a5
Big change 2
Guidesu Jan 19, 2024
d73847e
2
Guidesu Jan 30, 2024
fc10f02
Revert "Big change 2"
Guidesu Jan 30, 2024
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 6 additions & 30 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,20 @@
# to the same file or dir, add them to the end under Multiple Owners

# GoldenAlpharex
/modular_skyrat/ @GoldenAlpharex
/.github/workflows/ @GoldenAlpharex
/SQL/ @GoldenAlpharex
/tools/ @GoldenAlpharex

# Jake Park
/modular_skyrat/modules/apocolypse_of_scythes/ @jjpark-kb
/modular_skyrat/modules/ash_chemical_centrifuge/ @jjpark-kb
/modular_skyrat/modules/ash_farming/ @jjpark-kb
/modular_skyrat/modules/ashwalker_change/ @jjpark-kb
/modular_skyrat/modules/ashwalker_shaman/ @jjpark-kb
/modular_skyrat/modules/borg_buffs/ @jjpark-kb
/modular_skyrat/modules/cargo_teleporter/ @jjpark-kb
/modular_skyrat/modules/conveyor_sorter/ @jjpark-kb
/modular_skyrat/modules/cortical_borer/ @jjpark-kb
/modular_skyrat/modules/connecting_computer/ @jjpark-kb
/modular_skyrat/modules/fishing/ @jjpark-kb
/modular_skyrat/modules/positronic_alert_console/ @jjpark-kb
/modular_skyrat/modules/primitive_production/ @jjpark-kb
/modular_skyrat/modules/reagent_forging/ @jjpark-kb
/modular_skyrat/modules/xenoarch/ @jjpark-kb
/modular_nova/ @GoldenAlpharex
/icons/ @GoldenAlpharex

# Jolly-66
/modular_skyrat/modules/mapping @Jolly-66
/modular_nova/modules/mapping @Jolly-66
/tools/UpdatePaths @Jolly-66

# LT3
/code/modules/transport/ @lessthnthree
/modular_skyrat/master_files/code/controllers/subsystem/ @lessthnthree
/modular_skyrat/modules/advanced_engineering/ @lessthnthree
/modular_skyrat/modules/airlock_override/ @lessthnthree
/modular_skyrat/modules/alerts/ @lessthnthree
/modular_skyrat/modules/cme/ @lessthnthree
/modular_skyrat/modules/events/ @lessthnthree
/modular_skyrat/modules/ices_events/ @lessthnthree

# Multiple Owners

# Maptainers
/_maps/ @Jolly-66 @KathrinBailey
/_maps/ @Jolly-66

# Expensive files that touching basically always cause performance problems
## Init times
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ If you are porting features/tools from other codebases, you must give them credi

Regarding sprites & sounds, you must credit the artist and possibly the codebase. All /tg/station assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.

Regarding sprites in particular, you still need to take your own screenshots of the sprites in-game on your Skyrat code in your PR body, not just re-use the screenshots provided in the original PR.
Regarding sprites in particular, you still need to take your own screenshots of the sprites in-game on your Nova Sector code in your PR body, not just re-use the screenshots provided in the original PR.

## Banned content
Do not add any of the following in a Pull Request or risk getting the PR closed:
Expand Down
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: Bug report
about: Create a report to help reproduce and fix the issue
---
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable -->

## Issue Summary

<!-- Briefly explain your issue in a few plain sentences, e.g. "X has Y issue" "When I do X, Y happens instead of Z" "X on Y map has Z issue". You may copy and paste the issue title here if it is suitable. -->

## Round ID:

<!--- **INCLUDE THE ROUND ID**
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->

## How This Contributes To The Skyrat Roleplay Experience
## How This Contributes To The Nova Sector Roleplay Experience

<!-- Please add a short description of why you think these changes would benefit the game and the roleplay atmosphere of the server. If you can't justify it in words, it might not be worth adding. -->

Expand Down
2 changes: 0 additions & 2 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@
# Format is version: map
# Example:
# 500.1337: runtimestation

515.1603: runtimestation
1 change: 1 addition & 0 deletions .github/gbp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ reset_label = "GBP: Reset"
"Code Improvement" = 2
"Documentation" = 1
"Feature" = -6
"Good First PR" = 6
"Feedback" = 2
"Fix" = 3
"Grammar and Formatting" = 1
Expand Down
2 changes: 1 addition & 1 deletion .github/guides/CI.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If after reading this guide you still do not understand why a check suite is fai
The [linters](https://en.wikipedia.org/wiki/Lint_(software)) check the maps and code for common mistakes. This includes things like:

- Files not being included in the .dme
- Misspelling Nanotrasen as NanoTrasen
- Misspelling Symphionia as Symphionia
- Unformatted map files

Sometimes linters will fail, but you won't see anything in the "Run Linters" tab. If you open up the action, it might look like this:
Expand Down
41 changes: 41 additions & 0 deletions .github/guides/STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,47 @@ world.log << "[apples] apples left, taking one."
apples--
```

### initial() versus ::
`::` is a compile time scope operator which we use as an alternative to `initial()`.
It's used within the definition of a datum as opposed to `Initialize` or other procs.

```dm
// Bad
/atom/thing/better
name = "Thing"

/atom/thing/better/Initialize()
var/atom/thing/parent = /atom/thing
desc = inital(parent)

// Good
/atom/thing/better
name = "Thing"
desc = /atom/thing::desc
```

Another good use for it easy access of the parent's variables.
```dm
/obj/item/fork/dangerous
damage = parent_type::damage * 2
```

```dm
/obj/item/fork
flags_1 = parent_type::flags_1 | FLAG_COOLER
```


It's important to note that `::` does not apply to every application of `initial()`.
Primarily in cases where the type you're using for the initial value is not static.

For example,
```dm
/proc/cmp_subsystem_init(datum/controller/subsystem/a, datum/controller/subsystem/b)
return initial(b.init_order) - initial(a.init_order)
```
could not use `::` as the provided types are not static.

## Procs

### Getters and setters
Expand Down
10 changes: 6 additions & 4 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Changes to a .dmm or anything in the _map subfolder
# Changes to anything in the _map subfolder
Map Modification:
- '_maps/**'
- changed-files:
- any-glob-to-any-file: '_maps/**'

# Chganges to a .dmi
# Changes to a .dmi
Sprites:
- '**/*.dmi'
- changed-files:
- any-glob-to-any-file: '**/*.dmi'
2 changes: 1 addition & 1 deletion .github/workflows/auto_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
script: |
const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')
await processAutoChangelog({ github, context })
github-token: ${{ secrets.SKYRATBOT_TOKEN || secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.NOVABOT_TOKEN || secrets.GITHUB_TOKEN }}
3 changes: 0 additions & 3 deletions .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jobs:
- name: Install rust-g
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
bash tools/ci/install_rust_g.sh
- name: Compile and generate Autowiki files
if: steps.secrets_set.outputs.SECRETS_ENABLED
Expand Down
Loading
Loading