xxalpha fda59dc3f5 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-09-09 02:41:34 +01:00

..

devices

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

robot

Assemblies update

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

stacks

Fixes Gold Sheets Containing Plasma

2015-09-04 01:44:13 -04:00

weapons

Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r

2015-09-09 02:41:34 +01: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

Fixes bodybag not visually opening or closing.

2015-08-23 18:14:40 +02: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

-Removed some duplicate code

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

holotape.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

latexballoon.dm

Fixes proc arguments

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

nuke_tools.dm

Reworked nuke deconstruction. New nuke sprites. More++

2015-09-06 21:35:14 +01:00

shooting_range.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

toys.dm

Fixes oversight

2015-08-26 18:03:13 -04:00

trash.dm

Squashed Commits

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