xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-08-31 08:52:30 +01:00

..

devices

Added qdel(wires) to a bunch of objects Destroy proc.

2015-08-27 11:10:58 +01:00

robot

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

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

stacks

Merge pull request #11433 from Core0verload/framed

2015-08-30 13:43:19 -05:00

weapons

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

2015-08-31 08:52:30 +01:00

apc_frame.dm

Changed some circuits paths to reduce copypasta

2015-08-30 16:58:13 +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

…

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

…

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