Merge pull request #2 from infinitystation/master

Обнова

.github/workflows/lineendings.yml

@@ -0,0 +1,34 @@
+name: Add Empty Lines to Code
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  Add_empty_lineendings:
+    runs-on: ubuntu-latest
+    if: github.repository == 'infinitystation/Baystation12'
+    steps:
+      - name: Get Repo
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 25
+      - name: Python Setup
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.x'
+      - name: Empty Empty Lines Adding
+        run: python tools/simpleutilites/lineendings.py
+      - name: Difference
+        run: git diff
+      - name: Commit
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "Lineender"
+          git pull origin master
+          git commit -m "Автоматическая починка пустых строк в конце файлов" -a || true
+      - name: Push
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -15,6 +15,9 @@ stopserver
 reboot_called
 atupdate
 
+# sometimes something create backups of maps
+maps/*/backup/*.dmm
+
 # ignore config, but not subdirs
 !config/*/
 config/*

baystation12.dme

@@ -385,6 +385,7 @@
 #include "code\datums\music_tracks\infinity\bluesinvelvetroom.dm"
 #include "code\datums\music_tracks\infinity\creep.dm"
 #include "code\datums\music_tracks\infinity\digger.dm"
+#include "code\datums\music_tracks\infinity\fight_with_oneself.dm"
 #include "code\datums\music_tracks\infinity\fluvialbeatdeposits.dm"
 #include "code\datums\music_tracks\infinity\hurt.dm"
 #include "code\datums\music_tracks\infinity\Hydrogen.dm"
@@ -399,6 +400,7 @@
 #include "code\datums\music_tracks\infinity\right.dm"
 #include "code\datums\music_tracks\infinity\rising.dm"
 #include "code\datums\music_tracks\infinity\river.dm"
+#include "code\datums\music_tracks\infinity\silence_of_space.dm"
 #include "code\datums\music_tracks\infinity\snow.dm"
 #include "code\datums\music_tracks\infinity\somebody.dm"
 #include "code\datums\music_tracks\infinity\together.dm"
@@ -3148,6 +3150,7 @@
 #include "code\modules\ventcrawl\ventcrawl_atmospherics.dm"
 #include "code\modules\ventcrawl\ventcrawl_multiz.dm"
 #include "code\modules\ventcrawl\ventcrawl_verb.dm"
+#include "code\modules\webhooks\__webhook_sanitize_inf.dm"
 #include "code\modules\webhooks\_webhook.dm"
 #include "code\modules\webhooks\webhook_custom_event.dm"
 #include "code\modules\webhooks\webhook_roundend.dm"
@@ -3273,6 +3276,7 @@
 #include "code\unit_tests\~unit_test_types.dm"
 #include "infinity\code\changelog.dm"
 #include "infinity\code\_helpers\animations.dm"
+#include "infinity\code\_helpers\client.dm"
 #include "infinity\code\_helpers\gauss.dm"
 #include "infinity\code\_helpers\unsorted.dm"
 #include "infinity\code\_onclick\hud\alien_larva.dm"
@@ -3281,11 +3285,30 @@
 #include "infinity\code\controllers\subsystems\ticker.dm"
 #include "infinity\code\datums\mutable_appearance.dm"
 #include "infinity\code\datums\outfits\infinity.dm"
+#include "infinity\code\datums\skybox_data\_datum_skybox_data.dm"
+#include "infinity\code\datums\skybox_data\beidge_nebula.dm"
+#include "infinity\code\datums\skybox_data\green_nebula_river.dm"
+#include "infinity\code\datums\skybox_data\near_star.dm"
+#include "infinity\code\datums\skybox_data\purple_nebula.dm"
+#include "infinity\code\datums\skybox_data\skybox_default.dm"
+#include "infinity\code\datums\skybox_data\skybox_galactic.dm"
+#include "infinity\code\datums\skybox_data\skybox_green_nebula.dm"
+#include "infinity\code\datums\skybox_data\skybox_red_nebula.dm"
+#include "infinity\code\datums\skybox_data\star_in_far.dm"
+#include "infinity\code\datums\skybox_data\turqoize_nebula.dm"
 #include "infinity\code\datums\supplypacks\medical.dm"
 #include "infinity\code\datums\underwear\bottom.dm"
 #include "infinity\code\datums\underwear\top.dm"
 #include "infinity\code\datums\underwear\undershirt.dm"
+#include "infinity\code\datums\uplink\ammunition.dm"
+#include "infinity\code\datums\uplink\armor.dm"
+#include "infinity\code\datums\uplink\badassery.dm"
+#include "infinity\code\datums\uplink\devices and tools.dm"
+#include "infinity\code\datums\uplink\grenades.dm"
 #include "infinity\code\datums\uplink\hardsuit_modules.dm"
+#include "infinity\code\datums\uplink\highly_visible_and_dangerous_weapons.dm"
+#include "infinity\code\datums\uplink\implants.dm"
+#include "infinity\code\datums\uplink\services.dm"
 #include "infinity\code\datums\vote\vote.dm"
 #include "infinity\code\game\sound.dm"
 #include "infinity\code\game\antagonist\outsider\abductor.dm"
@@ -3330,20 +3353,26 @@
 #include "infinity\code\game\objects\effects\decals\posters.dm"
 #include "infinity\code\game\objects\effects\decals\Cleanable\blood.dm"
 #include "infinity\code\game\objects\effects\spawners\gibspawner.dm"
+#include "infinity\code\game\objects\items\contraband.dm"
+#include "infinity\code\game\objects\items\encryptionkey.dm"
 #include "infinity\code\game\objects\items\toys.dm"
 #include "infinity\code\game\objects\items\devices\blackout.dm"
 #include "infinity\code\game\objects\items\devices\hacktool.dm"
 #include "infinity\code\game\objects\items\devices\holobomb.dm"
 #include "infinity\code\game\objects\items\devices\multimeter.dm"
 #include "infinity\code\game\objects\items\devices\remote_device.dm"
 #include "infinity\code\game\objects\items\devices\serial.dm"
+#include "infinity\code\game\objects\items\devices\syndietele.dm"
 #include "infinity\code\game\objects\items\devices\radio\headset.dm"
 #include "infinity\code\game\objects\items\stacks\tiles\tile_types.dm"
 #include "infinity\code\game\objects\items\weapons\cards_Id.dm"
+#include "infinity\code\game\objects\items\weapons\explosives.dm"
 #include "infinity\code\game\objects\items\weapons\extunguisher.dm"
 #include "infinity\code\game\objects\items\weapons\lighter.dm"
 #include "infinity\code\game\objects\items\weapons\soap.dm"
 #include "infinity\code\game\objects\items\weapons\surgery_tools.dm"
+#include "infinity\code\game\objects\items\weapons\syndie_special.dm"
+#include "infinity\code\game\objects\items\weapons\tanks.dm"
 #include "infinity\code\game\objects\items\weapons\towels.dm"
 #include "infinity\code\game\objects\items\weapons\toys.dm"
 #include "infinity\code\game\objects\items\weapons\traps.dm"
@@ -3359,13 +3388,17 @@
 #include "infinity\code\game\objects\items\weapons\grenades\flashbang.dm"
 #include "infinity\code\game\objects\items\weapons\grenades\ied.dm"
 #include "infinity\code\game\objects\items\weapons\grenades\smokebomb.dm"
+#include "infinity\code\game\objects\items\weapons\grenades\special.dm"
+#include "infinity\code\game\objects\items\weapons\implants\adrenal.dm"
+#include "infinity\code\game\objects\items\weapons\implants\emp.dm"
 #include "infinity\code\game\objects\items\weapons\material\coins.dm"
 #include "infinity\code\game\objects\items\weapons\storage\backpack.dm"
 #include "infinity\code\game\objects\items\weapons\storage\belt.dm"
 #include "infinity\code\game\objects\items\weapons\storage\boxes.dm"
 #include "infinity\code\game\objects\items\weapons\storage\firstaid.dm"
 #include "infinity\code\game\objects\items\weapons\storage\firstaid_indiv.dm"
 #include "infinity\code\game\objects\items\weapons\storage\storage.dm"
+#include "infinity\code\game\objects\items\weapons\storage\uplink_kits.dm"
 #include "infinity\code\game\objects\items\weapons\storage\wall_mirror.dm"
 #include "infinity\code\game\objects\items\weapons\tools\combi_tool.dm"
 #include "infinity\code\game\objects\items\weapons\tools\crowbar.dm"
@@ -3411,15 +3444,24 @@
 #include "infinity\code\modules\admin\xeno_whitelist.dm"
 #include "infinity\code\modules\admin\secrets\admin_secrets\list_fax.dm"
 #include "infinity\code\modules\admin\update\update.dm"
+#include "infinity\code\modules\admin\verbs\offer_role_of_mob.dm"
 #include "infinity\code\modules\admin\verbs\randomverbs.dm"
 #include "infinity\code\modules\admin\verbs\respawn_as_self.dm"
+#include "infinity\code\modules\admin\verbs\skybox.dm"
 #include "infinity\code\modules\AiControl\_AiControl_Setup.dm"
 #include "infinity\code\modules\animations\animations_library.dm"
 #include "infinity\code\modules\ascent\ascent_atoms.dm"
 #include "infinity\code\modules\ascent\ascent_machines.dm"
 #include "infinity\code\modules\ascent\ascent_machinies.dm"
 #include "infinity\code\modules\ascent\ascent_turfs.dm"
 #include "infinity\code\modules\atmospherics\components\unary\vent_pump.dm"
+#include "infinity\code\modules\blob\abilities.dm"
+#include "infinity\code\modules\blob\blob.dm"
+#include "infinity\code\modules\blob\blobbernaut.dm"
+#include "infinity\code\modules\blob\blobcore.dm"
+#include "infinity\code\modules\blob\eye.dm"
+#include "infinity\code\modules\blob\spore.dm"
+#include "infinity\code\modules\blob\strains.dm"
 #include "infinity\code\modules\bs_silk\accessory.dm"
 #include "infinity\code\modules\bs_silk\circuits.dm"
 #include "infinity\code\modules\bs_silk\control.dm"
@@ -3456,6 +3498,7 @@
 #include "infinity\code\modules\clothing\shoes\shoes_resomi.dm"
 #include "infinity\code\modules\clothing\spacesuits\rig\rig.dm"
 #include "infinity\code\modules\clothing\spacesuits\rig\rig_pieces.dm"
+#include "infinity\code\modules\clothing\spacesuits\void\syndie.dm"
 #include "infinity\code\modules\clothing\spacesuits\void\voidsuits.dm"
 #include "infinity\code\modules\clothing\suits\armor.dm"
 #include "infinity\code\modules\clothing\suits\suits.dm"
@@ -3480,6 +3523,7 @@
 #include "infinity\code\modules\culture_descriptor\faction\factions_tajaran.dm"
 #include "infinity\code\modules\culture_descriptor\faction\factions_vox.dm"
 #include "infinity\code\modules\culture_descriptor\faction\factions_xenophage.dm"
+#include "infinity\code\modules\culture_descriptor\location\locations_human.dm"
 #include "infinity\code\modules\culture_descriptor\location\locations_ipc.dm"
 #include "infinity\code\modules\culture_descriptor\location\locations_resomi.dm"
 #include "infinity\code\modules\culture_descriptor\location\locations_skrell.dm"
@@ -3504,7 +3548,10 @@
 #include "infinity\code\modules\materials\material_sheets.dm"
 #include "infinity\code\modules\materials\reciepes.dm"
 #include "infinity\code\modules\materials\definitions\materials_other.dm"
+#include "infinity\code\modules\mechs\armour.dm"
+#include "infinity\code\modules\mechs\guns.dm"
 #include "infinity\code\modules\mechs\mech_interaction.dm"
+#include "infinity\code\modules\mechs\premade\combat.dm"
 #include "infinity\code\modules\mob\animations.dm"
 #include "infinity\code\modules\mob\holder.dm"
 #include "infinity\code\modules\mob\login.dm"
@@ -3536,12 +3583,15 @@
 #include "infinity\code\modules\mob\living\silicon\pai\pai.dm"
 #include "infinity\code\modules\mob\living\silicon\pai\mods\_core.dm"
 #include "infinity\code\modules\mob\living\silicon\robot\robot.dm"
+#include "infinity\code\modules\mob\living\silicon\robot\modules\syndicate_combat.dm"
+#include "infinity\code\modules\mob\living\silicon\robot\modules\syndicate_medic.dm"
 #include "infinity\code\modules\mob\living\simple_animal\aquatic\sharks.dm"
 #include "infinity\code\modules\mob\living\simple_animal\friendly\crab.dm"
 #include "infinity\code\modules\mob\living\simple_animal\friendly\fox.dm"
 #include "infinity\code\modules\mob\living\simple_animal\friendly\koala.dm"
 #include "infinity\code\modules\mob\living\simple_animal\hostile\changeling_mob.dm"
 #include "infinity\code\modules\mob\living\simple_animal\hostile\rabbit.dm"
+#include "infinity\code\modules\mob\new_player\login.dm"
 #include "infinity\code\modules\modular_computers\computers\modular_computer\interaction.dm"
 #include "infinity\code\modules\modular_computers\computers\subtypes\dev_wrist.dm"
 #include "infinity\code\modules\modular_computers\file_system\coding_data.dm"
@@ -3596,6 +3646,7 @@
 #include "infinity\code\modules\reagents\reagent_containers\food\snacks.dm"
 #include "infinity\code\modules\reagents\reagent_containers\food\drinks\bottle.dm"
 #include "infinity\code\modules\reagents\reagent_containers\food\drinks\champagne.dm"
+#include "infinity\code\modules\reagents\reagents_containers\hypospray.dm"
 #include "infinity\code\modules\reagents\reagents_containers\food\drinks\bottle.dm"
 #include "infinity\code\modules\research\stock_parts.dm"
 #include "infinity\code\modules\research\designs\designs_bluespace.dm"
@@ -3680,6 +3731,7 @@
 #include "infinity\customs\cust_zippo.dm"
 #include "infinity\customs\dakimakura.dm"
 #include "infinity\customs\darkred_headphones.dm"
+#include "infinity\customs\deadlizard.dm"
 #include "infinity\customs\diesiege.dm"
 #include "infinity\customs\eguitar.dm"
 #include "infinity\customs\eugen00751.dm"
@@ -3714,6 +3766,7 @@
 #include "infinity\customs\thehero13.dm"
 #include "infinity\customs\tools.dm"
 #include "infinity\customs\true_gentleman.dm"
+#include "infinity\customs\unchi_turtleneck.dm"
 #include "infinity\customs\vape.dm"
 #include "infinity\customs\vashuara.dm"
 #include "infinity\customs\warfoxy.dm"

code/__defines/_compile_options.dm

@@ -1,2 +1,2 @@
 #define BACKGROUND_ENABLED 0    // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
-								// 1 will enable set background. 0 will disable set background.
+								// 1 will enable set background. 0 will disable set background.

code/__defines/_inf/_inf.culture.dm

@@ -82,4 +82,17 @@
 // Human Cultures
 #define CULTURE_HUMAN_LORRIMAN "Lorrimanian"
 #define CULTURE_HUMAN_AVANOBLE "Avalon Noble"
-#define CULTURE_HUMAN_AVACOMMON "Avalon Commoner"
+#define CULTURE_HUMAN_AVACOMMON "Avalon Commoner"
+#define CULTURE_HUMAN_LORDUP "Lordanian, Upper"
+#define CULTURE_HUMAN_LORDLOW "Lordanian, Lower"
+#define CULTURE_HUMAN_MIRANIAN "Miranian"
+#define CULTURE_HUMAN_NYXIAN "Nyxian"
+
+//Human Planets
+#define HOME_SYSTEM_AVALON               	"Avalon"
+#define HOME_SYSTEM_MIRANIA              	"Mirania"
+#define HOME_SYSTEM_NYX_BRINKBURN        	"Brinkburn"
+#define HOME_SYSTEM_NYX_KALDARK          	"Kaldark"
+#define HOME_SYSTEM_NYX_ROANOK           	"Roanok"
+#define HOME_SYSTEM_NYX_YUKLIT           	"Yuklit"
+#define HOME_SYSTEM_NYX_CASSER           	"Casser"

code/__defines/_inf/_inf.gamemode.dm

@@ -2,4 +2,4 @@
 
 #define MODE_ABDUCTOR          "abductor"
 #define MODE_ABDUCTOR_SCI      "abductor scientist"
-#define MODE_ABDUCTED          "abducted"
+#define MODE_ABDUCTED          "abducted"

code/__defines/_inf/_inf.guns.dm

@@ -6,4 +6,4 @@
 #define GUN_BULK_CARABINE     4
 //#define GUN_BULK_RIFLE        5 определено в оригинале ~bear1ake
 #define GUN_BULK_SNIPER_RIFLE 6
-#define GUN_BULK_MACHINEGUN   7
+#define GUN_BULK_MACHINEGUN   7

code/__defines/_inf/_inf.items_clothing.dm

@@ -1 +1 @@
-#define ACCESSORY_SLOT_OVER     "Over"
+#define ACCESSORY_SLOT_OVER     "Over"

code/__defines/_inf/_inf.materials.dm

@@ -2,4 +2,4 @@
 #define MATERIAL_SCRAP				"scrap"
 #define MATERIAL_SCRAP_REFINED		"refined scrap"
 #define MATERIAL_ALIEN				"crystaline alloy"
-//#define MATERIAL_CONCRETE			"concrete" определено в оригинале ~bear1ake
+//#define MATERIAL_CONCRETE			"concrete" определено в оригинале ~bear1ake

code/__defines/_inf/_inf.misc.dm

@@ -26,3 +26,5 @@
 #define USE_FAIL_INCAPACITATED 5
 #define USE_FAIL_NOT_IN_USER 6
 #define USE_FAIL_IS_SILICON 7
+
+#define DEFAULT_RESPAWN_COOLDOWN config.default_respawn_cooldown

code/__defines/_inf/_inf.mobs.dm

@@ -11,17 +11,20 @@
 
 #define OBSERV_SPAWN_DELAY round(config.respawn_delay / 2)
 
-//Organs
+// Organs
 #define BP_FAKE    "fake_brain"
 
-#define SPECIES_TAJARA "Tajara"
-#define SPECIES_EROSAN "Erosan'Unathi"
-#define SPECIES_RESOMI "Resomi"
-#define SPECIES_XENO   "Xenophage"
-#define SPECIES_BIONIC "Bionic"
+// Species
+#define SPECIES_TAJARA			"Tajara"
+#define SPECIES_EROSAN			"Erosan'Unathi"
+#define SPECIES_RESOMI			"Resomi"
+#define SPECIES_XENO			"Xenophage"
+#define SPECIES_BIONIC			"Bionic"
 
-#define SPECIES_ABDUCTOR     "Abductor Agent"
-#define SPECIES_ABDUCTOR_SCI "Abductor Scientist"
+#define SPECIES_FBP				"Full Body Prosthesis"
+
+#define SPECIES_ABDUCTOR		"Abductor Agent"
+#define SPECIES_ABDUCTOR_SCI	"Abductor Scientist"
 
 #define HUMAN_SPECIES list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_GRAVWORLDER, SPECIES_TRITONIAN, SPECIES_MULE, SPECIES_BOOSTER)
 #define UNATHI_SPECIES list(SPECIES_UNATHI, SPECIES_EROSAN, SPECIES_YEOSA)

code/__defines/admin.dm

@@ -48,4 +48,4 @@
 #define TICKET_ASSIGNED 2 // An admin has assigned themself to the ticket and will respond
 
 #define LAST_CKEY(M) (M.ckey || M.last_ckey)
-#define LAST_KEY(M)  (M.key || M.last_ckey)
+#define LAST_KEY(M)  (M.key || M.last_ckey)

code/__defines/antagonists.dm

@@ -1,3 +1,3 @@
 #define ANTAG_SERVANT "servant"
 #define ANTAG_APPRENTICE "apprentice"
-#define ANTAG_WIZARD "Space Wizard"
+#define ANTAG_WIZARD "Space Wizard"

code/__defines/ao.dm

@@ -6,4 +6,4 @@
 #define AO_UPDATE_REBUILD 2
 
 // If ao_neighbors equals this, no AO shadows are present.
-#define AO_ALL_NEIGHBORS 1910 
+#define AO_ALL_NEIGHBORS 1910 

code/__defines/armor.dm

@@ -44,4 +44,4 @@
 #define  ARMOR_ENERGY_SMALL			25
 #define  ARMOR_ENERGY_RESISTANT		40
 #define  ARMOR_ENERGY_STRONG		75
-#define  ARMOR_ENERGY_SHIELDED		100
+#define  ARMOR_ENERGY_SHIELDED		100

code/__defines/atmospherics.dm

@@ -23,4 +23,4 @@
 #define PIPE_CLASS_QUATERNARY       4
 #define PIPE_CLASS_OMNI             5
 
-#define ADIABATIC_EXPONENT          0.667 //Actually adiabatic exponent - 1.
+#define ADIABATIC_EXPONENT          0.667 //Actually adiabatic exponent - 1.

code/__defines/callback.dm

@@ -1,4 +1,4 @@
 #define GLOBAL_PROC	"some_magic_bullshit"
 
 #define CALLBACK new /datum/callback
-#define INVOKE_ASYNC ImmediateInvokeAsync
+#define INVOKE_ASYNC ImmediateInvokeAsync

code/__defines/colors.dm

@@ -169,4 +169,4 @@
 #define CODEX_COLOR_MECHANICS "#9ebcd8"
 #define CODEX_COLOR_ANTAG     "#e5a2a2"
 
-#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5
+#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5

code/__defines/deity.dm

@@ -1,2 +1,2 @@
 #define DEITY_STRUCTURE_NEAR_IMPORTANT 	1 //Whether this needs to be near an important structure.
-#define DEITY_STRUCTURE_ALONE			2 //Whether this can be near another of the same type.
+#define DEITY_STRUCTURE_ALONE			2 //Whether this can be near another of the same type.

code/__defines/directions.dm

@@ -6,4 +6,4 @@
 #define N_NORTHEAST 32
 #define N_NORTHWEST 512
 #define N_SOUTHEAST 64
-#define N_SOUTHWEST 1024 
+#define N_SOUTHWEST 1024 

code/__defines/gamemode.dm

@@ -110,4 +110,4 @@
 
 #define VOTE_STATUS_PREVOTE   1
 #define VOTE_STATUS_ACTIVE    2
-#define VOTE_STATUS_COMPLETE  3
+#define VOTE_STATUS_COMPLETE  3