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

..

effects

Merge pull request #11748 from Aranclanos/pipep1

2015-09-14 18:26:46 -05:00

items

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

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

structures

Merge pull request #11689 from Steelpoint/RifleS

2015-09-16 13:34:35 +02:00

buckling.dm

buckling text span fix.

2015-09-09 09:29:51 +02:00

empulse.dm

…

explosion.dm

STOP BOMBING THE FUCKING BLOB, ASSHOLE

2015-08-30 19:54:55 -04:00

items.dm

Merge pull request #11677 from xxalpha/aliums

2015-09-14 17:00:14 +02:00

objs.dm

removes a bunch of .0

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

structures.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

weapons.dm

…