Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 ...

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

2014-12-15 18:12:14 -08:00

..

ammo_casings.dm

Description update

2014-12-11 21:23:16 +00:00

boxes.dm

Generic names and buffs

2014-12-08 16:49:48 -08:00

energy.dm

Defib sounds plus Code

2014-12-05 22:18:34 -08:00

magazines.dm

fixes a few bugs with gun and ammo icons/obj/gun.dmi

2014-12-13 17:13:25 -08:00

special.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00