Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

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

2012-10-22 19:35:03 +10:00

..

closets

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

effects

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

2012-10-21 01:25:04 +10:00

items

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

2012-10-22 19:35:03 +10:00

storage

Merge tgstation13 r4570 into bs12_with_tgport

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

structures

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

2012-10-21 01:25:04 +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

Runtime fix:

2012-09-06 01:55:03 +00: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

Surgery done.

2012-10-14 20:31:07 +04:00

objs.dm

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07: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