SamCroswell 5bb63a7f63 Merge Conflict Resolution ...

Conflicts:
	icons/obj/clothing/gloves.dmi

2015-03-08 15:59:20 -04:00

..

devices

Merge pull request #528 from TheDZD/nano_pai

2015-03-08 13:23:05 -04:00

robot

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

stacks

ERT equipment rework

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

weapons

Merge Conflict Resolution

2015-03-08 15:59:20 -04:00

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

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

blueprints.dm

Fix wall smoothing

2015-01-08 19:44:56 +01:00

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

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

changestone.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

contraband.dm

…

crayons.dm

Crayons and Gloves

2015-03-06 21:40:57 -05:00

documents.dm

Ports Antag Objectives from TG

2015-01-30 23:40:41 -05:00

flag.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

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

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

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

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

toys.dm

Crayons and Gloves

2015-03-06 21:40:57 -05:00

trash.dm

…