Skip to content

Commit

Permalink
Merge branch 'master' into spacepods
Browse files Browse the repository at this point in the history
  • Loading branch information
MrRomainzZ authored Mar 8, 2024
2 parents aecb799 + b513350 commit cc7f266
Show file tree
Hide file tree
Showing 1,314 changed files with 42,410 additions and 53,146 deletions.
50 changes: 43 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,28 @@ The previous code made compliant:
code
```

### Do not compare boolean values to TRUE or FALSE

Do not compare boolean values to TRUE or FALSE. For TRUE you should just check if there's a value in that address. For FALSE you should use the ! operator. An exception is made to this when working with JS or other external languages. If a function/variable can contain more values beyond null/0 or TRUE, use numbers and defines instead of true/false comparisons.

```dm
// Bad
var/thing = pick(list(TRUE, FALSE))
if(thing == TRUE)
return "bleh"
var/other_thing = pick(list(TRUE, FALSE))
if(other_thing == FALSE)
return "meh"
// Good
var/thing = pick(list(TRUE, FALSE))
if(thing)
return "bleh"
var/other_thing = pick(list(TRUE, FALSE))
if(!other_thing)
return "meh"
```

### User Interfaces

All new user interfaces in the game must be created using the TGUI framework. Documentation can be found inside the [`tgui/docs`](../tgui/docs) folder, and the [`README.md`](../tgui/README.md) file. This is to ensure all ingame UIs are snappy and respond well. An exception is made for user interfaces which are purely for OOC actions (Such as character creation, or anything admin related)
Expand All @@ -154,6 +176,19 @@ All new user interfaces in the game must be created using the TGUI framework. Do

The use of the `:` operator to override type safety checks is not allowed. You must cast the variable to the proper type.

### Do not access return value vars directly from functions

The use of the pointer operator, `.`, should not be used to access the return values of functions directly. This can cause unintended behavior and is difficult to read.

```dm
//Bad
var/our_x = get_turf(thing).x
//Good
var/turf/our_turf = get_turf(thing)
var/our_x = our_turf.x
```

### Type paths must begin with a /

eg: `/datum/thing`, not `datum/thing`
Expand Down Expand Up @@ -354,7 +389,7 @@ This is clearer and enhances readability of your code! Get used to doing it!

### Player Output

Due to the use of "Goonchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob << "message"`, you must use `to_chat(mob, "message")`. Failure to do so will lead to your code not working.
Due to the use of "TGchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob << "message"`, you must use `to_chat(mob, "message")`. Failure to do so will lead to your code not working.

### Use early returns

Expand Down Expand Up @@ -753,7 +788,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
`Headcoders` are the overarching "administrators" of the repository. People included in this role are:

* [farie82](https://github.com/farie82)
* [Charliminator](https://github.com/hal9000PR)
* [S34N](https://github.com/S34NW)
* [SteelSlayer](https://github.com/SteelSlayer)

---
Expand All @@ -762,19 +797,20 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c


* [AffectedArc07](https://github.com/AffectedArc07)
* [Charliminator](https://github.com/hal9000PR)
* [lewcc](https://github.com/lewcc)
* [S34N](https://github.com/S34NW)

---

`Review Team` members are people who are denoted as having reviews which can affect mergeability status. People included in this role are:

* [lewcc](https://github.com/lewcc)
* [S34N](https://github.com/S34NW)
* [Sirryan2002](https://github.com/Sirryan2002)
* [Contrabang](https://github.com/Contrabang)
* [Burzah](https://github.com/Burzah)
* [Charliminator](https://github.com/hal9000PR)
* [Contrabang](https://github.com/Contrabang)
* [DGamerL](https://github.com/DGamerL)
* [Henri215](https://github.com/Henri215)
* [lewcc](https://github.com/lewcc)
* [Sirryan2002](https://github.com/Sirryan2002)
* [Warriorstar](https://github.com/warriorstar-orion)

---
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ jobs:
python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
python -m tools.ci.check_icon_conflicts
python -m tools.ci.check_icon_dupenames
python -m tools.maplint.source --github
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
- name: Annotate Lints
uses: yogstation13/DreamAnnotate@v2
if: always()
with:
outputFile: output-annotations.txt
- name: Run DreamChecker
shell: bash
run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh

odlint:
name: Lint with OpenDream
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*.dmb
*.lk

# ignore tmp files generated by icon save operations
/tmp/*

#ignore any files in config/, except those in subdirectories.
/config/*
!config/**/*/
Expand Down
2 changes: 1 addition & 1 deletion _build_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file has all the information on what versions of libraries are thrown into the code
# For dreamchecker
export SPACEMANDMM_TAG=suite-1.7.1
export SPACEMANDMM_TAG=suite-1.8
# For TGUI
export NODE_VERSION=20
# Stable Byond Major
Expand Down
Loading

0 comments on commit cc7f266

Please sign in to comment.