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

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

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

2013-03-06 19:03:18 +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-06 19:03:18 +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

…

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

Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse().

2013-02-19 22:10:27 +08: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

Added an upgraded mopbucket for the janitor and placed it on the map.

2012-11-30 22:37:00 +00: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

added missing config links, added holder rights check to hearing deadchat

2013-02-23 01:31:52 +10:00

screen.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10: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

…