PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

circuitboards

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

grenades

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

implants

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

material

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

melee

Merge pull request #9851 from mwerezak/armourpen

2015-08-22 02:22:17 +09:30

storage

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

tanks

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

AI_modules.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +02:00

cards_ids.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +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

…

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

…

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

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

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

RCD.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

RSF.dm

…

scrolls.dm

…

shields.dm

…

stunbaton.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

…

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

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

traps.dm

…

trays.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

weaponry.dm

…

weldbackpack.dm

…

wires.dm

…