skull132 674cd94714 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm

2018-05-13 19:19:52 +03:00

..

brain_damage

[Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)

2018-04-08 16:29:33 +03:00

discord

Added webhook implementation of discord integration (#3748)

2017-12-23 23:56:20 +02:00

diseases

list2text() -> jointext() (#4342)

2018-03-03 00:36:44 +02:00

expansions

…

helper_datums

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

observation

Revert #3241 (#3670)

2017-10-17 20:39:50 -05:00

radio

…

repositories

…

trading

Merge branch 'master' into development

2018-05-13 19:19:52 +03:00

uplink

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

wires

Remove duplicate macros (#4683)

2018-05-06 18:31:03 +03:00

ai_law_sets.dm

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

ai_laws.dm

…

api.dm

Private Polls (#4488)

2018-04-02 14:30:32 +03:00

beam.dm

…

browser.dm

Replaces dibs with Bay's ticket system. (#3984)

2018-03-02 21:54:39 +02:00

callback-usage.txt

…

callback.dm

…

cargo.dm

Various Cargo Improvements (#4435)

2018-03-31 23:26:23 +03:00

category.dm

…

computerfiles.dm

…

datacore.dm

New Hair & Sprite Accessories Cleanup (#3897)

2017-11-29 11:41:09 +02:00

datum.dm

Unify datum definitions (#3991)

2017-12-23 21:29:17 +02:00

disease.dm

…

feedback.dm

…

mind.dm

Replaces dibs with Bay's ticket system. (#3984)

2018-03-02 21:54:39 +02:00

mixed.dm

…

modules.dm

…

position_point_vector.dm

Pixel Projectiles (#4105)

2018-03-10 17:13:24 +02:00

progressbar.dm

Fix image GC lag (#4086)

2018-01-08 16:43:03 +01:00

server_greeting.dm

…

statistic.dm

…

supplypacks.dm

Bolt-action refactor (#4667)

2018-05-02 21:24:32 +03:00

weakref.dm

Unify datum definitions (#3991)

2017-12-23 21:29:17 +02:00