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

Conflicts:
	code/game/turfs/simulated/floor_types.dm

2015-08-22 03:57:12 +09:30

..

admin

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

2015-08-22 03:57:12 +09:30

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

Cleans up id card setup. Now with less automagic and more controlled.

2015-08-14 16:08:47 +02:00

client

Merge pull request #10101 from mwerezak/shards

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

clothing

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

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

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

More computer overlay changes.

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

economy

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

events

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

Merge pull request #10101 from mwerezak/shards

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

hydroponics

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

icon generation

…

library

Merge pull request #10279 from Kearel/LibraryModifications

2015-08-13 17:47:16 +03:00

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 randmap

2015-08-22 03:57:12 +09:30

mining

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

mob

Compile fix.

2015-08-22 03:26:41 +09:30

nano

Merge pull request #10101 from mwerezak/shards

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

organs

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

2015-08-22 03:57:12 +09:30

overmap

More computer overlay changes.

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

paperwork

Added paper shredders from Minijar.

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

power

Fixes computers with custom icon states.

2015-08-21 09:50:39 +02:00

projectiles

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

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

random_map

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

2015-08-22 03:57:12 +09:30

reagents

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03: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 turfs

2015-08-18 12:06:53 -07:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

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

Added diona gestalt preset.

2015-08-13 16:59:37 +09:30

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

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

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

xgm

…