Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

devices

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

2013-11-23 13:21:11 +10:30

robot

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

stacks

Poultice potency, bugfixes

2013-11-14 15:21:29 -05:00

weapons

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

apc_frame.dm

…

blueprints.dm

…

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

…

contraband.dm

…

crayons.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

latexballoon.dm

…

shooting_range.dm

…

toys.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

trash.dm

Expansion of every "icon = ''" path.

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