cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9336 from Tenryumi/blobs-speak-languages-too

Browse Source 
Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
This commit is contained in:
Novacat
2020-11-21 23:50:50 -05:00
committed by Chompstation Bot
parent 94b6c737aa
commit 08900e9e4a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
View File

@@ -381,6 +381,9 @@ var/global/list/disallowed_protean_accessories = list(
B.forceMove(blob) B.forceMove(blob)
B.owner = blob B.owner = blob
//We can still speak our languages!
blob.languages = languages
//Flip them to the protean panel //Flip them to the protean panel
if(panel_was_up) if(panel_was_up)
client?.statpanel = "Protean" client?.statpanel = "Protean"

3
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
View File

@@ -100,7 +100,8 @@
/mob/living/carbon/human/proc/shapeshifter_select_wings, /mob/living/carbon/human/proc/shapeshifter_select_wings,
/mob/living/carbon/human/proc/shapeshifter_select_tail, /mob/living/carbon/human/proc/shapeshifter_select_tail,
/mob/living/carbon/human/proc/shapeshifter_select_ears, /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() var/global/list/abilities = list()