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

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm

2015-06-23 12:54:26 -07:00

..

PDA

Merge pull request #9845 from AnturK/buttsender

2015-06-17 20:36:52 +02:00

radio

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

aicard.dm

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-15 12:26:28 -05:00

camera_bug.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

chameleonproj.dm

Effect pooling

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

doorCharge.dm

Changes the way the airlock charge works

2015-06-19 14:46:06 -04: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

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

lightreplacer.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01: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

Polishes the AI nerfs a bit:

2015-06-06 16:51:09 +02:00

paicard.dm

Edited pAIcard displayed message, donksoft dart description and some tips of the round.

2015-05-24 20:49:06 +01:00

pipe_painter.dm

Fixes a few RPD painting bugs

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

pizza_bomb.dm

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

2015-06-23 12:54:26 -07:00

powersink.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

scanners.dm

Merge pull request #8876 from xxalpha/fixfixfix

2015-06-21 22:12:17 +03:00

sensor_device.dm

Adds the handheld crew monitor.

2014-12-09 19:42:54 -05:00

taperecorder.dm

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

2015-06-23 12:54:26 -07: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

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

uplinks.dm

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

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