killer653 88acd48f16 Merge remote-tracking branch 'refs/remotes/VOREStation/master' ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm

2016-07-03 19:04:53 -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 remote-tracking branch 'refs/remotes/VOREStation/master'

2016-07-03 19:04:53 -04:00

clothing

Removes a random space.

2016-06-22 22:46:59 -04:00

customitems

…

detectivework

Frame Fixes

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

economy

…

events

Merge pull request #358 from VOREStation/sync

2016-06-14 19:29:43 -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 remote-tracking branch 'refs/remotes/VOREStation/master'

2016-07-03 19:04:53 -04:00

multiz

…

nano

Ports event system from Bay

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

organs

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

2016-06-13 13:12:40 -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

"1" Spam

2016-06-10 09:50:54 -04:00

projectiles

Desert Eagle empty icons added.

2016-06-14 16:17:25 -04:00

random_map

…

reagents

Forgot one part.

2016-06-17 19:50:16 -04:00

recycling

Frame Fixes

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

research

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

2016-06-13 13:12:40 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Replaced mobs with vore versions.

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

supermatter

…

surgery

Fixes a random typo in limb_reattach

2016-06-11 21:54:08 -04:00

tables

Ports event system from Bay

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

vehicles

…

virus2

…

vore

Merge remote-tracking branch 'refs/remotes/VOREStation/master'

2016-07-03 19:04:53 -04:00

xenobio2

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

2016-06-13 13:12:40 -04:00

xgm

…