comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

2013-08-04 01:40:32 +04: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

Re-enables....something...

2013-06-21 20:15:14 +01:00

Cael_Aislinn

Hotfix for EFTPOS and ATM machines not connecting to databases.

2013-07-30 20:26:08 +01: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

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

Cib

Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode

2013-03-06 17:04:45 +04:00

kilakk

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

Mini

Hotfix for EFTPOS and ATM machines not connecting to databases.

2013-07-30 20:26:08 +01:00

Mloc

…

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

Engineering tape can be placed on doors.

2013-05-30 19:30:36 +03:00

Sigyn

Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.

2013-01-21 00:11:48 +00:00

SkyMarshal

Fixes air alarms going off if the upper bounds were set to disabled.

2013-05-15 14:31:31 -07:00

Susan

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

2013-01-14 22:14:46 +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

Wrongnumber

…

autopsy.dm

Fixes #3145

2013-06-24 21:31:38 -07:00

buildmode.dm

This just fixes a small typo in build mode.

2013-06-09 03:16:51 -04: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

…

periodic_news.dm

Removes a few typos from channel names

2013-06-09 18:04:27 -04:00