Why

Why do I have to do this like this why why whyyyyyyyyyy. Well at least we're up to date assuming this doesn't just explode.
SS13-Source-Archive · Jul 1, 2020 · b8f8d43 · b8f8d43
1 parent 4c6a774
commit b8f8d43
Show file tree

Hide file tree

Showing 686 changed files with 91,811 additions and 57,151 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ env:
 jobs:
     include:
     - name: "DreamChecker"
-      env: SPACEMAN_DMM_VERSION=suite-1.2
+      env: SPACEMAN_DMM_VERSION=suite-1.4
       cache:
         directories: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
       install:

diff --git a/README.md b/README.md
@@ -1,37 +1,39 @@
-## Welcome to GitHub Pages
+# baystation12
 
-You can use the [editor on GitHub](https://github.com/Doctor-Derp/Isolation-Station-13/edit/master/README.md) to maintain and preview the content for your website in Markdown files.
+[Website](http://baystation12.net/) - [Code](http://github.com/Baystation12/Baystation12/) - [Discord](https://discord.baystation12.net/) - [IRC](https://kiwiirc.com/client/irc.sorcery.net/codershuttle): irc://irc.sorcery.net/#codershuttle
 
-Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files.
+---
 
-### Markdown
+### CONTRIBUTING GUIDELINES
 
-Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for
+**Please refrain from making non code related comments in pull requests on GitHub.** See the Code of Conduct on where you may provide feedback to users.
 
-```markdown
-Syntax highlighted code block
+All users are expected to review [/docs/CODE_OF_CONDUCT.md](/docs/CODE_OF_CONDUCT.md) before interacting with the repository or other users.
 
-# Header 1
-## Header 2
-### Header 3
+---
 
-- Bulleted
-- List
+### SECURITY
 
-1. Numbered
-2. List
+Please see [/docs/SECURITY.md](/docs/SECURITY.md) for this repository's security policy, and how to report security issues.
 
-**Bold** and _Italic_ and `Code` text
+---
 
-[Link](url) and ![Image](src)
-```
+### LICENSE
 
-For more details see [GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/).
+The code for Baystation12 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE](/LICENSE).
 
-### Jekyll Themes
+Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00 GMT) is licensed under the GNU General Public License version 3, which can be found in full in [/docs/GPL3.txt](/docs/GPL3.txt)
 
-Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/Doctor-Derp/Isolation-Station-13/settings). The name of this theme is saved in the Jekyll `_config.yml` configuration file.
+All code where the authorship dates on or after `1420675200 +0000` is assumed to be licensed under AGPL v3, if you wish to license under GPL v3 please make this clear in the commit message and any added files.
 
-### Support or Contact
+If you wish to develop and host this codebase in a closed source manner you may use all commits prior to `1420675200 +0000`, which are licensed under GPL v3.  The major change here is that if you host a server using any code licensed under AGPLv3 you are required to provide full source code for your servers users as well including addons and modifications you have made.
 
