PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm

2015-08-13 08:09:28 +02:00

..

circuitboards

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

grenades

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

implants

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

material

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-08 15:34:51 +02:00

melee

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

storage

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-08 15:34:51 +02:00

tanks

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

AI_modules.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-12 21:18:18 +02:00

autopsy.dm

…

candle.dm

…

cards_ids.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

cigs_lighters.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

clown_items.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-12 21:18:18 +02:00

cosmetics.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

dice.dm

…

dna_injector.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

explosives.dm

…

extinguisher.dm

Makes fire extinguishers effective at putting out mob fires

2015-06-21 00:43:15 -04:00

flamethrower.dm

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

…

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

mop.dm

Fixes #10548

2015-08-12 12:21:28 -04:00

paint.dm

…

paiwire.dm

…

policetape.dm

…

power_cells.dm

…

RCD.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

RSF.dm

…

scrolls.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

shields.dm

…

stunbaton.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

surgery_limbattachment.dm

…

surgery_tools.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

swords_axes_etc.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

syndie.dm

…

tape.dm

…

teleportation.dm

…

tools.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-31 10:00:16 +02:00

traps.dm

Fixes #9785

2015-06-20 22:12:38 +09:30

trays.dm

…

weaponry.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weldbackpack.dm

…

wires.dm

…