Erthilo edd6f3ad88 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm

2012-06-19 22:09:30 +01:00

..

admin

Fixed a long-lasting error with vending machine in toxins, fixed/added atmos setting editor in game.

2012-06-18 23:39:12 -07:00

assembly

TG: Added checks for the player being dead, stunned, unconcious ect... to:

2012-06-14 17:15:58 +01:00

chemical

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

client

Comments out control_freak again, since it didn't stop any Topic exploits, and prevented using the profiler.

2012-06-07 04:50:03 +01:00

clothing

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

critters

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

customitems

Removed one of my custom items, and added a new one.

2012-06-19 17:43:26 +09:30

DetectiveWork

Shitload of bugfixes.

2012-06-18 21:18:26 -07:00

flufftext

TG: - Deleted ERP.dmi

2012-06-07 02:41:38 +01:00

food

Tweaked the food system to allow for custom sounds.

2012-06-04 12:21:38 -07:00

icon generation

Adding some (currently unused) icon generation stuff

2012-05-30 17:54:33 -04:00

maps

TG: Adds the framework for randomlly loading an additional external z-level at

2012-05-10 02:12:12 +01:00

mining

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

mob

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

paperwork

TG: Updated toilets. You can now crowbar open the cistern and hide stuff in there.

2012-06-14 17:46:43 +01:00

power

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

projectiles

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

recycling

possible fix for a conveyor bug

2012-06-15 00:06:20 +10:00

research

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-19 22:09:30 +01:00

scripting

TG: More work done on Telecomms:

2012-04-24 21:13:55 +01:00

security levels

TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits.

2012-02-03 08:09:32 +00:00