Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

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

..

crates_lockers

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

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

stool_bed_chair_nest

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07: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

Small refactor of curtains

2015-04-25 09:36:08 -07:00

displaycase.dm

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

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

door_assembly.dm

Escape Pod Fixes

2015-03-16 02:18:35 -04:00

dresser.dm

Fix dressers to actually work. [BUGFIX]

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

electricchair.dm

Added electric chair to map

2015-04-14 23:50:55 +02: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

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07: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

LINDA, Stage 1

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

grille.dm

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

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

inflatable.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07: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

First 1/3 of port done.

2015-05-25 17:59:30 -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

-tg- atom pooling system, qdel changes

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

mineral_doors.dm

3/3 port done

2015-05-25 20:16: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

ERT equipment rework

2015-03-03 22:51:54 +01:00

morgue.dm

3/3 port done

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

musician.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07: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

Garbage collection fixes

2014-02-19 20:24:31 -05:00

signs.dm

Completed adding Kidan Ambassador decorations

2014-07-23 13:24:51 -04:00

spirit_board.dm

Fixes luminosity checks

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

tables_racks.dm

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

2015-06-22 13:40:07 -07: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

heheh

2015-05-27 20:02:22 -04:00

windoor_assembly.dm

-tg- atom pooling system, qdel changes

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

window.dm

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

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