Skip to content

Commit e7fde56

Browse files
Merge branch 'Bleeding-Edge' into grind-list-consistency
2 parents 5640b14 + 29efaf0 commit e7fde56

File tree

1,014 files changed

+283466
-333380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,014 files changed

+283466
-333380
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,19 @@ jobs:
3838
steps:
3939
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4040
- uses: actions/checkout@v3
41-
- uses: actions/setup-python@v4
42-
with:
43-
python-version: '3.x'
41+
# - uses: actions/setup-python@v4
42+
# with:
43+
# python-version: '3.x'
44+
45+
- name: Setup Python
46+
run: |
47+
tools/bootstrap/python -c ''
4448
4549
#TODO: Cache Dreamchecker install
4650
- name: Run dreamchecker
4751
run: |
4852
SPACEMAN_DMM_GIT_TAG="suite-1.8" tools/travis/install_spaceman_dmm.sh dreamchecker
49-
~/dreamchecker
53+
~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
5054
5155
- name: Run map checker
5256
run: python tools/travis/check_map_files.py maps/
@@ -59,6 +63,17 @@ jobs:
5963
- name: Make sure test maps or vaults aren't ticked
6064
run: find -name '*.dme' -exec cat {} \; | awk '/maps\\test.*|\.dmm/ { exit 1 }'
6165

66+
# OpenDream linting
67+
- name: Install OpenDream
68+
uses: robinraju/release-downloader@v1.9
69+
with:
70+
repository: "OpenDreamProject/OpenDream"
71+
tag: "latest"
72+
fileName: "DMCompiler_linux-x64.tar.gz"
73+
extract: true
74+
- name: Run OpenDream
75+
run: ./DMCompiler_linux-x64/DMCompiler vgstation13.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh
76+
6277
build:
6378
name: ${{matrix.job-name}}
6479
runs-on: ubuntu-latest

.github/workflows/update_tgs_dmapi.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Update the TGS DMAPI
1212
steps:
1313
- name: Clone
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Branch
1717
run: |
@@ -21,15 +21,16 @@ jobs:
2121
2222
- name: Apply DMAPI update
2323
uses: tgstation/tgs-dmapi-updater@v2
24+
id: dmapi-update
2425
with:
2526
header-path: '__DEFINES/tgs.dm'
2627
library-path: 'code/modules/tgs'
2728

2829
- name: Commit and Push
2930
continue-on-error: true
3031
run: |
31-
git config user.name tgstation-server
32-
git config user.email tgstation-server@users.noreply.github.com
32+
git config user.name "tgstation-server-ci[bot]"
33+
git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com"
3334
git add .
3435
git commit -m 'Update TGS DMAPI'
3536
git push -f -u origin tgs-dmapi-update
@@ -41,7 +42,7 @@ jobs:
4142
source_branch: "tgs-dmapi-update"
4243
destination_branch: "Bleeding-Edge"
4344
pr_title: "Automatic TGS DMAPI Update"
44-
pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: __DEFINES/tgs.dm before merging."
45+
pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: __DEFINES/tgs.dm before merging.\n\n${{ steps.dmapi-update.outputs.release-notes }}"
4546
pr_label: "System"
4647
pr_allow_empty: false
4748
github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ Thumbs.db
7777

7878
# Bootstrapped node installation for the tgui build system
7979
.cache
80+
81+
# Running OpenDream locally
82+
vgstation13.json

GPLv3.txt

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 72 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
GNU GENERAL PUBLIC LICENSE
2-
Version 3, 29 June 2007
31

4-
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
2+
GNU AFFERO GENERAL PUBLIC LICENSE
3+
Version 3, 19 November 2007
4+
5+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
56
Everyone is permitted to copy and distribute verbatim copies
67
of this license document, but changing it is not allowed.
78

89
Preamble
910

10-
The GNU General Public License is a free, copyleft license for
11-
software and other kinds of works.
11+
The GNU Affero General Public License is a free, copyleft license for
12+
software and other kinds of works, specifically designed to ensure
13+
cooperation with the community in the case of network server software.
1214

1315
The licenses for most software and other practical works are designed
1416
to take away your freedom to share and change the works. By contrast,
15-
the GNU General Public License is intended to guarantee your freedom to
17+
our General Public Licenses are intended to guarantee your freedom to
1618
share and change all versions of a program--to make sure it remains free
17-
software for all its users. We, the Free Software Foundation, use the
18-
GNU General Public License for most of our software; it applies also to
19-
any other work released this way by its authors. You can apply it to
20-
your programs, too.
19+
software for all its users.
2120

