PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

circuitboards

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

2015-10-11 17:17:41 +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/master' into dev-freeze

2015-09-08 07:58:25 +02:00

material

Merge pull request #10939 from Baystation12/master

2015-08-30 10:20:32 +02:00

melee

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

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

storage

Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon

2015-09-09 19:49:46 -04:00

tanks

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

2015-10-11 17:17:41 +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/master' into dev-freeze

2015-08-14 08:34:42 +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

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

…

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

Fixes #10548

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

paint.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

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

…

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

Removes bear traps from the custodial closet, adds autolathe recipe

2015-08-22 02:31:19 -04:00

trays.dm

…

weaponry.dm

…

weldbackpack.dm

…

wires.dm

…