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

PGF Content Part One #2287

Merged
merged 18 commits into from
Nov 8, 2023
Merged

PGF Content Part One #2287

merged 18 commits into from
Nov 8, 2023

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Aug 14, 2023 •
edited
Loading

About The Pull Request

The lizards are here
Sprites are all done by me, guns by Rye, except for the beam projectiles, those are from Eris and I'm fairly sure INFRARED_BARON made them.
TODO:

  • Finish up all current sprites
  • Godforsaken Inhands
  • Icons
  • Firearms/other weapons

Why It's Good For The Game

I like lizards

Changelog

🆑
add: Pan-Gezenan Federation Asset Pack (Part One)
/:cl:

@thgvr thgvr requested a review from a team as a code owner August 14, 2023 05:08
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Aug 14, 2023
@thgvr thgvr marked this pull request as draft August 14, 2023 05:17
@Imaginos16
Copy link
Member

We're so back bros we're so back.

@Geoengi
Copy link
Contributor

Geoengi commented Aug 16, 2023

Lizards. Stay. Winning.

@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 18, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 19, 2023
@thgvr
Copy link
Member Author

thgvr commented Sep 15, 2023

soon

@thgvr
Copy link
Member Author

thgvr commented Sep 16, 2023

integration failure is not my fault i swear

@thgvr
Copy link
Member Author

thgvr commented Sep 16, 2023

godd

@Zevotech
Copy link
Contributor

what if you wanted to get ints to pass but check said [WOLF COULD NOT BE DELETED. FAIL.]

@MarkSuckerberg
Copy link
Member

that just happens sometimes okay

@thgvr
Copy link
Member Author

thgvr commented Sep 16, 2023

im having a break down

@github-actions github-actions bot added the Sound USSR Anthem 2.66 MB file. label Sep 17, 2023
@thgvr
Copy link
Member Author

thgvr commented Sep 17, 2023

Guns and stuff done (read: need balancing, but probably fine), all the icons should work, see you when I get the motivation to do inhands and more sprites.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 28, 2023
@github-actions
Copy link
Contributor

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

@Imaginos16
Copy link
Member

go lizard boy go

@thgvr
Copy link
Member Author

thgvr commented Oct 26, 2023

AAAAAAAAAAAAAAA

@thgvr
Copy link
Member Author

thgvr commented Oct 29, 2023

soon. classes alsmot done

@MarkSuckerberg
Copy link
Member

Lizsaderd

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 7, 2023
@thgvr thgvr marked this pull request as ready for review November 7, 2023 02:58
Imaginos16
Imaginos16 approved these changes Nov 7, 2023
View reviewed changes
Copy link
Member

@Imaginos16 Imaginos16 left a comment

Choose a reason for hiding this comment

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

Fire

@Imaginos16
Copy link
Member

*thump

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 8, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 8, 2023

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 8, 2023
@Imaginos16
Copy link
Member

attempt numero dos

@Imaginos16 Imaginos16 added this pull request to the merge queue Nov 8, 2023
Merged via the queue into shiptest-ss13:master with commit e91fc4e Nov 8, 2023
10 checks passed
shiptest-server pushed a commit that referenced this pull request Nov 8, 2023
@actions-user
Automatic changelog generation for PR #2287 [ci skip]
086227c
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 9, 2023
@MysticalFaceLesS
Merge pull request #129 from Mirag1993/Мердж-с-оффами
0d1701d 
PGF Content Part One (shiptest-ss13#2287)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Imaginos16 Imaginos16 Imaginos16 approved these changes

Assignees
No one assigned
Labels
Code change Watch something violently break. DME Edit Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@thgvr @Imaginos16 @Geoengi @Zevotech @MarkSuckerberg