Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml

2018-05-10 13:48:20 -04:00

..

antagonist

Removes AOOC from non-team antags

2018-04-14 23:25:34 -05:00

area

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

2018-04-25 17:23:33 -04:00

dna

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

2018-03-15 22:41:14 -04:00

gamemodes

Fix cascade portal teleporting

2018-04-19 20:17:29 -04:00

jobs

Undoes species economic modifiers from Polaris, leaves them all at the human amount

2018-04-25 17:53:10 -04:00

machinery

Merge pull request #3630 from VOREStation/aro-cryograb

2018-05-08 19:51:45 -04:00

magic

…

mecha

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

objects

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04:00

turfs

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04:00

vehicles

…

verbs

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

atoms_movable_vr.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

atoms_movable.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

atoms.dm

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

2018-03-31 09:20:59 -04: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

POLARIS: Port's /tg/'s current sound.dm, plus pref

2018-03-13 17:46:40 -04:00

supplyshuttle.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trader_visit.dm

…