MrSnapwalk 789134d8f2 Automerge fix ...

Fixing the conflicts preventing an automerge.

2014-03-02 17:03:35 -06:00

..

PDA

Reduced the potency of carrying multiple light sources.

2014-02-05 16:54:46 -05:00

radio

This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.

2014-02-27 10:56:06 -08:00

aicard.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

camera_bug.dm

Camera bug sprites from Rob

2013-11-23 17:10:43 +00:00

chameleonproj.dm

second pass

2014-02-15 20:11:12 -08:00

flash.dm

Automerge fix

2014-03-02 17:03:35 -06:00

flashlight.dm

Reduced the potency of carrying multiple light sources.

2014-02-05 16:54:46 -05:00

laserpointer.dm

Merged two lines with origin_tech

2014-02-17 10:44:00 +03:00

lightreplacer.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

multitool.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

paicard.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

powersink.dm

Logs everywhere

2014-01-19 21:16:30 +04:00

scanners.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

taperecorder.dm

passed over everything with throwforce

2014-02-13 18:06:50 -08:00

traitordevices.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

transfer_valve.dm

Accounted for ridiculous edge case

2014-02-12 14:33:27 -08:00

uplinks.dm

Uses compiled list for uplinks

2014-02-25 17:53:30 -05:00

violin.dm

no more headaches

2014-02-21 01:20:46 -08:00