PsiOmega fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm

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

..

circuitboards

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

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

grenades

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

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

Merge pull request #9712 from mwerezak/all-things-to-everyone

2015-06-07 09:01:11 +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 branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03: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

…

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

…

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

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

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

…

teleportation.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

tools.dm

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

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

Restructuring a bunch of files in prep for widespread path changes.

2015-05-16 20:09:28 +09:30

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