Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

admin

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

2016-07-03 16:21:21 -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

2016-07-03 16:21:21 -04:00

clothing

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

2016-07-03 16:21:21 -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

Introduces max record length for record, converts uses of max book length to max paper length barring books

2016-06-27 16:26:31 +01:00

genetics

…

ghosttrap

…

holodeck

Fixes part 1

2016-06-20 23:32:18 -04:00

hydroponics

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

2016-07-03 16:21:21 -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

2016-07-03 16:21:21 -04:00

mob

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

2016-07-03 16:21:21 -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

2016-07-03 16:21:21 -04:00

overmap

…

paperwork

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

2016-07-03 16:21:21 -04:00

power

"1" Spam

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

projectiles

Merge pull request #1983 from Anewbe/ninja_cloak+dart

2016-06-27 01:25:47 -04:00

random_map

…

reagents

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

2016-07-03 16:21:21 -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

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

2016-07-03 16:21:21 -04:00

supermatter

…

surgery

Adds do_surgery() behaviour for various items

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

tables

Ports event system from Bay

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

vehicles

…

virus2

…

vore

Merge pull request #385 from Cameron653/master

2016-06-30 10:56:46 -04:00

xenobio2

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

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

xgm

…