Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

devices

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

2014-02-20 19:16:23 -06:00

robot

code/game/objects/items/robot/* lowercase pass

2014-01-08 19:47:48 +00:00

stacks

Folder recipes.

2014-02-03 04:45:42 +03:00

weapons

Chem grenade fix

2014-02-15 23:30:56 +13: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

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +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

…

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

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00