SinTwo 2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix ...

Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm

2016-06-01 14:47:21 -04:00

..

admin

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

alarm

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

assembly

Reverts the second mob clean up because of incomplete implementation.

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

awaymissions

…

blob

…

client

Scheduler now uses btime, and other improvements

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

clothing

Adds a few more accessories

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

customitems

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

detectivework

Frame Fixes

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

economy

Fixes #1136

2016-05-19 22:25:40 +01:00

events

Generic Station & System Name

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

examine

Generic Station & System Name

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

ext_scripts

…

flufftext

Changes some fluffy bits to be more accurate

2016-05-21 18:00:54 -05:00

food

…

games

Generic Station & System Name

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

genetics

…

ghosttrap

…

holodeck

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

2016-05-28 20:22:09 +01:00

hydroponics

Randomized Plant Update (#1805)

2016-05-31 15:08:42 +01:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

lighting

Scheduler now uses btime, and other improvements

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

maps

Fixes issues travis found

2016-03-11 11:59:51 +03:00

materials

Small update to double beds. (#1828)

2016-05-31 15:08:57 +01:00

mining

Frame Fixes

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

mob

Scheduler now uses btime, and other improvements

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

multiz

…

nano

HTML5 and CSS3 (#1677)

2016-05-19 14:28:38 -04:00

organs

Merge pull request #1806 from VOREStation/limbprinter

2016-05-31 15:50:32 -04:00

overmap

…

paperwork

Frame Fixes

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

power

Ports Bay's Robolimb Changes (#1779)

2016-05-28 14:12:19 +01:00

projectiles

Merge pull request #1787 from EmperorJon/28_May_Port_setup_changes

2016-05-28 22:59:56 -04:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

reagents

Scheduler now uses btime, and other improvements

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

recycling

Frame Fixes

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

research

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

2016-06-01 14:47:21 -04:00

scripting

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

security levels

Construction Update

2016-03-25 16:02:36 -04:00

shieldgen

…

shuttles

…

spells

Removes Horsehead and Mindswap from Wizard spellbooks

2016-05-22 11:38:09 -05:00

supermatter

Reverts the second mob clean up because of incomplete implementation.

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

surgery

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

tables

…

vehicles

Reverts the second mob clean up because of incomplete implementation.

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

virus2

Fixes #1171

2016-03-21 14:22:44 +03:00

xenobio2

Xenobio2 Update #3 (#1832)

2016-05-31 18:30:52 +01:00

xgm

…