cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

mob_spawners

Browse Source
This commit is contained in:
raspy-on-osu
2020-08-30 01:50:55 -04:00
parent 55226048b2
commit c90c46a2d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effects/anomalies.dm
View File

@@ -285,7 +285,7 @@
S.rabid = TRUE S.rabid = TRUE
S.amount_grown = SLIME_EVOLUTION_THRESHOLD S.amount_grown = SLIME_EVOLUTION_THRESHOLD
S.Evolve() S.Evolve()
offer_control(S) offer_control(S,POLL_IGNORE_SENTIENCE_POTION)
///////////////////// /////////////////////

4
code/modules/mob/mob_helpers.dm
View File

@@ -431,7 +431,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/mob/living/getImplant(type) /mob/living/getImplant(type)
return locate(type) in implants return locate(type) in implants
/proc/offer_control(mob/M) /proc/offer_control(mob/M,ignore_category=null)
to_chat(M, "Control of your mob has been offered to dead players.") to_chat(M, "Control of your mob has been offered to dead players.")
if(usr) if(usr)
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.") log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
@@ -445,7 +445,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/) var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/)
if(A) if(A)
poll_message = "[poll_message] Status:[A.name]." poll_message = "[poll_message] Status:[A.name]."
var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M) var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M, ignore_category)
if(LAZYLEN(candidates)) if(LAZYLEN(candidates))
var/mob/C = pick(candidates) var/mob/C = pick(candidates)