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

..

drilling

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

laborcamp

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

surprises

Brooms, Stick-horses, and Flying Wizards!

2015-05-15 03:52:36 -04:00

abandonedcrates.dm

oops

2015-06-20 17:43:42 -04:00

alloys.dm

…

coins.dm

Adds in Rings

2015-04-29 19:05:43 -04:00

equipment_locker.dm

tweaks and optimization

2015-06-21 02:16:18 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

machine_stacking.dm

…

machine_unloading.dm

…

manufacturing.dm

Bay/-tg- Meteor port

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

materials.dm

…

mine_areas.dm

Codebase Size Reduction--Music

2015-06-17 18:14:14 -04:00

mine_items.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

mine_turfs.dm

-tg- atom pooling system, qdel changes

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

minerals.dm

…

mining_recipes.dm

…

mint.dm

…

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

ore_datum.dm

…

ore.dm

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

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

security_recipes.dm

…

surprise.dm

…