Zuhayr 161d21f8d0 Added cuff-breaking checks for can_shred().

2014-09-30 12:03:19 +09:30

..

dead

Merge resolution, master into dev.

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

living

Added cuff-breaking checks for can_shred().

2014-09-30 12:03:19 +09:30

new_player

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

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

death.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

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

Allows clicking (simulated) floors to drop pipes

2014-08-20 12:21:42 +02:00

language.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

login.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

mob_grab.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

mob_helpers.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

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

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

say.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

transform_procs.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

typing_indicator.dm

Added tracking of inactivity in chatbar.

2014-08-29 21:12:55 +04:00

update_icons.dm

…