Arokha Sieyes eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync ...

# Conflicts:
#	vorestation.dme

2016-06-07 18:37:47 -04:00

..

admin

Merge pull request #245 from VOREStation/sink

2016-05-31 01:35:04 -04:00

alarm

Ports event system from Bay

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

assembly

…

awaymissions

…

blob

…

client

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

clothing

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

customitems

…

detectivework

Frame Fixes

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

economy

…

events

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

2016-05-31 18:17:58 -04: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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

multiz

…

nano

Ports event system from Bay

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

organs

cc

2016-06-05 22:49:09 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

power

Fixes power monitor computer screens

2016-06-03 22:10:52 -04:00

projectiles

Fixes many dense objects from stopping penetrating bullets

2016-06-07 19:30:21 +01:00

random_map

…

reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

recycling

Frame Fixes

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

research

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

supermatter

…

surgery

Synth gets hit by axe? Internal bleeding.

2016-06-03 21:18:24 -04:00

tables

Ports event system from Bay

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

vehicles

…

virus2

…

vore

Merge pull request #312 from JoanRisu/Fluff_Items_worshop

2016-06-06 21:37:34 -04:00

xenobio2

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

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

xgm

…