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

Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm

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

..

PDA

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

radio

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

2015-08-12 21:18:18 +02:00

aicard.dm

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

2015-08-01 19:45:42 +02:00

binoculars.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

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

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

2015-07-11 10:58:49 +02: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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-08 15:34:51 +02:00

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

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

spy_bug.dm

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

2015-06-30 08:59:34 +02:00

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

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

uplink_categories.dm

Adds anti-photon grenades.

2015-07-28 09:25:38 +02:00

uplink_items.dm

Adds the ability for mercenaries to false crew arrival announcements and records.

2015-07-28 11:58:16 +02:00

uplink_random_lists.dm

Adds anti-photon grenades.

2015-07-28 09:25:38 +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

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

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