Merge branch 'shiptest-ss13:master' into master

.github/CODEOWNERS

@@ -4,22 +4,39 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# MarkSuckerberg
-/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
-/code/modules/shuttle/ @MarkSuckerberg
-/code/modules/overmap/ @MarkSuckerberg
-
-# Teams
+# TEAMS
 
 # Map Maintainers
 /_maps/ @shiptest-ss13/maptainers
 
 # Sprite Maintainers
 /icons/ @shiptest-ss13/spritetainers
-/whitesands/icons/ @shiptest-ss13/spritetainers
 
 # CI and tool chains
 /tools/ @shiptest-ss13/admins
 
-#SIC SEMPER TYRANNIS
+
+# MAINTAINERS
+
+# FalloutFalcon
+
+/code/game/objects/items/storage/ration.dm @FalloutFalcon
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
+/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
+/code/modules/projectiles/ @FalloutFalcon
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
+/code/modules/unit_tests/icons/ @FalloutFalcon
+
+# MarkSuckerberg
+
+/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
+/code/modules/shuttle/ @MarkSuckerberg
+/code/modules/overmap/ @MarkSuckerberg
 /_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
+
+
+# CONTRIBUTORS
+
+
+# MULTIPLE OWNERS

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@
 add: Added new things
 add: Added more things
 del: Removed old things
-tweak: tweaked a few things
 balance: rebalanced something
 fix: fixed a few things
 soundadd: added a new sound thingy

.github/RUNNING_A_SERVER.md

@@ -4,9 +4,9 @@ First-time installation should be fairly straightforward. First, you'll need
 BYOND installed. You can get it from https://www.byond.com/download. Once you've done
 that, extract the game files to wherever you want to keep them. This is a
 sourcecode-only release, so the next step is to compile the server files.
-Open shiptest.dme by double-clicking it, open the Build menu, and click
-compile. This'll take a little while, and if everything's done right you'll get
-a message like this:
+
+Double-click `BUILD.bat` in the root directory of the source code. This'll take
+a little while, and if everything's done right you'll get a message like this:
 
 ```
 saving shiptest.dmb (DEBUG mode)
@@ -17,14 +17,6 @@ If you see any errors or warnings, something has gone wrong - possibly a corrupt
 download or the files extracted wrong. If problems persist, ask for assistance
 in [the discord](https://shiptest.net/discord)
 
-Once that's done, open up the config folder. You'll want to edit config.txt to
-set the probabilities for different gamemodes in Secret and to set your server
-location so that all your players don't get disconnected at the end of each
-round. It's recommended you don't turn on the gamemodes with probability 0,
-except Extended, as they have various issues and aren't currently being tested,
-so they may have unknown and bizarre bugs. Extended is essentially no mode, and
-isn't in the Secret rotation by default as it's just not very fun.
-
 You'll also want to edit config/admins.txt to remove the default admins and add
 your own. "Game Master" is the highest level of access, and probably the one
 you'll want to use for now. You can set up your own ranks and find out more in
@@ -43,9 +35,15 @@ Windows DLL is included in this repository, but Linux users will need to build
 and install it themselves. Directions can be found at the [rust-g
 repo](https://github.com/tgstation/rust-g).
 
+**Unlike other servers,** Shiptest also uses an external library called Auxmos, which
+needs to be compiled on linux systems. Like with rust-g, Windows hosts should be fine, as the DLL
+it needs is shipped with the repository. Please download and install [auxmos](https://github.com/Putnam3145/auxmos)
+using the instructions provided if you're running a linux system.
+`tools/ci/build_auxmos.sh` can also be used if you're in a rush.
+
 Finally, to start the server, run Dream Daemon and enter the path to your
 compiled shiptest.dmb file. Make sure to set the port to the one you
-specified in the config.txt, and set the Security box to 'Safe'. Then press GO
+specified in the config.txt, and set the Security box to 'Trusted'. Then press GO
 and the server should start up and be ready to join. It is also recommended that
 you set up the SQL backend (see below).
 
@@ -68,9 +66,14 @@ https://github.com/tgstation/tgstation-server
 
 ## SQL SETUP
 
-The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://shiptest.net/wiki/Downloading_the_source_code#Setting_up_the_database
+The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not 
+supported, but Mariadb is a drop in replacement for mysql. SQL is required for the 
+library, stats tracking, admin notes, and job-only bans, among other features,
+mostly related to server administration. Your server details go in /config/dbconfig.txt, 
+and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql 
+depending on if you want table prefixes. 
 
-If you are hosting a testing server on windows you can use a standalone version of MariaDB pre load with a blank (but initialized) tgdb database. Find them here: https://tgstation13.download/database/ Just unzip and run for a working (but insecure) database server. Includes a zipped copy of the data folder for easy resetting back to square one.
+More detailed setup instructions are located here: https://shiptest.net/wiki/Downloading_the_source_code#Setting_up_the_database
 
 ## WEB/CDN RESOURCE DELIVERY
 

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM beestation/byond:515.1616 as base
+FROM beestation/byond:515.1633 as base
 
 # Install the tools needed to compile our rust dependencies
 FROM base as rust-build
@@ -12,8 +12,8 @@ RUN dpkg --add-architecture i386 \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     curl ca-certificates gcc-multilib \
-    g++-multilib libc6-i386 zlib1g-dev:i386 \
-    libssl-dev:i386 pkg-config:i386 git \
+    clang g++-multilib libc6-i386 \
+    zlib1g-dev:i386 pkg-config:i386 git \
     && /bin/bash -c "source dependencies.sh \
     && curl https://sh.rustup.rs | sh -s -- -y -t i686-unknown-linux-gnu --no-modify-path --profile minimal --default-toolchain \$RUST_VERSION" \
     && rm -rf /var/lib/apt/lists/*
@@ -25,7 +25,7 @@ RUN git init \
     && /bin/bash -c "source dependencies.sh \
     && git fetch --depth 1 origin \$RUST_G_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo build --release --all-features --target i686-unknown-linux-gnu
+    && cargo build --release --target i686-unknown-linux-gnu
 
 # Build auxmos
 FROM rust-build as auxmos
@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo rustc --target=i686-unknown-linux-gnu --release --features all_reaction_hooks,katmos -- -C target-cpu=native
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node

_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -374,11 +374,8 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	pixel_y = 5;
-	pin = /obj/item/firing_pin
-	},
-/obj/item/gun/energy/lasercannon{
-	pin = /obj/item/firing_pin
 	},
+/obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)