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

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

2012-05-31 15:09:35 +01:00

..

beast

Huge commit! Standardizes var definitions in most places.

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

computer2

/obj/item/weapon/spacecash change to /obj/item/weapon/money

2012-05-21 23:56:48 +01:00

gamemodes

TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)

2012-05-06 22:53:39 +01:00

hivebot

HUD Update

2012-05-23 22:58:52 +01:00

mining

TG: - unticked module/mining/datum_processing_recipe.dm

2012-04-23 22:19:17 +01:00

optics

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

pda2

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

powerarmor

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

spacecraft

Huge commit! Standardizes var definitions in most places.

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

_debug.dm

TG: Adds more debugging to the tensioner.

2012-04-29 23:21:02 +01:00

ai_lockdown.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

airtunnel.dm

Cleaned up:

2011-08-20 04:30:37 +00:00

assemblies.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

BrokenInhands.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

carpetsplosion.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

conveyor.dm

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

dna.dm

Derp.

2012-03-20 17:30:24 +00:00

filter_control.dm

Moved some of the old pipe files into unused.

2011-08-22 10:59:54 +00:00

game_kit.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

heater.dm

Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.

2012-05-11 18:02:30 -07:00

jobs.dm

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

musicplayer.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

newcombatsystem.dm

TG: Now all calls for bruteloss are handled via procs now. Extensibility++ r2803

2012-03-26 18:01:06 +01:00

pipe_filter.dm

Moved some of the old pipe files into unused.

2011-08-22 10:59:54 +00:00

pipe.dm

Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.

2012-05-11 18:02:30 -07:00

scrap.dm

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

siphs.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

toilets.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-02-04 22:36:42 +10:00

traps.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

travel.dm

Engineering got a new machine that spawns/feeds the singularity.

2011-02-09 06:07:32 +00:00

Ultralight.dm

re-adding fixed ul + new helper proc (get_opposite())

2012-01-05 15:37:02 +10:00

vehicle.dm

Cleaned up:

2011-08-20 04:30:37 +00:00