Skip to content

Gunner#1

Closed
generalthrax wants to merge 2917 commits intofirebudgy:masterfrom
generalthrax:gunner
Closed

Gunner#1
generalthrax wants to merge 2917 commits intofirebudgy:masterfrom
generalthrax:gunner

Conversation

@generalthrax
Copy link

Why It's Good For The Game

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

Anticept and others added 30 commits June 28, 2025 10:42
…hiptest-ss13#5007)

<!-- 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
resprites three old hairs, and adds one new one, longbun. its just bun
with bangs.

![image](https://github.com/user-attachments/assets/2d4084fd-a405-4d90-88d0-94587d0eab20)

## Why It's Good For The Game
hair resprites good

## Changelog

:cl:
add: resprites spiky ponytail, long emo, bunhead3, and adds long bun
/: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. -->
<!-- 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 cargo pants. They're recolorable. 

![image](https://github.com/user-attachments/assets/9e07e806-942a-4adc-a76d-4703391fbd64)

![image](https://github.com/user-attachments/assets/61755422-05cb-4a6a-9c34-ff883f8bbc6d)


## Why It's Good For The Game
Waiter more indie sprites please

## Changelog

:cl:
add: cargo pants to the game
/: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. -->
<!-- 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

yeah the attachment list for Scarborough shouldn't be inside another
list.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

Fixes are good

## Changelog

:cl:
fix: Mil cobra rail slots for real
/: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. -->
## Changelog

:cl:
fix: refa-li recipe fixed
/:cl:
…st-ss13#5008)

<!-- 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Science legion corpses can no longer randomly spawn posibrains.
## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

Random ghost spawns are something we're moving away from.

## Changelog

:cl:
del: Legion posibrain loot.
/: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. -->
<!-- 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
last few 516 compats that arent directly related to tgui from shiptest-ss13#4574 
none of these should do anything really.
<!-- 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 add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog
Nothing player facing

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
shiptest-ss13#4892 (comment)

Just one tiny thing wasn't commented out.

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
…shiptest-ss13#5021)

## About The Pull Request

Replaces the ghost HUD "re-enter corpse" icon with a randomly generated
Sarathi (thanks autowiki!), and also updates the pAI icon with the
Shiptest sprites.

![image](https://github.com/user-attachments/assets/5379fecf-f8a5-4eef-aa7f-fcf9d4331a65)

![image](https://github.com/user-attachments/assets/206a92bd-537e-4f8b-b534-d300d1b7153e)

## Why It's Good For The Game

I REALLY HATE CLOWNS!!!

Also the sprite literally gives me a migraine whenever i look at it and
when i opened it in aseprite the first thing I was subjected to was

![image](https://github.com/user-attachments/assets/e10c4525-4114-482f-99cf-34f50f5b6b60)

## Changelog

:cl:
del: Vestigal clownsprite in Ghost HUD
/:cl:
…s13#4970)

## Changelog

:cl:
add: you can now find certain tecetian foods at randomgen gardens.
/:cl:
…est-ss13#5020)

## About The Pull Request

slightly adjusted some drinkening names to include whats actually in
them so you dont need to buy the bottle and look at the description

left some unchanged because i thought their obvious to tell what was in
them just by the name (notably Sauvignon and the Creme bottles)

## Why It's Good For The Game

guess what Kadi Witka reserve or Triple Horned is without knowing it /
memorizing the sprite beforehand

## Changelog

:cl:
fix: Fixed Drinkening Names to (more or less) include the Reagent name
within
/:cl:
## About The Pull Request
i discovered this is a real reagent

## Changelog

:cl:
add: teceti foods now come with protein
fix: chicken meat now has its old sprite
/:cl:
<!-- 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

Old tendril loot shouldnt be randomly spawning

## Changelog

:cl:
del: Rods of asclepius can no longer randomly spawn in jungles
/: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. -->
…13#5029)

## About The Pull Request

25 to 30 and 1 to 0.5

## Why It's Good For The Game

.44's advantage it would've gotten with AP was pretty much entirely lost
by low volume of fire and damage compared to similar cartridges. This
has resulted in .44 guns being fairly uninteresting outside of one
revolver and rarely used (notably most problematic with the M20 Auto
Elite)

Reduces the recoil on the Auto Elite as well, as between that and .44 no
Vanguard I've seen has ever used it (and I only point them out because I
have never once seen the civilian version Ever that was not wielded
myself the very first round it was tested because it was given to me for
free)

Testing Data:
(Original)
- Average Seven to Crit on Ramzi with Basic Vest (accounting for
unarmoured limbs)
- Average Seven to Crit on Rusted Red
- Average Eleven to Crit on Rusted Elite
- Ten to Crit on Bulletproof (accounting for unarmoured limbs)

(New)
- Average Six to Crit on Ramzi with Basic Vest (accounting for
unarmoured limbs)
- Average Six to Crit on Rusted Red
- Average Nine to Crit on Rusted Elite
- Average Eight to Crit on Bulletproof (accounting for unarmoured limbs)

## Changelog

:cl:
balance: Increased .44's damage and reduced recoil on the M20 Auto Elite
/:cl:
## About The Pull Request

Hoodies now have minor cold protection.

## Why It's Good For The Game

It's what they do.

## Changelog

:cl:
fix: Hoodies are now warm
/:cl:
…shiptest-ss13#5035)

<!-- 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

Corrects the only instance of mob/usr in a proc line across the entire
database.

Corrects Open Dream OD2000 Error from most recent Open Dream Build

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Linter Pass is Good

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
/: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. -->
the woods


![image](https://github.com/user-attachments/assets/4dcea09c-e379-4259-8d95-ba4b8fa17d8e)


## Changelog

:cl:
add: the woods
/:cl:

---------

Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
actions-user and others added 25 commits August 1, 2025 16:12
<!-- 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
Changes how drilling works.

Drills now spawn "seismic disturbances" that spawn the monsters. They
stay in place for the duration of the "wave". After a certain amount of
waves you get a short break that is EXPLICITLY NOTIFIED


![dreamseeker_euQbH5FbEw](https://github.com/user-attachments/assets/a3bebab0-62c4-4b88-b63c-ef1818e1d075)

![dreamseeker_k03O0zdMKd](https://github.com/user-attachments/assets/95c8ce1f-7013-4cd9-a2aa-10c176fbc37e)


## Changelog

:cl:
add: Drills now spawn a spawner, which in turn spawns the monsters. It's
an innovative system really.
fix: ACTUALLY FIXED DRILL TURF PLACEMENT THIS TIME
/:cl:
<!-- 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
resprites ponytail with the sprite on the bottom, and adds two new
ponytails, ponytail over eye and ponytail simple.
<img width="515" height="402" alt="image"
src="https://github.com/user-attachments/assets/e93e9710-4f3b-4ccc-b05a-7d20803c83fa"
/>

## Why It's Good For The Game
give me more hairs or give me death

## Changelog

:cl:
add: resprites ponytail, adds ponytail simple, ponytail over eye
/: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. -->
<!-- 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
resprites pews to be from after the pharoahs curse era
<img width="1067" height="412" alt="image"
src="https://github.com/user-attachments/assets/e6a7eb02-a22d-4fa6-bc66-856806e0bbe9"
/>

## Why It's Good For The Game
hidden sauna buff

## Changelog

:cl:
add: resprites pews
/: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. -->
<!-- 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
tgstation/tgstation#61183 and
tgstation/tgstation#59474 (only the setting)

Instead of obj integrity and other obj_ intergity procs, most behavior
is now handled on the atom layer.
Integrity is now also handled by a setting meaning we can reliably hook
a signal onto integrity changes. (could be useful for damage overlays or
similar)
renames some limb integ and SM integ stuff so they dont overlap with
updated proc names.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I want to move the damage_deflection var up to atoms so i can make walls
reflect like windows do. I didnt want to snowflake more code so i did
the sensible thing and moved the required behavior up to where i can use
it.. Im not going to do it in this pr tho because walls have a fair bit
of snow flake code related to integrity i want to tackle in its own pr.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog
Nothing player facing

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->

---------

Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
## About The Pull Request

gel causes bones to heal slowly but it wasn't starting the process to
actually do that

## Changelog

:cl:

fix: bone gel on its own now causes bone breaks to heal
/:cl:
## About The Pull Request

the silenced cobras are cooler than machine pistol

## Changelog

:cl:
balance: replace cirrus rattlesnakes with cobras
/:cl:
<!-- 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
Brings back the changes from PR shiptest-ss13#4943 since PR shiptest-ss13#4886 overwrote them.
Reintroduces the Cthonian revamp.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
It was never meant to removed/replaced initially so, it's back!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: Brings back the Cthonian revamp
/: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. -->

---------

Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com>
Co-authored-by: Changelogs <action@github.com>
<!-- 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

- Coffee Machines no longer give invisible spirited coffee creamer
packages.
- Also corrects the Chocolate Sprinkles pack as it had the same error.
- Coffee Bags ordered via Cargo once again contain coffee beans.
- Coffee Bags ordered via Cargo are dried before being shipped.
- The check that Premium Coffee Machines performed for Dried/Undried
Beans was reversed when the beans were inside a bag. This has been
corrected.

## Why It's Good For The Game

Ordering a premium coffee set and not getting any coffee beans is bad.
Invisible sprites are bad.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: Coffee Creamer Packages have sprites.
fix: Chocolate Sprinkles have sprites.
fix: Coffee is being placed inside the coffee bags, and its already
dried.
fix: Premium Coffee Machine correctly understand dried and undried beans
inside the coffee bag.
/: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. -->
<!-- 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
Reimplements functionality for outpost market blockades that was removed
at some point(?). Controlled by the `supply_blocked` variable on the
outpost's market.
<img width="571" height="203" alt="image"
src="https://github.com/user-attachments/assets/d725b64b-6ac9-4638-a11b-540e294f2f04"
/>

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Re-adds missing functionality for admins to disable purchasing things
from the outpost during events.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: Market blockades now work again
/: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. -->
<!-- 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
- Moves some lightswitches to be in more accessible places
- Adds a windoor to the cargo bay/waiting room
- Removes some uneccesary crate shelvers
- Moves some objects slightly that were blocking APCs visually
- Fills in some empty tables in the bridge and cryo room
- Fixes faxes being PGF fax machines , for some reason
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Lightswitches aren't in weird places anymore, harder to ruin the atmos
in the cargo bay, ship has radios now other than the ones you spawn with
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: minor Atira-class QoL tweaks
/: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. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.