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

Merge pull request #3822 from VOREStation/upstream-merge-5305

Browse Source 
[MIRROR] Prevent autosay() from creating/deleting AIs
This commit is contained in:
Aronai Sieyes
2018-06-02 19:03:02 -04:00
committed by GitHub
parent 19cfaea56d 81cf0d319a
commit b0f21a938b
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_helpers/global_lists.dm
View File

@@ -9,6 +9,7 @@ var/global/list/player_list = list() //List of all mobs **with clients attach
var/global/list/mob_list = list() //List of all mobs, including clientless var/global/list/mob_list = list() //List of all mobs, including clientless
var/global/list/human_mob_list = list() //List of all human mobs and sub-types, including clientless var/global/list/human_mob_list = list() //List of all human mobs and sub-types, including clientless
var/global/list/silicon_mob_list = list() //List of all silicon mobs, including clientless var/global/list/silicon_mob_list = list() //List of all silicon mobs, including clientless
var/global/list/ai_list = list() //List of all AIs, including clientless
var/global/list/living_mob_list = list() //List of all alive mobs, including clientless. Excludes /mob/new_player var/global/list/living_mob_list = list() //List of all alive mobs, including clientless. Excludes /mob/new_player
var/global/list/dead_mob_list = list() //List of all dead mobs, including clientless. Excludes /mob/new_player var/global/list/dead_mob_list = list() //List of all dead mobs, including clientless. Excludes /mob/new_player
var/global/list/listening_objects = list() //List of all objects which care about receiving messages (communicators, radios, etc) var/global/list/listening_objects = list() //List of all objects which care about receiving messages (communicators, radios, etc)

4
code/game/objects/items/devices/radio/radio.dm
View File

@@ -247,14 +247,12 @@ var/global/list/default_medbay_channels = list(
if (!connection) if (!connection)
return return
var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1) var/static/mob/living/silicon/ai/announcer/A = new /mob/living/silicon/ai/announcer(src, null, null, 1)
A.SetName(from) A.SetName(from)
Broadcast_Message(connection, A, Broadcast_Message(connection, A,
0, "*garbled automated announcement*", src, 0, "*garbled automated announcement*", src,
message, from, "Automated Announcement", from, "synthesized voice", message, from, "Automated Announcement", from, "synthesized voice",
4, 0, list(0), connection.frequency, "states") 4, 0, list(0), connection.frequency, "states")
qdel(A)
return
// Interprets the message mode when talking into a radio, possibly returning a connection datum // Interprets the message mode when talking into a radio, possibly returning a connection datum
/obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode) /obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode)

13
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -1,7 +1,6 @@
#define AI_CHECK_WIRELESS 1 #define AI_CHECK_WIRELESS 1
#define AI_CHECK_RADIO 2 #define AI_CHECK_RADIO 2
var/list/ai_list = list()
var/list/ai_verbs_default = list( var/list/ai_verbs_default = list(
// /mob/living/silicon/ai/proc/ai_recall_shuttle, // /mob/living/silicon/ai/proc/ai_recall_shuttle,
/mob/living/silicon/ai/proc/ai_emergency_message, /mob/living/silicon/ai/proc/ai_emergency_message,
@@ -802,5 +801,17 @@ var/list/ai_verbs_default = list(
// If that is ever fixed please update this proc. // If that is ever fixed please update this proc.
return TRUE return TRUE
//Special subtype kept around for global announcements
/mob/living/silicon/ai/announcer/initialize()
. = ..()
mob_list -= src
living_mob_list -= src
dead_mob_list -= src
ai_list -= src
silicon_mob_list -= src
/mob/living/silicon/ai/announcer/Life()
return
#undef AI_CHECK_WIRELESS #undef AI_CHECK_WIRELESS
#undef AI_CHECK_RADIO #undef AI_CHECK_RADIO