DZD 29e70854e9 Fix merge conflicts ...

🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.

2015-07-15 22:28:12 -04:00

..

crates_lockers

Fix merge conflicts

2015-07-15 22:28:12 -04:00

stool_bed_chair_nest

LINDA Pressure Changes

2015-07-11 06:28:03 -04:00

transit_tubes

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

artstuff.dm

Port Atlas's implementation of -tg-'s canvas art.

2015-05-29 15:43:42 -07:00

barsign.dm

SNIP

2015-05-31 22:32:20 -04:00

bedsheet_bin.dm

3/3 port done

2015-05-25 20:16:34 -04:00

coathanger.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

curtains.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

displaycase.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

door_assembly.dm

Pass II

2015-07-09 19:51:40 -04:00

dresser.dm

Fix dressers to actually work. [BUGFIX]

2015-02-13 23:04:04 +01:00

electricchair.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

engicart.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

extinguisher.dm

3/3 port done

2015-05-25 20:16:34 -04:00

false_walls.dm

Sort of compiles

2015-07-09 15:55:36 -04:00

flora.dm

Potted Plant Hiding

2015-05-10 14:41:06 -04:00

foodcart.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

fullwindow.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

girders.dm

Fix non-icon merge conflicts

2015-07-10 19:57:59 -04:00

grille.dm

Tweaks a Few Destroy()'s

2015-07-05 04:51:47 -04:00

inflatable.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

janicart.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

kitchen_spike.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

ladders.dm

3/3 port done

2015-05-25 20:16:34 -04:00

lamarr_cage.dm

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

2015-06-22 13:40:07 -07:00

lattice.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

mineral_doors.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

mirror.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

mop_bucket.dm

LINDA Pressure Changes

2015-07-11 06:28:03 -04:00

morgue.dm

Removes redundant timestamp

2015-07-14 04:18:35 -04:00

musician.dm

Pass 3

2015-07-08 01:34:53 -04:00

noticeboard.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

safe.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07:00

segway.dm

Fix remaining non-returning Destroys()

2015-07-06 09:20:39 -07:00

signs.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

spirit_board.dm

Fixes luminosity checks

2015-05-15 01:07:08 -04:00

tables_racks.dm

pass one fix

2015-07-08 01:09:10 -04:00

tank_dispenser.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

target_stake.dm

Get Turf Optimizations

2015-06-09 21:29:21 -04:00

watercloset.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

windoor_assembly.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

window.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00