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

..

devices

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

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

robot

Adds movement states for some cyborgs

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

stacks

Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials

2015-02-14 13:45:23 -05:00

weapons

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

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

apc_frame.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00:00

bodybag.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

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

Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.

2015-01-03 13:44:23 -06:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

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

Repaths practice laser

2015-01-07 04:45:49 -03:00

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