GunHog 60c9106f05 Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense ...

Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm

2015-08-19 09:56:16 -05:00

..

devices

Changes a lot of del() to qdel()

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

robot

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

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

stacks

I screwed up that merge

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

weapons

Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense

2015-08-19 09:56:16 -05: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

I screwed up that merge

2015-08-14 21:36:35 -06: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

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

All nukes can now be deconstructed.

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

shooting_range.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03:00

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