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

# Conflicts:
#	vorestation.dme

2016-06-07 18:37:47 -04:00

..

antagonist

The last commit.

2016-06-03 21:01:53 -04:00

area

Minor tweaks, Skipjack can now dock at station

2016-05-29 18:04:46 -04:00

dna

Fixes Issue #274 - Preserves custom species when being cloned.

2016-06-02 18:50:35 -04:00

gamemodes

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

2016-06-07 18:37:47 -04:00

jobs

Ok, actually, good catch on that one Travis.

2016-06-01 23:18:34 -04:00

machinery

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

2016-06-07 18:37:47 -04:00

magic

…

mecha

Merge pull request #1844 from SpadesNeil/GunsGunsGuns

2016-06-05 13:25:26 -04:00

objects

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

2016-06-07 18:37:47 -04:00

turfs

Merge pull request #1765 from Yoshax/cocainecocaine

2016-06-01 15:57:15 -04:00

vehicles

…

verbs

Adds preference to mute remote LOOC chatter heard by admins.

2016-05-27 15:10:29 +01:00

atoms_movable.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

atoms.dm

…

base_turf.dm

…

json.dm

…

periodic_news.dm

Generic Station & System Name

2016-05-16 16:21:17 -04:00

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Revamps cargo supply code to allow for nicer code (#1508)

2016-05-04 17:20:22 -04:00