Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs ...

Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi

2015-02-20 22:00:53 -08:00

..

PDA

Font Define'ers Renamed

2015-01-24 17:32:17 +01:00

radio

Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems

2014-12-31 20:22:32 +00:00

aicard.dm

Refactors snowflake AI hosting in ninja

2014-12-18 21:03:09 -06:00

camera_bug.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems

2015-01-04 01:52:14 +00:00

chameleonproj.dm

Deactivates the Hidden Syndicate Teleportation Device

2015-02-19 16:34:49 +01:00

flash.dm

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

flashlight.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

laserpointer.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

lightreplacer.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

multitool.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paicard.dm

adds walterje's pais

2015-01-20 14:31:17 -08:00

pipe_painter.dm

Fixes a few RPD painting bugs

2015-01-04 04:35:36 -03:00

powersink.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

recaller.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

scanners.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs

2015-02-20 22:00:53 -08:00

sensor_device.dm

Adds the handheld crew monitor.

2014-12-09 19:42:54 -05:00

taperecorder.dm

Conflicts:

2014-11-13 17:33:32 +01:00

traitordevices.dm

Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff.

2014-11-22 17:36:02 +01:00

transfer_valve.dm

Fixes some functional but kekworthy code in transfer_valve.dm

2015-01-10 09:01:59 +00:00

uplinks.dm

…

violin.dm

Merge pull request #7179 from Firecage/Violin_hit

2015-01-23 22:15:13 -03:00