Cheridan 66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 ...

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm

2014-10-06 19:27:14 -05:00

..

devices

Merge pull request #5092 from Cheridan/flashing

2014-10-06 14:10:31 +01:00

robot

Resolved conflicts and added my yml changelog file

2014-09-19 09:30:59 -06:00

stacks

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

weapons

Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3

2014-10-06 19:27:14 -05:00

apc_frame.dm

SPANCLASSES!!!!!

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

blueprints.dm

Merge pull request #3283 from Aranclanos/Blueprints

2014-04-07 18:36:36 -07:00

bodybag.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

candle.dm

SPANCLASSES!!!!!

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

crayons.dm

SPANCLASSES!!!!!

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

documents.dm

-Removed some duplicate code

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

latexballoon.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

shooting_range.dm

SPANCLASSES!!!!!

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

toys.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

trash.dm

Cleans up the trash.dm

2014-02-13 10:35:02 -05:00