Arokha Sieyes c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

2017-04-02 23:25:59 -04:00

..

antagonist

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

2017-03-28 14:28:15 -05:00

area

Some map tweaks

2017-03-12 00:12:32 -05:00

dna

Adds Body Markings

2017-03-30 18:05:20 -04:00

gamemodes

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

jobs

Fix mob.loc = X on spawn

2017-03-22 23:05:44 -04:00

machinery

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

2017-04-01 19:19:42 -04:00

magic

…

mecha

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

objects

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

2017-04-02 23:25:59 -04:00

turfs

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

2017-04-01 19:19:42 -04:00

vehicles

…

verbs

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

2017-04-01 19:19:42 -04:00

atoms_movable.dm

Fix thrown objects hitting windows not in their path

2017-03-19 17:06:38 -04:00

atoms.dm

…

base_turf.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

json.dm

…

periodic_news.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

response_team.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shuttle_engines.dm

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Adds Supply Shuttle Hook

2017-03-06 12:36:19 -05:00

trader_visit.dm

…