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

..

laborcamp

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

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

equipment_locker.dm

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

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

machine_input_output_plates.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

machine_processing.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

machine_stacking.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

machine_unloading.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

mine_areas.dm

Area Ambiance Refactor

2014-05-06 21:40:28 -05:00

mine_items.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

mine_turfs.dm

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

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

mint.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

money_bag.dm

Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork

2014-08-23 10:13:21 +02:00

ores_coins.dm

Merge pull request #5233 from Jordie0608/stateoftheiconstates

2014-10-16 08:28:13 -05:00

satchel_ore_boxdm.dm

Ok now explosions shall work properly

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