phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff ...

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm

2015-09-19 22:34:30 +02:00

..

PDA

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

radio

removes a bunch of .0

2015-09-10 20:57:30 +09:00

aicard.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

camera_bug.dm

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

chameleonproj.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

doorCharge.dm

Adds origin tech values to a lot of items.

2015-09-14 14:27:01 -04:00

flashlight.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

instruments.dm

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

laserpointer.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

lightreplacer.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

megaphone.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

multitool.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

paicard.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

pipe_painter.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

pizza_bomb.dm

Assemblies update

2015-09-04 11:22:37 +03:00

powersink.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

scanners.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

sensor_device.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

taperecorder.dm

Removes tape recorder wires to fix a server-crashing bug.

2015-08-10 14:00:05 +02:00

traitordevices.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

transfer_valve.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

uplinks.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00