cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins

Browse Source 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
This commit is contained in:
Anewbe
2017-01-17 22:05:38 -06:00
parent 2c86a0a465 b0faa7c06c
commit d53cfc4773
137 changed files with 2730 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
polaris.dme
View File

@@ -777,6 +777,7 @@
#include "code\game\objects\items\devices\taperecorder.dm"
#include "code\game\objects\items\devices\traitordevices.dm"
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\tvcamera.dm"
#include "code\game\objects\items\devices\uplink.dm"
#include "code\game\objects\items\devices\uplink_random_lists.dm"
#include "code\game\objects\items\devices\violin.dm"
@@ -879,6 +880,7 @@
#include "code\game\objects\items\weapons\implants\implant.dm"
#include "code\game\objects\items\weapons\implants\implantcase.dm"
#include "code\game\objects\items\weapons\implants\implantchair.dm"
#include "code\game\objects\items\weapons\implants\implantcircuits.dm"
#include "code\game\objects\items\weapons\implants\implanter.dm"
#include "code\game\objects\items\weapons\implants\implantfreedom.dm"
#include "code\game\objects\items\weapons\implants\implantlanguage.dm"
@@ -1031,6 +1033,7 @@
#include "code\modules\admin\IsBanned.dm"
#include "code\modules\admin\map_capture.dm"
#include "code\modules\admin\NewBan.dm"
#include "code\modules\admin\news.dm"
#include "code\modules\admin\player_notes.dm"
#include "code\modules\admin\player_panel.dm"
#include "code\modules\admin\topic.dm"
@@ -1143,6 +1146,7 @@
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_spawnpoints.dm"
#include "code\modules\client\preferences_toggle_procs.dm"
#include "code\modules\client\spam_prevention.dm"
#include "code\modules\client\ui_style.dm"
#include "code\modules\client\preference_setup\_defines.dm"
#include "code\modules\client\preference_setup\preference_setup.dm"
@@ -1318,6 +1322,7 @@
#include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\random_antagonist.dm"
#include "code\modules\events\rogue_drones.dm"
#include "code\modules\events\shipping_error.dm"
#include "code\modules\events\solar_storm.dm"
#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\spacevine.dm"
@@ -1392,7 +1397,6 @@
#include "code\modules\integrated_electronics\arithmetic.dm"
#include "code\modules\integrated_electronics\assemblies.dm"
#include "code\modules\integrated_electronics\converters.dm"
#include "code\modules\integrated_electronics\coordinate.dm"
#include "code\modules\integrated_electronics\data_transfer.dm"
#include "code\modules\integrated_electronics\input_output.dm"
#include "code\modules\integrated_electronics\logic.dm"
@@ -1401,6 +1405,7 @@
#include "code\modules\integrated_electronics\reagents.dm"
#include "code\modules\integrated_electronics\time.dm"
#include "code\modules\integrated_electronics\tools.dm"
#include "code\modules\integrated_electronics\trig.dm"
#include "code\modules\integrated_electronics\~defines.dm"
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
@@ -2120,6 +2125,12 @@
#include "code\unit_tests\research_tests.dm"
#include "code\unit_tests\unit_test.dm"
#include "code\unit_tests\zas_tests.dm"
#include "code\unit_tests\integrated_circuits\arithmetic.dm"
#include "code\unit_tests\integrated_circuits\circuits.dm"
#include "code\unit_tests\integrated_circuits\converter.dm"
#include "code\unit_tests\integrated_circuits\data_transfer.dm"
#include "code\unit_tests\integrated_circuits\logic.dm"
#include "code\unit_tests\integrated_circuits\trig.dm"
#include "code\ZAS\_docs.dm"
#include "code\ZAS\Airflow.dm"
#include "code\ZAS\Atom.dm"