Lohikar 461ec73b94 Merge branch 'master' into development

2017-11-25 12:57:38 -06: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

Turns dominate into an end game power (#3850)

2017-11-20 10:14:02 -06:00

jobs

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

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

machinery

Merge branch 'master' into development

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

magic

…

mecha

Merge branch 'master' into development

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

modifiers

…

objects

Merge branch 'master' into development

2017-11-25 12:57:38 -06: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

…

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

…