Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix ...

Conflicts:
	code/game/gamemodes/wizard/artefact.dm

2015-02-15 10:27:50 -06:00

..

devices

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

robot

Adds movement states for some cyborgs

2015-02-10 00:44:38 -06:00

stacks

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

2015-02-11 16:13:04 +01:00

weapons

Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix

2015-02-15 10:27:50 -06:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

…

candle.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

crayons.dm

…

documents.dm

…

holotape.dm

fixes redundant passglass

2015-02-14 15:15:22 -08:00

latexballoon.dm

last fixes I hope:

2015-02-07 20:10:11 +01:00

shooting_range.dm

…

toys.dm

Blargh removed commented code I'm fuckin' tired

2015-02-03 08:37:48 -06:00

trash.dm

Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)

2015-02-05 16:48:25 +01:00