Cael_Aislinn 4c500f8b1c Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/devices/uplinks.dm
	code/game/objects/weapons.dm
	code/modules/mining/mine_items.dm
	html/changelog.html
	icons/obj/chemical.dmi
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-08-24 21:55:58 +10:00

..

beast

Huge commit! Standardizes var definitions in most places.

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

computer2

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

disease2

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

gamemodes

I started with the desire to fix issue 634. It sounded like a simple issue, right? Well one complete rewrite of how equipping and stripping works later, this commit fixes issue 645

2012-08-15 23:15:55 +00:00

hivebot

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

mining

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

optics

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

pda2

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10: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

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

_debug.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

Agouri_stuff.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

ai_lockdown.dm

Just some general cleanup

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

AI_Visibility.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

airtunnel.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

assemblies.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

asteroiddevice.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

authorize.dm

Finished moving the clothes in defines over to modules.

2012-06-23 19:25:01 +00:00

blender.dm

Fixed me being retarded.

2012-08-22 19:55:52 +00:00

BrokenInhands.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

carpetsplosion.dm

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

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

checkkarma.dm

Finished moving the clothes in defines over to modules.

2012-06-23 19:25:01 +00:00

conveyor.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

dna_mutations.dm

Added Willox’s explosion code. It should make explosions faster than they have been lately.

2012-06-18 01:56:24 +00:00

dna.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

filter_control.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

musicplayer.dm

…

new_year.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10: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

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

pipe.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00: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

…

toilets.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

traps.dm

Energy projectiles work again.

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

travel.dm

…

Ultralight.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

vehicle.dm

- Added support for pulledby, which tells you who is pulling this object.

2012-07-23 07:45:27 +00:00

Virus2Prob.dm

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

2011-12-30 16:43:41 +00:00