PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml

2015-10-11 17:37:01 +02:00

..

PDA

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

2015-09-11 08:54:03 +02:00

radio

Destroy tweaks.

2015-09-25 10:44:23 +02:00

aicard.dm

Should fix AI-camera breaking when moved between cards.

2015-08-24 17:12:41 +09:30

binoculars.dm

…

chameleonproj.dm

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

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

debugger.dm

Mech chargers are now a single machine

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

flash.dm

Species flash cleanup.

2015-09-06 10:09:03 +09:30

flashlight.dm

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

2015-09-11 08:54:03 +02:00

floor_painter.dm

Floor painter, turf, and decal tweaks.

2015-09-21 15:14:13 +02:00

lightreplacer.dm

Amendments to light replacer and janitor supply crate

2015-10-06 19:59:56 +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

Mech chargers are now a single machine

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

paicard.dm

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

2015-08-29 10:06:18 +02:00

pipe_painter.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

powersink.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

scanners.dm

Mech chargers are now a single machine

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

spy_bug.dm

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

2015-09-11 08:54:03 +02:00

suit_cooling.dm

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

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

t_scanner.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03: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

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

2015-10-11 17:37:01 +02:00

uplink_categories.dm

Adds anti-photon grenades.

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

uplink_items.dm

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

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

uplink_random_lists.dm

Adds anti-photon grenades.

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

uplink.dm

Uplink fixes.

2015-09-08 08:43:40 +02:00

violin.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

whistle.dm

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

2015-08-24 10:23:12 +02:00