xxalpha 4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium ...

Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm

2015-07-02 18:49:41 +01:00

..

PDA

Merge pull request #9845 from AnturK/buttsender

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

radio

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +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

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

flash.dm

span fixes

2015-04-24 20:52:01 +03:00

flashlight.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

instruments.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

laserpointer.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +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

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01: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

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

pizza_bomb.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

powersink.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

scanners.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

sensor_device.dm

- Crew monitoring computer using the html_interface module

2015-06-27 10:26:46 +02:00

taperecorder.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

traitordevices.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

transfer_valve.dm

Remove optimization code.

2015-06-24 01:14:20 +01:00

uplinks.dm

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

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