Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

crates_lockers

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

2014-06-30 23:44:46 +01:00

stool_bed_chair_nest

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

2014-06-30 23:44:46 +01: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

…

displaycase.dm

…

door_assembly.dm

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

electricchair.dm

…

extinguisher.dm

Can no longer use fire extinguisher closet without hands

2014-03-31 18:19:25 +03:00

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

…

grille.dm

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

inflatable.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

Merge pull request #5325 from mwerezak/temperature-expose

2014-06-23 00:19:15 +09:30

mirror.dm

…

mop_bucket.dm

…

morgue.dm

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

2014-03-24 13:54:11 +00:00

musician.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

noticeboard.dm

…

safe.dm

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

2014-03-24 13:54:11 +00:00

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

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

target_stake.dm

Replaces get_turf_loc() with get_turf()

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

transit_tubes.dm

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

2014-05-03 16:56:19 +01:00

watercloset.dm

Cannot wash your missing hands anymore

2014-03-31 21:13:26 +03:00

windoor_assembly.dm

Fixed inexplicable reversions.

2014-02-19 17:11:09 -07:00

window.dm

atmos: make fires more destructive

2014-06-23 20:58:14 +01:00