search

octareenroon91 / -tg-station

SpareStation, downstream of Zaers' branch, out of /tg/ code.
GNU Affero General Public License v3.0
1 stars 3 forks source link

MAKE ACID GREAT AGAIN #34

Closed newguywhoislearning closed 8 years ago

newguywhoislearning commented 8 years ago

Buffs both sacid and pacid, hoping to make them great again!

newguywhoislearning commented 8 years ago

-what the fuck is this -you just added the old toxins No, I buffed pacid and sacid's item destruction power. -also get good nerd, wait til octareen merges my travis fix before submitting a pr I've really have no idea how github works. -oh. I guess github website PR shit does adding not changes? ?

Koriath commented 8 years ago

Uh... is this suposed to change all those lines? I mean, like you said, you only buffed sacid and pacid power, it should only be changing line 631, 665, and 674. There's no conflicts with existing files, so I dunno.

newguywhoislearning commented 8 years ago

Uh... is this suposed to change all those lines? I've only changed 3 lines, I'm pretty sure about that. I mean, like you said, you only buffed sacid and pacid power, it should only be changing line 631, 665, and 674. There's no conflicts with existing files, so I dunno. Perhaps it is because I used the "upload file" feature?Nothing else has been changed though.

ZioZan commented 8 years ago

I suggest against merging this because in-hand sprites are broken basically, so guns, spray bottles don't appear on character sprite in game. Which means this update will increase grief. Maybe later when sprites are fixed.

Perhaps it is because I used the "upload file" feature?Nothing else has been changed though.

You should not be using this feature, use edit option, or edit files locally and use GitHub to push updates.

octareenroon91 commented 8 years ago

Yeah, this PR drops the file right in the top directory. It would pass the compile test fine, since it changes nothing that DreamMaker would look at.