Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Ports Space Dragon rework - #13684

Merged
JamieD1 merged 39 commits into
masterfrom
unknown repository
Aug 5, 2022
Merged

Ports Space Dragon rework#13684
JamieD1 merged 39 commits into
masterfrom
unknown repository

Conversation

@ghost

@ghost ghost commented Apr 11, 2022

Copy link
Copy Markdown

Document the changes in your pull request

Makes Space Dragon antag be actually up to date, since yogstation doesn't have the rework. This rework gives the dragon a mission to open and protect 3 carp rifts, and not just be a sentient megafauna that arrived on the station to kill the heads.

Also my first PR with this had merge issues, so i create this one.

also it ports this tgstation/tgstation#61539

Wiki Documentation

Actually yogstation wiki doesn't have a page about this antagonist, so it should be created.

Changelog

🆑 Authors: IndieanaJones, ExcessiveUseOfCobblestone, ported by SuperSlayer
rscadd: Ports Space Dragon rework from tg
imageadd: Adds new fancy images for the Space Dragon and for the carp rift.
/:cl:

@ghost
ghost requested review from a team as code owners April 11, 2022 15:03
@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Sprites This PR has spriting changes labels Apr 11, 2022
@github-actions github-actions Bot added the Sound This PR changes audio files label Apr 11, 2022
Comment thread code/modules/mob/living/simple_animal/hostile/space_dragon.dm Outdated
@ghost

ghost commented Apr 13, 2022

Copy link
Copy Markdown
Author

Checks please

@ghost

ghost commented Apr 14, 2022

Copy link
Copy Markdown
Author

Cheeeeeecks

@nmajask nmajask left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Credit the original author of the PR

@ghost

ghost commented Apr 15, 2022

Copy link
Copy Markdown
Author

Credit the original author of the PR

Credited

@ghost

ghost commented Apr 15, 2022

Copy link
Copy Markdown
Author

@nmajask

Comment thread code/modules/events/space_dragon.dm
SuperSlayer and others added 3 commits April 17, 2022 08:05
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Comment thread code/modules/events/space_dragon.dm Outdated
@ghost
ghost requested a review from nmajask April 24, 2022 12:16
@JamieD1

JamieD1 commented Apr 30, 2022

Copy link
Copy Markdown
Contributor

Test merging.

Yogbot-13 added a commit that referenced this pull request Apr 30, 2022
Yogbot-13 added a commit that referenced this pull request May 2, 2022
Yogbot-13 added a commit that referenced this pull request May 3, 2022
@SegaCD

SegaCD commented May 4, 2022

Copy link
Copy Markdown

Butchering the space dragon does not yield carp dragon hide.

@ghost

ghost commented May 4, 2022

Copy link
Copy Markdown
Author

Hmmmm

Comment thread code/modules/mob/living/simple_animal/hostile/space_dragon.dm Outdated
Comment thread code/modules/mob/living/simple_animal/hostile/space_dragon.dm Outdated
@ghost

ghost commented May 19, 2022

Copy link
Copy Markdown
Author

97E1240F-8F75-4349-B58C-CE899F416B6E
IT FUCKING SAYS THAT I HAVE INCONSISTENT INDENTATIONS IN FUCKING COMMENTS WHAT IS WRONG WITH IT

@ghost

ghost commented May 19, 2022

Copy link
Copy Markdown
Author

Okay fuck this, i give up. until someone will not fix this github related shit I can’t literally do anything.

@JamieD1 JamieD1 added the TESTMERGED This PR is currently live in a test merge. label May 30, 2022

@Anvilman6 Anvilman6 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar syntax review

Comment thread code/modules/antagonists/space_dragon/space_dragon.dm Outdated
Comment thread code/modules/antagonists/space_dragon/space_dragon.dm Outdated
Comment thread code/modules/antagonists/space_dragon/space_dragon.dm Outdated
Comment thread code/modules/events/space_dragon.dm Outdated
Comment thread code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm Outdated
SuperSlayer and others added 9 commits June 15, 2022 21:13
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
@adamsong adamsong added the Stale I'm closing this in like a week if you don't push a new commit label Jul 8, 2022

@JamieD1 JamieD1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hopefully this works

@JamieD1
JamieD1 merged commit 4698799 into yogstation13:master Aug 5, 2022
Yogbot-13 added a commit that referenced this pull request Aug 5, 2022
@ghost
ghost deleted the Sussy_Spessdragon branch August 5, 2022 12:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Sound This PR changes audio files Sprites This PR has spriting changes Stale I'm closing this in like a week if you don't push a new commit TESTMERGED This PR is currently live in a test merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants