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

Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

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

2013-03-10 23:01:33 +10:00

..

dead

Some uses of ismouse() replaced with isanimal()

2013-02-19 19:22:00 +08:00

living

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

2013-03-10 23:01:33 +10:00

new_player

fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>

2013-02-25 13:45:13 +10:00

death.dm

…

emote.dm

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

2012-11-21 04:01:32 -08:00

inventory.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

login.dm

…

logout.dm

…

mob_cleanup.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob_defines.dm

Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode

2013-03-06 17:04:45 +04:00

mob_grab.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob_helpers.dm

Change to check_zone proc.

2013-02-16 19:01:48 +04:00

mob_movement.dm

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

2013-01-31 14:26:58 -08:00

mob_transformation_simple.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

say.dm

Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode

2013-03-06 17:04:45 +04:00

screen.dm

Refactored and moved targeting code around a little.

2013-03-07 00:44:28 +04:00

transform_procs.dm

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08:00

update_icons.dm

WIP Guncode

2012-12-09 17:12:59 -08:00