Commit Graph

16 Commits

Author SHA1 Message Date
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
Jordan Brown
487f2a88c5 Fixes allow_custom_shuttles default 2017-10-30 15:21:11 -05:00
LetterJay
84272ea241 Merge branch 'master' into upstream-merge-32206 2017-10-29 23:36:39 -04:00
LetterJay
b6f0423840 Update map_config.dm 2017-10-29 22:23:17 -05:00
Jordan Brown
37fdf365a5 Fixes map_config validation 2017-10-29 10:26:20 -05:00
Jordan Brown
27492e891f Map config cleanup (#32132)
* Map config cleanup

* Fix
2017-10-27 17:35:05 -05:00
LetterJay
a6a4deb94c Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
[MIRROR] Fixes transitions
2017-09-30 15:18:26 -04:00
AnturK
60952bfb83 Fixes transitions (#31084)
* Fixes transitions

* Cautionary comment.
2017-09-28 10:43:50 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
LetterJay
17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
CitadelStationBot
94400c4d38 Allows disabling shuttle purchases per map. 2017-08-26 11:08:12 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
730deafef7 [s] Fixes Centcom not being selflooping 2017-05-28 16:02:29 -05:00
Poojawa
7e9b96a00f 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.
2017-04-13 23:37:00 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00