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

..

antagonist

The last commit.

2016-06-03 21:01:53 -04:00

area

Increases stun time from falling due to gravity change

2016-06-07 19:48:48 +01:00

dna

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

gamemodes

510 Improved Overlays

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

jobs

Merge pull request #1934 from SpadesNeil/implants

2016-06-23 05:02:48 +01:00

machinery

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

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

magic

…

mecha

Use correct sprite for Pros fab

2016-06-10 15:19:31 -04:00

objects

a whole lot of nanoui upgrades

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

turfs

Updates our own snow to have fancy footprints + stuff

2016-06-24 14:48:27 +01:00

vehicles

…

verbs

Removes old code comment block

2016-06-11 22:08:31 -04:00

atoms_movable.dm

Ports event system from Bay

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

atoms.dm

…

base_turf.dm

…

json.dm

…

periodic_news.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Revamps cargo supply code to allow for nicer code (#1508)

2016-05-04 17:20:22 -04:00