Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

PDA

Merge pull request #6738 from PsiOmegaDelta/Messaging

2014-10-17 06:16:30 +10:30

radio

Merge pull request #6790 from mwerezak/robot-radio

2014-10-20 03:53:10 +04:00

aicard.dm

AI restoration console shows ion laws

2014-09-20 10:42:41 +02:00

binoculars.dm

Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.

2014-10-04 17:38:38 +08:00

chameleonproj.dm

…

debugger.dm

…

flash.dm

…

flashlight.dm

Merge with dev.

2014-06-12 01:14:40 +09:30

floor_painter.dm

Fixes being able to use the floor painter through windows, windoors etc.

2014-08-13 09:30:11 +01:00

lightreplacer.dm

Stack update

2014-09-02 09:59:32 +04:00

megaphone.dm

…

modkit.dm

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

multitool.dm

…

paicard.dm

Initial commit for mobile pAIs. Almost guaranteed to be broken as shit.

2014-07-17 23:09:47 +09:30

pipe_painter.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

powersink.dm

…

scanners.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

suit_cooling.dm

fixes #6005 and broken ancient human low/high pressure code.

2014-08-17 18:06:30 +02:00

taperecorder.dm

…

traitordevices.dm

…

transfer_valve.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

uplinks.dm

The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character.

2014-09-02 07:12:13 +02:00

violin.dm

…

whistle.dm

…