GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm

2015-08-11 18:47:05 +01: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

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

2015-06-07 10:51:41 +02:00

AI_modules.dm

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

2015-07-27 10:20:20 +02:00

autopsy.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

candle.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

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

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01: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

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

extinguisher.dm

Makes fire extinguishers effective at putting out mob fires

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

flamethrower.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

game_kit.dm

…

gift_wrappaper.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

handcuffs.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

hydroponics.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

improvised_components.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

kitchen.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

policetape.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

power_cells.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

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

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

stunbaton.dm

All the span-corrected dm files.

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

surgery_limbattachment.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

surgery_tools.dm

Merge with dev-freeze.

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

swords_axes_etc.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

syndie.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

tape.dm

…

teleportation.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

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

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

weaponry.dm

Ports /tg/'s meteor implementation.

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

weldbackpack.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

wires.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00