From 7718dbb2db37c6a8fb8cf245240398549d45b7ec Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 31 Jan 2024 19:12:00 +1000 Subject: [PATCH] Adds borg jobban check to mindswap traits --- .../simple_mob/subtypes/vore/dominated_brain.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm index 540aaaa156..73c2d81079 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm @@ -194,6 +194,10 @@ to_chat(prey, "You cannot do that in your current state.") return + if(isrobot(pred) && jobban_isbanned(prey, "Cyborg")) + to_chat(prey, "Forces beyond your comprehension forbid you from taking control of [pred].") + return + if(!pred.ckey) to_chat(prey, "\The [pred] isn't able to be dominated.") return @@ -421,17 +425,20 @@ var/mob/living/pred = src if(prey.stat == DEAD) - to_chat(prey, "You cannot do that to this prey.") + to_chat(pred, "You cannot do that to this prey.") return if(!prey.ckey) - to_chat(prey, "\The [prey] cannot take control.") + to_chat(pred, "\The [prey] cannot take control.") + return + if(isrobot(pred) && jobban_isbanned(prey, "Cyborg")) + to_chat(pred, "Forces beyond your comprehension prevent you from giving [prey] control.") return if(prey.prey_controlled) - to_chat(prey, "\The [prey] is already under someone's control and cannot be given control of your body.") + to_chat(pred, "\The [prey] is already under someone's control and cannot be given control of your body.") return if(pred.prey_controlled) - to_chat(prey, "You are already controlling someone's body.") + to_chat(pred, "You are already controlling someone's body.") return if(tgui_alert(pred, "You are attempting to give [prey] control over you, are you sure? Ensure that their preferences align with this kind of play.", "Give Prey Control",list("No","Yes")) != "Yes") return