GunHog 3b35e80e4d Merge remote-tracking branch 'remotes/upstream/master' into Botcall_V2 ...

Conflicts:
	code/game/machinery/bots/bots.dm

2015-05-03 17:59:46 -05:00

..

PDA

Bots Revamp

2015-05-03 17:31:10 -05:00

radio

Fixes NTSL!

2015-04-25 22:31:51 -05:00

aicard.dm

…

camera_bug.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

chameleonproj.dm

Effect pooling

2015-03-24 11:44:49 -07:00

flash.dm

span fixes

2015-04-24 20:52:01 +03:00

flashlight.dm

more spans

2015-04-24 20:52:00 +03:00

instruments.dm

Ports Nienhaus's guitar, the additional sounds are about ~1mb.

2015-04-24 19:12:22 -06:00

laserpointer.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

lightreplacer.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

megaphone.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

multitool.dm

…

paicard.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

pipe_painter.dm

Fixes a few RPD painting bugs

2015-01-04 04:35:36 -03:00

pizza_bomb.dm

span fixes

2015-04-24 20:52:01 +03:00

powersink.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

recaller.dm

uncommitted files (+5 squashed commit)

2015-04-29 20:28:28 -06:00

scanners.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

2015-03-23 16:51:03 +01:00

sensor_device.dm

…

taperecorder.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

traitordevices.dm

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

transfer_valve.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

uplinks.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00