April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
+1 -3
View File
@@ -10,7 +10,6 @@
#_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm
##RESPAWN
#_maps/RandomRuins/LavaRuins/lavaland_surface_prisoner_crash.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -30,7 +29,6 @@
#_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
#_maps/RandomRuins/LavaRuins/lavaland_gym.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm
@@ -39,4 +37,4 @@
#_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
+9 -6
View File
@@ -18,18 +18,21 @@ map tgstation2
endmap
map metastation
minplayers 10
minplayers 25
#voteweight 0.5
endmap
map pubbystation
minplayers 10
endmap
map CitadelStation
#default
#voteweight 1.5
map omegastation
maxplayers 35
endmap
map deltastation
minplayers 10
minplayers 50
endmap
map cerestation
minplayers 45
endmap
Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

+21 -12
View File
@@ -1,20 +1,29 @@
#Listing maps here will make the shuttle not available to buy in comms console.
#Maps must be the full path to them
#Only shuttles with a price in the code will work with this!
#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
##Listing maps here will make the shuttle not available to buy in comms console.
##Maps must be the full path to them
##Only shuttles with a price in the code will work with this!
##SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
#_maps/shuttles/emergency_asteroid.dmm
#_maps/shuttles/emergency_bar.dmm
#_maps/shuttles/emergency_meteor.dmm
#_maps/shuttles/emergency_luxury.dmm
##Station shuttles
#_maps/shuttles/emergency_birdboat.dmm
#_maps/shuttles/emergency_box.dmm
#_maps/shuttles/emergency_clown.dmm
#_maps/shuttles/emergency_cramped.dmm
#_maps/shuttles/emergency_delta.dmm
#_maps/shuttles/emergency_meta.dmm
#_maps/shuttles/emergency_mini.dmm
#_maps/shuttles/emergency_pubby.dmm
##Others
#_maps/shuttles/emergency_asteroid.dmm
#_maps/shuttles/emergency_airless.dmm
#_maps/shuttles/emergency_arena.dmm
#_maps/shuttles/emergency_bar.dmm
#_maps/shuttles/emergency_clown.dmm
#_maps/shuttles/emergency_cramped.dmm
#_maps/shuttles/emergency_imfedupwiththisworld.dmm
#_maps/shuttles/emergency_goon.dmm
#_maps/shuttles/emergency_wabbajack.dmm
#_maps/shuttles/emergency_arena.dmm
#_maps/shuttles/emergency_luxury.dmm
#_maps/shuttles/emergency_meteor.dmm
#_maps/shuttles/emergency_raven.dmm
#_maps/shuttles/emergency_russiafightpit.dmm
#_maps/shuttles/emergency_scrapheap.dmm
#_maps/shuttles/emergency_supermatter.dmm
#_maps/shuttles/emergency_wabbajack.dmm