cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes ignore_mob because it doesn't exist and lets progenitors speak, probably doesn't mess with any of the to visible message stuff

Browse Source
This commit is contained in:
SomeguyManperson
2019-08-31 18:34:59 -04:00
parent 777e120c72
commit 6dee367841
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/status_effects/neutral.dm
View File

@@ -162,7 +162,7 @@
if(owner.loc == shadowing)
owner.forceMove(cached_location ? cached_location : get_turf(owner))
shadowing.visible_message("<span class='warning'>[owner] breaks away from [shadowing]'s shadow!</span>", \
"<span class='userdanger'>You feel a sense of freezing cold pass through you!</span>", ignore_mob = owner)
"<span class='userdanger'>You feel a sense of freezing cold pass through you!</span>")
to_chat(owner, "<span class='velvet'>You break away from [shadowing].</span>")
playsound(owner, 'yogstation/sound/magic/devour_will_form.ogg', 50, TRUE)
owner.setDir(SOUTH)
@@ -175,7 +175,7 @@
cached_location = get_turf(shadowing)
if(cached_location.get_lumcount() < DARKSPAWN_DIM_LIGHT)
owner.forceMove(cached_location)
shadowing.visible_message("<span class='warning'>[owner] suddenly appears from the dark!</span>", ignore_mob = owner)
shadowing.visible_message("<span class='warning'>[owner] suddenly appears from the dark!</span>")
to_chat(owner, "<span class='warning'>You are forced out of [shadowing]'s shadow!</span>")
owner.Knockdown(30)
qdel(src)

4
yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
View File

@@ -9,7 +9,7 @@
config_tag = "darkspawn"
antag_flag = ROLE_DARKSPAWN
required_players = 26
required_enemies = 3
required_enemies = 1
recommended_enemies = 3
enemy_minimum_age = 0
restricted_jobs = list("AI", "Cyborg")
@@ -24,7 +24,7 @@
restricted_jobs += protected_jobs
if(CONFIG_GET(flag/protect_assistant_from_antagonist))
restricted_jobs += "Assistant"
var/darkbois = max(3, round(num_players()/14))
var/darkbois = max(1, round(num_players()/14))
while(darkbois)
var/datum/mind/darkboi = pick(antag_candidates)
darkspawn += darkboi

2
yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm
View File

@@ -12,7 +12,7 @@
if(isliving(owner.loc))
var/mob/living/L = owner.loc
L.visible_message("<span class='warning'>[owner] breaks away from [L]'s shadow!</span>", \
"<span class='userdanger'>You feel a sense of freezing cold pass through you!</span>", ignore_mob = owner)
"<span class='userdanger'>You feel a sense of freezing cold pass through you!</span>")
to_chat(owner, "<span class='velvet'><b>zayaera</b><br>You create an illusion of yourself.</span>")
else
owner.visible_message("<span class='warning'>[owner] splits in two!</span>", \

2
yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm
View File

@@ -62,7 +62,7 @@
return
else
L.visible_message("<span class='userdanger italics'>[L] suddenly howls and clutches as their face as violet light screams from their eyes!</span>", \
"<span class='userdanger italics'>AAAAAAAAAAAAAAA-</span>", ignore_mob = user)
"<span class='userdanger italics'>AAAAAAAAAAAAAAA-</span>")
to_chat(user, "<span class='velvet'><b>cera qo...</b><br>You begin siphoning [L]'s will...</span>")
L.Stun(50)
playsound(L, 'yogstation/sound/magic/devour_will_long.ogg', 65, FALSE)

1
yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm
View File

@@ -56,6 +56,7 @@
roar()
/mob/living/simple_animal/hostile/darkspawn_progenitor/say()
..()
if(time_since_last_roar > world.time + 350) //at least give it SOME time
return
roar()