mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-26 01:52:29 +00:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard
This commit is contained in:
48
polaris.dme
48
polaris.dme
@@ -64,6 +64,7 @@
|
||||
#include "code\_onclick\telekinesis.dm"
|
||||
#include "code\_onclick\hud\_defines.dm"
|
||||
#include "code\_onclick\hud\action.dm"
|
||||
#include "code\_onclick\hud\ai.dm"
|
||||
#include "code\_onclick\hud\alien_larva.dm"
|
||||
#include "code\_onclick\hud\gun_mode.dm"
|
||||
#include "code\_onclick\hud\hud.dm"
|
||||
@@ -178,7 +179,6 @@
|
||||
#include "code\datums\wires\autolathe.dm"
|
||||
#include "code\datums\wires\camera.dm"
|
||||
#include "code\datums\wires\explosive.dm"
|
||||
#include "code\datums\wires\mulebot.dm"
|
||||
#include "code\datums\wires\particle_accelerator.dm"
|
||||
#include "code\datums\wires\radio.dm"
|
||||
#include "code\datums\wires\robot.dm"
|
||||
@@ -219,7 +219,6 @@
|
||||
#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"
|
||||
@@ -325,7 +324,6 @@
|
||||
#include "code\game\gamemodes\malfunction\newmalf_ability_trees\tree_networking.dm"
|
||||
#include "code\game\gamemodes\meteor\meteor.dm"
|
||||
#include "code\game\gamemodes\meteor\meteors.dm"
|
||||
#include "code\game\gamemodes\mixed\bughunt.dm"
|
||||
#include "code\game\gamemodes\mixed\conflux.dm"
|
||||
#include "code\game\gamemodes\mixed\infestation.dm"
|
||||
#include "code\game\gamemodes\mixed\paranoia.dm"
|
||||
@@ -462,8 +460,6 @@
|
||||
#include "code\game\machinery\atmoalter\portable_atmospherics.dm"
|
||||
#include "code\game\machinery\atmoalter\pump.dm"
|
||||
#include "code\game\machinery\atmoalter\scrubber.dm"
|
||||
#include "code\game\machinery\bots\bots.dm"
|
||||
#include "code\game\machinery\bots\mulebot.dm"
|
||||
#include "code\game\machinery\camera\camera.dm"
|
||||
#include "code\game\machinery\camera\camera_assembly.dm"
|
||||
#include "code\game\machinery\camera\motion.dm"
|
||||
@@ -594,7 +590,6 @@
|
||||
#include "code\game\objects\objs.dm"
|
||||
#include "code\game\objects\structures.dm"
|
||||
#include "code\game\objects\weapons.dm"
|
||||
#include "code\game\objects\effects\aliens.dm"
|
||||
#include "code\game\objects\effects\bump_teleporter.dm"
|
||||
#include "code\game\objects\effects\effect_system.dm"
|
||||
#include "code\game\objects\effects\explosion_particles.dm"
|
||||
@@ -784,6 +779,7 @@
|
||||
#include "code\game\objects\items\weapons\storage\fancy.dm"
|
||||
#include "code\game\objects\items\weapons\storage\firstaid.dm"
|
||||
#include "code\game\objects\items\weapons\storage\internal.dm"
|
||||
#include "code\game\objects\items\weapons\storage\laundry_basket.dm"
|
||||
#include "code\game\objects\items\weapons\storage\lockbox.dm"
|
||||
#include "code\game\objects\items\weapons\storage\misc.dm"
|
||||
#include "code\game\objects\items\weapons\storage\secure.dm"
|
||||
@@ -809,7 +805,6 @@
|
||||
#include "code\game\objects\structures\inflatable.dm"
|
||||
#include "code\game\objects\structures\janicart.dm"
|
||||
#include "code\game\objects\structures\kitchen_spike.dm"
|
||||
#include "code\game\objects\structures\lamarr_cage.dm"
|
||||
#include "code\game\objects\structures\lattice.dm"
|
||||
#include "code\game\objects\structures\mirror.dm"
|
||||
#include "code\game\objects\structures\mop_bucket.dm"
|
||||
@@ -854,7 +849,6 @@
|
||||
#include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
|
||||
#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\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"
|
||||
@@ -948,7 +942,6 @@
|
||||
#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"
|
||||
@@ -1014,7 +1007,6 @@
|
||||
#include "code\modules\client\movement.dm"
|
||||
#include "code\modules\client\preferences.dm"
|
||||
#include "code\modules\client\preferences_factions.dm"
|
||||
#include "code\modules\client\preferences_gear.dm"
|
||||
#include "code\modules\client\preferences_savefile.dm"
|
||||
#include "code\modules\client\preferences_spawnpoints.dm"
|
||||
#include "code\modules\client\preferences_toggles.dm"
|
||||
@@ -1032,6 +1024,21 @@
|
||||
#include "code\modules\client\preference_setup\global\02_settings.dm"
|
||||
#include "code\modules\client\preference_setup\global\03_pai.dm"
|
||||
#include "code\modules\client\preference_setup\global\04_communicators.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_accessories.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_ears.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_eyes.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_general.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_gloves.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_head.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_mask.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_shoes.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_smoking.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_suit.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_uniform.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_utility.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno.dm"
|
||||
#include "code\modules\client\preference_setup\occupation\occupation.dm"
|
||||
#include "code\modules\client\preference_setup\skills\skills.dm"
|
||||
#include "code\modules\clothing\chameleon.dm"
|
||||
@@ -1039,6 +1046,7 @@
|
||||
#include "code\modules\clothing\ears\skrell.dm"
|
||||
#include "code\modules\clothing\glasses\glasses.dm"
|
||||
#include "code\modules\clothing\glasses\hud.dm"
|
||||
#include "code\modules\clothing\gloves\arm_guards.dm"
|
||||
#include "code\modules\clothing\gloves\boxing.dm"
|
||||
#include "code\modules\clothing\gloves\color.dm"
|
||||
#include "code\modules\clothing\gloves\miscellaneous.dm"
|
||||
@@ -1057,6 +1065,7 @@
|
||||
#include "code\modules\clothing\masks\voice.dm"
|
||||
#include "code\modules\clothing\shoes\colour.dm"
|
||||
#include "code\modules\clothing\shoes\jobs.dm"
|
||||
#include "code\modules\clothing\shoes\leg_guards.dm"
|
||||
#include "code\modules\clothing\shoes\magboots.dm"
|
||||
#include "code\modules\clothing\shoes\miscellaneous.dm"
|
||||
#include "code\modules\clothing\spacesuits\alien.dm"
|
||||
@@ -1117,7 +1126,6 @@
|
||||
#include "code\modules\detectivework\forensics.dm"
|
||||
#include "code\modules\detectivework\microscope\dnascanner.dm"
|
||||
#include "code\modules\detectivework\microscope\microscope.dm"
|
||||
#include "code\modules\detectivework\microscope\slides.dm"
|
||||
#include "code\modules\detectivework\tools\crimekit.dm"
|
||||
#include "code\modules\detectivework\tools\evidencebag.dm"
|
||||
#include "code\modules\detectivework\tools\luminol.dm"
|
||||
@@ -1130,10 +1138,13 @@
|
||||
#include "code\modules\economy\Accounts_DB.dm"
|
||||
#include "code\modules\economy\ATM.dm"
|
||||
#include "code\modules\economy\cash.dm"
|
||||
#include "code\modules\economy\cash_register.dm"
|
||||
#include "code\modules\economy\economy_misc.dm"
|
||||
#include "code\modules\economy\EFTPOS.dm"
|
||||
#include "code\modules\economy\Events.dm"
|
||||
#include "code\modules\economy\Events_Mundane.dm"
|
||||
#include "code\modules\economy\price_list.dm"
|
||||
#include "code\modules\economy\retail_scanner.dm"
|
||||
#include "code\modules\economy\TradeDestinations.dm"
|
||||
#include "code\modules\events\apc_damage.dm"
|
||||
#include "code\modules\events\blob.dm"
|
||||
@@ -1185,6 +1196,9 @@
|
||||
#include "code\modules\flufftext\Hallucination.dm"
|
||||
#include "code\modules\flufftext\TextFilters.dm"
|
||||
#include "code\modules\food\recipes_microwave.dm"
|
||||
#include "code\modules\games\cah.dm"
|
||||
#include "code\modules\games\cah_black_cards.dm"
|
||||
#include "code\modules\games\cah_white_cards.dm"
|
||||
#include "code\modules\games\cardemon.dm"
|
||||
#include "code\modules\games\cards.dm"
|
||||
#include "code\modules\games\spaceball_cards.dm"
|
||||
@@ -1226,7 +1240,6 @@
|
||||
#include "code\modules\lighting\lighting_system.dm"
|
||||
#include "code\modules\lighting\lighting_turf.dm"
|
||||
#include "code\modules\lighting\~lighting_undefs.dm"
|
||||
#include "code\modules\liquid\splash_simulation.dm"
|
||||
#include "code\modules\maps\dmm_suite.dm"
|
||||
#include "code\modules\maps\reader.dm"
|
||||
#include "code\modules\maps\swapmaps.dm"
|
||||
@@ -1313,6 +1326,7 @@
|
||||
#include "code\modules\mob\living\bot\farmbot.dm"
|
||||
#include "code\modules\mob\living\bot\floorbot.dm"
|
||||
#include "code\modules\mob\living\bot\medbot.dm"
|
||||
#include "code\modules\mob\living\bot\mulebot.dm"
|
||||
#include "code\modules\mob\living\bot\secbot.dm"
|
||||
#include "code\modules\mob\living\carbon\breathe.dm"
|
||||
#include "code\modules\mob\living\carbon\carbon.dm"
|
||||
@@ -1338,9 +1352,6 @@
|
||||
#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\brain_item.dm"
|
||||
#include "code\modules\mob\living\carbon\brain\death.dm"
|
||||
@@ -1380,17 +1391,11 @@
|
||||
#include "code\modules\mob\living\carbon\human\species\species_attack.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\species_hud.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\golem.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\monkey.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\seromi.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\slime.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\station.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_embryo.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_facehugger.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"
|
||||
@@ -1552,7 +1557,6 @@
|
||||
#include "code\modules\organs\subtypes\seromi.dm"
|
||||
#include "code\modules\organs\subtypes\standard.dm"
|
||||
#include "code\modules\organs\subtypes\unbreakable.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"
|
||||
|
||||
Reference in New Issue
Block a user