Zuhayr e3d9bc90e3 Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

..

admin

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

2015-08-18 12:06:53 -07: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

…

client

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

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

clothing

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

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

customitems

Small tweaks to get rolldowns to work properly.

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

detectivework

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

2015-08-15 11:06:03 +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-freeze' into dev

2015-08-11 18:47:05 +01: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

2015-08-16 17:10:11 -07:00

hydroponics

Merge branch 'dev' into ofBeesAndHoney

2015-08-13 08:33:46 +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

Reimplemented floor lights as a machine built at the autolathe.

2015-08-16 19:26:17 -07:00

mining

Mech chargers are now a single machine

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

mob

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

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

nano

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

organs

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

2015-08-13 09:01:10 +02:00

overmap

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

2015-07-28 07:59:49 +02:00

paperwork

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

power

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

projectiles

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03: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 turfs

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

recycling

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07: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

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

2015-07-06 18:33:09 +02:00

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

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

surgery

…

tables

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

2015-08-13 05:55:05 +01:00

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 dev

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

xgm

…