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

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

PDA

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

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

radio

Merge with dev-freeze.

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

aicard.dm

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

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

binoculars.dm

…

chameleonproj.dm

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

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

debugger.dm

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

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

flash.dm

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

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

flashlight.dm

Merge with dev-freeze.

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

floor_painter.dm

Updates fire_act() implementations to work better with lower temperature fires

2015-06-26 00:40:55 -04:00

lightreplacer.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

megaphone.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

modkit.dm

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

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

multitool.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

paicard.dm

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

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

pipe_painter.dm

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

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

powersink.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

scanners.dm

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

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

spy_bug.dm

Merge with dev-freeze.

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

suit_cooling.dm

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

2015-05-30 16:11:57 +02:00

taperecorder.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

traitordevices.dm

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

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

transfer_valve.dm

…

uplink_categories.dm

Allows one to define list of random selection items.

2015-06-17 15:04:06 +02:00

uplink_items.dm

Makes it possible to buy up all telecrystals in one go.

2015-06-18 13:10:49 +02:00

uplink_random_lists.dm

Makes it possible to buy up all telecrystals in one go.

2015-06-18 13:10:49 +02:00

uplink.dm

Makes it possible to buy up all telecrystals in one go.

2015-06-18 13:10:49 +02:00

violin.dm

…

whistle.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00