Cherrypick - Week 3 - March 15th to March 21th #235
Merged
Conversation
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
<!-- 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! --> Fixes the path on the loaded MP charger Kills a few instances of Gygax in descs and replaces them with 501p Adds a 515 EX kit for Syndicate factions in cargo. ## 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. --> I forgot to add the 515 EX kit in #3918. It's nice to be able to fly your faction colours I think. Also bug fixes are good. ## Changelog :cl: add: 515 Conversion kit fix: Loaded MP charger path spellcheck: Removed a few instances of Gygax /: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. --> (cherry picked from commit 559b787aa028806d63175a3fbe98f8e7ce8fb98f)
## About The Pull Request Makes most DMRs the same when it comes to zoom. ## Why It's Good For The Game Most of these were set prior to the scope pr, just updates them accordingly. ## Changelog :cl: balance: DMR's are now equalized according to new scopes /:cl: (cherry picked from commit 6a37aa92ce89e1e669f2c717ff07ecfd664b934b)
## About The Pull Request Removes damage multiplier from genemod ears. ## Why It's Good For The Game Keeps cosmetic options available to humans functionally the same throughout ## Changelog :cl: balance: Genemod human ears no longer take double ear damage /:cl: (cherry picked from commit aa5880230faffe7ef5aa0c75ff464744d025f685)
<!-- 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 Was the same as specialist ammo for some reason boosts ammo economy for it from 1.8 to 3.6 ## Why It's Good For The Game least efficient bullet in the game for no reason now not least efficient ## Changelog :cl: balance: .308 baseline price cut in half! Specialist ammo is still 500 cr though. /: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: Theos <[email protected]> (cherry picked from commit 0b603a3ba9a21c2cf7fa5536ee0ceddf1fafa820)
🆑 balance: you can put tape recorders in command pouches /🆑 (cherry picked from commit 50a578fcf3d96e781edb896b3e91d5d2e33fd3bd)
## About The Pull Request Says on the thing. Brings .22lr HP to 24 and .22lr AP to 18. ## Why It's Good For The Game It was pretty bad before. Like worse than .38. A survival knife in the modern day does more damage on hit than .22. The AP remains bad so hopefully it can retain its angry swarm of bees / faunakiller niche it had before those ammo changes a While ago. ## Changelog :cl: balance: Boosts .22lr's damage very slightly. AP is still abysmal dogshit. /:cl: --------- Co-authored-by: github-actions <[email protected]> (cherry picked from commit b07d0165a1e923bc9dafd34875bde0be0deb0f6a)
<!-- 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. --> Removes unused languages and cleans up the language lists on tongues. Also renames the paths of the language from `draconic` -> `kalixcian_common` etc. Before this PR, humans are unable to speak TUS, Elzu are unable to speak Solarian, and other cases. This fixes that. There is no reason for only Kepori to be able to speak TUS, same for any other case. I have kept Rachnidian(we should change this name sometime...) as well as Vox Pidgin only speakable by their respective species - Rachnidian is a physical and expressive language utilizing a Rachnid's legs, and Vox is... weird Vox screeching. I hope these changes please people. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> we should change this section <!-- 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. --> :cl: del: Removed the following languages: mushroom, narsian, piratespeak, shadowtongue, calcic, beachbum fix: Any species now has the ability to speak any language other than Rachnidian and Vox Pidgin. /: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. --> (cherry picked from commit c5fb205e4257d5af83bc88368d69e98ce6129ddb)
## About The Pull Request for future outposts or other various uses. Good to have ## Changelog :cl: add: Indestructible Jungle Rock add: Indestructible Beach Rock add: Indestructible Waste Rock add: Indestructible Sand Rock /:cl: (cherry picked from commit 0ad5ec0f97eb1c135861674b95c35d78e0e8e94a)
## About The Pull Request heavily trims planetgen lists for land mines ## Changelog :cl: del: All those mine removal bounties have paid off, since the amount of landmines on most worlds has plummeted del: CLIP pulled the bounty for landmines as a result. add: someone blew a landmine freighter up over a sand world. /:cl: (cherry picked from commit 33d378230df4e6c59f44ea32aedabb916c9abefd)
<!-- 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 Much more informative plant analyzer. <!-- 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: add: Cool new plant analyzer tgui fix: Max reagent level on trays now work as intented. code: Alot of plant file cleanup, primarly defining important things. /: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. --> (cherry picked from commit 5b91131779ecdb7617f109ff7e34b2990f622b08)
Almost completely replaces the lootpool of the abandoned crate with various items, some funny, some partially useful. A big gripe I had with the crates was that you could get all sorts of cruft things like honk injectors and gondolas and everything. This keeps the goofy nature of the crate's loot items while making them fit more and honestly, actually be a little bit more worth interacting with. A lot has changed, but the main contents now consist of things such as black market drugs to more silly things such as E-11s. I really don't want to see another honk injector or "funny" DNA mutator. It's just not funny. :cl: balance: Abandoned Crates reportedly now contain vastly different contents. Pry them open, if you dare. /:cl: --------- Signed-off-by: firebudgy <[email protected]> Co-authored-by: Theos <[email protected]> (cherry picked from commit d84f9905419bfea4d8cd544d194d5b4822246768)
Gives Arke a stamp, another folder, and a clipboard along with CLIP gas masks in the mining crate. Evidence bags too last minute. Need more organizing for surveys. Gas masks because they look cool. Evidence bags for putting dirt inside. Yippee. :cl: add: Added more paperstuff to the Arke and CLIP gas masks + Evidence bags /:cl: --------- Co-authored-by: github-actions <[email protected]> (cherry picked from commit 0badd8edba4348509b1159ce9bd2c07a8e0b0c63)
<!-- 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 Main part of the pr is tweaking the exotic maint loot to be much less cruft Few minor repaths Removal of a few cruft items/spawners <!-- 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. --> ## Changelog :cl: add: Wallets now use a random spawner add: More spawners now use the fancy sprites del: Removed a few cruft items/spawners balance: Exotic loot is alot less cruft refactor: Re paths a few spawns to make them easier to reuse balance: Ration crayons and twice as rare /: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: FalloutFalcon <[email protected]> (cherry picked from commit dfe22e7418c33e4064deac1d2079bbfa5dd9e45b)
<!-- 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 The old id console has a terrible ui and is a single purpose computer. The modular computer can be used for a handful of other important programs <!-- 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 the old one sucks <!-- 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: add: Replaces Identification consoles with modular ones /: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. --> (cherry picked from commit 83f1f8b897be7c462a76343fb0be571db14d2112)
<!-- 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 Came up during a round that the Arke was unable to replace a lost ID, this replaces the power monitoring console (less useful for a ship this small) with a command modcomp. <!-- 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 Lets the Arke command do things most command should be able to do! <!-- 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: Arke-class now has a command modcomp /: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. --> (cherry picked from commit fb98f692629a691db971208b4b470ebef299e29a)
## About The Pull Request Rewrites a vast majority of all the food items in the game. Removes a lot of old cruft, in-jokes, writing errors, racist bits, etc.. Vending machine snacks are untouched for now, as a revamp of them would require sprite changes. ## Why It's Good For The Game A lot of the current food descriptions are either game-y, outdated, or of the style for the time in the ancient era of the late 2000s. Bringing it up to the modern era is for the best. ## Changelog :cl: del: Removed the borscht misspelling system. spellcheck: Fixed of typos and errors in multiple food descriptions. rewrote multiple food descriptions from the ground up. /:cl: (cherry picked from commit b11a1f4f08d8ae6ccd76d7bc5ab863cada4e3f12)
🆑 fix: radiation storms don't suck any more /🆑 (cherry picked from commit 20ca5add2f62193413d796aef6da12aaa8e20c1b)
<!-- 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 ship helms in orbit menu now display there ship name first, and crew size in the tool tip. move adding a helm as "intresting" to connect to shuttle which means it wont include ruin mapped shit. <!-- 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 this sucks ass  better  <!-- 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: add: Helms in the orbit menu now use the ship's name as its full name fix: Random helms not connected to a ship don't appear in the orbit menu /: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. --> (cherry picked from commit 1032d34c5600245d222fdb90a194ad3716619ed6)
<!-- 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 Star and outpost overmap tokens are now added as objects of intrest that show up in the orbit menu. <!-- 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 having to use the teleport verb kinda sucks, it works, but its not great. <!-- 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: add: Stars and outposts now show up in the orbit menu /: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. --> (cherry picked from commit 59aa363d8a61574ed8c76f4f6f67d6098e00fc35)
Parents: 59aa363d8a61574ed8c76f4f6f67d6098e00fc35 Author: FalloutFalcon <[email protected]> Committer: GitHub <[email protected]> Date: Mon Mar 17 2025 17:54:54 GMT-0700 (Pacific Daylight Time) Basic mob port (#3969) <!-- 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 port of tgstation/tgstation#60694 tgstation/tgstation#61455 tgstation/tgstation#70728 tgstation/tgstation#71593 tgstation/tgstation#77143 and other small portions of basic mob code - [x] port missing subsytem pr so atmos stops running slow - [ ] figure out that bug that took down the server <!-- 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 basic mobs woooo <!-- 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: refactor: Adds basic mobs, a replacement for simple mobs that will hopefully destroy the subtype. This is so far applied to cockroaches, mice, rats (and their variants) /: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! --> Touches up the Wrecked Factory ruin, replaces the var edited bullet casings with the proper spent shells. Simple mobs now support saying things on aggro. Gives the manager some aggro quotes. Some new decor for the new Manager's office.  ## 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. --> Cleans up the ruin and does some maintenace. The aggro quotes and the added objects should add some flavour to the office. ## Changelog :cl: add: Touches up the wrecked factory ruin add: Simple mobs can say things on aggro. /: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. --> (cherry picked from commit b999ecffbbb750ae5960148e7ccc372f3c10d1be)
<!-- 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. --> did you guys know this is a button?  <!-- 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. --> :cl: del: Removed some decals inside walls /: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. --> (cherry picked from commit 3d2b4234cc4a5b693672dc1e9a512a6c7d6d6b61)
## About The Pull Request - Health scanners can now detect structure damage on mechanical limbs. - Health scanners now simply indicate the position of broken bone/structure instead of giving the full name of the damaged limb (looking at you "Bioshop Cyberkinetics 2.0 right arm") ## Why It's Good For The You can now heal IPC and not have the full backstory of people's limb clogging up your screen while operating. ## Changelog :cl: add: You can now see mechanical limb structure damage on scanner. fix: Make the limb description in health scanner more concise. :cl: Co-authored-by: ritorizo <ritorizo@localhost> (cherry picked from commit a42964a930af286993a5213018899eaa4441d52f)
## About The Pull Request Distillery now has Mauler mags instead of Rattlesnake mags. Put a factory illestren in there with the Commander ## Why It's Good For The Game Fixes good. And a fancy Illestren as the officer's little treat. ## Changelog :cl: fix: Distillery now has Mauler mags. add: Fancy Illestren in the Distillery armoury. /:cl: --------- Co-authored-by: github-actions <[email protected]> (cherry picked from commit 8c354db04b4d7a1ecd8b902a70b7b8a4ab151de2)
<!-- 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. -->
alot of diffrenct changes to weapons
including but not limited
differing cool downs
better sounds
no more shield stacking
more levels to the force string as to better communicate damage
(toolboxes are now medium force)
many behind the scenes refactors
energy weapons now are subtyped smart (halberds are like 8 lines isntead
of like the 70 they used to be)
shields arent all relying on the riot subtype for logic
sledge now has its own type
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
good code and more interesting weapons!
<!-- 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. -->
:cl:
add: melee weapons now support varried cooldowns, we now have fast
swinging knives and slow swinging axes for example
add: stamped machetes can now break
add: expanded the range of the force string, toolboxes are now "medium"
in accordance to power creep
balance: you now only take the block chance from your best weapon
soundadd: alot of sounds ported from mojave sun
refactor: halberds are now a simple subtype of dswords
refactor: detached some shield code from shield/riot and ported from
breaking logic from tg
refactor: gorlex sledgehammers no longer inherit behavoir from axes
/: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: FalloutFalcon <[email protected]>
(cherry picked from commit 11c363f4ec63ad02377e095bcd5882505b2cf0f1)
<!-- 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 title <!-- 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 the grinch can no longer pipe rapidly through bluespace <!-- 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: You can no longer place pipes anywhere you can see with an RPD. The grinch is setback once more. /: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. --> (cherry picked from commit 016df322db4f716eeac62e0ea23e4aa62eff031c)
<!-- 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 Why i am an advocate of the saltpetre pea method its good to have options <!-- 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: add: You can now buy the 3 basic fertilizers from cargo /: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. --> (cherry picked from commit 7bf2fca045736eabe5b55d8a21e33e5194a38351)
in anticipation of the chronicle remake :cl: add: Solar Armories Turrets exist now. I guess. Sighs. /:cl: (cherry picked from commit 2c1c153abed5c84f1d5c44a5f8b50c1d3b6a7f82)
🆑 add: missions now announce that they've deposited money /🆑 (cherry picked from commit 763d06589c181e6b2f0a6470b2d69ab6536b0d50)
<!-- 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. --> agghhh. Better checks so this doesnt happen, i hope. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> this needs to stop happening <!-- 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. --> :cl: fix: stops missions from qdeling players, i hope /: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. --> --------- Co-authored-by: Theos <[email protected]> (cherry picked from commit 2b3e487791df89a7b0ef398a175630462e535f12)
<!-- 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. --> Primarly, allows you to acctually turn in quests that are "non-specific" and prevent you from turning in generic items when its specific (IE qdeling yourself from a body recovery mission <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> I was told to fix this a few days ago i was just very distracted <!-- 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. --> :cl: fix: booze missions should work better now fix: you cant turn yourself in for missions fix: crashed starwalker now spawns its blackbox recorder /: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. --> (cherry picked from commit 0d936a6d40c153453c25d5a136dbe5268a4f32c9)
Ossa88
commented
Apr 9, 2025
| if(31 to 35) | ||
| new /obj/item/seeds/firelemon(src) |
There was a problem hiding this comment.
Relocate means to aquire
| if(36 to 40) | ||
| for(var/i in 1 to 5) | ||
| new /obj/item/toy/snappop/phoenix(src) |
There was a problem hiding this comment.
Relocate means to aquire
| if(46 to 50) | ||
| new /obj/item/storage/box/syndie_kit/chameleon/broken | ||
| if(51 to 52) // 2% chance | ||
| new /obj/item/melee/classic_baton(src) | ||
| if(53 to 54) | ||
| new /obj/item/toy/balloon/corgi(src) |
There was a problem hiding this comment.
Add a new way to aquire
| if(55 to 56) | ||
| var/newitem = pick(subtypesof(/obj/item/toy/prize)) | ||
| new newitem(src) | ||
| if(57 to 58) | ||
| new /obj/item/toy/balloon/syndicate(src) |
There was a problem hiding this comment.
add new way to aquire
| if(59 to 60) | ||
| new /obj/item/borg/upgrade/modkit/aoe/mobs(src) | ||
| new /obj/item/clothing/suit/space(src) | ||
| new /obj/item/clothing/head/helmet/space(src) | ||
| if(61 to 62) | ||
| for(var/i in 1 to 5) | ||
| new /obj/item/clothing/head/kitty(src) | ||
| new /obj/item/clothing/neck/petcollar(src) |
There was a problem hiding this comment.
Add new way to aquire...
| if(88) | ||
| new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src) | ||
| if(89) | ||
| new /obj/item/melee/energy/sword/bananium(src) |
| if(91) | ||
| for(var/i in 1 to 30) | ||
| new /mob/living/simple_animal/hostile/cockroach(src) | ||
| if(92) | ||
| new /obj/item/melee/sword/katana(src) |
Ossa88
commented
Apr 9, 2025
| @@ -230,36 +230,34 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items | |||
| /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1, | |||
| /obj/item/storage/box/donkpockets/donkpocketpizza = 1, | |||
| /obj/item/storage/box/donkpockets/donkpocketberry = 1, | |||
| /obj/item/storage/box/donkpockets/donkpockethonk = 1, | |||
| /obj/item/clothing/shoes/jackboots/fast = 1, | ||
| /obj/item/clothing/suit/armor/reactive/table = 1, | ||
| /obj/item/storage/box/donkpockets/donkpocketgondola = 1, | ||
| /obj/item/melee/sword/greyking = 1 //WS - Meth Sword |
There was a problem hiding this comment.
Verify these changes, determine hard removals. Assess modularization.
Ossa88
added
Review Request - Code
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…walls. Adjusted some Areas.
…will complain because of comment blocks or something
Merged
via the queue into
PentestSS13:master
with commit Apr 14, 2025
a7ed123
25 of 27 checks passed
github-actions bot
pushed a commit
to Ossa88/PentestMain
that referenced
this pull request
Apr 15, 2025
github-actions bot
pushed a commit
to Constellado/PentestDevelopment
that referenced
this pull request
Apr 16, 2025
github-actions bot
pushed a commit
to monsterlord59/Pentest
that referenced
this pull request
Apr 25, 2025
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.
About The Pull Request
Cherrypick for March Week 3
Lots of changes, Key Notes:
Why It's Good For The Game
New Stuff and Catches us up to Shiptest
Changelog
🆑
add: Gygax 515 Conversion kit (ST #4325)
fix: Loaded MP charger path (ST #4325)
balance: DMR's are now equalized according to new scopes (ST #4365)
balance: Genemod human ears no longer take double ear damage (ST #4364)
balance: .308 baseline price cut in half! Specialist ammo is still 500 cr though. (ST #4359)
balance: you can put tape recorders in command pouches (ST #4366)
balance: Boosts .22lr's damage very slightly. (ST #4351)
del: Removed the following languages: mushroom, narsian, piratespeak, shadowtongue, calcic, beachbum (ST #4367)
fix: Any species now has the ability to speak any language other than Rachnidian and Vox Pidgin. (ST #4367)
fix: Common renamed Galactic Common (Unlisted Change) - (ST #4367)
fix: Draconic renamed Kalixcian Common (Unlisted Change) - (ST #4367)
fix: Solarian renamed Solarian International (Unlisted Change) - (ST #4367)
fix: Non Terragov (ST:Solgov) Humans can speak Solarian International (Unlisted Change) - (ST #4367)
fix: Spider renamed Rachnidian (Unlisted Change) - (ST #4367)
fix: Solarian enabled to be speakable - (PT #235)
fix: Restored Narsian - Modularized - (PT #235)
add: Indestructible Jungle Rock - (ST #4360)
add: Indestructible Beach Rock - (ST #4360)
add: Indestructible Waste Rock - (ST #4360)
add: Indestructible Sand Rock - (ST #4360)
del: All those mine removal bounties have paid off, since the amount of landmines on most worlds has plummeted - (ST #4352)
del: CLIP pulled the bounty for landmines as a result. - (ST #4352)
add: someone blew a landmine freighter up over a sand world. - (ST #4352)
add: Cool new plant analyzer tgui - (ST #4227)
fix: Max reagent level on trays now work as intended. - (ST #4227)
code: A lot of plant file cleanup, primarily defining important things. - (ST #4227)
balance: Abandoned Crates reportedly now contain vastly different contents. Pry them open, if you dare. - (ST #4346)
add: Added more paperstuff to the Arke and CLIP gas masks + Evidence bags - (ST #4353)
add: Wallets now use a random spawner - (ST #3644)
add: More spawners now use the fancy sprites - (ST #3644)
del: Removed a few cruft items/spawners - (ST #3644)
balance: Exotic loot is a lot less cruft - (ST #3644)
refactor: Re paths a few spawns to make them easier to reuse - (ST #3644)
balance: Ration crayons and twice as rare - (ST #3644)
add: Replaces Identification consoles with modular ones - (ST #4261)
fix: Arke-class now has a command modcomp - (ST #4336)
fix: Arke-class warning sign name and description updated (Unlisted Change) - (ST #4336)
fix: radiation storms don't suck any more - (ST #4369)
add: Helms in the orbit menu now use the ship's name as its full name - (ST #4249)
fix: Random helms not connected to a ship don't appear in the orbit menu - (ST #4249)
add: Stars and outposts now show up in the orbit menu - (ST #4251)
refactor: Adds basic mobs, a replacement for simple mobs that will hopefully destroy the subtype. This is so far applied to cockroaches, mice, rats (and their variants) - (ST #3969)
add: Touches up the wrecked factory ruin - (ST #4117)
add: Simple mobs can say things on aggro. - (ST #4117)
del: Removed some decals inside walls - (ST #4292)
add: You can now see mechanical limb structure damage on scanner. - (ST #4318)
fix: Make the limb description in health scanner more concise. - (ST #4318)
fix: Distillery now has Mauler mags. - (ST #4356)
add: Fancy Illestren in the Distillery armoury. - (ST #4356)
add: melee weapons now support varried cooldowns, we now have fast swinging knives and slow swinging axes for example - (ST #3964)
add: stamped machetes can now break - (ST #3964)
add: expanded the range of the force string, toolboxes are now "medium" in accordance to power creep - (ST #3964)
balance: you now only take the block chance from your best weapon - (ST #3964)
soundadd: a lot of sounds ported from mojave sun - (ST #3964)
refactor: halberds are now a simple subtype of dswords - (ST #3964)
refactor: detached some shield code from shield/riot and ported from breaking logic from tg - (ST #3964)
refactor: gorlex sledgehammers no longer inherit behavior from axes - (ST #3964)
fix: You can no longer place pipes anywhere you can see with an RPD. The grinch is setback once more. - (ST #4391)
add: You can now buy the 3 basic fertilizers from cargo - (ST #4386)
add: Solar Armories Turrets exist now. I guess. Sighs. - (ST #4390)
refactor: energy halberd are repathed to be melee duel energy subtypes (Unlisted Change) - (ST #4390)
refactor: Solar Armories Turrets now Terra... something... I renamed them. - (PT #235)
add: missions now announce that they've deposited money - (ST #4382)
code: the blackbox key "reagent expose mob" is now reagent_expose_mob - (ST #4371)
refactor: hermit mobs and soda cans now use a proper spawner - (ST #4381)
add: New much more subtle particle effect to replace the glow. - (ST #4222)
del: Removed the glow effect and apply and remove messages from trickwines. - (ST #4222)
fix: Fixed the remaining text to acctually display words that are useful. - (ST #4222)
add: CLIP War correspondents spawn with a broadcasting camera and a multitool - (ST #4373)
add: CLIP Ships now have entertainment monitors - (ST #4373)
add: Blackmarket purchases are logged to the blackbox. - (ST #4394)
fix: .38 black market trickwine ammo now comes in boxes instead of speedloaders. - (ST #4392)
fix: The XO cape for SUNS is no longer incorrectly mirrored. - (ST #4383)
add: Syndicate Hardsuit helmet lights can be activated on their own - (ST #4354)
add: Syndicate Hardsuit no longer references removed mechanics - (ST #4354)
imageadd: sprites for several types of specialist ammo - (ST #4378)
add: Autowiki ship table - (ST #3815)
tweak: Ship Prefixes are now immutable. - (ST #3815)
tweak: Crew manifest is prettier. In my opinion. - (ST #3815)
add: broadcast cameras have gotten some minor improvements. - (ST #4389)
fix: a say() is now a invoke async cause it sleeps - (ST #4406)
add: surgeries to organic limbs that are done without anesthetic or painkillers now have a chance to cause extra damage - (ST #4270)
balance: medical cyborgs now have access to morphine in their hypospray - (ST #4270)
add: Dynamic missions! see about them in your local outpost. - (ST #4015)
add: A ModComp program to view and call dibs on missions. - (ST #4015)
add: You now need to head down to outpost cargo to view and turn in missions. - (ST #4015)
add: Adds multiple ruin specific missions, you can examine objects to see if they are using in a mission. - (ST #4015)
add: You can examine planets and other overmap objects. (will eventually become admin only) - (ST #4015)
del: Kills all old missions expect for drills, overmap scans, and capture. - (ST #4015)
admin: Swaps the category on a few overmap related buttons. - (ST #4015)
admin: You can now choose to not load a planet when spawning them. - (ST #4015)
refactor: Planets now pick there ruin before they spawn. Used in missions to pick a planet - (ST #4015)
fix: Pentest Ships Faction PRefix updated
fix: Gold core spawns basic mobs now
add: entertainment monitors now tell you when someone starts their livestream. don't miss today's episode of the scrapper show! - (ST #4412)
add: Modsuits can be bought in Cargo - (ST #4221) -- Note this changelog is not true, ST Commented them all out prior to merge upstream.
add: Toolset, Armor Assist Module, Plasma Engine Module - (ST #4221)
del: Ethereal MOD Core, Bikehorn Module - (ST #4221)
balance: Modsuit slow downs, power drain and armor - (ST #4221)
balance: Spacesuit prices. - (ST #4221)
add: EHF point beacons, which can be used to preserve planets - (ST #4246)
fix: people should remember how to breath again - (ST #4409)
add: Added a grinder and PPE to the Nail-class boarding shuttle (ST #4269)
balance: Basic cleanliness is now a thing on Inteq ships, Corpsmen have been equipped with gloves. (CT #4347)
add: vox and kepori sprites for the azuilhauz (ST #4393)
del: Elzuose, IPC, and Phorid damage mods - (ST #4437)
tweak: Plenty tweaks have hit the Sunskipper. Most importantly, dorms should suck less now. It also now gets more medicine, more fuel and fishing gear. The mini egun has been swapped for an E-60 too. - (ST #4304)
fix: Restores Selling Pad to modularized code.
fix: Random paths in various map files corrected.
del: Players go no longer open the overmap inspector, it was designed for admins - (ST #4445)
fix: Overmap inspect is now formated better and santizes desc html - (ST #4445)
add: Added a handful of kepori hardsuit sprites - (ST #4511)
refactor: Properly modularized secc's Swat Mk 2 and Cap armors so that future me wont have to struggle again.
fix: ROLE_CULTIST is no longer so out of place on the Preferences window
fix: Service Cyborg with Knife upgrade will once again be able to see their knife. Issue was caused by a chance in how knife based items appear in the world... a new world_icon was added.
fix: stops missions from qdeling players, i hope - (ST #4509)
fix: booze missions should work better now - (ST #4490)
fix: you cant turn yourself in for missions - (ST #4490)
fix: crashed starwalker now spawns its blackbox recorder - (ST #4490)
refactor: Modularized lots of food descriptions along with some missed items from before.
fix: the beach fish mobs no longer toxic, instead they are just normal fish meat, not carp.
fix: Junker Captain has access again
add: NT Asteroid Outpost now has access to dynamic mission console in cargo.
/:cl: