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

Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm

2012-08-23 13:56:12 +01:00

..

AI_Visibility

Fixes the space unbuildable bug, I hope

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

animusstation

Huge commit! Standardizes var definitions in most places.

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

Apples

…

Cael_Aislinn

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

2012-08-23 13:56:12 +01:00

carn

Standardised reagent colour mixing a little bit. Fixes issue 785.

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

Chinsky

…

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

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

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

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

SkyMarshal

Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that.

2012-08-21 17:25:57 -07: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