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

..

antagonist

Adds pranks, jukes, and anal retentive bolt action rifles (#3664)

2017-11-10 23:53:01 -06:00

area

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

dna

Add support for non-genetic markings (#3643)

2017-11-08 21:26:44 -06:00

gamemodes

Merge branch 'fake-master' into development

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

jobs

Fixes the merchant job showing up in the id's console (#3737)

2017-10-29 13:17:07 +02:00

machinery

Adds pre-set turret types (#3865)

2017-11-25 18:18:46 -06:00

magic

clean up some legacy code (#3211)

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

mecha

Merge branch 'master' into development

2017-11-25 12:57:38 -06:00

modifiers

Adds the sarlaccs and some golden slime fixes (#3533)

2017-10-07 13:15:34 +03:00

objects

Merge branch 'fake-master' into development

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

turfs

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

verbs

Bug fixes (#3807)

2017-11-05 16:20:51 +02:00

atoms_init.dm

Recharger QoL Tweaks (#3826)

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

atoms_movable.dm

Merge branch 'master' into development

2017-10-20 13:30:03 -05:00

atoms.dm

Rings (#3886)

2017-12-04 18:53:39 -06:00

base_turf.dm

Runtime Map Loading (#3597)

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

periodic_news.dm

…

response_team.dm

Runtime Map Loading (#3597)

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

shuttle_engines.dm

…

sound.dm

Sound Tweaks (#3627)

2017-10-20 17:53:44 +03:00

supplyshuttle.dm

More macros (#2955)

2017-07-06 23:37:58 +03:00