[TM ONLY] masq component refactor mirror from darkpack - #271
Draft
chazzyjazzy wants to merge 63 commits into
Draft
chazzyjazzy wants to merge 63 commits into
chazzyjazzy wants to merge 63 commits into
Conversation
## About The Pull Request makes offset/corner variants of the yellow roadline because decal shifting broke and I need them for parking spaces ## Why It's Good For The Game <img width="1339" height="633" alt="image" src="https://github.com/user-attachments/assets/b3bd0fec-00a5-469b-a3ca-b232d5c5a46f" /> ## Changelog :cl: add: adds an offset yellow roadline decal /:cl:
(Upstreaming [Apocrypha13#138](ApocryphaXIII#138)) ## About The Pull Request effectively, just changes the footstep sounds for Fera Dire/War forms to more hefty, thumpy sounds. more specifically, adds subtypes to Fera left/right legs that use their own special footstep sounds, and adds the sound they should use. ## Why It's Good For The Game better audio design :) gives some extra heft to the more dangerous fera forms, but still lets forms use the normal dinky clawfootstep sounds when it's appropriate ## Testing Photographs and Procedure https://github.com/user-attachments/assets/ee8b34ee-34f4-4e77-810b-03a476421e04 </details> ## Changelog :cl: sound: added heavy footstep sound code: gave fera war/dire forms new heavy footstep sound /:cl:
## About The Pull Request Updates Rotten 4 bodysprite Icons to a more skeletal looking version, changing the icons of Samedi and especially old Harbringers of Skulls. Full credits to karlgoblington for the sprite. <img width="234" height="347" alt="Spooky Scary Samedi" src="https://github.com/user-attachments/assets/df916910-574d-4562-a2d4-1bdbd62bc4c7" /> <img width="209" height="463" alt="Spooky Scary Samedi 2" src="https://github.com/user-attachments/assets/26a2b8ab-85ca-471e-a9f6-1464b3cf26a3" /> <img width="212" height="474" alt="Spooky Scary Samedi 3" src="https://github.com/user-attachments/assets/6042349c-9ace-4097-ad58-b4b4298adff3" /> ## Why It's Good For The Game Better looking icons are good, looks closer to a skeleton ## Changelog :cl: image: New Rotten 4 bodysprite icons (Samedi + Harbringers of Skulls) /:cl:
## About The Pull Request someone abused this and caused an actual ss13 zombie outbreak with all the npcs ## Why It's Good For The Game griefers ## Changelog :cl: fix: gets rid of /tg/ style zombie outbreaks forever hopefully /:cl:
## About The Pull Request Adds 2 versions of a FAL rifle with one version being semi auto and another being auto. Both version along with magazines and ammo can be purchased from cargo. <img width="167" height="130" alt="Screenshot 2026-08-27 182517" src="https://github.com/user-attachments/assets/9e8365fb-6998-46cf-ba04-6679af19fd48" /> Also fixes 2 duplicates of 556 ammo cargo order. ## Why It's Good For The Game Gives more use for the 7.62 round as well as a base 7.62 gun that does not have a damage multiplier like the psg sniper. ## Changelog :cl: Breadcrombs, ATP Engineer, despong add: Added a new FAL rifle along with it's magazines and ammo being purchasable from cargo fix: Removed a 556 ammo box duplicate from cargo /:cl:
## About The Pull Request bomb B ## Why It's Good For The Game black chair ## Changelog :cl: Marshmellow10 image: adds a black version of the basic darkpack wheely office chair /: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 Removed a lot of Language keys from ss13 langauges so our new modern languages can be used. Also made it so that Garou can speak primal tongue in Crinos, Hispos, and Lupus form as like in the Lore. Also made it so Kinfolk can now finally speak Garou Tongue <!-- 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 Bug fixes. can actually use language keys, and more usage of garou tongue stuff. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: code: commented out language keys of old ss13 languages fix: Allows modern language keys to be able to be used qol: Allow Crinos Hispos and Lupus forms to do primal tongue qol: Kinfolk can speak Garou tongue now /: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: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
## About The Pull Request Adds the following to cargo's console: - Brass knuckles - Spiked knuckles - Mac 10 magazines (Can order the mac10 currently but no mags for it) - Material - iron, 50 stack - Material - glass, 50 stack ## Why It's Good For The Game The knuckles were intended to be added based on feedback; apparently the spiked knuckles are decent but not that strong so I think it's fair to add them as a bit of a more expensive version of brass knuckles. Mac 10 really needs its magazines orderable if the gun is orderable/buyable from black-market vendor. The sheets of material was a request in Apoc. I think this is mainly an oversight given TG kind of expects mining to do this job, but we don't have mining, so.. just let people order the sheets to make stuff instead of have to break tons of map stuff down. ## Changelog :cl: add: Adds new brass knuckles, spiked knuckles, mac-10 magazine, iron, and glass shipments to Cargo. /:cl: --------- Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
## About The Pull Request <img width="187" height="96" alt="image" src="https://github.com/user-attachments/assets/00a1d5db-71bd-41cb-a97b-c6dacbbd9e1f" /> old/current sprite: <img width="99" height="87" alt="image" src="https://github.com/user-attachments/assets/f1e31d6d-5d90-4595-8965-7827135316f3" /> adds some frag grenade sprites, in case anyone wants to add grenades in the future has both a standard and primed version (sprites dredged up from paynt's sprite sheet) adds a darkpack page for the janicart to master_files just a copy of the janicart but with a new name and description that is more 90s/00s friendly also has the icon set to use the zamboni-looking sprite rather than the SS13 sprite <img width="336" height="260" alt="image" src="https://github.com/user-attachments/assets/6ee22a9a-0f57-4995-a317-67ccb6ae12b4" /> adds a 48x32 weapons sheet outside of deprecated deprecated files are supposed to be for placeholder sprites currently holds the sprites borrowed from TFN, though new sprites should ideally go here instead of deprecated guns had their icon folder changed to direct to this page instead adds an unused paynt sprite for the mclusky .50 to that folder probably not being used for anything in the immediate future, but its there if anyone ever wants to use it <img width="429" height="288" alt="image" src="https://github.com/user-attachments/assets/5a735d74-c940-4a42-8120-a88df32cc850" /> wheel chair changed to modern wheelchair, the sprite was already in the code but unusued SS13 wheelchair internally re-named to "wheelchair_old" <img width="412" height="111" alt="image" src="https://github.com/user-attachments/assets/3a51ef1e-7f11-40b8-a517-121f2ac5c459" /> ## Why It's Good For The Game deprecated is going to lose its meaning if all the guns keep using it adds currently unused sprites somewhere for future use the janicart references SS13 lore and has an SS13 sprite ## Changelog :cl: add: frag grenade sprite add: new page for vehicles and new folder for vehicles change: janicart sprite, name, and desc change: wheelchair sprite /:cl:
## About The Pull Request Whoops. Typo. TMed with ApocryphaXIII#165 ## Why It's Good For The Game Bug bad ## Changelog :cl: fix: Bawn fog acctually links with its totem /:cl:
🆑 fix: replaced non-functional broadcast camera type-override with new subtype add: lecterns are now undense and count as a soapbox image: lectern south sprite is shorter to prevent needing to pixelshift spellcheck: de-SS13'd the captain-cast radio frequency add: start_off subtype for generators /🆑
## About The Pull Request adds a sig and hooks city time to it so we can broadcast the subsystem info ## Why It's Good For The Game lets you tell when the round is gonna end for something like a website.. ## Changelog :cl: server: broadcast configs for time till roundend to status /:cl:
## About The Pull Request adds a config setting for allowing artifact stacking widely hated on CG and planned to be patched out of Apoc anyways ## Why It's Good For The Game customization and balance ## Changelog :cl: config: Artifact Stacking can now be disabled via config /:cl: --------- Co-authored-by: TheTrueSilverRat <nigredo055@outlook.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
## About The Pull Request Essentially, this PR just adds a check for the sharpness of any damage source that deals Burn/Aggravated damage, and if so deals the appropriate WOUND_SLASH or WOUND_PIERCE ## Why It's Good For The Game One of the biggest consistency problems for myself atleast, when playing Garou/Gangrels is that the large **claws** meant to be cutting people into pieces instead slightly singe them without any blood drawn. Changing the wounding type for these cases fixes this consistency problem and improves immersion. ## Changelog :cl: balance: Aggravated Damage now considers sharpness when dealing wounds (Werewolves now properly cut people) /:cl:
## About The Pull Request thanks Halgmor for this cool sprite for the Ductus ## Why It's Good For The Game gold ## Changelog :cl: Halgmor image: the Ductus now has a golden icon instead of sharing white with the priest /:cl: --------- Co-authored-by: halgmor <halgmor@gmail.com>
## About The Pull Request For the [EVIL COMPANY] hardhats this PR: Makes them subtypes of hardhats Makes them not hide hair For the Pentex Beret this PR: Makes it not hide hair Gives the beret the same armor as a police cap. _(Willing to remove, but they're few in number and an ERT Item mostly so I dont think it's gods biggest deal)_ ## Why It's Good For The Game Long needed fix to a couple hats hiding your hair when it didn't need to. ## Changelog :cl: KCartridge fix: Pentex/Evilcompany hat issues /:cl:
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
11 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
Why It's Good For The Game
Changelog