Neerti b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev ...

Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm

2015-09-04 08:43:37 -04:00

..

admin

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04:00

alarm

…

assembly

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

awaymissions

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

client

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

clothing

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

customitems

…

detectivework

More computer overlay changes.

2015-08-20 08:38:43 +02:00

economy

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

events

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-22 15:44:02 +01:00

examine

…

ext_scripts

…

flufftext

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

hydroponics

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

icon generation

…

library

…

lighting

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2015-08-18 11:59:50 -07:00

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

mining

colony-1 could not be saved, unfortunately. RIP

2015-08-23 18:04:47 -04:00

mob

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

nano

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

organs

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

2015-08-22 03:17:16 +09:30

overmap

More computer overlay changes.

2015-08-20 08:38:43 +02:00

paperwork

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-22 02:30:14 +09:30

power

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

projectiles

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

random_map

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

reagents

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

recycling

Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir

2015-08-18 15:48:55 +01:00

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

spells

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

supermatter

…

surgery

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

tables

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

vehicles

…

virus2

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

2015-08-22 03:17:16 +09:30

xgm

…