PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

PDA

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-11 08:38:28 +02:00

radio

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-17 09:37:49 +02:00

aicard.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-01 19:45:42 +02:00

binoculars.dm

…

chameleonproj.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

debugger.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

flash.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-05 09:24:30 +02:00

flashlight.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-11 08:38:28 +02:00

floor_painter.dm

Updates fire_act() implementations to work better with lower temperature fires

2015-06-26 00:40:55 -04:00

lightreplacer.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-08 15:34:51 +02:00

megaphone.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

modkit.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

multitool.dm

…

paicard.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

pipe_painter.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

powersink.dm

…

scanners.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-06-16 10:30:50 +02:00

spy_bug.dm

Code relocation.

2015-09-11 08:45:49 +02:00

suit_cooling.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-30 16:11:57 +02:00

taperecorder.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

traitordevices.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

transfer_valve.dm

TTV Refactor

2015-10-08 23:26:05 -04:00

uplink_categories.dm

Allows one to define list of random selection items.

2015-06-17 15:04:06 +02:00

uplink_items.dm

Updates "on merge" entries. Relocates code.

2015-09-08 08:03:14 +02:00

uplink_random_lists.dm

Makes it possible to buy up all telecrystals in one go.

2015-06-18 13:10:49 +02:00

uplink.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:17:06 +09:30

violin.dm

…

whistle.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-24 10:23:12 +02:00