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.

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

G11 #24

Closed
wants to merge 24 commits into from
Closed

G11 #24

wants to merge 24 commits into from

Conversation

toasterpm87
Copy link
Contributor

@toasterpm87 toasterpm87 commented Nov 7, 2023

Description

Kraut space magic


Tasks

  • Task
  • Completed Task

Media

image


Changelog

🆑

  • add: Added fun!
  • tweak: Tweaked fun!
  • fix: Fixed fun!
  • remove: Removed fun!

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Nov 7, 2023
@toasterpm87
Copy link
Contributor Author

image

Copy link
Contributor

github-actions bot commented Nov 7, 2023

RSI Diff Bot; head commit d44ec1f merging into faa2072
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SimpleStation14/weapons/G11.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Edit: diff updated after d44ec1f

@toasterpm87
Copy link
Contributor Author

I had a revelation in the shower, i should add firerate, to decrease the between burst time

@toasterpm87
Copy link
Contributor Author

I will also add it to deltav

@DEATHB4DEFEAT
Copy link
Member

firefox_T55jDM3kPH

@toasterpm87
Copy link
Contributor Author

firefox_T55jDM3kPH

Its already fixed

@DEATHB4DEFEAT
Copy link
Member

firefox_T55jDM3kPH

Its already fixed

Push the fix then, current version is supposedly invalid

@toasterpm87
Copy link
Contributor Author

i fixed it

@toasterpm87
Copy link
Contributor Author

let me test something first then we can merge it

@toasterpm87
Copy link
Contributor Author

this is ready to pr

@toasterpm87 toasterpm87 marked this pull request as ready for review November 7, 2023 21:38
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Nov 7, 2023
@toasterpm87
Copy link
Contributor Author

g11magin
I am done

@toasterpm87
Copy link
Contributor Author

its ready

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

Someone else should look at the sprites

@LovelyLophi
Copy link
Member

I personally feel that the gun visuals do not match the current visual style of the game and this should not be merged until it does.

@DEATHB4DEFEAT
Copy link
Member

There are also tests failing

Comment on lines +8 to +15
sprite: SimpleStation14\weapons\G11.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: SimpleStation14\weapons\G11.rsi
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sprite: SimpleStation14\weapons\G11.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: SimpleStation14\weapons\G11.rsi
sprite: SimpleStation14/weapons/G11.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: SimpleStation14/weapons/G11.rsi

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

Guh, backward slashes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants