New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Shadowling Update 2: 121% Merge-Ready #10254
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
df319a7
Beginnings of new update
1d0f106
More work.
cbc076c
More work and moves ascendant shadowling file
1a9d5aa
Oh I see what I did wrong.
7a50fe6
Removes Vortex
39de83b
Bit more work
ebc6041
Comitterydoo
apuh3 2c3f141
Whoops
apuh3 95e94c3
Fixes
apuh3 6a25694
Improvements
apuh3 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
332 changes: 178 additions & 154 deletions
332
code/game/gamemodes/shadowling/shadowling_abilities.dm
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
//In here: Hatch and Ascendance | ||
|
||
var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "Noaey'gief", "Mii`mahza", "Amerziox", "Gyrg-mylin", "Kanet'pruunance", "Vigistaezian") | ||
/mob/living/carbon/human/proc/shadowling_hatch() | ||
set category = "Shadowling Evolution" | ||
set name = "Hatch" | ||
|
@@ -13,7 +13,7 @@ | |
usr.verbs += /mob/living/carbon/human/proc/shadowling_hatch | ||
return | ||
if("Yes") | ||
usr.notransform = 1 | ||
usr.Stun(INFINITY) //This is bad but notransform won't work. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just buckle them to an invisible chair in the MC :^] There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't do this. |
||
usr.visible_message("<span class='warning'>[usr]'s things suddenly slip off. They hunch over and vomit up a copious amount of purple goo which begins to shape around them!</span>", \ | ||
"<span class='shadowling'>You remove any equipment which would hinder your hatching and begin regurgitating the resin which will protect you.</span>") | ||
|
||
|
@@ -37,7 +37,7 @@ | |
"<span class='shadowling'>Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.</span>") | ||
|
||
sleep(90) | ||
usr.visible_message("<span class='warning'><b>[usr], now no longer recognizable as human, begins clawing at the resin walls around them.</b></span>", \ | ||
usr.visible_message("<span class='warning'><b>[usr], skin shifting, begins tearing at the walls around them.</b></span>", \ | ||
"<span class='shadowling'>Your false skin slips away. You begin tearing at the fragile membrane protecting you.</span>") | ||
|
||
sleep(80) | ||
|
@@ -52,9 +52,11 @@ | |
|
||
sleep(10) | ||
playsound(usr.loc, 'sound/effects/ghost.ogg', 100, 1) | ||
usr.real_name = "Shadowling ([rand(1,1000)])" | ||
var/newNameId = pick(possibleShadowlingNames) | ||
possibleShadowlingNames.Remove(newNameId) | ||
usr.real_name = newNameId | ||
usr.name = usr.real_name | ||
usr.notransform = 0 | ||
usr.SetStunned(0) | ||
usr << "<i><b><font size=3>YOU LIVE!!!</i></b></font>" | ||
|
||
for(var/obj/structure/alien/resin/wall/shadowling/W in orange(usr, 1)) | ||
|
@@ -102,7 +104,7 @@ | |
usr.verbs += /mob/living/carbon/human/proc/shadowling_ascendance | ||
return | ||
if("Yes") | ||
usr.notransform = 1 | ||
usr.Stun(INFINITY) | ||
usr.visible_message("<span class='warning'>[usr] rapidly bends and contorts, their eyes flaring a deep crimson!</span>", \ | ||
"<span class='shadowling'>You begin unlocking the genetic vault within you and prepare yourself for the power to come.</span>") | ||
|
||
|
@@ -123,21 +125,24 @@ | |
sleep(50) | ||
for(var/mob/M in mob_list) | ||
if(is_thrall(M) && !ticker.mode.shadowling_ascended) | ||
M.visible_message("<span class='userdanger'>[M] trembles minutely as their form turns to ash, black smoke pouring from their disintegrating face.</span>", \ | ||
"<span class='userdanger'><font size=3>It's time! Your masters are ascending! Your last thoughts are happy as your body is drained of life.</span>") | ||
M.visible_message("<span class='userdanger'>[M] trembles minutely as they collapse, black smoke pouring from their disintegrating face.</span>", \ | ||
"<span class='userdanger'>It's time! Your masters are ascending! Your last thoughts are happy as your body is drained of life.</span>") | ||
|
||
ticker.mode.thralls -= M.mind //To prevent message spam | ||
M.death(0) | ||
M.dust() | ||
|
||
usr << "<span class='userdanger'>Drawing upon your thralls, you find the strength needed to finish and rend apart the final barriers to godhood.</b></span>" | ||
|
||
sleep(40) | ||
sleep(20) | ||
usr << "<span class='big'><b>Yes!</b></span>" | ||
sleep(10) | ||
usr << "<span class='reallybig'><b>YES!</b></span>" | ||
sleep(10) | ||
usr << "<font size=5><b><i>YE--</b></I></font>" | ||
sleep(1) | ||
for(var/mob/living/M in orange(7, src)) | ||
M.Weaken(10) | ||
M << "<span class='userdanger'>An immense pressure slams you onto the ground!</span>" | ||
usr << "<font size=3.5><span class='shadowling'>YOU LIVE!!!</font></span>" | ||
world << "<br><br><font size=4><span class='shadowling'><b>A horrible wail echoes in your mind as the world plunges into blackness.</font></span><br><br>" | ||
world << "<font size=5><span class='shadowling'><b>\"VYSHA NERADA YEKHEZET U'RUU!!\"</font></span>" | ||
world << 'sound/hallucinations/veryfar_noise.ogg' | ||
for(var/obj/machinery/power/apc/A in world) | ||
A.overload_lighting() | ||
|
@@ -147,15 +152,14 @@ | |
usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/hypnosis | ||
usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_phase_shift | ||
usr.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/glacial_blast | ||
usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/vortex | ||
usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind_ascendant | ||
usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowlingAscendantTransmit | ||
usr.mind.transfer_to(A) | ||
A.name = usr.real_name | ||
if(A.real_name) | ||
A.real_name = usr.real_name | ||
usr.alpha = 0 //This is pretty bad, but is also necessary for the shuttle call to function properly | ||
usr.invisibility = 60 //This is pretty bad, but is also necessary for the shuttle call to function properly | ||
usr.flags |= GODMODE | ||
usr.notransform = 1 | ||
sleep(50) | ||
if(!ticker.mode.shadowling_ascended) | ||
SSshuttle.emergency.request(null, 0.3) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be an override of treat_message(), you should basically never override say() directly. it's also probably more aesthetically pleasing to just add ..() | list(SPAN_REALLYBIG, SPAN_YELL) to get_spans