tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm

2014-11-14 15:23:35 -03:00

..

devices

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

2014-11-09 12:27:48 -06:00

robot

Finishes repathing flashes

2014-10-22 19:09:43 +01:00

stacks

Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel

2014-11-12 22:50:32 -03:00

weapons

Merge pull request #5845 from phil235/StunBatonAtckAnimFix

2014-11-14 18:17:37 +00:00

apc_frame.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

Adds construction permits

2014-10-11 17:39:27 -05:00

bodybag.dm

Adding bluespace bodybags. Adding changelog.

2014-10-21 17:27:40 +02:00

candle.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

crayons.dm

Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown.

2014-09-28 14:02:08 +04:00

documents.dm

…

latexballoon.dm

…

shooting_range.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

toys.dm

Adds a new prize mech based on the mime mech.

2014-10-21 10:26:01 -05:00

trash.dm

…