Ergovisavi 439aec7b50 Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2013-09-12 18:02:15 -07:00

..

effects

Minor atmos fixes for resin and mineral structures

2013-09-08 01:01:12 +01:00

items

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

2013-09-12 18:02:15 -07:00

structures

Minor atmos fixes for resin and mineral structures

2013-09-08 01:01:12 +01:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-03-13 00:08:20 -03:00

explosion_recursive.dm

* Added a debug verb for counting non-turf instances during rounds.

2013-08-04 21:42:36 +01:00

explosion.dm

Fixed some more

2013-06-20 21:14:02 -04:00

items.dm

Fix for laserproof vest

2013-09-09 16:58:49 +08:00

objs.dm

Removes an unused var defined for every obj.

2013-09-03 09:38:30 -05:00

structures.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

weapons.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00