Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/objects/items/weapons/kitchen.dm

2015-02-25 20:44:32 +01:00

..

backpack.dm

Merge pull request #388 from Markolie/master

2015-02-23 12:47:25 -05:00

bags.dm

Fix trays (now bags)

2015-02-25 20:42:43 +01:00

belt.dm

ERT - Emergency Box, Toolbelt Fix, PDA

2015-02-24 13:02:15 -05:00

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

boxes.dm

ERT - Emergency Box, Toolbelt Fix, PDA

2015-02-24 13:02:15 -05:00

briefcase.dm

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

2015-02-23 16:47:55 -05:00

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

firstaid.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

internal.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

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

secure.dm

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

2015-02-23 16:47:55 -05:00

storage.dm

Fix trays (now bags)

2015-02-25 20:42:43 +01:00

toolbox.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

uplink_kits.dm

Thickmaterial Flag

2015-02-21 07:26:25 -05:00

wallets.dm

Part 1 of economy rework: Spacecash refactor - See commit for full changelog.

2014-04-19 20:47:41 -04:00