2221
When we speak of free software, we are referring to freedom, not
2322
price. Our General Public Licenses are designed to make sure that you
@@ -26,44 +25,34 @@ them if you wish), that you receive source code or can get it if you
2625
want it, that you can change the software or use pieces of it in new
2726
free programs, and that you know you can do these things.
2827

29-
To protect your rights, we need to prevent others from denying you
30-
these rights or asking you to surrender the rights. Therefore, you have
31-
certain responsibilities if you distribute copies of the software, or if
32-
you modify it: responsibilities to respect the freedom of others.
33-
34-
For example, if you distribute copies of such a program, whether
35-
gratis or for a fee, you must pass on to the recipients the same
36-
freedoms that you received. You must make sure that they, too, receive
37-
or can get the source code. And you must show them these terms so they
38-
know their rights.
39-
40-
Developers that use the GNU GPL protect your rights with two steps:
41-
(1) assert copyright on the software, and (2) offer you this License
42-
giving you legal permission to copy, distribute and/or modify it.
43-
44-
For the developers' and authors' protection, the GPL clearly explains
45-
that there is no warranty for this free software. For both users' and
46-
authors' sake, the GPL requires that modified versions be marked as
47-
changed, so that their problems will not be attributed erroneously to
48-
authors of previous versions.
49-
50-
Some devices are designed to deny users access to install or run
51-
modified versions of the software inside them, although the manufacturer
52-
can do so. This is fundamentally incompatible with the aim of
53-
protecting users' freedom to change the software. The systematic
54-
pattern of such abuse occurs in the area of products for individuals to
55-
use, which is precisely where it is most unacceptable. Therefore, we
56-
have designed this version of the GPL to prohibit the practice for those
57-
products. If such problems arise substantially in other domains, we
58-
stand ready to extend this provision to those domains in future versions
59-
of the GPL, as needed to protect the freedom of users.
60-
61-
Finally, every program is threatened constantly by software patents.
62-
States should not allow patents to restrict development and use of
63-
software on general-purpose computers, but in those that do, we wish to
64-
avoid the special danger that patents applied to a free program could
65-
make it effectively proprietary. To prevent this, the GPL assures that
66-
patents cannot be used to render the program non-free.
28+
Developers that use our General Public Licenses protect your rights
29+
with two steps: (1) assert copyright on the software, and (2) offer
30+
you this License which gives you legal permission to copy, distribute
31+
and/or modify the software.
32+
33+
A secondary benefit of defending all users' freedom is that
34+
improvements made in alternate versions of the program, if they
35+
receive widespread use, become available for other developers to
36+
incorporate. Many developers of free software are heartened and
37+
encouraged by the resulting cooperation. However, in the case of
38+
software used on network servers, this result may fail to come about.
39+
The GNU General Public License permits making a modified version and
40+
letting the public access it on a server without ever releasing its
41+
source code to the public.
42+
43+
The GNU Affero General Public License is designed specifically to
44+
ensure that, in such cases, the modified source code becomes available
45+
to the community. It requires the operator of a network server to
46+
provide the source code of the modified version running there to the
47+
users of that server. Therefore, public use of a modified version, on
48+
a publicly accessible server, gives the public access to the source
49+
code of the modified version.
50+
51+
An older license, called the Affero General Public License and
52+
published by Affero, was designed to accomplish similar goals. This is
53+
a different license, not a version of the Affero GPL, but Affero has
54+
released a new version of the Affero GPL which permits relicensing under
55+
this license.
6756

6857
The precise terms and conditions for copying, distribution and
6958
modification follow.
@@ -72,7 +61,7 @@ modification follow.
7261

7362
0. Definitions.
7463

75-
"This License" refers to version 3 of the GNU General Public License.
64+
"This License" refers to version 3 of the GNU Affero General Public License.
7665

7766
"Copyright" also means copyright-like laws that apply to other kinds of
7867
works, such as semiconductor masks.
@@ -549,35 +538,45 @@ to collect a royalty for further conveying from those to whom you convey
549538
the Program, the only way you could satisfy both those terms and this
550539
License would be to refrain entirely from conveying the Program.
551540

