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

Conflicts:
	nano/css/icons.css
	nano/css/shared.css

2016-06-25 19:58:21 -04:00

..

admin

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

2016-06-25 19:58:21 -04:00

alarm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

assembly

…

awaymissions

a whole lot of nanoui upgrades

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

blob

…

client

and the unversioned files

2016-06-24 00:44:34 -04:00

clothing

Removes species restrictions on shoes and gloves for Taj and Unathi

2016-06-04 16:05:05 -05:00

customitems

…

detectivework

Frame Fixes

2016-06-01 14:32:56 -04:00

economy

…

events

Neither Travis nor Byond noticed this. Whoops!

2016-06-09 01:37:54 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Fixes part 1

2016-06-20 23:32:18 -04:00

hydroponics

…

icon generation

…

library

…

lighting

Scheduler now uses btime, and other improvements

2016-06-01 17:56:07 +01:00

maps

…

materials

…

mining

510 Improved Overlays

2016-06-18 15:50:10 -03:00

mob

Ports Snowy stuff from Eros

2016-06-24 14:35:17 +01:00

multiz

…

nano

a whole lot of nanoui upgrades

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

organs

Merge pull request #1956 from Yoshax/harpiesports

2016-06-21 17:31:29 +01:00

overmap

…

paperwork

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

2016-06-25 19:58:21 -04:00

power

a whole lot of nanoui upgrades

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

projectiles

510 Improved Overlays

2016-06-18 15:50:10 -03:00

random_map

…

reagents

changelog and chemmaster fix

2016-06-23 15:01:17 -04:00

recycling

Frame Fixes

2016-06-01 14:32:56 -04:00

research

Makes everything produced in Robotics 25% cheaper to produce

2016-06-11 16:28:32 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

510 Improved Overlays

2016-06-18 15:50:10 -03:00

supermatter

…

surgery

Adds do_surgery() behaviour for various items

2016-06-17 19:06:56 +01:00

tables

Ports event system from Bay

2016-06-01 22:05:04 +01:00

vehicles

…

virus2

…

xenobio2

Xenobio2 Update #7 (#1910)

2016-06-10 19:28:59 +01:00

xgm

…