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

Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

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

2013-01-07 22:26:24 +10:00

..

closets

Cleaned up walllocker code.

2012-10-31 02:00:39 +04:00

effects

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

items

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

2013-01-07 22:26:24 +10:00

storage

Ported coats pockets

2013-01-04 05:31:14 +04:00

structures

compile fixes and cleanup

2013-01-07 02:36:52 +10:00

empulse.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

explosion_recursive.dm

Removed a stupid dumb wrong bad define from explosion_recursive.dm. It was a typo define for rwalls, but the proper define was right below it.

2012-10-14 03:24:05 +00:00

explosion.dm

Update code/game/objects/explosion.dm

2012-12-22 14:58:01 -08:00

hud.dm

obj/hud is now datum/hud. There was no need for it to be an object.

2012-09-28 23:02:11 +00:00

items.dm

Added implant removal surgery.

2013-01-06 11:25:53 +04:00

objs.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

sign_decals.dm

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

structures.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

weapons.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00