cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2

Browse Source
This commit is contained in:
Spades
2016-10-04 16:06:18 -04:00
parent 31681d054f 5d8ac049f7
commit c2dba72caf
72 changed files with 776 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polaris.dme
View File

@@ -140,6 +140,7 @@
#include "code\controllers\Processes\chemistry.dm"
#include "code\controllers\Processes\emergencyShuttle.dm"
#include "code\controllers\Processes\event.dm"
#include "code\controllers\Processes\game_master.dm"
#include "code\controllers\Processes\garbage.dm"
#include "code\controllers\Processes\inactivity.dm"
#include "code\controllers\Processes\machinery.dm"
@@ -995,6 +996,7 @@
#include "code\game\turfs\simulated\wall_types.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\snow\snow.dm"
#include "code\game\turfs\space\cracked_asteroid.dm"
#include "code\game\turfs\space\space.dm"
#include "code\game\turfs\space\transit.dm"
#include "code\game\turfs\unsimulated\beach.dm"
@@ -1335,6 +1337,14 @@
#include "code\modules\flufftext\Hallucination.dm"
#include "code\modules\flufftext\TextFilters.dm"
#include "code\modules\food\recipes_microwave.dm"
#include "code\modules\gamemaster\controller.dm"
#include "code\modules\gamemaster\defines.dm"
#include "code\modules\gamemaster\game_master.dm"
#include "code\modules\gamemaster\helpers.dm"
#include "code\modules\gamemaster\actions\action.dm"
#include "code\modules\gamemaster\actions\comms_blackout.dm"
#include "code\modules\gamemaster\actions\grid_check.dm"
#include "code\modules\gamemaster\actions\waste_disposal.dm"
#include "code\modules\games\cah.dm"
#include "code\modules\games\cah_black_cards.dm"
#include "code\modules\games\cah_white_cards.dm"