Simple-Station / Einstein-Engines

Clearly several people noticed, but who changed the description?

GNU Affero General Public License v3.0

54 stars 149 forks source link

Make Stamres Show in Actual Damage Resistance View #766

Closed whateverusername0 closed 3 months ago

whateverusername0 commented 3 months ago

Description

title

using the same branch for everything makes me happy.

no cl no fun

github-actions[bot] commented 3 months ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

VMSolidus commented 3 months ago

PR'ing from a several week old fork moment.

whateverusername0 commented 3 months ago

whuh what

DangerRevolution commented 3 months ago

4 conflicts, this man hates updates

VMSolidus commented 3 months ago

whuh what

You have merge conflicts on a file that hasn't existed for a few weeks. :) Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs doesn't live there anymore lol.

whateverusername0 commented 3 months ago

whuh what

You have merge conflicts on a file that hasn't existed for a few weeks. :) Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs doesn't live there anymore lol.

lol

DEATHB4DEFEAT commented 3 months ago

curse of the force push