Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

dead

Merge

2014-10-11 13:58:16 -04:00

living

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

2014-10-20 04:52:45 +04:00

new_player

Bunch of xeno fixes, details in PR.

2014-10-13 17:32:13 +10: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

Fixes robot radio component not using power

2014-10-19 00:50:13 -04:00

login.dm

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2014-10-01 18:16:04 +09:30

mob_grab.dm

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10: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

Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.

2014-10-04 17:38:38 +08:00

mob_transformation_simple.dm

Readded transform procs for xenos.

2014-09-30 16:07:47 +09:30

mob.dm

disable typing indicator.

2014-10-12 17:22:30 -07:00

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 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev

2014-10-02 02:39:37 +09:30

typing_indicator.dm

Merge

2014-10-11 13:58:16 -04:00

update_icons.dm

…