Tigercat2000 40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm

2015-05-10 14:15:51 -07:00

..

closets

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

effects

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

2015-05-10 14:15:51 -07:00

items

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

2015-05-10 14:15:51 -07:00

random

Crayons and Gloves

2015-03-06 21:40:57 -05:00

structures

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

2015-05-10 14:15:51 -07:00

empulse.dm

…

explosion.dm

Fixed mobs not taking damage from explosions

2015-05-10 00:19:28 -04:00

items.dm

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

objs.dm

NanoUI update

2015-03-01 04:22:12 +01:00

structures.dm

Squish Squash

2015-04-04 14:27:53 -04:00

weapons.dm

…