Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 ...

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

2018-02-24 13:19:10 -05:00

..

antagonist

Port Bay's survival boxes

2018-02-16 19:21:15 -06:00

area

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

2018-02-17 00:35:29 -05:00

dna

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

gamemodes

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

2018-02-23 21:55:42 -05:00

jobs

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

2018-02-23 21:55:42 -05:00

machinery

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

2018-02-24 13:19:10 -05:00

magic

…

mecha

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

objects

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

2018-02-24 13:19:10 -05:00

turfs

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

2018-02-24 13:19:10 -05:00

vehicles

…

verbs

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

atoms_movable.dm

Implement SSatoms

2018-02-05 15:50:06 -05:00

atoms.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes

2018-02-07 03:40:06 +00:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

trader_visit.dm

…