Cael_Aislinn 56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport ...

Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

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

2012-09-06 13:13:57 +10:00

..

AI_Visibility

Fixes the space unbuildable bug, I hope

2012-08-11 05:45:36 -07:00

animusstation

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

Apples

Added Artifact #1

2012-02-24 16:07:35 +00:00

Cael_Aislinn

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

carn

Replaced var/netnum for cables and powered machines with a direct reference to their powernet. The bug which was causing cutting and merging powernets to fail was due to my attempts to fix the powernets slowly becoming filled with null entries. Removing those null entries messed up the indexes and essentially jumbled up the powernets. :( sorry

2012-09-05 16:14:24 +00:00

Chinsky

Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues.

2012-08-24 16:20:50 +01:00

mapload

Rewrote blackholes (gravitational anomalies) and wormholes to try and optimise them a little. If you have any concerns about how I've done so just give me a shout and I'll either rework them or revert my changes back. Wormholes especially seem a bit faster on my laptop. Smoke has temporarily been removed from the blackhole event until I get time to investigate why the hell effect_systems are using so much memory ( spark effects were using 40% of my processor a second ago D: ). To compensate this I made them a new sprite.

2012-04-12 21:54:51 +00:00

Mini

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

Mloc

HUD Update

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

organs

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

Ported

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

SkyMarshal

moved some re-used ul procs to another file

2012-08-25 01:59:05 +10:00

Tastyfish

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

virus2

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

Wrongnumber

Fixed and cleaned up ZAS. Added some better sanity to explosion locations.

2012-06-04 14:56:28 -07:00

buildmode.dm

-OPTIMIZATION TIME

2012-07-26 03:04:05 +00:00

explosion_particles.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

meteors.dm

Fixed and cleaned up ZAS. Added some better sanity to explosion locations.

2012-06-04 14:56:28 -07:00