skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

apc_damage.dm

Runtime Map Loading (#3597)

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

blob.dm

…

brand_intelligence.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

camera_damage.dm

Runtime Map Loading (#3597)

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

carp_migration.dm

Assorted tweaks & fixes (#3305)

2017-08-20 14:10:15 +03:00

ccia_general_notice.dm

Should fix #3841 (#3861)

2017-12-08 23:05:52 +02:00

comms_blackout.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

communications_blackout.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

disease_outbreak.dm

…

dust.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

electrical_storm.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

event_container.dm

Remove Bear Attack (#3611)

2017-10-14 23:59:45 +03:00

event_dynamic.dm

…

event.dm

Merge Event Manager & SSevents (#2431)

2017-05-23 11:58:37 +03:00

false_alarm.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

gravity.dm

Fixes the gravity generator (#3590)

2017-10-06 18:26:44 -05:00

grid_check.dm

…

infestation.dm

Fixes throat slitting being broken (#3232)

2017-08-05 21:04:18 +03:00

ion_storm.dm

Runtime Map Loading (#3597)

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

meteors.dm

…

money_hacker.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

money_lotto.dm

Runtime Map Loading (#3597)

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

money_spam.dm

Runtime Map Loading (#3597)

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

prison_break.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

radiation_storm.dm

Runtime Map Loading (#3597)

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

random_antagonist.dm

Various Bugfixes (#2463)

2017-05-27 12:40:18 +03:00

rogue_drones.dm

Runtime Map Loading (#3597)

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

space_ninja.dm

…

spacevine.dm

Final merge

2016-11-12 00:10:21 +02:00

spider_infestation.dm

Runtime Map Loading (#3597)

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

spontaneous_appendicitis.dm

…

supply_drop.dm

Agent whatever soundstuffs (#2719)

2017-06-16 19:33:34 +03:00

vent_clog.dm

Runtime Map Loading (#3597)

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

viral_infection.dm

Runtime Map Loading (#3597)

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

viral_outbreak.dm

…

wallrot.dm

Fungi memes (#3080)

2017-07-18 12:22:37 +03:00