Upsteam Pull 5/7/2026#22
Merged
chazzyjazzy merged 90 commits intoMay 7, 2026
Merged
Conversation
## About The Pull Request melbert pr introduced heights into dna and it excluded two of our height defines making those heights broken ## Why It's Good For The Game height fix ## Changelog :cl: fix: fixes the very smallest and the very tallest height from not being applied /:cl:
## About The Pull Request negative st_add_stat_mods do not work ## Why It's Good For The Game negative st_add_stat_mods now work ## Changelog :cl: fix: negative stat modifiers now work /:cl:
## About The Pull Request adds an area check before continuing the crime report proc ## Why It's Good For The Game because when i crinos on a lick in the sewers and kill 10 hobos (servants of the wyrm) in the way i shouldnt have to deal with mortal cops ## Changelog :cl: fix: Crime will no longer be automatically reported outside of masquerade enforced areas /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request Removes Dice output preference in favor of just always outputting to chat unless its marked spammy per roll ## Why It's Good For The Game This made alot more sense when they were more equivlent, pretty much just showing the success. The chat output has slowly outpaced balloon alert in terms of information (now including stuff like the bumper text and feedback on what dice were used). This is now a noob trab which just causes alot of confusion because they dont know what the roll is acctually for, and there was a point in time where it was the default which creates issue for people who dont know its a setting. ## Changelog :cl: del: Removes dice output preference in favor of always outputting to chat unless declared by the roll. /:cl:
## About The Pull Request was present in oldcode should we even have these roles called 'la squadra' and 'la famiglia' considering... they're a jojos bizarre adventure reference...? <img width="672" height="555" alt="dreamseeker_PfXfYkGpDP" src="https://github.com/user-attachments/assets/0c65bd0c-6d44-4331-b02e-9f102e5dbfb3" /> ## Why It's Good For The Game readding a feature ## Changelog :cl: fix: readds bank vault door to giovanni kindred roles /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request makes store owners say funny and concerning and satirical things and also revamps them giving them unique outfits <img width="301" height="117" alt="dreamseeker_DrZPNAhhbO" src="https://github.com/user-attachments/assets/d4066fef-ef5c-49a5-b665-e184385205d9" /> <img width="919" height="688" alt="dreamseeker_npq0THEXVN" src="https://github.com/user-attachments/assets/5c930df4-9e82-4b40-ad2c-8217c9c0acec" /> ## Why It's Good For The Game immersion, flavor, humor ## Changelog :cl: add: store owners now say unique things to you when you open their store add: store owners now have revamped outfits for unique and cool looks /:cl:
## About The Pull Request people said this wasnt working so i made it cooler ## Why It's Good For The Game serpentis ## Changelog :cl: add: fixes serpentis 1 /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
…rkPack13#973) ## About The Pull Request makes lightposts go out when the area power transformer is broken also wanna make them flicker <img width="760" height="514" alt="dreamseeker_Bn0gwoRGdK" src="https://github.com/user-attachments/assets/a66aebc9-8484-46bd-bd09-37f96e836b3f" /> ## Why It's Good For The Game this is cool ## Changelog :cl: add: makes lightposts go out when the area power transformer is broken /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request I saw this in the files. <img width="543" height="463" alt="image" src="https://github.com/user-attachments/assets/175074cd-ad2d-4b9c-82e4-24fc74f0c0f5" /> ## Why It's Good For The Game onfloors good. ## Changelog :cl: image: hair dye spray has an onfloor /:cl:
## About The Pull Request a subtype for the street sign icon_state that displays the area its in. <img width="1223" height="469" alt="image" src="https://github.com/user-attachments/assets/7e82edfe-4128-4824-8c85-b56220cd6084" /> A subtype of for all the other street signs that we had in the dmi. ## Why It's Good For The Game Where am I? ## Changelog :cl: qol: Street signs tell you where you are /:cl:
…o merits and aura heartbeats (DarkPack13#946) ## About The Pull Request setites get their clan keys bloodpacks actually increment bloodpool sunglasses and other glasses protect from TRAIT_MASQUERADE_VIOLATING_EYES dementation missing sprite fix accidentally added nimi's pr into this as well aura hearts now only beat if below a certain humanity or the vampire is path of enlightenment adds blush of health quirk adds eat food quirk ## Why It's Good For The Game bugfix ## Changelog :cl: chazzyjazzy, buffyuwu add: blush of health quirk add: eat food quirk fix: aura hearts now beat only when they should fix: setites now get their clan keys fix: bloodpacks now actually increment bloodpool fix: sunglasses and other glasses now act in the same way masks do for masquerade violating eyes fix: dementation's missing sprite is now patched /:cl: --------- Co-authored-by: buffyuwu <buffyvrc@gmail.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request yeagh. ## Why It's Good For The Game too many 2 cats get together and an alleyway fills with kittens over the course of round. <img width="962" height="823" alt="image" src="https://github.com/user-attachments/assets/cbb9637b-d0fb-4808-9263-313753e853d7" /> ## Changelog :cl: balance: reduces the rate at which cats breed /:cl:
## About The Pull Request adding factions to jobs, these are needed for gameplay loops that are planned, they are currently all 'FACTION_CITY' because for some reason in jobcode if jobs arent FACTION_STATION (renamed to FACTION_CITY in our modular edits) then you just cant select them in prefs. ## Why It's Good For The Game i can use this var for gameplay loops ## Changelog :cl: code: every job datum now has a faction code: removes unused and useless 'is_gun_store' job on /obj/structure/retail /:cl:
## About The Pull Request people can buy empty blood bags at the pharmacy ## Why It's Good For The Game yea ## Changelog :cl: add: empty bloodbags can now be bought at the pharmacy /:cl:
## About The Pull Request title ## Why It's Good For The Gamea we're nearing a post-ticked file enforcement world and this stuff isn't used and isn't planned for use. Dispose of it At Once My Liege. ## Changelog No player-facing changes
## About The Pull Request W20 p. 472 <img width="444" height="242" alt="image" src="https://github.com/user-attachments/assets/c6c5d088-e590-415d-9263-af2d4a71d201" /> Also some random cleanup like moving overides to master files and making sure all quirks use add instead of add_to_holder ## Why It's Good For The Game Cool TTRPG merit. ## Changelog :cl: add: Adds Wolf Sight Merit from W20 /:cl:
## About The Pull Request A port of two werewolf fetishes sourced from old apoc code. Alot of general cleanup, some type path changes, and other stuff to make sure they have sane behavoir or mesh well with the new addition. - [x] Need an updatepaths for that type path change ## Why It's Good For The Game ## Changelog :cl: add: Adds two werewolf fetishes; Nyxs Bangle and Dagger of retribution refactor: Cleans up some artifact code around ownership and power granting /:cl: --------- Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
## About The Pull Request makes ghouls only able to take level 1 in any given discipline makes ghouls get potence 1 for free solves ghoul splat harddels by removing bloodheal and potence on_lose_or_destroy fixes a bug caused by our flawed implementation of destroy procs that i didnt update the pr with ## Why It's Good For The Game fix fix fix fix ## Changelog :cl: buffyuwu add: ghouls now get potence 1 for free fix: ghouls can now only have level 1 in their disciplines fix: solves bloodheal and potence harddels by removing the disciplines on_lose_or_destroy fix: fixes a bug with transformation disciplines causing disciplines to become unusable /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request Makes the local host instant start sound quieter and only play once ## Why It's Good For The Game loud... plz no. ## Changelog :cl: qol: Makes the local host start now sound quieter and only play once /:cl:
## About The Pull Request Active potance is now mostly TTRPG accruate and its primary effect is converting potances strength dots directly into AUTO SUCCESSES (regardless of dot cast, which means all the actions now do the same thing. (investigate a flag for not adding some actions tbh) Acctually a pretty massive buff to potance as it makes damage VERY consistent. I was originally gonna tackle Vengeance of Samiel cause it could use some work but ATOMIZATION!! I fixed the melee thing but its kinda due for scraping once melee is affected by strength https://github.com/user-attachments/assets/9ea24806-ec32-44ac-bb96-ab3d41a6d617 As a refresher: V20 pg. 192 <img width="435" height="569" alt="image" src="https://github.com/user-attachments/assets/d8dc1517-b30e-4916-8492-82d29fd2f341" /> ## Why It's Good For The Game TTRPG accuracy. Makes brawl actually effected by potance. ## Changelog :cl: add: Adds support for automatic successes based on the TTRPG code: Cleans up some of the code surrounding potance balance: Kills some of the snowflaky effect of potance in favor of it granting automatic successes (TTRPG accuracy) qol: Makes the dice unicode characters to show individual dice results a little larger fix: Potance 1-2 no longer cripples melee damage and it now scales correctly with all dots. /:cl: --------- Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
…3#850) ## About The Pull Request Fixes Obtenebration 3 "Arms of the Abyss" tentacle behaviour: - Tentacles are now properly removed when destroyed/deleted - Deletion of a tentacle that is grabbing someone no longer makes them immune to other tentacles - Aggro mode controls have been fixed; no reliance on global list checks, updates currently-spawned tentacles and retains the set mode for any tentacles created afterwards - No more runtime errors ## Why It's Good For The Game Bugfixes are good. ## Changelog :cl: fix: Fixed Obtenebration 3 "Arms of the Abyss" tentacle behaviour /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
## About The Pull Request thanks linters ## Why It's Good For The Game landmarks ## Changelog :cl: fix: adds hunter landmarks /:cl:
## About The Pull Request yeagh. a little crufty. ## Why It's Good For The Game A decent amount of combat involves biting here which creates issue from being getting fat from combat <img width="556" height="205" alt="image" src="https://github.com/user-attachments/assets/72257c76-7980-4bfc-a58f-d9f62ff77394" /> ## Changelog :cl: balance: Removes nutriment gain from biting /:cl:
## About The Pull Request removes the transformer snowflake integrity code creates random events framework and adds a blackout event as the basic event <img width="1634" height="816" alt="dreamseeker_q8R5NrFfRP" src="https://github.com/user-attachments/assets/3879e48e-5830-4356-9575-43ccb810c211" /> ## Why It's Good For The Game events ## Changelog :cl: add: adds blackout random event code: cleaned up fusebox damage code /:cl: --------- Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
github-actions
Bot
added
GitHub
Tools
Sound
Map Edit
SQL
UI
Sprites
Config Update
Feature
labels
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
upstream pull
do not squash
Why It's Good For The Game
its good
Changelog
🆑
add: upstream pull 5/7/2026
/:cl: