Leshana 780eb637d8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614 ...

# Conflicts:
#	code/controllers/shuttle_controller.dm
#	code/modules/shuttles/shuttles_multi.dm

2017-06-14 17:54:34 -04:00

..

antagonist

Ups the number of autotraitors to 4

2017-05-21 16:40:43 -05:00

area

Converts area.all_doors list to be lazily instantiated as a simple example of using the lazy list macros.

2017-06-08 17:21:36 -04:00

dna

Tweak spacing on setup, fix DNA bug

2017-05-30 11:39:12 -04:00

gamemodes

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00

jobs

NIF Fixes and Soulcatcher NIFSoft, Money Tweak

2017-06-09 01:08:34 -04:00

machinery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614

2017-06-14 17:54:34 -04:00

magic

…

mecha

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

objects

Merge pull request #1711 from VOREStation/more-qdel-fixes

2017-06-12 10:28:48 -04:00

turfs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614

2017-06-14 17:54:34 -04:00

vehicles

…

verbs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

atoms_movable.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

atoms.dm

…

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Fix missing closing HTML tags in messages.

2017-05-20 16:05:54 -04:00

supplyshuttle.dm

…

trader_visit.dm

…