Hornygranny af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor ...

Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm

2014-12-09 16:03:45 -08:00

..

lib_items.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

lib_machines.dm

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

lib_readme.dm

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00