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

..

antagonist

IPCs cant be cultists (#4711)

2018-05-13 18:16:55 +03:00

area

Fixes #4612 (#4614)

2018-04-15 22:15:28 +03:00

dna

Remove duplicate macros (#4683)

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

gamemodes

IPCs cant be cultists (#4711)

2018-05-13 18:16:55 +03:00

jobs

Moves the Janitor Back to Civilian (#4716)

2018-05-13 18:07:44 +03:00

machinery

Merge branch 'master' into development

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

magic

clean up some legacy code (#3211)

2017-08-02 19:53:23 +03:00

mecha

Bug Fixes (#4527)

2018-04-06 17:48:31 +03:00

modifiers

Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)

2018-03-25 21:51:27 +03:00

objects

Merge branch 'master' into development

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

turfs

Code and Map Bugfixes (#4514)

2018-04-19 00:03:46 +02:00

verbs

Repath a bunch of things to /mob/abstract childtypes (#4111)

2018-01-24 11:27:14 +01:00

atoms_init.dm

Recharger QoL Tweaks (#3826)

2017-11-18 18:46:14 +02:00

atoms_movable.dm

Refactors gravity checking (#4591)

2018-04-12 20:31:05 +03:00

atoms.dm

Code Cleanup: (Bump(), Bumped()) -> (Collide(), CollidedWith()) (#4349)

2018-03-08 09:39:53 +02:00

base_turf.dm

Runtime Map Loading (#3597)

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

periodic_news.dm

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

response_team.dm

Repath a bunch of things to /mob/abstract childtypes (#4111)

2018-01-24 11:27:14 +01:00

shuttle_engines.dm

…

sound.dm

Iterative Explosions (#3838)

2017-12-30 04:38:12 +02:00

supplyshuttle.dm

Remove duplicate macros (#4683)

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