552-
13. Use with the GNU Affero General Public License.
541+
13. Remote Network Interaction; Use with the GNU General Public License.
542+
543+
Notwithstanding any other provision of this License, if you modify the
544+
Program, your modified version must prominently offer all users
545+
interacting with it remotely through a computer network (if your version
546+
supports such interaction) an opportunity to receive the Corresponding
547+
Source of your version by providing access to the Corresponding Source
548+
from a network server at no charge, through some standard or customary
549+
means of facilitating copying of software. This Corresponding Source
550+
shall include the Corresponding Source for any work covered by version 3
551+
of the GNU General Public License that is incorporated pursuant to the
552+
following paragraph.
553553

554554
Notwithstanding any other provision of this License, you have
555555
permission to link or combine any covered work with a work licensed
556-
under version 3 of the GNU Affero General Public License into a single
556+
under version 3 of the GNU General Public License into a single
557557
combined work, and to convey the resulting work. The terms of this
558558
License will continue to apply to the part which is the covered work,
559-
but the special requirements of the GNU Affero General Public License,
560-
section 13, concerning interaction through a network will apply to the
561-
combination as such.
559+
but the work with which it is combined will remain governed by version
560+
3 of the GNU General Public License.
562561

563562
14. Revised Versions of this License.
564563

565564
The Free Software Foundation may publish revised and/or new versions of
566-
the GNU General Public License from time to time. Such new versions will
567-
be similar in spirit to the present version, but may differ in detail to
565+
the GNU Affero General Public License from time to time. Such new versions
566+
will be similar in spirit to the present version, but may differ in detail to
568567
address new problems or concerns.
569568

570569
Each version is given a distinguishing version number. If the
571-
Program specifies that a certain numbered version of the GNU General
570+
Program specifies that a certain numbered version of the GNU Affero General
572571
Public License "or any later version" applies to it, you have the
573572
option of following the terms and conditions either of that numbered
574573
version or of any later version published by the Free Software
575574
Foundation. If the Program does not specify a version number of the
576-
GNU General Public License, you may choose any version ever published
575+
GNU Affero General Public License, you may choose any version ever published
577576
by the Free Software Foundation.
578577

579578
If the Program specifies that a proxy can decide which future
580-
versions of the GNU General Public License can be used, that proxy's
579+
versions of the GNU Affero General Public License can be used, that proxy's
581580
public statement of acceptance of a version permanently authorizes you
582581
to choose that version for the Program.
583582

@@ -635,40 +634,29 @@ the "copyright" line and a pointer to where the full notice is found.
635634
Copyright (C) <year> <name of author>
636635

637636
This program is free software: you can redistribute it and/or modify
638-
it under the terms of the GNU General Public License as published by
639-
the Free Software Foundation, either version 3 of the License, or
637+
it under the terms of the GNU Affero General Public License as published
638+
by the Free Software Foundation, either version 3 of the License, or
640639
(at your option) any later version.
641640

642641
This program is distributed in the hope that it will be useful,
643642
but WITHOUT ANY WARRANTY; without even the implied warranty of
644643
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
645-
GNU General Public License for more details.
644+
GNU Affero General Public License for more details.
646645

647-
You should have received a copy of the GNU General Public License
648-
along with this program. If not, see <https://www.gnu.org/licenses/>.
646+
You should have received a copy of the GNU Affero General Public License
647+
along with this program. If not, see <http://www.gnu.org/licenses/>.
649648

650649
Also add information on how to contact you by electronic and paper mail.
651650

652-
If the program does terminal interaction, make it output a short
653-
notice like this when it starts in an interactive mode:
654-
655-
<program> Copyright (C) <year> <name of author>
656-
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657-
This is free software, and you are welcome to redistribute it
658-
under certain conditions; type `show c' for details.
659-
660-
The hypothetical commands `show w' and `show c' should show the appropriate
661-
parts of the General Public License. Of course, your program's commands
662-
might be different; for a GUI interface, you would use an "about box".
651+
If your software can interact with users remotely through a computer
652+
network, you should also make sure that it provides a way for users to
653+
get its source. For example, if your program is a web application, its
654+
interface could display a "Source" link that leads users to an archive
655+
of the code. There are many ways you could offer source, and different
656+
solutions will be better for different programs; see section 13 for the
657+
specific requirements.
663658

