Krausus f816b8672d Resolves merge conflicts ...

Conflicts:
	code/game/machinery/computer/communications.dm

2015-08-18 04:14:14 -04:00

..

PDA

Fixes bad PDA tnote entries and minor PDA bugs

2015-08-14 23:33:38 -04:00

radio

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

aicard.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

autopsy.dm

Pass II

2015-07-09 19:51:40 -04:00

camera_bug.dm

Singularity Refactor

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

chameleonproj.dm

spawn() added to ex_act

2015-08-01 15:48:29 -04: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

Pass 3

2015-07-08 01:34:53 -04:00

laserpointer.dm

Squish Squash

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

lightreplacer.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

megaphone.dm

Switch copytext and sanitize proc

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

modkit.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

multitool.dm

Replaces Reamining Del()'s

2015-07-07 00:35:19 -04:00

paicard.dm

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

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

pipe_freezer.dm

…

pipe_painter.dm

…

pizza_bomb.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

powersink.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

scanners.dm

Fixes various runtimes

2015-08-18 02:53:23 -04:00

sensor_device.dm

Update NanoUI to be up-to-date with Bay

2015-07-28 21:04:44 +02: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

Fix compile error

2015-08-17 01:03:34 +02:00

uplinks.dm

Fix traitor end of round message

2015-08-10 20:00:53 +02:00

violin.dm

Pass 3

2015-07-08 01:34:53 -04:00

whistle.dm

Adds Grenade, Flash, and EMP in-hands

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