mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

2014-08-22 01:24:34 -04:00

..

food

Fixes apply_effect() used without armour checks

2014-08-22 00:02:50 -04:00

glass

Added lids for bottles and beakers.

2013-05-26 06:38:38 +04:00

blood_pack.dm

…

borghydro.dm

Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.

2014-07-05 16:48:59 +09:30

dropper.dm

A first pass at more realistic w_class values

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

food.dm

Renames CoM into center_of_mass

2014-07-14 23:13:46 +02:00

glass.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

hypospray.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

pill.dm

Lousy goddamn indentation.

2014-05-03 21:09:55 +09:30

robodropper.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

spray.dm

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-27 03:20:16 +09:30

syringes.dm

Adds new syndicate closet and adjusts nuke setup

2014-07-15 17:22:03 +02:00