Ccomp5950 e44bcf81fe Merge pull request #5559 from Walter0o/deadly_fork_fix ...

deadly sharp w_class 1 fix

2014-07-10 23:40:25 -05:00

..

admin

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

2014-07-09 19:12:32 +09:30

assembly

…

awaymissions

…

client

Fix Change UI verb

2014-07-05 21:28:11 +01:00

clothing

Fixed some vox icons.

2014-07-01 07:29:30 +09:30

customitems

Fixes Sasha Mason-Kalinka's custom item

2014-07-02 10:16:15 +02:00

destilery

…

detectivework

…

economy

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

events

Fixes #5483

2014-07-04 17:48:12 +09:30

ext_scripts

…

flufftext

…

food

…

games

Fixed a couple of oversights with cards.

2014-06-29 09:43:34 +09:30

genetics

…

hydroponics

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

icon generation

…

library

…

liquid

…

maps

…

mining

Reapplied scanners to map, stopped braces working on drill turfs with no resources.

2014-07-10 20:13:59 +09:30

mob

Merge pull request #5559 from Walter0o/deadly_fork_fix

2014-07-10 23:40:25 -05:00

nano

…

organs

Fixed wrong operator

2014-07-09 00:11:20 -04:00

paperwork

Merge pull request #5359 from Baystation12/master

2014-06-25 15:37:04 +04:00

power

fixes #5449

2014-07-10 18:21:00 +02:00

projectiles

Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.

2014-06-29 10:00:35 +09:30

reagents

Merge pull request #5533 from mwerezak/wound-infections

2014-07-09 19:28:00 +09:30

recycling

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

2014-06-20 22:02:40 +01:00

research

Fixes #5487

2014-07-04 00:28:06 +02:00

scripting

…

security levels

…

shuttles

Merge pull request #5507 from mwerezak/supply-shuttle-fix

2014-07-05 23:16:42 +01:00

supermatter

Removes duplicate defines, updates comments

2014-07-07 23:18:12 -04:00

surgery

Allows necrosis to be fixed with peridaxon and surgery

2014-07-06 13:02:58 -04:00

vehicles

Fixes in wheelchair and different handling of movement

2014-07-02 22:42:18 +02:00

virus2

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

2014-06-22 21:58:30 +09:30