(EVENT) Cortical Borers #5829
Draft
(EVENT) Cortical Borers #5829
+2,627
−19
Conversation
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
tiny bit of text clean up Working chems working chems p2 Text SPANs Action swap and categories Moved procs to separate file Apparently this didn't go through in the last commmit? Ported Paradise SS13 Cortical Borers tiny bit of text clean up Working chems working chems p2 Text SPANs Action swap and categories Moved procs to separate file reproduction levels icons icons Cure hiding icon Rebase Checks PROC_REF PROC_REF 515 is lame UID Temp Reproduce icon UID death Disables Zombie Powder and stun action wheel too Update ColonialMarinesALPHA.dme Co-authored-by: harryob <[email protected]> Lang fix 0.5 Lang fix, property, chem names. Var tidy and chem cats Speech, Chem Fix & Enzyme Grinding Chem log Spans and Ghost chat emote freedom parenthesis stun fix Death handling & hud fix Follow and Death death check Player SimpleMobs in Orbit Enzymes and FOLLOW Defines, Balance, Brain Damage Defines and Balancing Spawn message & Orbit order Orbit order X Impurity Part 1 Luminescence and Icons Icon Rebase Hibernation message types Ported Paradise SS13 Cortical Borers working chems p2 Text SPANs Moved procs to separate file Ported Paradise SS13 Cortical Borers tiny bit of text clean up Working chems working chems p2 Text SPANs Action swap and categories Moved procs to separate file icons icons hiding icon Rebase UID Temp Reproduce icon UID death Disables Zombie Powder and stun action wheel too Update ColonialMarinesALPHA.dme Co-authored-by: harryob <[email protected]> Var tidy and chem cats Speech, Chem Fix & Enzyme Grinding Spans and Ghost chat Death handling & hud fix Follow and Death Player SimpleMobs in Orbit Enzymes and FOLLOW Defines, Balance, Brain Damage Defines and Balancing Spawn message & Orbit order Orbit order X Luminescence and Icons Icon Rebase 515 rebase ma antiruntime carbon tests
HUD and more modernisation holder icon follow and PP fix + Life() ack! Minor tweaks and updates ert name ladders x f scanner detection
realforest2001
added
the
Test Merge Only
github-actions
bot
added
Sprites
cm13-github
added a commit
that referenced
this pull request
Feb 27, 2024
cm13-github
added a commit
that referenced
this pull request
Feb 27, 2024
cm13-github
added a commit
that referenced
this pull request
Feb 28, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
added a commit
that referenced
this pull request
Sep 2, 2024
This was referenced Sep 2, 2024
cm13-github
added a commit
that referenced
this pull request
Sep 3, 2024
cm13-github
added a commit
that referenced
this pull request
Sep 3, 2024
cm13-github
added a commit
that referenced
this pull request
Sep 3, 2024
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Was requested to be run again, amazingly.