Merge branch 'dev-sierra' into cooleffects

SierraBay · Jan 5, 2025 · 68462b8 · 68462b8
2 parents 7faef80 + 7e219b5
commit 68462b8
Show file tree

Hide file tree

Showing 290 changed files with 68,106 additions and 1,772 deletions.
diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -49,7 +49,7 @@ jobs:
         run: |
           ~/dmdoc
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@62fec3add6773ec5dbbf18d2ee4260911aa35cf4
+        uses: JamesIves/github-pages-deploy-action@15de0f09300eea763baee31dff6c6184995c5f6a
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -62,7 +62,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -92,14 +92,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -130,14 +130,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -168,14 +168,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"

diff --git a/baystation12.dme b/baystation12.dme
@@ -34,6 +34,7 @@
 #include "code\__defines\atmos.dm"
 #include "code\__defines\atmospherics.dm"
 #include "code\__defines\byond_tracy.dm"
+#include "code\__defines\changeling.dm"
 #include "code\__defines\chemistry.dm"
 #include "code\__defines\client.dm"
 #include "code\__defines\colors.dm"
@@ -348,6 +349,8 @@
 #include "code\datums\item_modifiers\space_suits.dm"
 #include "code\datums\item_modifiers\~defines.dm"
 #include "code\datums\licences\license.dm"
+#include "code\datums\managed_browsers\_managed_browser.dm"
+#include "code\datums\managed_browsers\changelingevolution.dm"
 #include "code\datums\mind\memory.dm"
 #include "code\datums\mind\mind.dm"
 #include "code\datums\move_intent\move_intent.dm"
@@ -494,6 +497,7 @@
 #include "code\datums\traits\general\nonpermeable_skin.dm"
 #include "code\datums\traits\general\permeable_skin.dm"
 #include "code\datums\traits\general\serpentid_adapted.dm"
+#include "code\datums\traits\maluses\allergy.dm"
 #include "code\datums\traits\maluses\animal_protein.dm"
 #include "code\datums\traits\maluses\ethanol.dm"
 #include "code\datums\traits\maluses\malus.dm"
@@ -609,8 +613,48 @@
 #include "code\game\gamemodes\calamity\calamity.dm"
 #include "code\game\gamemodes\changeling\absorbed_dna.dm"
 #include "code\game\gamemodes\changeling\changeling.dm"
+#include "code\game\gamemodes\changeling\changeling_evolutiontree.dm"
 #include "code\game\gamemodes\changeling\changeling_powers.dm"
-#include "code\game\gamemodes\changeling\modularchangling.dm"
+#include "code\game\gamemodes\changeling\generic_equip_procs.dm"
+#include "code\game\gamemodes\changeling\powers\absorb.dm"
+#include "code\game\gamemodes\changeling\powers\armblade.dm"
+#include "code\game\gamemodes\changeling\powers\armor.dm"
+#include "code\game\gamemodes\changeling\powers\augmented_eyesight.dm"
+#include "code\game\gamemodes\changeling\powers\bioelectrogenesis.dm"
+#include "code\game\gamemodes\changeling\powers\blind_sting.dm"
+#include "code\game\gamemodes\changeling\powers\boost_range.dm"
+#include "code\game\gamemodes\changeling\powers\cryo_sting.dm"
+#include "code\game\gamemodes\changeling\powers\darkvision.dm"
+#include "code\game\gamemodes\changeling\powers\deaf_sting.dm"
+#include "code\game\gamemodes\changeling\powers\death_sting.dm"
+#include "code\game\gamemodes\changeling\powers\delayed_toxin_sting.dm"
+#include "code\game\gamemodes\changeling\powers\electric_lockpick.dm"
+#include "code\game\gamemodes\changeling\powers\endoarmor.dm"
+#include "code\game\gamemodes\changeling\powers\engorged_glands.dm"
+#include "code\game\gamemodes\changeling\powers\enrage.dm"
+#include "code\game\gamemodes\changeling\powers\escape_restraints.dm"
+#include "code\game\gamemodes\changeling\powers\extract_dna_sting.dm"
+#include "code\game\gamemodes\changeling\powers\fabricate_clothing.dm"
+#include "code\game\gamemodes\changeling\powers\fake_death.dm"
+#include "code\game\gamemodes\changeling\powers\false_identity.dm"
+#include "code\game\gamemodes\changeling\powers\fleshmend.dm"
+#include "code\game\gamemodes\changeling\powers\hivemind.dm"
+#include "code\game\gamemodes\changeling\powers\lsd_sting.dm"
+#include "code\game\gamemodes\changeling\powers\mimic_voice.dm"
+#include "code\game\gamemodes\changeling\powers\panacea.dm"
+#include "code\game\gamemodes\changeling\powers\rapid_regen.dm"
+#include "code\game\gamemodes\changeling\powers\rapid_synthesis.dm"
+#include "code\game\gamemodes\changeling\powers\reattach_limb.dm"
+#include "code\game\gamemodes\changeling\powers\recursive_enhancement.dm"
+#include "code\game\gamemodes\changeling\powers\reinforced_tendons.dm"
+#include "code\game\gamemodes\changeling\powers\revive.dm"
+#include "code\game\gamemodes\changeling\powers\self_respiration.dm"
+#include "code\game\gamemodes\changeling\powers\shriek.dm"
+#include "code\game\gamemodes\changeling\powers\silence_sting.dm"
+#include "code\game\gamemodes\changeling\powers\synaptizine_overdose.dm"
+#include "code\game\gamemodes\changeling\powers\tentacle.dm"
+#include "code\game\gamemodes\changeling\powers\transform.dm"
+#include "code\game\gamemodes\changeling\powers\visible_camouflage.dm"
 #include "code\game\gamemodes\cult\cult.dm"
 #include "code\game\gamemodes\cult\cult_items.dm"
 #include "code\game\gamemodes\cult\cult_structures.dm"
