Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

..

crates_lockers

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

stool_bed_chair_nest

Fixes #6178

2014-09-01 22:15:45 +09:30

barsign.dm

…

bedsheet_bin.dm

…

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

…

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

…

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

…

mop_bucket.dm

…

morgue.dm

…

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

…

tables_racks.dm

…

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

…

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