Leshana f93141d7d3 Merge remote-tracking branch 'polaris/master' ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme

2017-03-22 20:08:29 -04:00

..

antagonist

Fixed paths references to obsolete path /obj/item/clothing/shoes/combat

2017-03-06 21:58:39 -05:00

area

Some map tweaks

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

dna

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

gamemodes

Added vore capabilies to the new simple_animal system.

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

jobs

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

2017-03-06 20:58:38 -05:00

machinery

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

magic

…

mecha

Polaris Sync Merge

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

objects

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

turfs

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

vehicles

…

verbs

Prevents LOOC impersonation with resleeving

2017-02-24 19:50:56 -05:00

atoms_movable.dm

Fix thrown objects hitting windows not in their path

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

atoms.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

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

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

supplyshuttle.dm

Adds Supply Shuttle Hook

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

trader_visit.dm

…