Cheridan d915997ea7 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057 ...

Conflicts:
	icons/obj/items.dmi

2015-08-08 19:36:36 -05:00

..

devices

Moved cyberimplants to internal organs system

2015-08-02 22:28:45 +03:00

robot

Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights

2015-07-18 21:56:25 -05:00

stacks

Adds Astral Carpet Tiles

2015-08-05 23:46:49 -05:00

weapons

Merge pull request #10992 from RemieRichards/AlternateWornLayer

2015-08-07 19:37:52 +10:00

apc_frame.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

Transferred body eggs to new organs system

2015-08-03 23:24:17 +03:00

bodybag.dm

fixes my shit

2015-08-08 19:49:09 -04:00

candle.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

crayons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

dehy_carp.dm

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

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

documents.dm

…

holotape.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

latexballoon.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

nuke_tools.dm

All nukes can now be deconstructed.

2015-06-24 15:23:44 +01:00

shooting_range.dm

…

toys.dm

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

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

trash.dm

Squashed Commits

2015-06-27 00:09:16 -06:00