Spades 700b8b5934 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns ...

# Conflicts:
#	code/modules/projectiles/gun.dm

2016-06-03 20:29:19 -04:00

..

admin

First commit of manual port of BS12

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

alarm

Ports event system from Bay

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

assembly

…

awaymissions

…

blob

…

client

Sanitizing text twice breaks quotes

2016-06-02 14:12:48 -04:00

clothing

Adds a few more accessories

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

customitems

…

detectivework

Frame Fixes

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

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

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

…

lighting

Scheduler now uses btime, and other improvements

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

maps

…

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

Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns

2016-06-02 13:01:45 -04:00

multiz

…

nano

Ports event system from Bay

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

organs

Merge pull request #1806 from VOREStation/limbprinter

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

overmap

…

paperwork

Fixes fax runtimes at startup.

2016-06-02 15:10:33 -04:00

power

Ports Bay's Robolimb Changes (#1779)

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

projectiles

Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns

2016-06-03 20:29:19 -04:00

random_map

…

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

Fixes a bad material discovered by the new unit test!

2016-06-02 18:37:37 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Removes Horsehead and Mindswap from Wizard spellbooks

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

supermatter

…

surgery

Make FBPs Constructable

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

tables

Ports event system from Bay

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

vehicles

…

virus2

…

xenobio2

Ensures slimes will have identically different trait datums when the cores are created.

2016-06-02 18:09:27 -04:00

xgm

…