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

Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml

2015-12-06 11:48:20 +01:00

..

PDA

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

2015-10-16 13:02:59 +02:00

radio

Ghosts can now view any object with a NanoUI interface.

2015-11-22 12:21:41 +01:00

aicard.dm

Should fix AI-camera breaking when moved between cards.

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

binoculars.dm

…

chameleonproj.dm

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

2015-12-06 11:34:36 +01:00

debugger.dm

Mech chargers are now a single machine

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

flash.dm

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

flashlight.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-09-11 18:13:14 -04:00

floor_painter.dm

Floor painter, turf, and decal tweaks.

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

hacktool.dm

Corrects and adds more sanity checking.

2015-11-15 14:45:36 +01: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

Adds hacking tool.

2015-11-13 21:59:56 +01: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

Security Gear II

2015-12-02 13:42:41 -05: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