Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01:00

..

crates_lockers

Limits body/cryo bags to a single mob.

2014-09-03 10:43:04 +02:00

stool_bed_chair_nest

Fixes #6118

2014-08-25 21:02:57 -04:00

barsign.dm

Change selection interface to have cancel button

2014-06-02 15:39:43 +01:00

bedsheet_bin.dm

A first pass at more realistic w_class values

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

coathanger.dm

…

curtains.dm

Adding shower curtains to the various station showers because.. well, it's nice.

2014-08-29 11:08:22 +02:00

displaycase.dm

…

door_assembly.dm

Stack update

2014-09-02 09:59:32 +04:00

electricchair.dm

…

extinguisher.dm

…

false_walls.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

flora.dm

…

girders.dm

Stack update

2014-09-02 09:59:32 +04:00

grille.dm

Stack update

2014-09-02 09:59:32 +04:00

inflatable.dm

Slime update

2014-07-13 17:37:30 +04:00

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

mirror.dm

Slime update

2014-07-13 17:37:30 +04:00

mop_bucket.dm

…

morgue.dm

…

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

tables_racks.dm

Fixed moving between tables freely.

2014-06-29 10:46:31 +09:30

tank_dispenser.dm

Fixes tank dispenser sprite not updating icons when a tank is added

2014-08-31 15:22:13 -07:00

target_stake.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

transit_tubes.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

watercloset.dm

Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor).

2014-09-04 16:36:26 +02:00

windoor_assembly.dm

Stack update

2014-09-02 09:59:32 +04:00

window.dm

Master to dev merge.

2014-08-11 17:23:40 +09:30