[MDB IGNORE] [IDB IGNORE] Upstream mirror #383
Merged
Conversation
This file contains 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
![psychonaut-ci[bot]](https://avatars.githubusercontent.com/u/121906662?s=60&v=4){kind=small}
## About The Pull Request This readds my other lost-to-wallening PR, #85964.  I made some slightly bigger changes this time, opening up the area a bit more so you don't have trees spawning surrounded by walls. ## Why It's Good For The Game Tree in wall bad. ## Changelog :cl: Rhials fix: Modifies the mapping around the icebox cliffside, guaranteeing a bit more openness. /:cl:
## About The Pull Request reduces the cost of the planning subsystem. instead of calculating able_to_plan on every fire for every mob, we only calculate it when a mob queues/dequeues a behavior. also converts behavior lists into lists rather than lazylists to reduce the amount of checks we do on process. these are the differences after ran on tracy.  ## Why It's Good For The Game reduces the cost of ai planning subsystem ## Changelog :cl: /:cl:
## About The Pull Request This is a researchable upgrade for janitorial cyborgs. It gives them slightly more than double the amount of lights, and it is researchable in the same suite of upgrades. ## Why It's Good For The Game I often found myself wanting more lights, or wanting to fix small broken windows as a cyborg, and this PR adds a solution. ## Changelog :cl: add: Add a capacity upgrade for janitorial cyborg light replacers /:cl:
## About The Pull Request Closes #86567 Don't think any of these were found/reported or actually could trigger in-game ## Why It's Good For The Game Glory to OpenDream ## Changelog :cl: code: Fixed multiple minor logic issues with code found by OpenDream's new pragma /:cl:
## About The Pull Request Adds all ice ruin maps to the config file iceruinblacklist.txt Alphabetises that file. ## Why It's Good For The Game File is disorderly and missing entries. Some ruins can't be blacklisted by server runners as a result. ## Changelog :cl: fix: Added missing entries to server config file iceruinblacklist.txt /:cl:
## About The Pull Request Closes #86452 ## Changelog :cl: fix: Fixed missing felinid ear preference /:cl:
…a heretic (#86554) ## About The Pull Request Closes #86083 ## Why It's Good For The Game Being teleported to a random place, often without an ID as heretics frequently loot their victims first, almost guarantees a death with some of the new organs unless someone can notice and quickly save you, and due to heavy slurring you cannot broadcast your position either. ## Changelog :cl: fix: You no longer return to the station cuffed after being sacrificed by a heretic /:cl:
…Station's Z-Level (#85982) ## About The Pull Request Adds an obj/docking_port/stationary/syndicate/northeast to Birdshot Station, enabling syndicate cruisers to show up at the station (Location shown below)  ## Why It's Good For The Game Closes #85938 ## Changelog :cl: fix: The Syndicate have cleared up the static preventing them from sending their battlecruisers to Birdshot Station. Watch out, crew! /:cl:
## About The Pull Request Every CI run for the last 15 hours has been breaking because this little bugger was hiding behind a tree:  I don't think a changelog is of value here.
## About The Pull Request This makes tomato smudges on the floor valid for bloodcrawl. Pretty simple. ## Why It's Good For The Game Why not? It's funny, and ketchup = fake blood. ## Changelog :cl: add: Tomato smudges on the floor are now considered valid to bloodcrawl into and out of. /:cl:
## About The Pull Request Adding speaker voice to tape recorder ## Why It's Good For The Game Interrogations will become easier ## Changelog  :cl: add: tape recorder now records speaker name /:cl:
## About The Pull Request You can now look at an entertainment monitor from up to 7 tiles away. You still must be adjacent (or telekinetic, or a silicon) to change the channel. ## Why It's Good For The Game Using these things is a little frustrating given they're wall mounts that you have to be adjacent to watch. So if someone's doing a TV show bit you basically have to get everyone to clutter around one single tv, when more accurately people could just stand back and watch. ## Changelog :cl: Melbert qol: You can watch entertainment monitors from up to seven tiles away, though you still need to be adjacent(or telekinetic, or a silicon) if you want to change the channel. /:cl:
…r reagents to target (#86566) ## About The Pull Request Adds a crafting flag for clearing and transferring reagents on craft, only applies it to food recipes. This makes it a partial fix to #81226 ## Changelog :cl: Melbert fix: Trash cannons can be filled with fuel and fired again /:cl:
## About The Pull Request While trying to reproduce a bed buckling issue, I noticed that a roundstart ian bedsheet was not getting placed on the right end of the bed. After a bit of testing, I realized it just, didn't have any other directions. We fix this by just adding the missing directions in the dmi:  ## Why It's Good For The Game Wonky inconsistency fixed, currently can't use ian bedsheets on half the bed directions. ## Changelog :cl: image: Ian bedsheets actually have more than one direction, and so can be put on beds properly. /:cl:
## About The Pull Request deers now correctly emote with nearby friends ## Why It's Good For The Game closes #86575 ## Changelog :cl: fix: deers now correctly emote with nearby friends /:cl:
## About The Pull Request ethereal cell is now stored in contents instead of nullspace ## Why It's Good For The Game i mostly made this because i realized that the recharging function of relics doesn't actually work on these, and i found out it's because this isnt in contents but nullspace seems kind of lame for a cool interaction i hoped for (ethereal charging via relic) and possibly other interactions in the future as well it might cause a disaster somehow. but let's yolo it and revert if it causes anything awful ## Changelog :cl: fix: The recharging relics now work on ethereal cells. balance: EMP now affects ethereal's hunger. /:cl: Co-authored-by: Ghom <[email protected]>
…85941) ## About The Pull Request Lighters now have welding fuel which can be filled/extracted by hand, giving a small but consistent source of welding fuel for non-chemists. Welding fuel is now required for these lighters to work, they'll close automatically once they're out of fuel. They last for a minute, zippo lasts 2 minutes, before they need to be refuelled. It can have other reagents put into it but it only checks for welding fuel, so it won't work at all unless its got some. They can be used as welding tools in minor cases, mostly fixing things and welding doors shut, but can't do big things like deconstruction, except the xenobio one because it's a lot hotter than the normal lighter. Also added a baseline support to check for heat to perform certain welds, before heat is just this binary "has or doesnt have heat", which made its value useless. ## Why It's Good For The Game Adds a ghetto way of getting welding fuel, hiding reagents, and a ghetto welding tool without being something that prisoners could break out of prison with. They could weld the doors shut which is a little funny, security still has proper welding tools to counter it. It also currently is kinda lame that lighters could just be open 24/7, unlike matches which has a lifespan of 10 seconds each or something. ## Changelog :cl: add: Lighters now use and require welding fuel to work, but can be used as a welding tool for tasks that don't require much heat. /:cl: --------- Co-authored-by: Ghom <[email protected]>
## About The Pull Request https://github.com/user-attachments/assets/bc104e6d-6007-4e9f-ab9f-b810d0f5d664 ## Why It's Good For The Game no reason to be unweldable ## Changelog :cl: add: you may weld a crate /:cl: Co-authored-by: Ghom <[email protected]>
## About The Pull Request Adds two air pumps to birdshot toxins Connects the SMES grid via a second wire to the powernet connects the engineering storage to the powernet ## Why It's Good For The Game Air pumps are really important for making toxins bombs and running to engineering every shift isn't fun Having one more connection to the powernet makes it a tad bit more resilient And stuff should be connected to the powernet in the first place ## Changelog :cl: qol: Adds an additional cable from birdshot SMES units qol: Adds two air pumps to birdshot science fix: bird engineering storage is now connected to the powernet /:cl:
…ire onto floor (#86156) ## About The Pull Request Double the melting point of regular plating from 10'000 kelvin to 20'000 kelvin by using the max_temperature_sustained instead of heat capacity of turf to determine melting point. Turf should still super conducts using heat capacity but melts based on this variable instead, reinforced floor still retain their immunity to melting. ## Why It's Good For The Game Fire melting a floor leads to a quickly depressurization of the room and thus killing the fire. This creates a cold airless room and also harder to fix due to the cold temperature. By making it harder to burn through floors fire will last longer and be more engaging due to its visuals compared to a cold vacuum. ## Changelog :cl: balance: double the melting point of hull and halves the thermal transfer so plasma fire should lose less heat and harder to melt it /:cl:
…e cleanup (#86609) ## About The Pull Request Closes #86603 by adding a dummy antag datum that will be added to everyone who lost the trauma before losing the antag datum (i.e. from being "cured" from trauma in one way or another) Also added defines for obsession objectives ## Changelog :cl: code: Minor obsession code cleanup admin: Admins can now see players who were previously obsessed but had been "cured" from the trauma /:cl:
# Conflicts: # code/controllers/subsystem/job.dm # code/datums/station_traits/negative_traits.dm # code/game/objects/items/cigarettes.dm # code/modules/atmospherics/gasmixtures/gas_mixture.dm # code/modules/mob/living/carbon/human/human_helpers.dm # code/modules/mob/living/silicon/robot/robot.dm # html/changelogs/archive/2024-09.yml # icons/mob/huds/hud.dmi
Seefaaa
force-pushed
the
mirror-080379624cd
branch
from
8d9dcef to
9c3fdda
Compare
Seefaaa
approved these changes
Sep 14, 2024
|
atmos işi biraz kuşkulandırdı ama bozmaz heralde |
|
@exdal eski deltanın checkini kaldırman gerek |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automated pull request to merge the latest changes from the upstream repository.
The following files have conflicts: