Jeremy Liberman a95a28e303 Merge branch 'dev' into mutiny-fixes

2014-05-18 11:25:36 -05:00

..

devices

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

2014-05-14 22:42:03 +01:00

robot

Mutiny Mode

2014-05-11 15:03:50 -05:00

stacks

Fixes #4979

2014-05-14 17:02:04 +09:30

weapons

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

2014-05-14 22:42:03 +01:00

apc_frame.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

blueprints.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

bodybag.dm

Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much.

2013-08-28 17:38:21 +01:00

candle.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

contraband.dm

Added missing contraband.dm file

2013-01-03 08:20:08 +04:00

crayons.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

latexballoon.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

shooting_range.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

toys.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

trash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00