Tigercat2000 43a09daddc Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent ...

Conflicts:
	code/modules/reagents/reagent_containers/glass_containers.dm
	maps/cyberiad.dmm

Fawwkss wai ;-;

2015-04-29 15:31:21 -07:00

..

assembly.dm

Bug fixes, update quick create object

2015-03-02 21:20:12 +01:00

bomb.dm

Apply most/all of LINDA's updates

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

helpers.dm

…

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

igniter.dm

Various Fixes

2015-04-29 18:12:24 -04:00

infrared.dm

assembly fixes

2015-04-25 22:43:40 -04:00

mousetrap.dm

assembly fixes

2015-04-25 22:43:40 -04:00

proximity.dm

…

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

signaler.dm

Revert "Revert "Emergency communications hotfix""

2015-02-20 17:59:07 +01:00

timer.dm

…

voice.dm

Voice trigger fixes

2013-11-24 03:21:37 -05:00