Zuhayr b47d91b612 Merge resolution, master into dev.

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

..

crates_lockers

Brig Fixes

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

stool_bed_chair_nest

Comfy chair update, makes armrests show up.

2014-08-17 22:48:38 -04:00

barsign.dm

Change selection interface to have cancel button

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

bedsheet_bin.dm

…

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

…

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

…

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

…

tables_racks.dm

Fixed moving between tables freely.

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

tank_dispenser.dm

…

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