Cael_Aislinn 6ec8669df6 Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
	icons/obj/device.dmi
	maps/tgstation.2.1.0.0.1.dmm

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

2013-02-24 11:18:49 +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 branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze

2013-02-24 11:18:49 +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

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

Removed double definition.

2013-02-22 23:13:22 +01:00

Mini

tweaks to finances (inc boost to wallet capacity, new sprite for eftpos)

2013-02-23 21:51:29 +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

Fixed engietape requiring both Atmos AND enginering access. Now need only one.

2013-01-08 23:34:18 +04: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

Ported coats pockets

2013-01-04 05:31:14 +04: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

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

Merge pull request #2185 from CIB/feature

2013-01-16 17:57:35 -08: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