cib 422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm

2012-11-13 19:01:03 +01:00

..

dead

ghosts have universal talk again

2012-10-24 23:45:57 +10:00

living

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

2012-11-13 19:01:03 +01:00

new_player

Alternative titles system.

2012-10-31 08:40:51 +04:00

simple_animal

Just uh,fixes.

2012-11-01 17:29:02 +01:00

death.dm

…

emote.dm

…

inventory.dm

Ported custom items system.

2012-10-30 02:27:51 +04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

mob_defines.dm

Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH.

2012-11-12 21:54:16 +00:00

mob_grab.dm

…

mob_helpers.dm

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

2012-10-22 20:15:05 +10:00

mob_movement.dm

Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH.

2012-11-12 21:54:16 +00:00

mob_transformation_simple.dm

…

mob.dm

1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED

2012-10-25 20:00:44 +04:00

say.dm

…

screen.dm

all-intents-intent-button

2012-11-10 14:19:02 +04:00

transform_procs.dm

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

2012-10-22 20:15:05 +10:00

update_icons.dm

…