From 612ededfd0dba426a09e3a3c80c70eba6669b14d Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 17 Mar 2015 14:26:05 -0400 Subject: [PATCH 1/2] Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs. Fixes an unreported bug where statues could bleed out --- .../objects/structures/crates_lockers/closets/statue.dm | 6 ++++-- code/modules/mob/living/carbon/slime/slime.dm | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 0a9f02bf133..dbf9c21c162 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -30,8 +30,10 @@ intialBrute = L.getBruteLoss() intialOxy = L.getOxyLoss() if(ishuman(L)) - name = "statue of [L.name]" - if(L.gender == "female") + var/mob/living/carbon/human/H = L + name = "statue of [H.name]" + H.bleedsuppress = 1 + if(H.gender == "female") icon_state = "human_female" else if(ismonkey(L)) name = "statue of a monkey" diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 4d50dd3e1a8..4720c8cc3c4 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -649,6 +649,7 @@ C = pick(candidates) M.key = C.key M.languages |= HUMAN + M.faction = list() M << "All at once it makes sense, you know what you are and who you are! Self awareness is yours!" M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost." user << "[M] is suddenly attentive and aware. It worked!" From 94e683885bb3b52816e31c9157050c308b2d6fed Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 17 Mar 2015 16:40:38 -0400 Subject: [PATCH 2/2] The uplifted simple mob will now only lose its neutral faction, keeping them safe from other creatures of the same type --- code/modules/mob/living/carbon/slime/slime.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 4720c8cc3c4..052e523cd0d 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -649,7 +649,7 @@ C = pick(candidates) M.key = C.key M.languages |= HUMAN - M.faction = list() + M.faction -= "neutral" M << "All at once it makes sense, you know what you are and who you are! Self awareness is yours!" M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost." user << "[M] is suddenly attentive and aware. It worked!"