Arokha Sieyes 6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync ...

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

2017-03-13 01:29:01 -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

…

gamemodes

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

2017-03-06 22:46:28 -05: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

The ultimate in food vending

2017-03-11 19:28:14 -05:00

magic

…

mecha

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

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

objects

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

2017-03-13 01:29:01 -04:00

turfs

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

2017-03-11 18:47:17 -05:00

vehicles

…

verbs

Prevents LOOC impersonation with resleeving

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

atoms_movable.dm

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

2017-02-27 07:36:41 -05: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

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

…