search

LLA-Gaming / SS13

Please put all your changes that are not fixes on the "Development" branch -
http://www.llagaming.net
GNU Affero General Public License v3.0
14 stars 37 forks source link

Healing Sting #307

Closed Ahbahl closed 9 years ago

Ahbahl commented 9 years ago

Adds a healing sting which heals the target over time.

http://www.llagaming.net/forums/threads/changeling-healing-sting.3697/ <- Suggestion thread http://www.llagaming.net/forums/threads/healing-sting.3931/ <- Feedback thread

NullNeska commented 9 years ago

Can you revert the changelog edit, we do those before a server update and this would cause a conflict of some sort.

Ahbahl commented 9 years ago

Like this?

Ahbahl commented 9 years ago

That should do it.

NullNeska commented 9 years ago

Looks fine, squash your commits if you know how to do it.

Ahbahl commented 9 years ago

No, I dont know how to do that. How do I do it?

NullNeska commented 9 years ago

Which git program you using?

Ahbahl commented 9 years ago

GitHub for Windows. The one from the first guide.

NullNeska commented 9 years ago

right click the fork in github for windows, click gitshell

git rebase Healing-Sting -i HEAD~4

a text file will open up looking like pick changelog.html pick healing sting pick updates tiny prick pick changelog.html

keep one as pick, the one you want to be the commit message then change the rest to squash. save the text file and close it out

Ahbahl commented 9 years ago

I get this http://pastebin.com/gTR41mBH

NullNeska commented 9 years ago

Anything above that?

Ahbahl commented 9 years ago

Yes, "noop" without the "s. No # either

NullNeska commented 9 years ago

try git rebase -i HEAD~4

Ahbahl commented 9 years ago

Yes, that works.

Ahbahl commented 9 years ago

Gah, it doesnt work like I want it to work

NullNeska commented 9 years ago

close this one, make a new branch off your master, put all your changes into it and make 1 commit then make a new PR

Ahbahl commented 9 years ago

Aye