diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 2014ce8ccf..ce911d9e3d 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -77,7 +77,7 @@ #define DO_AUTOPILOT 5 // Setting this much higher than 1024 could allow spammers to DOS the server easily. -#define MAX_MESSAGE_LEN 2048 //VOREStation Edit - I'm not sure about "easily". It can be a little longer. +#define MAX_MESSAGE_LEN 4096 //VOREStation Edit - I'm not sure about "easily". It can be a little longer. #define MAX_PAPER_MESSAGE_LEN 6144 #define MAX_BOOK_MESSAGE_LEN 24576 #define MAX_RECORD_LENGTH 24576 diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index b7e712fafe..08312f4788 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -462,15 +462,15 @@ var/global/datum/controller/subsystem/ticker/ticker for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:") + to_world("[aiPlayer.name]'s laws at the end of the round were:") // VOREStation edit else - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") + to_world("[aiPlayer.name]'s laws when it was deactivated were:") // VOREStation edit aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) - robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" + robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" // VOREStation edit to_world("[robolist]") var/dronecount = 0 @@ -488,9 +488,9 @@ var/global/datum/controller/subsystem/ticker/ticker if (!robo.connected_ai) if (robo.stat != 2) - to_world("[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:") + to_world("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:") // VOREStation edit else - to_world("[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") + to_world("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") // VOREStation edit if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index d172e0e8db..1aa1967d6d 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -318,6 +318,10 @@ organData["robotic"] = (I.robotic >= ORGAN_ROBOT) organData["dead"] = (I.status & ORGAN_DEAD) + if(istype(I, /obj/item/organ/internal/appendix)) + var/obj/item/organ/internal/appendix/A = I + organData["inflamed"] = A.inflamed + intOrganData.Add(list(organData)) occupantData["intOrgan"] = intOrganData @@ -497,23 +501,28 @@ if(i.robotic >= ORGAN_ROBOT) mech = "Mechanical:" if(i.status & ORGAN_DEAD) - i_dead = "Necrotic:" + i_dead = "Necrotic" var/infection = "None" switch (i.germ_level) if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200) - infection = "Mild Infection:" + infection = "Mild Infection" if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300) - infection = "Mild Infection+:" + infection = "Mild Infection+" if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400) - infection = "Mild Infection++:" + infection = "Mild Infection++" if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200) - infection = "Acute Infection:" + infection = "Acute Infection" if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300) - infection = "Acute Infection+:" + infection = "Acute Infection+" if (INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_THREE - 50) - infection = "Acute Infection++:" + infection = "Acute Infection++" if (INFECTION_LEVEL_THREE -49 to INFINITY) - infection = "Necrosis Detected:" + infection = "Necrosis Detected" + + if(istype(i, /obj/item/organ/internal/appendix)) + var/obj/item/organ/internal/appendix/A = i + if(A.inflamed) + infection = "Inflammation detected!" dat += "