SinTwo 0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl

2016-07-27 16:11:55 -04:00

..

admin

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

2016-07-27 16:11:55 -04:00

alarm

…

assembly

…

awaymissions

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

blob

…

client

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

2016-07-27 16:11:55 -04:00

clothing

Adds access requirements to EVA and Medical hardsuits

2016-07-26 20:47:16 -05: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

Introduces max record length for record, converts uses of max book length to max paper length barring books

2016-06-27 16:26:31 +01:00

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

Fixes some items on working on people on tables

2016-07-26 03:10:54 +01:00

multiz

…

nano

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

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 NanoGrade

2016-07-27 16:11:55 -04:00

power

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

2016-07-27 16:11:55 -04:00

projectiles

Merge pull request #2204 from Yoshax/accuracypenalty

2016-07-25 16:44:46 -05:00

random_map

Grammar fix + Ensures Christmas drop pod has trees

2016-07-23 15:23:54 +01:00

reagents

Fixes some items on working on people on tables

2016-07-26 03:10:54 +01: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

makes benches a subtype of tables

2016-06-29 17:52:27 -04:00

vehicles

…

virus2

…

xenobio2

Some more work + prep for drydocking.

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

xgm

…