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

Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm

2012-10-14 20:39:26 +04:00

..

closets

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

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

effects

Fixed a bug with blood drips being limited to 1 per turf rather than 3.

2012-10-13 10:31:37 -07:00

items

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

2012-10-14 20:39:26 +04:00

storage

Merge tgstation13 r4570 into bs12_with_tgport

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

structures

Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more

2012-10-13 03:44:19 -07: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

- Added the 'splash' and 'kaboom' verbs to 'debug verbs'.

2012-08-30 12:48:28 +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