664659
You should also get your employer (if you work as a programmer) or school,
665660
if any, to sign a "copyright disclaimer" for the program, if necessary.
666-
For more information on this, and how to apply and follow the GNU GPL, see
667-
<https://www.gnu.org/licenses/>.
668-
669-
The GNU General Public License does not permit incorporating your program
670-
into proprietary programs. If your program is a subroutine library, you
671-
may consider it more useful to permit linking proprietary applications with
672-
the library. If this is what you want to do, use the GNU Lesser General
673-
Public License instead of this License. But first, please read
674-
<https://www.gnu.org/licenses/why-not-lgpl.html>.
661+
For more information on this, and how to apply and follow the GNU AGPL, see
662+
<http://www.gnu.org/licenses/>.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ Included in the repo is an IRC bot capable of relaying adminhelps to a specified
8686

8787
### LICENSE
8888

89-
All code is licensed under the [GNU GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.html) unless specified otherwise.
89+
All code after [commit 8cfadfbf0085c29423d2a5677db41df3ef1f59eb on 2024/11/9 at 11:42 AM EST](https://github.com/vgstation-coders/vgstation13/commit/8cfadfbf0085c29423d2a5677db41df3ef1f59eb) is licensed under [GNU AGPL v3](http://www.gnu.org/licenses/agpl-3.0.html).
90+
All code before [commit 8cfadfbf0085c29423d2a5677db41df3ef1f59eb on 2024/11/9 at 11:42 AM EST](https://github.com/vgstation-coders/vgstation13/commit/8cfadfbf0085c29423d2a5677db41df3ef1f59eb) is licensed under the [GNU GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.html). (Including tools unless their readme specifies otherwise.)
91+
92+
See LICENSE and GPLv3.txt for more details.
9093

9194
TGUI and the tgstation-server DMAPI are licensed under the MIT license.
9295

__DEFINES/_macros.dm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,11 @@
206206

207207
#define isgripper(G) (istype(G, /obj/item/weapon/gripper))
208208

209-
#define isholyweapon(I) (istype(I, /obj/item/weapon/nullrod) || istype(I, /obj/item/weapon/gun/hookshot/whip/vampkiller))
209+
#define isholyweapon(I) (istype(I, /obj/item/weapon/storage/bible)\
210+
|| istype(I, /obj/item/weapon/nullrod)\
211+
|| istype(I, /obj/item/weapon/gun/hookshot/whip/vampkiller/true)\
212+
|| istype(I, /obj/item/projectile/hookshot/whip/vampkiller/true)\
213+
|| istype(I, /obj/item/weapon/boomerang/cross))
210214

211215
#define isholyprotection(I) (istype(I, /obj/item/weapon/nullrod))
212216

__DEFINES/atom_locking_and_control.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define CANT_BE_MOVED_BY_LOCKED_MOBS 4
77
#define LOCKED_CAN_LIE_AND_STAND 8
88
#define LOCKED_STAY_INSIDE 16
9+
#define DONT_MESS_WITH_DENSITY 32
910

1011
// Flags for atom.lockflags
1112
#define DENSE_WHEN_LOCKED 1

__DEFINES/materials.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#define MAT_GINGERBREAD "$gingerbread"
3434

3535

36+
#define VALUE_MISC 0.1
3637
#define VALUE_IRON 0.2
3738
#define VALUE_GLASS 0.2
3839
#define VALUE_DIAMOND 50

__DEFINES/obj_defines.dm

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,27 @@ var/list/qualityByString = list(
4242

4343
#define SPAWN_ON_TURF "turf"
4444
#define SPAWN_ON_LOC "loc"
45+
46+
// Slime extract application flags
47+
#define SLIME_GREY 1
48+
#define SLIME_GOLD 2
49+
#define SLIME_SILVER 4
50+
#define SLIME_METAL 8
51+
#define SLIME_PURPLE 16
52+
#define SLIME_DARKPURPLE 32
53+
#define SLIME_ORANGE 64
54+
#define SLIME_YELLOW 128
55+
#define SLIME_RED 256
56+
#define SLIME_BLUE 512
57+
#define SLIME_DARKBLUE 1024
58+
#define SLIME_PINK 2048
59+
#define SLIME_GREEN 4096
60+
#define SLIME_LIGHTPINK 8192
61+
#define SLIME_BLACK 16384
62+
#define SLIME_OIL 32768
63+
#define SLIME_ADAMANTINE 65536
64+
#define SLIME_BLUESPACE 131072
65+
#define SLIME_PYRITE 262144
66+
#define SLIME_CERULEAN 524288
67+
#define SLIME_SEPIA 1048576
68+
#define ALL_SLIMES 2097151 //sum of above, 2097152 - 1

0 commit comments

Comments
 (0)