diff --git a/README.md b/README.md index 7804321b4a..5249fc4160 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ The code for VOREStation is licensed under the [GNU Affero General Public Licens Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) are licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt. -All code whose authorship dates are not prior to `1420675200 +0000` are 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. +All code whose authorship dates are not prior to `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. -If you wish to develop and host this codebase in a closed source manner you may use all code 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. +If you wish to develop and host this codebase in a closed source manner you may use all code prior to `1420675200 +0000`, which is 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. See [here](https://www.gnu.org/licenses/why-affero-gpl.html) for more information. diff --git a/sound/effects/mousesqueek.ogg b/sound/effects/mouse_squeak.ogg similarity index 100% rename from sound/effects/mousesqueek.ogg rename to sound/effects/mouse_squeak.ogg diff --git a/sound/effects/mouse_squeak_loud.ogg b/sound/effects/mouse_squeak_loud.ogg new file mode 100644 index 0000000000..60732123b1 Binary files /dev/null and b/sound/effects/mouse_squeak_loud.ogg differ diff --git a/sound/effects/woodcutting.ogg b/sound/effects/woodcutting.ogg new file mode 100644 index 0000000000..ef4883ba7e Binary files /dev/null and b/sound/effects/woodcutting.ogg differ diff --git a/sound/weapons/Gunshot.ogg b/sound/weapons/Gunshot.ogg index eee7d68648..4fd082ce7f 100644 Binary files a/sound/weapons/Gunshot.ogg and b/sound/weapons/Gunshot.ogg differ diff --git a/sound/weapons/Gunshot_heavy.ogg b/sound/weapons/Gunshot_heavy.ogg new file mode 100644 index 0000000000..eee7d68648 Binary files /dev/null and b/sound/weapons/Gunshot_heavy.ogg differ diff --git a/sound/weapons/Laser.ogg b/sound/weapons/Laser.ogg index 4e566c1cf5..0fbb611f9c 100644 Binary files a/sound/weapons/Laser.ogg and b/sound/weapons/Laser.ogg differ diff --git a/sound/weapons/gunshot2.ogg b/sound/weapons/gunshot2.ogg new file mode 100644 index 0000000000..2dfc6fc1e9 Binary files /dev/null and b/sound/weapons/gunshot2.ogg differ diff --git a/sound/weapons/gunshot3.ogg b/sound/weapons/gunshot3.ogg new file mode 100644 index 0000000000..97799dff10 Binary files /dev/null and b/sound/weapons/gunshot3.ogg differ diff --git a/sound/weapons/gunshot4.ogg b/sound/weapons/gunshot4.ogg new file mode 100644 index 0000000000..2d971f7b1a Binary files /dev/null and b/sound/weapons/gunshot4.ogg differ diff --git a/sound/weapons/semiauto.ogg b/sound/weapons/gunshot_pathetic.ogg similarity index 100% rename from sound/weapons/semiauto.ogg rename to sound/weapons/gunshot_pathetic.ogg diff --git a/vorestation.dme b/vorestation.dme index 5e62b649e7..a1ce3afba0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -187,6 +187,7 @@ #include "code\controllers\Processes\vote.dm" #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm" +#include "code\controllers\subsystems\creation.dm" #include "code\controllers\subsystems\garbage.dm" #include "code\controllers\subsystems\lighting.dm" #include "code\controllers\subsystems\mobs.dm" @@ -345,6 +346,7 @@ #include "code\game\antagonist\antagonist_print.dm" #include "code\game\antagonist\antagonist_update.dm" #include "code\game\antagonist\alien\borer.dm" +#include "code\game\antagonist\alien\xenomorph.dm" #include "code\game\antagonist\outsider\commando.dm" #include "code\game\antagonist\outsider\deathsquad.dm" #include "code\game\antagonist\outsider\ert.dm" @@ -804,6 +806,7 @@ #include "code\game\objects\effects\spiders.dm" #include "code\game\objects\effects\step_triggers.dm" #include "code\game\objects\effects\zone_divider.dm" +#include "code\game\objects\effects\alien\aliens.dm" #include "code\game\objects\effects\chem\chemsmoke.dm" #include "code\game\objects\effects\chem\foam.dm" #include "code\game\objects\effects\chem\water.dm" @@ -1092,6 +1095,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security_vr.dm" +#include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm" #include "code\game\objects\structures\stool_bed_chair_nest\bed.dm" #include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools.dm" @@ -1204,6 +1208,7 @@ #include "code\modules\admin\secrets\fun_secrets\turn_humans_into_monkeys.dm" #include "code\modules\admin\secrets\random_events\gravity.dm" #include "code\modules\admin\secrets\random_events\trigger_cordical_borer_infestation.dm" +#include "code\modules\admin\secrets\random_events\trigger_xenomorph_infestation.dm" #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminjump.dm" #include "code\modules\admin\verbs\adminpm.dm" @@ -1222,6 +1227,7 @@ #include "code\modules\admin\verbs\dice.dm" #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\grief_fixers.dm" +#include "code\modules\admin\verbs\map_template_loadverb.dm" #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\massmodvar.dm" #include "code\modules\admin\verbs\modifyvariables.dm" @@ -1643,10 +1649,9 @@ #include "code\modules\lore_codex\lore_data_vr\orgs.dm" #include "code\modules\lore_codex\lore_data_vr\political_parties.dm" #include "code\modules\lore_codex\lore_data_vr\species.dm" -#include "code\modules\maps\dmm_suite.dm" -#include "code\modules\maps\reader.dm" -#include "code\modules\maps\swapmaps.dm" -#include "code\modules\maps\writer.dm" +#include "code\modules\maps\tg\dmm_suite.dm" +#include "code\modules\maps\tg\map_template.dm" +#include "code\modules\maps\tg\reader.dm" #include "code\modules\materials\fifty_spawner_mats.dm" #include "code\modules\materials\material_recipes.dm" #include "code\modules\materials\material_sheets.dm" @@ -1778,6 +1783,9 @@ #include "code\modules\mob\living\carbon\alien\diona\progression.dm" #include "code\modules\mob\living\carbon\alien\diona\say_understands.dm" #include "code\modules\mob\living\carbon\alien\diona\update_icons.dm" +#include "code\modules\mob\living\carbon\alien\larva\larva.dm" +#include "code\modules\mob\living\carbon\alien\larva\life.dm" +#include "code\modules\mob\living\carbon\alien\larva\progression.dm" #include "code\modules\mob\living\carbon\brain\brain.dm" #include "code\modules\mob\living\carbon\brain\death.dm" #include "code\modules\mob\living\carbon\brain\emote.dm" @@ -1842,11 +1850,13 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" +#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm" +#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_species.dm" +#include "code\modules\mob\living\carbon\human\species\xenomorphs\xenomorphs.dm" #include "code\modules\mob\living\carbon\metroid\death.dm" #include "code\modules\mob\living\carbon\metroid\emote.dm" #include "code\modules\mob\living\carbon\metroid\examine.dm" #include "code\modules\mob\living\carbon\metroid\hud.dm" -#include "code\modules\mob\living\carbon\metroid\items.dm" #include "code\modules\mob\living\carbon\metroid\life.dm" #include "code\modules\mob\living\carbon\metroid\login.dm" #include "code\modules\mob\living\carbon\metroid\metroid.dm" @@ -1951,7 +1961,6 @@ #include "code\modules\mob\living\simple_animal\animals\pike_vr.dm" #include "code\modules\mob\living\simple_animal\animals\slime.dm" #include "code\modules\mob\living\simple_animal\animals\snake_vr.dm" -#include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\animals\spiderbot.dm" #include "code\modules\mob\living\simple_animal\animals\tomato.dm" #include "code\modules\mob\living\simple_animal\animals\tree.dm" @@ -1969,6 +1978,12 @@ #include "code\modules\mob\living\simple_animal\humanoids\pirate.dm" #include "code\modules\mob\living\simple_animal\humanoids\russian.dm" #include "code\modules\mob\living\simple_animal\humanoids\syndicate.dm" +#include "code\modules\mob\living\simple_animal\slime\ai.dm" +#include "code\modules\mob\living\simple_animal\slime\combat.dm" +#include "code\modules\mob\living\simple_animal\slime\death.dm" +#include "code\modules\mob\living\simple_animal\slime\life.dm" +#include "code\modules\mob\living\simple_animal\slime\slime.dm" +#include "code\modules\mob\living\simple_animal\slime\subtypes.dm" #include "code\modules\mob\living\simple_animal\vore\awoo.dm" #include "code\modules\mob\living\simple_animal\vore\bee.dm" #include "code\modules\mob\living\simple_animal\vore\carp.dm" @@ -1981,6 +1996,7 @@ #include "code\modules\mob\living\simple_animal\vore\horse.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm" #include "code\modules\mob\living\simple_animal\vore\snake.dm" +#include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\vore\wah.dm" #include "code\modules\mob\living\simple_animal\vore\wolf.dm" #include "code\modules\mob\living\simple_animal\vore\zz_vore_overrides.dm" @@ -2065,6 +2081,7 @@ #include "code\modules\organs\subtypes\unathi.dm" #include "code\modules\organs\subtypes\unbreakable.dm" #include "code\modules\organs\subtypes\vox.dm" +#include "code\modules\organs\subtypes\xenos.dm" #include "code\modules\overmap\_defines.dm" #include "code\modules\overmap\sectors.dm" #include "code\modules\overmap\ships\ship.dm" @@ -2401,7 +2418,6 @@ #include "code\modules\surgery\organs_internal.dm" #include "code\modules\surgery\other.dm" #include "code\modules\surgery\robotics.dm" -#include "code\modules\surgery\slimes.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\surgery\~defines.dm" #include "code\modules\tables\bench.dm" @@ -2538,24 +2554,11 @@ #include "code\modules\xenoarcheaology\tools\tools_pickaxe.dm" #include "code\modules\xenoarcheaology\tools\tools_pickaxe_vr.dm" #include "code\modules\xenoarcheaology\tools\tools_vr.dm" -#include "code\modules\xenobio2\_xeno_setup.dm" -#include "code\modules\xenobio2\_xeno_setup_vr.dm" -#include "code\modules\xenobio2\controller.dm" -#include "code\modules\xenobio2\machinery\core_extractor.dm" -#include "code\modules\xenobio2\machinery\gene_manipulators.dm" -#include "code\modules\xenobio2\machinery\injector.dm" -#include "code\modules\xenobio2\machinery\injector_computer.dm" -#include "code\modules\xenobio2\machinery\slime_replicator.dm" -#include "code\modules\xenobio2\mob\xeno procs.dm" -#include "code\modules\xenobio2\mob\xeno.dm" -#include "code\modules\xenobio2\mob\xeno_product.dm" -#include "code\modules\xenobio2\mob\slime\slime life.dm" -#include "code\modules\xenobio2\mob\slime\slime procs.dm" -#include "code\modules\xenobio2\mob\slime\slime.dm" -#include "code\modules\xenobio2\mob\slime\slime_core.dm" -#include "code\modules\xenobio2\mob\slime\slime_monkey.dm" -#include "code\modules\xenobio2\tools\slime_handling_tools.dm" -#include "code\modules\xenobio2\tools\xeno_trait_scanner.dm" +#include "code\modules\xenobio\items\extracts.dm" +#include "code\modules\xenobio\items\slime_objects.dm" +#include "code\modules\xenobio\items\slimepotions.dm" +#include "code\modules\xenobio\items\weapons.dm" +#include "code\modules\xenobio\machinery\processor.dm" #include "code\modules\xgm\xgm_gas_data.dm" #include "code\modules\xgm\xgm_gas_mixture.dm" #include "code\unit_tests\loadout_tests.dm"