Tigercat2000 40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm

2015-05-10 14:15:51 -07:00

..

crates_lockers

Engineering berets changes

2015-05-03 01:41:42 +03:00

stool_bed_chair_nest

LINDA, Stage 1

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

transit_tubes

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

barsign.dm

Adds Barsign Picking

2015-04-25 09:35:38 -07:00

bedsheet_bin.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

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

Bug fixes galore

2015-03-01 20:35:07 +01: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

Squish Squash

2015-04-04 14:27:53 -04:00

false_walls.dm

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

flora.dm

Procedural Map Generator System

2015-04-11 05:28:10 -07: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

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

inflatable.dm

LINDA, Stage 1

2015-04-28 08:43:42 -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

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

ladders.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

lamarr_cage.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

lattice.dm

Bug fixes

2015-03-17 16:16:44 +01:00

mineral_doors.dm

Apply most/all of LINDA's updates

2015-04-28 12:45:58 -07: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

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

musician.dm

vg Garbage Collector

2015-02-23 17:18:38 -05: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

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

segway.dm

…

signs.dm

…

spirit_board.dm

Make actually work, grgrgr.

2015-03-26 21:03:23 +01:00

tables_racks.dm

LINDA, Stage 1

2015-04-28 08:43:42 -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

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

watercloset.dm

Water_act: Wetlevel for carbon mobs

2015-05-10 05:39:26 -07:00

windoor_assembly.dm

Apply most/all of LINDA's updates

2015-04-28 12:45:58 -07:00

window.dm

ONE DAY I WILL HAVE FIXED TOXINS MIXING

2015-05-01 07:52:29 -07:00