Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

PDA

Merge remote-tracking branch 'upstream/master' into poolit

2015-06-22 13:40:07 -07:00

radio

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

aicard.dm

tweaks and optimization

2015-06-21 02:16:18 -04:00

autopsy.dm

Squish Squash

2015-04-04 14:27:53 -04:00

camera_bug.dm

Singularity Refactor

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

chameleonproj.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

debugger.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

flash.dm

Adds Grenade, Flash, and EMP in-hands

2015-05-31 16:39:41 -04:00

flashlight.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

guitar.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

laserpointer.dm

Squish Squash

2015-04-04 14:27:53 -04:00

lightreplacer.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

megaphone.dm

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

modkit.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

multitool.dm

/vg/ Multitool menu port!

2015-05-14 22:34:02 +02:00

paicard.dm

Merge remote-tracking branch 'upstream/master' into poolit

2015-06-22 13:40:07 -07:00

pipe_freezer.dm

New icon for pipe freezer

2014-08-12 02:04:07 +01:00

pipe_painter.dm

Major atmos overhaul: scrubbers and pipes can now co-exist

2015-01-18 02:24:24 +01:00

powersink.dm

Powernet Tweaks

2015-06-14 17:21:01 -04:00

scanners.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

sensor_device.dm

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

taperecorder.dm

Taperecorder Rework

2015-03-23 05:45:15 -04:00

traitordevices.dm

[Goonchem] Tweaks, Fixes, etc.

2015-03-28 21:16:13 -04:00

transfer_valve.dm

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

uplinks.dm

Radio uplink refund fix

2015-03-17 22:54:21 +01:00

violin.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

whistle.dm

Adds Grenade, Flash, and EMP in-hands

2015-05-31 16:39:41 -04:00