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

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

PDA

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

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

radio

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

aicard.dm

Fixes #9548

2015-06-06 06:28:46 +02:00

binoculars.dm

…

chameleonproj.dm

…

debugger.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-13 06:17:26 +02:00

flash.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

flashlight.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04: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

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

megaphone.dm

…

modkit.dm

…

multitool.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

paicard.dm

Makes the code compile by adding a comma and removing some unused lines.

2015-05-10 02:03:28 -05:00

pipe_painter.dm

…

powersink.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts

2015-05-12 17:19:36 +02:00

scanners.dm

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

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

spy_bug.dm

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

2015-06-30 08:24:43 +02:00

suit_cooling.dm

Refactor floodlights

2015-05-28 21:45:54 +02:00

taperecorder.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

traitordevices.dm

…

transfer_valve.dm

…

uplinks.dm

…

violin.dm

…

whistle.dm

Allows hailer messages to be altered.

2015-05-12 16:42:43 +09:30