Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Watch a man lose his sanity in real time: Heretic draft, ported from TG. #27873

Draft
wants to merge 43 commits into
base: master
Choose a base branch
from
Draft

Watch a man lose his sanity in real time: Heretic draft, ported from TG. #27873

wants to merge 43 commits into from

Conversation

Qwertytoforty
Copy link
Contributor

@Qwertytoforty Qwertytoforty commented Jan 7, 2025 •
edited
Loading

What Does This PR Do

Ports heretic from TG station.
Please look at https://discord.com/channels/145533722026967040/1302766254750433413
This is just me showing it is being worked on as I have to go through each bloody file to get it working.
This will be filled out SIGNIFICANTLY MORE once it is done.

Why It's Good For The Game

See above.

Testing

This is going to need a lot of testing. It will be robust.

It needs to compile first though.

Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

image

TODO:

  • Have it compile
  • Test the shit out of it
  • Make balance changes / tune for para
  • Deal with QWERTODO
  • Get it reviewed
  • Other needed changes per the proposal
  • TM it.
  • Balance further.

Changelog

// TODO: Credit most TG contributors to heretic here, such as Djiq, and fill this out.
🆑
add: Heretics. This should be filled out way more before TM
/:cl:

@DGamerL DGamerL added Large PR This PR will lag you if you try to review it Feature This PR is a new addition to the game Balance This PR will modify how effective something is or isnt labels Jan 7, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites Sound This PR modifies the game sound labels Jan 7, 2025
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 7, 2025
Contrabang
Contrabang requested changes Jan 8, 2025
View reviewed changes
Copy link
Contributor

@Contrabang Contrabang left a comment

Choose a reason for hiding this comment

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

I claim first review

code/modules/antagonists/heretic/heretic_antag.dm Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 8, 2025
@lewcc lewcc added Requires Space Law Update This PR requires an update to Space Law. Requires Wiki Update Useful for Wiki Contributers to search for things that need updating labels Jan 8, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added the Testmerge Requested This PR has a pending testmerge request label Jan 9, 2025
Qwertytoforty and others added 6 commits January 9, 2025 14:33
@Qwertytoforty @Contrabang
Update code/modules/antagonists/heretic/heretic_antag.dm
b709848 
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
@Qwertytoforty
more changes
b0f0787
@Qwertytoforty
more bullshit, no more sleeping
7171616
@Qwertytoforty
more shit
368550a
@Qwertytoforty
more stuff before rust gets mergefd
c30fd4d
@Qwertytoforty
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
13e82f5 
…e-is-there-to-say-
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 12, 2025
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 18, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added the TGUI This PR modifies TGUI, will conflict label Jan 19, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Contrabang Contrabang Contrabang requested changes

@AffectedArc07 AffectedArc07 Awaiting requested review from AffectedArc07 AffectedArc07 will be requested when the pull request is marked ready for review AffectedArc07 is a code owner

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
-Status: Awaiting approval This PR is waiting for approval internally Balance This PR will modify how effective something is or isnt Feature This PR is a new addition to the game Large PR This PR will lag you if you try to review it Requires Space Law Update This PR requires an update to Space Law. Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Sound This PR modifies the game sound Sprites This PR modifies the game sprites Testmerge Requested This PR has a pending testmerge request TGUI This PR modifies TGUI, will conflict
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Qwertytoforty @Contrabang @ParadiseSS13-Bot @lewcc @DGamerL