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

..

devices

Fixing Intercom changes from VG Code to Paradise

2015-05-02 16:14:36 -07:00

mountable_frames

Intercom Frame Icon fix

2015-05-08 05:49:22 -07:00

robot

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

stacks

Adding Intercom to recipes

2015-05-02 15:12:42 -07:00

weapons

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

2015-05-10 14:15:51 -07: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

w_classes, NEED W_CLASSES, gaah.

2015-03-26 19:21:32 +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

…

contraband.dm

[Goonchem] Reagent Decals

2015-04-17 18:27:49 -04:00

crayons.dm

Adds spraycans, fixes lipstick, modifies scleaner

2015-04-15 17:19:08 -07:00

dehy_carp.dm

Carp Plushie Syndies Buff

2015-04-24 01:40:24 -04:00

documents.dm

…

flag.dm

Removes Space Ninjas

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

latexballoon.dm

Modify fire_act to temperature_expose where needed

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

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

policetape.dm

Adds creating hazard floor overlay with tape

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

random_items.dm

Merge pull request #980 from FalseIncarnate/master

2015-05-10 16:05:57 -04: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

Traitor Item Additions and Surplus Crates

2015-04-21 03:05:12 -04:00

trash.dm

LINDA, Stage 1

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