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

..

grenades

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

implants

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

melee

Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits

2015-02-22 08:27:38 -05:00

storage

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

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

tanks

Bug fixes, add atmos watertank

2015-02-25 19:47:04 +01:00

AI_modules.dm

Merge with upstream/master

2015-02-12 16:43:01 -05:00

alien_specific.dm

Removes TABLEPASS and FPRINT flags

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

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

cash.dm

Vox Heist port from Bay

2015-01-10 06:21:21 +01:00

chrono_eraser.dm

NODROP flag addition & handling

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

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

clown_items.dm

Janitor Rework

2014-11-10 03:17:56 -05:00

cosmetics.dm

Removes TABLEPASS and FPRINT flags

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

defib.dm

Merge pull request #398 from SamCroswell/master

2015-02-24 00:03:11 +01:00

dice.dm

…

dna_injector.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

dnascrambler.dm

Traitor Gear and Balance

2014-10-28 01:35:03 -04:00

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

extinguisher.dm

Extinguisher wheelchair update, deathsquad robot fix

2015-02-25 19:56:24 +01:00

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

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

game_kit.dm

…

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

grenades.dm

Unused/WorkInProgress folder cleanup

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

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

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

kitchen.dm

Fix trays (now bags)

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

manuals.dm

Change space law iframe wiki link

2015-02-20 19:20:21 +01:00

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

ninja_manuscript.dm

Removes TABLEPASS and FPRINT flags

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

paint.dm

Removes TABLEPASS and FPRINT flags

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

paiwire.dm

…

power_cells.dm

ERT - Helmets Change, Cells Capacity Adjustment

2015-02-24 14:25:28 -05:00

RCD.dm

ERT Rework - Part One

2015-02-24 09:47:44 -05:00

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

scrolls.dm

Removes TABLEPASS and FPRINT flags

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

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

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

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

surgery_limbattachment.dm

…

surgery_tools.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

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

syndie.dm

…

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

teleportation.dm

Merge with upstream/master

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

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

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

vending_items.dm

Clothing Update

2015-01-01 11:23:48 -05:00

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

wires.dm

…