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

Conflicts:
	code/game/objects/structures/janicart.dm

2015-10-12 22:01:57 +02:00

..

devices

Merge pull request #12283 from KorPhaeron/inworld

2015-10-12 12:12:35 +03:00

robot

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

stacks

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

weapons

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

2015-10-12 22:01:57 +02:00

apc_frame.dm

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

blueprints.dm

…

body_egg.dm

…

bodybag.dm

Adds large cardboard boxes to the game, constructable from five sheets of cardboard.

2015-09-10 19:29:19 -04:00

candle.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

crayons.dm

Merge pull request #11749 from feemjmeem/suicides-sep12

2015-09-24 01:33:27 +03:00

dehy_carp.dm

…

documents.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

holotape.dm

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

latexballoon.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

nuke_tools.dm

Radiation changes

2015-09-26 13:33:27 -04:00

shooting_range.dm

Adds extra HONK. Tweaks sprite.

2015-09-09 16:27:21 -04:00

toys.dm

Merge pull request #11868 from bgobandit/diditallforthelewdbe

2015-10-01 05:06:34 +03:00

trash.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00