xxalpha 4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-09-16 23:14:14 +01:00

..

backpack.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

bags.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

belt.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa

2015-09-09 14:04:41 -04:00

book.dm

Major cult changes

2015-09-16 10:04:49 +12:00

boxes.dm

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

briefcase.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

fancy.dm

Fixes a runtime when cigarette packets are destroyed.

2015-07-29 13:37:06 +02:00

firstaid.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

internal.dm

New traitor item: storage implant

2015-08-04 18:28:38 +03:00

lockbox.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

secure.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

storage.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

toolbox.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa

2015-09-09 14:04:41 -04:00

uplink_kits.dm

Reworked nuke deconstruction. New nuke sprites. More++

2015-09-06 21:35:14 +01:00

wallets.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00