PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm

2015-06-16 10:52:33 +02:00

..

circuitboards

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

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

grenades

All the span-corrected dm files.

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

implants

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

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

material

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

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

melee

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

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

storage

All the span-corrected dm files.

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

tanks

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

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

AI_modules.dm

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

2015-06-02 20:18:45 +01: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' into span_class=notice

2015-06-05 00:49:13 +01:00

cigs_lighters.dm

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

2015-06-16 10:30:50 +02:00

clown_items.dm

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

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

cosmetics.dm

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

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

dice.dm

…

dna_injector.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30

explosives.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

extinguisher.dm

Fixes #9380

2015-05-20 16:44:47 +01: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

Minor fixes to supermatter manual text

2015-04-05 22:40:19 +10:00

mop.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

paint.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

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

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

RSF.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

scrolls.dm

Changes teleportation scroll and spellbook to be only usable by wizards

2015-06-04 20:21:31 +01:00

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

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

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

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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

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-06-16 10:52:33 +02:00

traps.dm

Updates bear traps

2015-05-24 16:33:41 -04:00

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