@@ -1531,7 +1575,10 @@
 #include "code\modules\augment\passive\armor.dm"
 #include "code\modules\augment\passive\boost.dm"
 #include "code\modules\augment\passive\fluff.dm"
+#include "code\modules\augment\passive\ling_lenses.dm"
+#include "code\modules\augment\passive\lingcore.dm"
 #include "code\modules\augment\passive\nanoaura.dm"
+#include "code\modules\augment\passive\ragecore.dm"
 #include "code\modules\augment\passive\boost\muscle.dm"
 #include "code\modules\augment\passive\boost\reflex.dm"
 #include "code\modules\augment\passive\boost\shooting.dm"
@@ -2166,6 +2213,7 @@
 #include "code\modules\mob\living\bot\mulebot.dm"
 #include "code\modules\mob\living\bot\remotebot.dm"
 #include "code\modules\mob\living\bot\secbot.dm"
+#include "code\modules\mob\living\carbon\allergy.dm"
 #include "code\modules\mob\living\carbon\breathe.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
 #include "code\modules\mob\living\carbon\carbon_defense.dm"
@@ -3030,6 +3078,7 @@
 #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_age_comparison.dm"
 #include "code\modules\species\species_attack.dm"
 #include "code\modules\species\species_getters.dm"
 #include "code\modules\species\species_grab.dm"

diff --git a/code/__defines/changeling.dm b/code/__defines/changeling.dm
@@ -0,0 +1,2 @@
+#define ABSORB_NONLETHAL 1
+#define ABSORB_LETHAL 2
diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm
@@ -58,45 +58,53 @@
 #define HOME_SYSTEM_OTHER      "Other System"
 #define HOME_SYSTEM_DEEP_SPACE "Deep Space"
 
