Zuhayr 51e7f95b72 Merge pull request #6610 from SparklySheep/patch-7 ...

Replaces Vox telebaton with a stun baton

2014-10-08 00:30:02 +10:30

..

admin

Replaces Vox telebaton with a stun baton

2014-10-05 23:17:17 -05:00

assembly

…

awaymissions

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

client

fixes #6599

2014-10-06 09:57:01 +01:00

clothing

fixes #6562

2014-10-01 17:48:17 +01:00

customitems

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

destilery

…

detectivework

Fixes #6592

2014-10-04 02:11:51 -04:00

economy

…

events

Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.

2014-09-18 21:41:54 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Fixes #6297

2014-09-25 21:49:20 +09:30

icon generation

…

library

Fix for non-cancelable book removal from bookshelves

2014-09-21 16:04:22 +01:00

liquid

…

maps

…

mining

Fixes #6436

2014-09-18 13:12:36 +09:30

mob

Fixes #6597

2014-10-04 18:15:13 +01:00

nano

…

organs

Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes.

2014-09-25 20:07:11 +09:30

paperwork

fixes #6499

2014-10-01 17:48:21 +01:00

power

Map changes

2014-09-15 15:30:27 +02:00

projectiles

Adjusts laser cannon damage

2014-08-16 22:34:23 -04:00

reagents

fixes #6561

2014-09-30 22:18:25 +01:00

recycling

Disposals install fix

2014-09-15 17:04:30 +10:00

research

Changes Alden-Saraspova counter behaviour to wait for new results before outputting

2014-10-01 22:32:45 +01:00

scripting

…

security levels

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

shieldgen

Reorganizes shieldgen source code and icon files

2014-08-10 11:58:25 -04:00

shuttles

Fixes supply shuttle state when returning

2014-10-01 00:48:16 -04:00

supermatter

Adds two mwerezak's requests.

2014-09-18 19:23:00 +02:00

surgery

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

resolves #6260

2014-10-01 10:13:15 +01:00