PsiOmegaDelta a83e78a648 Merge remote-tracking branch 'upstream/dev' into 160102-Yona ...

Conflicts:
	code/modules/modular_computers/file_system/programs/ntnrc_client.dm

2016-01-08 19:02:30 +01:00

..

PDA

Rewrote targeting.

2015-12-16 10:10:13 +10:30

radio

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

aicard.dm

Removes suicide code.

2015-12-14 15:57:56 +01:00

binoculars.dm

…

chameleonproj.dm

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

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

debugger.dm

…

flash.dm

Merge pull request #10287 from mwerezak/attack-cleanup2

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

flashlight.dm

Fixes #11914

2016-01-07 05:49:16 +03:00

floor_painter.dm

Added a colour selector to the floor painter, added the floor painter to the construction and drone modules.

2016-01-02 12:23:30 +01:00

hacktool.dm

Turns events into vars instead of a list, to greatly simplify qdel() cleanup.

2015-12-14 13:44:05 +01:00

lightreplacer.dm

Amendments to light replacer and janitor supply crate

2015-10-06 19:59:56 +02:00

megaphone.dm

…

modkit.dm

…

multitool.dm

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

paicard.dm

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

2015-12-20 11:55:53 +01:00

pipe_painter.dm

…

powersink.dm

…

scanners.dm

…

spy_bug.dm

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

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

suit_cooling.dm

…

t_scanner.dm

…

taperecorder.dm

…

traitordevices.dm

…

transfer_valve.dm

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

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

uplink_categories.dm

…

uplink_items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2

2015-12-29 20:25:34 +01:00

uplink_random_lists.dm

…

uplink.dm

Uplink fixes.

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

violin.dm

…

whistle.dm

…