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

..

crates_lockers

Brig Fixes

2014-08-14 18:26:17 -04:00

stool_bed_chair_nest

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

2014-08-22 01:24:34 -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

…

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

Slime update

2014-07-13 17:37:30 +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

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

integrate XGM into the code

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

watercloset.dm

integrate XGM into the code

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

windoor_assembly.dm

…

window.dm

Master to dev merge.

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