From 515fb581633892ac23e2224774f30604e67fde60 Mon Sep 17 00:00:00 2001 From: Eman Date: Fri, 22 Mar 2019 16:52:14 +0100 Subject: [PATCH] Can now collar any animal that has gained sentience. This makes it so that upon becoming sentient, either by the xenobiology sentience/transference potion or by the random sentience event, it is possible to put a collar on you. --- code/modules/events/sentience.dm | 1 + code/modules/research/xenobiology/xenobiology.dm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 59fbbc01e55..419bebfe2c1 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -33,6 +33,7 @@ SA.key = SG.key SA.universal_speak = 1 SA.sentience_act() + SA.can_collar = 1 SA.maxHealth = max(SA.maxHealth + 200) SA.melee_damage_lower = max(SA.melee_damage_lower + 15) SA.melee_damage_upper = max(SA.melee_damage_upper + 15) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 0c67888b444..f60954a83a6 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -205,6 +205,7 @@ SM.faction = user.faction SM.master_commander = user SM.sentience_act() + SM.can_collar = 1 to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!") to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.") if(SM.flags_2 & HOLOGRAM_2) //Check to see if it's a holodeck creature @@ -254,6 +255,7 @@ SM.universal_speak = 1 SM.faction = user.faction SM.sentience_act() //Same deal here as with sentience + SM.can_collar = 1 user.death() to_chat(SM, "In a quick flash, you feel your consciousness flow into [SM]!") to_chat(SM, "You are now [SM]. Your allegiances, alliances, and roles are still the same as they were prior to consciousness transfer!")