Merge pull request #11168 from Heroman3003/emptylines

Fixes some more potential issues with empty lines on examine with pAIs
This commit is contained in:
Aronai Sieyes
2021-07-20 10:42:20 -04:00
committed by GitHub
+6 -3
View File
@@ -300,8 +300,11 @@
var/list/message_list = list()
for (var/belly in vore_organs)
var/obj/belly/B = belly
message_list += B.get_examine_msg()
message_list += B.get_examine_msg_absorbed()
var/bellymessage = B.get_examine_msg()
if(bellymessage) message_list += bellymessage
bellymessage = B.get_examine_msg_absorbed()
if(bellymessage) message_list += bellymessage
return message_list
@@ -519,7 +522,7 @@
// Their AI should get notified so they can stab us
prey.ai_holder?.react_to_attack(user)
//Timer and progress bar
if(!do_after(user, swallow_time, prey, exclusive = TASK_USER_EXCLUSIVE))
return FALSE // Prey escpaed (or user disabled) before timer expired.