Cael_Aislinn 5768d6a741 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi

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

2012-12-31 02:01:37 +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

…

Cael_Aislinn

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

carn

removed src arguments from new /obj/screen(src) as src was a datum anyway. This is to remove confusion.

2012-09-29 11:35:24 +00:00

Chinsky

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

2012-10-26 23:57:05 +04:00

mapload

…

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

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

SkyMarshal

moved some re-used ul procs to another file

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

Susan

I'm an idiot and I forgot to change a mob's projectile.

2012-12-29 02:41:51 -06: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

Rebalanced spaceacillin metabolism.

2012-12-11 13:22:44 +01:00

Wrongnumber

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

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

autopsy.dm

Made autopsy age estimates use station time.

2012-11-14 21:40:46 +01:00

buildmode.dm

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +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

surgery.dm

compile and misc other fixes

2012-12-29 13:23:43 +10:00