-#define CULTURE_OTHER          "Other Culture"
-#define CULTURE_HUMAN          "Humankind"
-#define CULTURE_HUMAN_VATGROWN "Nonborn"
-#define CULTURE_HUMAN_MARTIAN  "Martian, Surfacer"
-#define CULTURE_HUMAN_MARSTUN  "Martian, Tunneller"
-#define CULTURE_HUMAN_LUNAPOOR "Luna, Lower Class"
-#define CULTURE_HUMAN_LUNARICH "Luna, Upper Class"
-#define CULTURE_HUMAN_VENUSIAN "Venusian, Zoner"
-#define CULTURE_HUMAN_VENUSLOW "Venusian, Surfacer"
-#define CULTURE_HUMAN_BELTER   "Belter, Ceres"
-#define CULTURE_HUMAN_KUIPERI  "Kuiper, Insider"
-#define CULTURE_HUMAN_KUIPERO  "Kuiper, Outsider"
-#define CULTURE_HUMAN_MAGNITKA "Magnitkan"
-#define CULTURE_HUMAN_EARTH    "Earther"
-#define CULTURE_HUMAN_CETIN    "Cetite, Northern"
-#define CULTURE_HUMAN_CETIS    "Cetite, Southern"
-#define CULTURE_HUMAN_CETII    "Cetite, Interstate"
-#define CULTURE_HUMAN_FOSTER   "Fostersman"
-#define CULTURE_HUMAN_PIRXL    "Pirxish, High"
-#define CULTURE_HUMAN_PIRXB    "Pirxish, Bugeater"
-#define CULTURE_HUMAN_PIRXF    "Pirxish, Frontier"
-#define CULTURE_HUMAN_TADMOR   "Tadmorian"
-#define CULTURE_HUMAN_IOLAUS   "Iolan"
-#define CULTURE_HUMAN_BRAHE    "Brahite"
-#define CULTURE_HUMAN_EOS      "Eosic"
-#define CULTURE_HUMAN_SPACER   "Spacer"
-#define CULTURE_HUMAN_OFFWORLD "Offworlder"
-#define CULTURE_HUMAN_SOLCOL   "Solar-Colonial"
-#define CULTURE_HUMAN_CONFEDC  "Confederate, Core Systems"
-#define CULTURE_HUMAN_CONFEDO  "Confederate, Outer Systems"
-#define CULTURE_HUMAN_GAIAN    "Gaian"
-#define CULTURE_HUMAN_OTHER    "Other, Humanity"
-#define CULTURE_STARLIGHT      "Starlit Realms"
-#define CULTURE_MONKEY         "Monkey Business"
-#define CULTURE_FARWA          "Farwa Business"
-#define CULTURE_NEARA          "Neara Business"
-#define CULTURE_STOK           "Stok Business"
-#define CULTURE_ALIUM          "Mysterious Aliens"
-#define CULTURE_CULTIST        "Blood Cult"
+#define CULTURE_OTHER          			"Other Culture"
+#define CULTURE_HUMAN          			"Humankind"
+#define CULTURE_HUMAN_VATGROWN 			"Nonborn"
+#define CULTURE_HUMAN_MARTIAN  			"Martian, Surfacer"
+#define CULTURE_HUMAN_MARSTUN  			"Martian, Tunneller"
+#define CULTURE_HUMAN_LUNAPOOR 			"Luna, Lower Class"
+#define CULTURE_HUMAN_LUNARICH 			"Luna, Upper Class"
+#define CULTURE_HUMAN_VENUSIAN 			"Venusian, Zoner"
+#define CULTURE_HUMAN_VENUSLOW 			"Venusian, Surfacer"
+#define CULTURE_HUMAN_BELTER   			"Belter, Ceres"
+#define CULTURE_HUMAN_KUIPERI  			"Kuiper, Insider"
+#define CULTURE_HUMAN_KUIPERO  			"Kuiper, Outsider"
+#define CULTURE_HUMAN_MAGNITKA 			"Magnitkan"
+#define CULTURE_HUMAN_EARTH    			"Earther"
+#define CULTURE_HUMAN_CETIN    			"Cetite, Northern"
+#define CULTURE_HUMAN_CETIS    			"Cetite, Southern"
+#define CULTURE_HUMAN_CETII    			"Cetite, Interstate"
+#define CULTURE_HUMAN_FOSTER   			"Fostersman"
+#define CULTURE_HUMAN_PIRXL    			"Pirxish, High"
+#define CULTURE_HUMAN_PIRXB    			"Pirxish, Bugeater"
+#define CULTURE_HUMAN_PIRXF    			"Pirxish, Frontier"
+#define CULTURE_HUMAN_TADMOR   			"Tadmorian"
+#define CULTURE_HUMAN_IOLAUS   			"Iolan"
+#define CULTURE_HUMAN_BRAHE    			"Brahite"
+#define CULTURE_HUMAN_EOS      			"Eosic"
+#define CULTURE_HUMAN_SPACER   			"Spacer"
+#define CULTURE_HUMAN_OFFWORLD 			"Offworlder"
+#define CULTURE_HUMAN_SOLCOL   			"Solar-Colonial"
+#define CULTURE_HUMAN_THEIA	   			"Theian"
+#define CULTURE_HUMAN_CONFED_TERRA  	"Terran"
+#define CULTURE_HUMAN_CONFED_ZEMLYA 	"Zemlyan"
+#define CULTURE_HUMAN_CONFED_SESTRIS	"Sestrisite"
+#define CULTURE_HUMAN_CONFED_PUTKARI	"Putkarian"
+#define CULTURE_HUMAN_CONFED_ALTAIR		"Altairian"
+#define CULTURE_HUMAN_CONFED_PENGLAI	"Pengalese"
+#define CULTURE_HUMAN_CONFED_PROVIDENCE	"Providentian"
+#define CULTURE_HUMAN_CONFED_VALY		"Valyan"
+#define CULTURE_HUMAN_CONFEDO  			"Confederate, Colonial"
+#define CULTURE_HUMAN_GAIAN    			"Gaian"
+#define CULTURE_HUMAN_OTHER    			"Other, Humanity"
+#define CULTURE_STARLIGHT      			"Starlit Realms"
+#define CULTURE_MONKEY         			"Monkey Business"
+#define CULTURE_FARWA          			"Farwa Business"
+#define CULTURE_NEARA          			"Neara Business"
+#define CULTURE_STOK           			"Stok Business"
+#define CULTURE_ALIUM          			"Mysterious Aliens"
+#define CULTURE_CULTIST        			"Blood Cult"
 
 #define RELIGION_OTHER         "Other Religion"
 #define RELIGION_JUDAISM       "Judaism"

diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm
@@ -97,6 +97,9 @@
 #define Sp_CHARGES	"charges"
 #define Sp_HOLDVAR	"holdervar"
 
+//changeling cost
+#define CHANGELING_STASIS_COST 20
+
 //Voting-related
 #define VOTE_PROCESS_ABORT    1
 #define VOTE_PROCESS_COMPLETE 2
@@ -105,3 +108,14 @@
 #define VOTE_STATUS_PREVOTE   1
 #define VOTE_STATUS_ACTIVE    2
 #define VOTE_STATUS_COMPLETE  3
+
+/*
+Changeling Defines
+*/
+#define CHANGELING_POWER_INHERENT "Inherent"
+#define CHANGELING_POWER_ARMOR "Armor"
+#define CHANGELING_POWER_STINGS "Stings"
+#define CHANGELING_POWER_SHRIEKS "Shrieks"
+#define CHANGELING_POWER_HEALTH "Health"
+#define CHANGELING_POWER_ENHANCEMENTS "Enhancements"
+#define CHANGELING_POWER_WEAPONS "Weapons"
diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
@@ -163,7 +163,7 @@
 #define FLASH_PROTECTION_MODERATE 2
 #define FLASH_PROTECTION_MAJOR 3
 
-#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 6)
+#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 2) //SIERRA-EDIT ORIG was /6
 #define DRONE_SPAWN_DELAY  round(config.respawn_delay / 3)
 
 // Incapacitation flags, used by the mob/proc/incapacitated() proc
@@ -496,3 +496,7 @@
 
 /// Integer (~ticks * SSMobs/wait fire rate). The default maximum value a mob's confused var can be set to.
 #define CONFUSED_MAX 15
+
+///Flags assigned to carbon mobs trait_flags when they're actively having an allergy.
+#define MILD_ALLERGY FLAG(0)
+#define SEVERE_ALLERGY FLAG(1)
diff --git a/code/__defines/~mods/expanded_culture_descriptor.dm b/code/__defines/~mods/expanded_culture_descriptor.dm
@@ -24,16 +24,23 @@
 #define CULTURE_HUMAN_LORDLOW "Lordanian, Lower"
 #define CULTURE_HUMAN_MIRANIAN "Miranian"
 #define CULTURE_HUMAN_NYXIAN "Nyxian"
+#define CULTURE_HUMAN_CONFEDC "Confederate, Core Systems"
 
-#define HOME_SYSTEM_PLUTO      "Pluto"
-#define HOME_SYSTEM_TERSTEN                 "Tersten"
+#define HOME_SYSTEM_PLUTO                	"Pluto"
+#define HOME_SYSTEM_TERSTEN              	"Tersten"
 #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"
+#define HOME_SYSTEM_LORRIMAN             	"Lorriman"
+#define HOME_SYSTEM_CINU                 	"Cinu"
+#define HOME_SYSTEM_YUKLID               	"Yuklid V"
+#define HOME_SYSTEM_LORDANIA             	"Lordania"
+#define HOME_SYSTEM_KINGSTON             	"Kingston"
+#define HOME_SYSTEM_QUIG           	      "Quig"
 
 #define FACTION_SKRELL_MED  "Gloa'Morr Corp."
 #define FACTION_SKRELL_AIR  "Krri'gli Corp."

diff --git a/code/__defines/~mods/~master_defines.dm b/code/__defines/~mods/~master_defines.dm
@@ -99,3 +99,9 @@
 #define ANNOUNCER_BLUESPACEJUMP_PREP 'mods/eris_announcer/sound/announcements/bluespacejump_prepare.ogg'
 #define ANNOUNCER_BLUESPACEJUMP_START 'mods/eris_announcer/sound/announcements/bluespacejump_start.ogg'
 // ERIS_ANNOUNCER - End
+
+//PRIMLANGS - Start
+#define LANGUAGE_SIMPSKRELLIAN "Simplified Skrellian"
+#define LANGUAGE_SIMPUNATHI "Iber'Unathi"
+#define LANGUAGE_SIMPTAJARAN "Simplified Siik'Maas"
+//PRIMLANGS - End
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define ABSORB_NONLETHAL 1
		#define ABSORB_LETHAL 2