-Having trouble with Pages? Check out our [documentation](https://help.github.com/categories/github-pages-basics/) or [contact support](https://github.com/contact) and we’ll help you sort it out.
+See [here](https://www.gnu.org/licenses/why-affero-gpl.html) for more information.
+
+All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](http://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
+
+---
+
+### GETTING THE CODE AND INSTALLING
+
+Please see [/docs/installation.md](/docs/installation.md) for instructions on obtaining, installing, updating, and running this code.
diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml
@@ -0,0 +1,2 @@
+[langserver]
+dreamchecker = true
diff --git a/_config.yml b/_config.yml
diff --git a/baystation12.dme b/baystation12.dme
@@ -81,6 +81,7 @@
 #include "code\__defines\ZAS.dm"
 #include "code\__defines\zmimic.dm"
 #include "code\_global_vars\configuration.dm"
+#include "code\_global_vars\edible.dm"
 #include "code\_global_vars\logging.dm"
 #include "code\_global_vars\mapping.dm"
 #include "code\_global_vars\misc.dm"
@@ -140,7 +141,7 @@
 #include "code\_onclick\hud\_defines.dm"
 #include "code\_onclick\hud\ability_screen_objects.dm"
 #include "code\_onclick\hud\action.dm"
-#include "code\_onclick\hud\deity.dm"
+#include "code\_onclick\hud\chorus.dm"
 #include "code\_onclick\hud\fullscreen.dm"
 #include "code\_onclick\hud\global_hud.dm"
 #include "code\_onclick\hud\gun_mode.dm"
@@ -268,7 +269,6 @@
 #include "code\datums\communication\pray.dm"
 #include "code\datums\communication\~defines.dm"
 #include "code\datums\extensions\_defines.dm"
-#include "code\datums\extensions\deity_be_near.dm"
 #include "code\datums\extensions\event_registration.dm"
 #include "code\datums\extensions\extensions.dm"
 #include "code\datums\extensions\fake_data.dm"
@@ -448,6 +448,7 @@
 #include "code\datums\trading\misc.dm"
 #include "code\datums\trading\ship.dm"
 #include "code\datums\trading\trade.dm"
+#include "code\datums\trading\trade_response.dm"
 #include "code\datums\trading\unique.dm"
 #include "code\datums\trading\vox.dm"
 #include "code\datums\trading\weaponry.dm"
@@ -523,9 +524,9 @@
 #include "code\game\antagonist\antagonist_update.dm"
 #include "code\game\antagonist\alien\borer.dm"
 #include "code\game\antagonist\outsider\actors.dm"
+#include "code\game\antagonist\outsider\chorus.dm"
 #include "code\game\antagonist\outsider\commando.dm"
 #include "code\game\antagonist\outsider\deathsquad.dm"
-#include "code\game\antagonist\outsider\deity.dm"
 #include "code\game\antagonist\outsider\ert.dm"
 #include "code\game\antagonist\outsider\foundation.dm"
 #include "code\game\antagonist\outsider\hunter.dm"
@@ -535,8 +536,8 @@
 #include "code\game\antagonist\outsider\raider.dm"
 #include "code\game\antagonist\outsider\wizard.dm"
 #include "code\game\antagonist\station\changeling.dm"
-#include "code\game\antagonist\station\cult_god.dm"
 #include "code\game\antagonist\station\cultist.dm"
+#include "code\game\antagonist\station\god_cult.dm"
 #include "code\game\antagonist\station\loyalist.dm"
 #include "code\game\antagonist\station\provocateur.dm"
 #include "code\game\antagonist\station\renegade.dm"
@@ -564,6 +565,7 @@
 #include "code\game\gamemodes\changeling\changeling.dm"
 #include "code\game\gamemodes\changeling\changeling_powers.dm"
 #include "code\game\gamemodes\changeling\modularchangling.dm"
+#include "code\game\gamemodes\chorus\chorus.dm"
 #include "code\game\gamemodes\cult\cult.dm"
 #include "code\game\gamemodes\cult\cult_items.dm"
 #include "code\game\gamemodes\cult\cult_structures.dm"
@@ -587,20 +589,7 @@
 #include "code\game\gamemodes\events\power_failure.dm"
 #include "code\game\gamemodes\events\wormholes.dm"
 #include "code\game\gamemodes\events\holidays\Christmas.dm"
-#include "code\game\gamemodes\events\holidays\Holidays.dm"
-#include "code\game\gamemodes\events\holidays\Other.dm"
 #include "code\game\gamemodes\extended\extended.dm"
-#include "code\game\gamemodes\godmode\god_altar.dm"
-#include "code\game\gamemodes\godmode\god_pylon.dm"
-#include "code\game\gamemodes\godmode\god_structures.dm"
-#include "code\game\gamemodes\godmode\god_trap.dm"
-#include "code\game\gamemodes\godmode\godmode.dm"
-#include "code\game\gamemodes\godmode\form_items\narsie_items.dm"
-#include "code\game\gamemodes\godmode\form_items\narsie_structures.dm"
-#include "code\game\gamemodes\godmode\form_items\starlight_items.dm"
-#include "code\game\gamemodes\godmode\form_items\starlight_mobs.dm"
-#include "code\game\gamemodes\godmode\form_items\starlight_structures.dm"
-#include "code\game\gamemodes\godmode\form_items\wizard_structures.dm"
 #include "code\game\gamemodes\heist\heist.dm"
 #include "code\game\gamemodes\malfunction\malf_hardware.dm"
 #include "code\game\gamemodes\malfunction\malf_research.dm"
@@ -680,6 +669,7 @@
 #include "code\game\machinery\navbeacon.dm"
 #include "code\game\machinery\newscaster.dm"
 #include "code\game\machinery\nuclear_bomb.dm"
+#include "code\game\machinery\nuke_cylinder_dispenser.dm"
 #include "code\game\machinery\OpTable.dm"
 #include "code\game\machinery\oxygen_pump.dm"
 #include "code\game\machinery\pager.dm"
@@ -1187,7 +1177,6 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
-#include "code\game\objects\structures\crates_lockers\closets\secure\nuke.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
@@ -1695,6 +1684,7 @@
 #include "code\modules\emotes\definitions\adherent.dm"
 #include "code\modules\emotes\definitions\ascent.dm"
 #include "code\modules\emotes\definitions\audible.dm"
+#include "code\modules\emotes\definitions\exertion.dm"
 #include "code\modules\emotes\definitions\human.dm"
 #include "code\modules\emotes\definitions\slime.dm"
 #include "code\modules\emotes\definitions\synthetics.dm"
@@ -1738,6 +1728,7 @@
 #include "code\modules\events\spontaneous_appendicitis.dm"
 #include "code\modules\events\toilets.dm"
 #include "code\modules\events\wallrot.dm"
+#include "code\modules\events\whale_migration.dm"
 #include "code\modules\ext_scripts\irc.dm"
 #include "code\modules\fabrication\__fabricator_defines.dm"
 #include "code\modules\fabrication\_fabricator.dm"
@@ -2098,45 +2089,33 @@
 #include "code\modules\mob\living\carbon\xenobiological\subtypes.dm"
 #include "code\modules\mob\living\carbon\xenobiological\update_icons.dm"
 #include "code\modules\mob\living\carbon\xenobiological\xenobiological.dm"
-#include "code\modules\mob\living\deity\deity.dm"
-#include "code\modules\mob\living\deity\deity_boons.dm"
-#include "code\modules\mob\living\deity\deity_click.dm"
-#include "code\modules\mob\living\deity\deity_items.dm"
-#include "code\modules\mob\living\deity\deity_phenomena.dm"
-#include "code\modules\mob\living\deity\deity_power.dm"
-#include "code\modules\mob\living\deity\deity_pylon.dm"
-#include "code\modules\mob\living\deity\deity_sources.dm"
-#include "code\modules\mob\living\deity\deity_Stat.dm"
-#include "code\modules\mob\living\deity\deity_topic.dm"
-#include "code\modules\mob\living\deity\deity_tracking.dm"
-#include "code\modules\mob\living\deity\forms.dm"
-#include "code\modules\mob\living\deity\say.dm"
-#include "code\modules\mob\living\deity\forms\narsie.dm"
-#include "code\modules\mob\living\deity\forms\starlight.dm"
-#include "code\modules\mob\living\deity\forms\tower.dm"
-#include "code\modules\mob\living\deity\items\_defines.dm"
-#include "code\modules\mob\living\deity\items\deity_item.dm"
-#include "code\modules\mob\living\deity\items\general.dm"
-#include "code\modules\mob\living\deity\items\generic.dm"
-#include "code\modules\mob\living\deity\items\narsie\basic.dm"
-#include "code\modules\mob\living\deity\items\narsie\minions.dm"
-#include "code\modules\mob\living\deity\items\narsie\sacrificing.dm"
-#include "code\modules\mob\living\deity\items\narsie\smithing.dm"
-#include "code\modules\mob\living\deity\items\starlight\artifacts.dm"
-#include "code\modules\mob\living\deity\items\starlight\phenomena.dm"
-#include "code\modules\mob\living\deity\items\starlight\spells.dm"
-#include "code\modules\mob\living\deity\items\tower\conjuration.dm"
-#include "code\modules\mob\living\deity\items\tower\transmutation.dm"
-#include "code\modules\mob\living\deity\menu\deity_nano.dm"
-#include "code\modules\mob\living\deity\phenomena\_defines.dm"
-#include "code\modules\mob\living\deity\phenomena\communication.dm"
-#include "code\modules\mob\living\deity\phenomena\conjuration.dm"
-#include "code\modules\mob\living\deity\phenomena\conversion.dm"
-#include "code\modules\mob\living\deity\phenomena\generic.dm"
-#include "code\modules\mob\living\deity\phenomena\narsie.dm"
-#include "code\modules\mob\living\deity\phenomena\phenomena.dm"
-#include "code\modules\mob\living\deity\phenomena\starlight.dm"
-#include "code\modules\mob\living\deity\phenomena\transmutation.dm"
+#include "code\modules\mob\living\chorus\_defines.dm"
+#include "code\modules\mob\living\chorus\chorus.dm"
+#include "code\modules\mob\living\chorus\chorus_browser.dm"
+#include "code\modules\mob\living\chorus\chorus_building.dm"
+#include "code\modules\mob\living\chorus\chorus_click.dm"
+#include "code\modules\mob\living\chorus\chorus_end.dm"
+#include "code\modules\mob\living\chorus\chorus_followers.dm"
+#include "code\modules\mob\living\chorus\chorus_form.dm"
+#include "code\modules\mob\living\chorus\chorus_life.dm"
+#include "code\modules\mob\living\chorus\chorus_pylon.dm"
+#include "code\modules\mob\living\chorus\chorus_resources.dm"
+#include "code\modules\mob\living\chorus\chorus_say.dm"
+#include "code\modules\mob\living\chorus\chorus_topic.dm"
+#include "code\modules\mob\living\chorus\buildings\blueprint_obj.dm"
+#include "code\modules\mob\living\chorus\buildings\building_chorus.dm"
+#include "code\modules\mob\living\chorus\buildings\building_datum.dm"
+#include "code\modules\mob\living\chorus\buildings\generic.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\growth_base.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\tier_five.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\tier_four.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\tier_one.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\tier_three.dm"
+#include "code\modules\mob\living\chorus\buildings\growth\tier_two.dm"
+#include "code\modules\mob\living\chorus\forms\form_datum.dm"
+#include "code\modules\mob\living\chorus\forms\growth.dm"
+#include "code\modules\mob\living\chorus\resources\chorus_resource.dm"
+#include "code\modules\mob\living\chorus\resources\growth.dm"
 #include "code\modules\mob\living\maneuvers\_maneuver.dm"
 #include "code\modules\mob\living\maneuvers\maneuver_leap.dm"
 #include "code\modules\mob\living\silicon\death.dm"
@@ -2191,7 +2170,6 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
-#include "code\modules\mob\living\silicon\robot\drone\drone_remote_control.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
 #include "code\modules\mob\living\silicon\robot\flying\flying.dm"
 #include "code\modules\mob\living\silicon\robot\flying\module_flying.dm"
@@ -2235,6 +2213,7 @@
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
 #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
+#include "code\modules\mob\living\simple_animal\friendly\juvenile_space_whale.dm"
 #include "code\modules\mob\living\simple_animal\friendly\lizard.dm"
 #include "code\modules\mob\living\simple_animal\friendly\mouse.dm"
 #include "code\modules\mob\living\simple_animal\friendly\mushroom.dm"
@@ -2275,13 +2254,15 @@
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\king_of_goats.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\parrot.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\retaliate\space_whale.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\giant_parrot\giant_parrot.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\giant_parrot\giant_parrot_species.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\logout.dm"
 #include "code\modules\mob\new_player\new_player.dm"
 #include "code\modules\mob\new_player\poll.dm"
 #include "code\modules\mob\new_player\preferences_setup.dm"
+#include "code\modules\mob\observer\following.dm"
 #include "code\modules\mob\observer\observer.dm"
 #include "code\modules\mob\observer\freelook\chunk.dm"
 #include "code\modules\mob\observer\freelook\eye.dm"
@@ -2853,6 +2834,7 @@
 #include "code\modules\shuttles\shuttle_specops.dm"
 #include "code\modules\shuttles\shuttle_supply.dm"
 #include "code\modules\shuttles\shuttles_multi.dm"
+#include "code\modules\skrell\skrell_rigs.dm"
 #include "code\modules\species\species.dm"
 #include "code\modules\species\species_attack.dm"
 #include "code\modules\species\species_getters.dm"
@@ -2907,11 +2889,8 @@
 #include "code\modules\spells\general\area_teleport.dm"
 #include "code\modules\spells\general\contract_spells.dm"
 #include "code\modules\spells\general\create_air.dm"
-#include "code\modules\spells\general\god_construct.dm"
-#include "code\modules\spells\general\god_vision.dm"
 #include "code\modules\spells\general\invisibility.dm"
 #include "code\modules\spells\general\mark_recall.dm"
-#include "code\modules\spells\general\open_gateway.dm"
 #include "code\modules\spells\general\portal_teleport.dm"
 #include "code\modules\spells\general\radiant_aura.dm"
 #include "code\modules\spells\general\return_master.dm"
@@ -3145,6 +3124,7 @@
 #include "code\unit_tests\music_test.dm"
 #include "code\unit_tests\observation_tests.dm"
 #include "code\unit_tests\organ_tests.dm"
+#include "code\unit_tests\overmap_tests.dm"
 #include "code\unit_tests\power_tests.dm"
 #include "code\unit_tests\reagent_color_test.dm"
 #include "code\unit_tests\seed_tests.dm"
@@ -3174,6 +3154,8 @@
 #include "maps\away_sites_testing\away_sites_testing_define.dm"
 #include "maps\bearcat\bearcat_define.dm"
 #include "maps\example\example_define.dm"
+#include "maps\perseverance\XIV.dm"
+#include "maps\perseverance\XIV_define.dm"
 #include "maps\random_ruins\exoplanet_ruins\exoplanet_ruins.dm"
 #include "maps\random_ruins\exoplanet_ruins\crashed_pod\crashed_pod.dm"
 #include "maps\random_ruins\exoplanet_ruins\datacapsule\datacapsule.dm"
@@ -3186,13 +3168,12 @@
 #include "maps\random_ruins\exoplanet_ruins\marooned\marooned.dm"
 #include "maps\random_ruins\exoplanet_ruins\monoliths\monoliths.dm"
 #include "maps\random_ruins\exoplanet_ruins\oasis\oasis.dm"
+#include "maps\random_ruins\exoplanet_ruins\oldlab\oldlab.dm"
 #include "maps\random_ruins\exoplanet_ruins\oldpod\oldpod.dm"
 #include "maps\random_ruins\exoplanet_ruins\radshrine\radshrine.dm"
 #include "maps\random_ruins\exoplanet_ruins\spider_nest\spider_nest.dm"
 #include "maps\random_ruins\exoplanet_ruins\tar_anomaly\tar_anomaly.dm"
 #include "maps\random_ruins\space_ruins\space_ruins.dm"
-#include "maps\torch\torch.dm"
-#include "maps\torch\torch_define.dm"
 #include "maps\~mapsystem\map_preferences.dm"
 #include "maps\~mapsystem\map_ranks.dm"
 #include "maps\~mapsystem\maps.dm"

diff --git a/code/__defines/colors.dm b/code/__defines/colors.dm
@@ -34,7 +34,7 @@
 #define COLOR_DARK_GREEN_GRAY  "#54654c"
 #define COLOR_BLUE_GRAY        "#6a97b0"
 #define COLOR_DARK_BLUE_GRAY   "#3e4855"
-#define COLOR_SURGERY_BLUE     "#e0f2f6" 
+#define COLOR_SURGERY_BLUE     "#e0f2f6"
 #define COLOR_SUN              "#ec8b2f"
 #define COLOR_PURPLE_GRAY      "#a2819e"
 #define COLOR_BLUE_LIGHT       "#33ccff"
@@ -101,9 +101,11 @@
 #define	COMMS_COLOR_SUPPLY     "#7f6539"
 #define	COMMS_COLOR_SCIENCE    "#993399"
 #define	COMMS_COLOR_MEDICAL    "#009190"
+#define	COMMS_COLOR_MEDICAL_I  "#509190"
 #define	COMMS_COLOR_EXPLORER   "#929820"
 #define	COMMS_COLOR_ENGINEER   "#a66300"
 #define	COMMS_COLOR_SECURITY   "#930000"
+#define	COMMS_COLOR_SECURITY_I "#935050"
 #define	COMMS_COLOR_COMMAND    "#204090"
 #define	COMMS_COLOR_CENTCOMM   "#5c5c7c"
 #define	COMMS_COLOR_SYNDICATE  "#6d3f40"
@@ -169,4 +171,4 @@
 #define CODEX_COLOR_MECHANICS "#9ebcd8"
 #define CODEX_COLOR_ANTAG     "#e5a2a2"
 
-#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5
+#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5
diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm
@@ -153,6 +153,8 @@
 #define CULTURE_UNATHI              "Moghes Hegemony"
 
 #define HOME_SYSTEM_MOGHES          "Moghes"
+#define HOME_SYSTEM_OUERE			"Ouere"
+#define HOME_SYSTEM_OFFWORLD		"Off World"
 
 #define FACTION_UNATHI_POLAR        "Polar Clans"
 #define FACTION_UNATHI_DESERT       "Desert Clans"