From ab99287296649f047ce6cd6f87ce417d7931490d Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Thu, 5 Aug 2021 11:37:57 +0100
Subject: [PATCH] Sentience event information (#16426)
---
code/modules/events/sentience.dm | 40 ++++++++++++++++----------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm
index 09911cf54c6..b13af4cc34e 100644
--- a/code/modules/events/sentience.dm
+++ b/code/modules/events/sentience.dm
@@ -4,46 +4,46 @@
INVOKE_ASYNC(src, .proc/make_sentient_mob)
/datum/event/sentience/proc/make_sentient_mob()
- var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as a sentient being?", ROLE_SENTIENT, TRUE)
var/list/potential = list()
- var/sentience_type = SENTIENCE_ORGANIC
for(var/mob/living/simple_animal/L in GLOB.alive_mob_list)
var/turf/T = get_turf(L)
- if (!is_station_level(T.z))
+ if(!is_station_level(T.z))
continue
- if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == sentience_type))
+ if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == SENTIENCE_ORGANIC))
potential += L
- if(!candidates.len || !potential.len) //if there are no players or simple animals to choose from, then end
+ if(!length(potential)) // If there are somehow no simple animals to choose from, then end.
return FALSE
-
var/mob/living/simple_animal/SA = pick(potential)
+
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as \a [SA]?", ROLE_SENTIENT, TRUE, source = SA)
+ if(!length(candidates) || QDELETED(SA)) // If there's no candidates or the mob got deleted.
+ return
+
var/mob/SG = pick(candidates)
- var/sentience_report = "NAS Trurl Medium-Priority Update"
-
- var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED\]", "Steve")
- var/pets = pick("animals", "pets", "simple animals", "lesser lifeforms", "\[REDACTED\]")
- var/strength = pick("human", "skrell", "vox", "grey", "diona", "IPC", "tajaran", "vulpakanin", "kidan", "plasmaman", "drask",
- "slime", "monkey", "moderate", "lizard", "security", "command", "clown", "mime", "low", "very low", "greytide", "catgirl", "\[REDACTED\]")
-
- sentience_report += "
Based on [data], we believe that one of the station's [pets] has developed [strength] level intelligence, and the ability to communicate."
-
-
-
SA.key = SG.key
- SA.universal_speak = 1
+ SA.universal_speak = TRUE
SA.sentience_act()
- SA.can_collar = 1
+ SA.can_collar = TRUE
SA.maxHealth = max(SA.maxHealth, 200)
SA.health = SA.maxHealth
SA.del_on_death = FALSE
greet_sentient(SA)
+
+ var/sentience_report = "NAS Trurl Medium-Priority Update"
+
+ var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED]", "Steve")
+ var/pets = pick("animals", "pets", "simple animals", "lesser lifeforms", "\[REDACTED]")
+ var/strength = pick("human", "skrell", "vox", "grey", "diona", "IPC", "tajaran", "vulpakanin", "kidan", "plasmaman", "drask",
+ "slime", "monkey", "moderate", "lizard", "security", "command", "clown", "mime", "low", "very low", "greytide", "catgirl", "\[REDACTED]")
+
+ sentience_report += "
Based on [data], we believe that one of the station's [pets] has developed [strength] level intelligence, and the ability to communicate."
print_command_report(sentience_report, "NAS Trurl Update", FALSE)
/datum/event/sentience/proc/greet_sentient(mob/living/carbon/human/M)
to_chat(M, "Hello world!")
to_chat(M, "Due to freak radiation, you have gained \
- human level intelligence and the ability to speak and understand \
+ human level intelligence and the ability to speak and understand \
human language!")