PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-07-14 08:11:11 +02:00

..

closets

Removes some qdel:s of lists.

2015-06-05 12:05:43 +02:00

closets.dm

Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel.

2015-06-10 22:07:52 -05:00

crates.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-14 08:11:11 +02:00

largecrate.dm

…