LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 ...

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

configuration

Merge branch 'master' into upstream-merge-33562

2017-12-21 11:30:58 -06:00

subsystem

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

admin.dm

JSON feedback

2017-11-17 01:44:12 -06:00

configuration_citadel.dm

…

configuration.dm

updates

2017-10-01 00:59:59 -05:00

controller.dm

…

failsafe.dm

Update failsafe.dm

2017-09-12 03:08:20 -05:00

globals.dm

[MIRROR] Use associative list instead of in (#3710)

2017-10-31 00:43:39 -07:00

hooks-defs.dm

…

hooks.dm

…

master.dm

Adds random seed feedback (#33708)

2017-12-25 19:05:36 -06:00

subsystem.dm

Defines all subsystem priority values

2017-12-15 17:00:50 -06:00