Cheridan acba4c6cf6 Adds construction permits ...

Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi

2015-03-26 18:52:29 +01:00

..

grenades

Merge pull request #650 from ZomgPonies/beartraps

2015-03-25 09:37:08 -04:00

implants

Merge pull request #592 from Fox-McCloud/mindslave-loyalties

2015-03-19 01:41:51 -04:00

melee

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

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

storage

Adds construction permits

2015-03-26 18:52:29 +01:00

tanks

Explosion Tweaks and Fixes

2015-03-15 18:05:13 -04: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

…

cosmetics.dm

Removes TABLEPASS and FPRINT flags

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

courtroom.dm

Adding gavel and block

2015-03-25 10:22:04 -04:00

defib.dm

Borg Defib Fixes

2015-03-26 01:14:41 -04:00

dice.dm

…

dna_injector.dm

Standardize mutations

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

dnascrambler.dm

…

explosives.dm

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

extinguisher.dm

Ensure extinguisher precision works

2015-02-25 21:33:34 +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

Kitchen Overhaul

2015-03-08 05:09:19 -04: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

paint.dm

Removes TABLEPASS and FPRINT flags

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

paiwire.dm

…

power_cells.dm

Re-Adds Ninja Gear

2015-03-05 17:17:52 -05:00

RCD.dm

RCD fix

2015-02-26 22:08:12 -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

Health and Stack Fixes

2015-03-01 01:07:14 -05:00

shields.dm

Telescopic Riot Shield

2015-02-27 07:31:03 -05:00

stunbaton.dm

Energy Tweaks

2015-03-03 16:00:07 -05:00

surgery_limbattachment.dm

…

surgery_tools.dm

Fix debraining a severed head

2015-03-03 19:52:10 +01:00

swords_axes_etc.dm

Telescopic Riot Shield

2015-02-27 07:31:03 -05: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

Merge pull request #653 from ZomgPonies/headspear

2015-03-25 09:37:36 -04: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

…