caelaislinn f1782ec017 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

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

2012-06-16 12:02:29 +10:00

..

AI_Visibility

Runtime error fixes for AI camera chunks and ZAS ZConnect()

2012-06-14 07:50:19 +03:00

animusstation

Huge commit! Standardizes var definitions in most places.

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

Apples

Added Artifact #1

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

Cael_Aislinn

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

2012-06-16 12:02:29 +10:00

Chinsky

Small bugfix to ashtrays and cig butts

2012-03-04 06:45:14 +02:00

mapload

Removed and commented out the last traces of goon auth. code

2011-12-30 23:28:14 +02:00

Mini

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

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

Mloc

HUD Update

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

organs

TG: - Deleted ERP.dmi

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

Ported

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

SkyMarshal

Some comments, tweaks, and improvements to detective work, evidence bags, and packages.

2012-05-30 13:27:20 -07:00

Tastyfish

Add the capability for the NT chatbot pAI to use the PDA's messaging function instead of the system it had been. Also, several bugfixes for runtimes.

2012-05-14 12:19:15 -07:00

virus2

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

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

Wrongnumber

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

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

buildmode.dm

TG: - Deleted ERP.dmi

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

explosion_particles.dm

Energy projectiles work again.

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

meteors.dm

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

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