Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

..

dead

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

living

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

new_player

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

abilities.dm

…

death.dm

…

emote.dm

…

hear_say.dm

Compromise on speach_sound, will check distance instead of just checking if ghost.

2014-07-23 01:48:48 -05:00

holder.dm

Updated borer icons slightly.

2014-07-30 21:51:17 +09:30

inventory.dm

…

language.dm

Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.

2014-07-24 17:01:52 -07:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

…

mob_grab.dm

…

mob_helpers.dm

Removes comment, adjusts rel_sizes

2014-08-22 22:09:23 -04:00

mob_movement.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

mob_transformation_simple.dm

…

mob.dm

IB initial damage now depends on damage taken

2014-08-16 22:00:55 -04:00

say.dm

fixes alien castes not understanding each other

2014-08-01 22:34:28 +02:00

transform_procs.dm

Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration.

2014-08-19 21:09:14 +02:00

update_icons.dm

…