Skip to content

Upstreaming#11

Merged
Shroopy merged 5 commits into
masterfrom
upstreaming
Aug 17, 2024
Merged

Upstreaming#11
Shroopy merged 5 commits into
masterfrom
upstreaming

Conversation

@Shroopy
Copy link
Copy Markdown
Owner

@Shroopy Shroopy commented Aug 17, 2024

No description provided.

pixelkitty286 and others added 5 commits August 16, 2024 12:05
## About The Pull Request

This PR makes cat cyborgs more cat like by adding cat like grace.

It also adds a very quiet servo like sound to cat cyborgs when they move
wile rewriting how unique cyborgs such as tall borgs have their walking
sounds applied.

Also adds a small sprite animation when cat cyborgs are dead.

## Why It's Good For The Game

Better death sprites for cat cyborgs so they do NOT just get forgotten
when they die because they blend too well with the environment of the
station.

The quiet servo sounds add a little flavor that they are a smaller sized
cyborg unlike their bigger counter part cyborgs.

Cat like grace was added because why not and it fits the flavor of a
feline like robot only down side is anything that hates small sized mobs
will attack.

## Proof Of Testing

https://github.com/user-attachments/assets/08ce2104-a11d-43ea-aea6-f5d4a6ce26a2




![dreammaker_HL4zDZJlyy](https://github.com/user-attachments/assets/c9cc84de-4aff-42f5-852c-84f065315d3e)


## Changelog

:cl:
add: cat like grace to lightweight chassis and small quad borg walking
sounds
image: catborg death sprites
code: changed how cyborgs get their walking sounds.
/:cl:

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Waterpig <wtryoutube@seznam.cz>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
"Adds intern tags to job titles if players have low amount of job time
on a job, can be disabled manually in gameplay settings

I have tested it a bit, but as this relies on database information I
suggest testmerging and letting me know of any problems if any arise.

The time necessary to not be eligible for an intern tag is configured by
config and some variables under jobs
This time can depend on department exp, specific job exp, or exp to
unlock a "master" job (usually head position)"
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
This should help new players get taught more, and have players be less
harsh to someone who's inexperienced in a department.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

![image](https://github.com/user-attachments/assets/6f366593-15ed-4170-81d5-4485348c311d)

![image](https://github.com/user-attachments/assets/4f7232b9-306b-4bd5-9d73-b876cf02fbe9)

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl: Azarak (code), ReturnToZender (bugfixing)
add: New players to a department now show properly as interns.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: sebdaz <azarak10@gmail.com>
Co-authored-by: Swift <jackwars4@gmail.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
@Shroopy Shroopy merged commit 0587665 into master Aug 17, 2024
Shroopy pushed a commit that referenced this pull request Dec 7, 2024
# This is the 1st commit message:

goofsec hud

# This is the commit message #2:

the sensible tgui errors

# This is the commit message #3:

Gets it to compile

# This is the commit message #4:

Fixes all extra runtimes

# This is the commit message #5:

TGUI Fixes 1

# This is the commit message #6:

Removes open dream check

# This is the commit message #7:

Ticked file enforcement

# This is the commit message #8:

A very harsh way to fix potential missing icons

# This is the commit message #9:

Wipes all the errorneously included files

# This is the commit message #10:

fixes missing_icons fully

# This is the commit message #11:

some extra ci fixes before I forget

# This is the commit message #12:

WHAT THE FUCK

# This is the commit message #13:

really?

# This is the commit message #14:

bye waffles

# This is the commit message #15:

hooray
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants