bgobandit 8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit ...

Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-10-02 00:41:19 -04:00

..

devices

Merge pull request #11994 from bustygoku/Param-Pointers

2015-09-28 15:35:09 -05:00

robot

Added a self-repair module for cyborgs.

2015-09-19 18:38:24 +01:00

stacks

Merge pull request #11968 from xxalpha/hot_or_not

2015-09-25 04:02:52 +03:00

weapons

Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit

2015-10-02 00:41:19 -04:00

apc_frame.dm

Assemblies update

2015-09-04 11:22:37 +03:00

blueprints.dm

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

2015-07-16 04:27:25 -06:00

body_egg.dm

I screwed up that merge

2015-08-14 21:36:35 -06:00

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

Adds more feedback to traitor dehydrated space carp. Fixes spelling.

2015-07-26 00:00:04 -04:00

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

removes a bunch of .0

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

trash.dm

removes a bunch of .0

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