Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

antagonist

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

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

area

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

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

dna

Fixes a typo in the DNA Modifier

2016-09-20 20:44:39 -04:00

gamemodes

Not So Simple Animals (#3103)

2017-03-22 14:30:07 -05:00

jobs

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

2017-03-02 16:53:29 -06:00

machinery

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

2017-03-22 17:29:01 -05:00

magic

…

mecha

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

objects

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

2017-03-22 17:29:01 -05:00

turfs

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

2017-03-22 17:29:01 -05:00

vehicles

…

verbs

Fixes some stuff

2017-01-25 15:59:40 -06: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

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Merge pull request #2529 from redstryker/BoneSoundV2

2016-10-03 17:08:38 -05:00

supplyshuttle.dm

Adds Supply Shuttle Hook

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

trader_visit.dm

…