SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

admin

Creates a prompt on unparalyze

2016-07-10 20:58:08 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

client

Fixes Flannels. Also adds a Brown Flannel

2016-07-22 16:09:51 -04:00

clothing

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

2016-07-22 23:39:19 -04:00

customitems

…

detectivework

item_state cleanup

2016-07-11 22:31:32 -04:00

economy

Adds new non-alcoholic drinks

2016-07-07 21:51:30 +01:00

events

Fixes grammar error

2016-07-16 21:29:02 -05:00

examine

AI Core Update

2016-07-05 17:33:34 -04:00

ext_scripts

…

flufftext

…

food

adds bun-bun, a bread monkey made with two burger buns

2016-07-05 18:19:05 +01:00

games

…

genetics

…

ghosttrap

…

holodeck

item_state cleanup

2016-07-11 22:31:32 -04:00

hydroponics

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

2016-07-13 17:07:52 -04:00

icon generation

…

library

…

lighting

…

maps

…

materials

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

2016-07-13 17:07:52 -04:00

mining

Explosive Mining!

2016-07-10 08:06:56 -04:00

mob

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

2016-07-22 23:39:19 -04:00

multiz

…

nano

…

organs

Merge pull request #2131 from Anewbe/meatier_limbs

2016-07-15 07:04:59 -04:00

overmap

…

paperwork

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

2016-07-22 23:39:19 -04:00

power

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

2016-07-13 17:07:52 -04:00

projectiles

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

2016-07-19 17:37:14 -04:00

random_map

Ensure laser warfare drop pod has laser proof armor

2016-07-13 20:10:44 +01:00

reagents

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

2016-07-22 23:39:19 -04:00

recycling

…

research

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

2016-07-13 17:07:52 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Makes FBP burn repair actually work

2016-07-22 03:57:29 +01:00

tables

…

vehicles

…

virus2

…

xenobio2

Some more work + prep for drydocking.

2016-07-08 20:38:34 -04:00

xgm

…