From 08900e9e4a0cb4b41c99f04fc817bced39153a2c Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 21 Nov 2020 23:50:50 -0500 Subject: [PATCH 1/2] Merge pull request #9336 from Tenryumi/blobs-speak-languages-too Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability --- .../carbon/human/species/station/protean_vr/protean_blob.dm | 3 +++ .../carbon/human/species/station/protean_vr/protean_species.dm | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 98f0a3190d..55a6d5e4e4 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -380,6 +380,9 @@ var/global/list/disallowed_protean_accessories = list( var/obj/belly/B = belly B.forceMove(blob) B.owner = blob + + //We can still speak our languages! + blob.languages = languages //Flip them to the protean panel if(panel_was_up) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index d7b870bcb9..edb6d395a5 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -100,7 +100,8 @@ /mob/living/carbon/human/proc/shapeshifter_select_wings, /mob/living/carbon/human/proc/shapeshifter_select_tail, /mob/living/carbon/human/proc/shapeshifter_select_ears, - /mob/living/proc/eat_trash + /mob/living/proc/eat_trash, + /mob/living/carbon/human/proc/slime_feed ) var/global/list/abilities = list()