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

..

admin

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

2017-03-06 22:46:28 -05:00

alarm

…

assembly

…

awaymissions

Updated our custom items and maps to account for the path changes for boots!

2017-03-06 21:46:35 -05:00

blob

…

busy_space

Space Chatter

2017-03-01 15:32:43 -05:00

client

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

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

clothing

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

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

customitems

Adds a check for custom items

2017-03-06 21:25:54 -06:00

detectivework

…

economy

Fixes sliceable food and slices

2017-03-10 19:49:15 +00:00

error_handler

…

events

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

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

examine

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

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

ext_scripts

…

flufftext

…

food

…

gamemaster

Make sure that the canisters selected have a bit o' air in them.

2017-03-11 19:02:24 -05:00

games

Merge large polaris changes

2017-03-02 22:44:17 -05:00

genetics

…

ghosttrap

…

holodeck

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

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

hydroponics

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

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

icon generation

…

integrated_electronics

Resleeving tweaks, fix compile warning

2017-03-06 14:22:11 -05:00

library

…

lighting

…

maps

…

materials

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

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

metric

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

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

mining

…

mob

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

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

multiz

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

nano

Adds a console to medical, engineering, security AR glasses

2017-03-06 00:33:08 -05:00

organs

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

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

overmap

…

paperwork

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

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

planet

Comment out noisy message

2017-03-03 00:43:35 -05:00

power

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

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

projectiles

adds particle guns to science and cargo

2017-03-09 18:10:26 +00:00

random_map

…

reagents

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

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

recycling

…

research

Merge pull request #1146 from Screemonster/particlescience

2017-03-10 18:07:29 -05:00

resleeving

Replace backup implant boxes with special implanter

2017-03-09 23:13:52 -05:00

rogueminer_vr

Adds pike, weak pike and strong carp, also adds them to the belt mining lists

2017-03-11 02:40:18 +00:00

scripting

…

security levels

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

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

shieldgen

…

shuttles

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

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

spells

Merge large polaris changes

2017-03-02 22:44:17 -05:00

supermatter

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

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

surgery

Allow MMI/Posi/Digi brains w/o minds to be put in

2017-03-12 01:15:40 -05:00

tables

WR_SC_Map_Changes

2017-03-08 17:44:48 -08:00

telesci

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

turbolift

Ports Turbolifts from Bay.

2017-03-04 21:35:00 -05:00

vehicles

Some personal changes to my items and adds a dune buggy for science expeditions.

2017-03-02 23:17:04 -08:00

ventcrawl

…

virus2

Now in disease form

2017-03-08 19:52:55 -05:00

vore

Merge pull request #1158 from JoanRisu/Fluff_Items_worshop

2017-03-11 01:22:25 -05:00

xenoarcheaology

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

2017-03-03 19:39:56 -05:00

xenobio2

Merge large polaris changes

2017-03-02 22:44:17 -05:00

xgm

…