mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
master
28 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Spatison
|
011baeb64c |
Исправление шрифта универсального языка (#909)
fix |
||
|
Kutosss
|
e818505435 |
Небольшие правки в связи с апстримом (#693)
* шрифты * блоб переводы * руководство * Update game-presets.ftl * Delete Resources/Locale/ru-RU/_Goobstation/blob/admin.ftl * фикс * фикс * ревью * Update Resources/Prototypes/Language/Species-Specific/diona.yml Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> --------- Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> |
||
|
Lumminal
|
16ea61f52f |
Shadowling Antagonist (SS13 Port and Remake) (#2207)
<!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Ports Shadowlings from SS13 to SS14 with a remake to make them fun to play. Minimal Design Doc (not up-to-date, read comments in this repo for updates): https://github.com/Lumminal/SS14-Design-Docs-Lumminal/blob/main/Shadowling.md --- - Abilities - [X] Hatch - [x] Glare - [X] Enthrall - [x] Veil - [x] Shadow Walk - [x] Icy Veins - [x] Collective Mind - [x] Rapid Re-Hatch - [x] Destroy Engines - [x] Sonic Screech - [x] Blindness Smoke - [x] Null Charge - [x] Black Recuperation - [x] Empowered Enthrall - [x] Nox Imperii - [x] Ascension - [x] Annihilate - [x] Hypnosis - [x] Plane-Shift - [x] Lighting Storm - [x] Ascendant Broadcast - Antags - [X] Thrall - [x] Guise - [x] Thrall Darksight - [x] Lesser Shadowling - Passive - [x] Light Resistance Scaling - [x] Shadowmind - [x] Damage on Light - Other - [x] Sounds - [x] Sprites - [x] Psionic Interactions - [x] Handle Edge Cases --- <details><summary><h1>Media</h1></summary> <p> https://www.youtube.com/watch?v=H-Ee5wuRINc </p> </details> --- 🆑 - add: The shadows have awakened, and their ascendance is soon to follow. Do not enter maints. --------- Signed-off-by: Lumminal <81829924+Lumminal@users.noreply.github.com> |
||
|
Kyoth25f
|
ed2301f840 |
Port Blob (#2441)
Ports Blob from https://github.com/Goob-Station/Goob-Station/pull/975 that was ported from https://github.com/Rxup/space-station-14. Credit to VigersRay for original code, Roudenn and Rxup for maintaining and jorgun for the Goob port. --- - [X] Port https://github.com/Goob-Station/Goob-Station/pull/975; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/1209; - [X] Port Blob related code from https://github.com/Goob-Station/Goob-Station/pull/1262; - [X] Port Blob related code from https://github.com/Goob-Station/Goob-Station/pull/1340; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/1408; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/1419; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/1440; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/1817; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/2077; - [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/1916~; - [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/1917~; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/2077; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/2092; - [X] Port https://github.com/Goob-Station/Goob-Station/pull/2546; - [X] Port https://github.com/Rxup/space-station-14/pull/963; - [X] Port https://github.com/Rxup/space-station-14/pull/998; - [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/2563~. - [X] Enable Blob and Blob gamemode; - [X] Add `StationGlobConfig` to all stations; - [X] Use `AnnouncerSystem` in `BlobRuleSystem.cs`; - [X] Blob language and Hivemind (from https://github.com/Rxup/space-station-14/pull/176); - [x] Change CVars location; - [X] Add media. --- <details><summary><h1>Media</h1></summary> <p> https://youtu.be/-WtMQwRcmrU?si=su3An6RtiCTZg-DV </p> </details> --- 🆑 VigersRay, Roudenn, Rxup, vladospupuos, fishbait and Kyoth25f - add: Added a new antagonist: Blob --------- Co-authored-by: fishbait <gnesse@gmail.com> Co-authored-by: Fishbait <Fishbait@git.ml> Co-authored-by: Aiden <aiden@djkraz.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: lanse12 <cloudability.ez@gmail.com> Co-authored-by: BombasterDS <deniskaporoshok@gmail.com> Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com> Co-authored-by: Piras314 <p1r4s@proton.me> Co-authored-by: shibe <95730644+shibechef@users.noreply.github.com> Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com> Co-authored-by: JohnOakman <sremy2012@hotmail.fr> Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com> |
||
|
Kai5
|
33ad7a8b34 |
[Tweak] Шрифт абдукторов (#482)
Шрифт |
||
|
Remuchi
|
1e363c7346 |
Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit |
||
|
DVONIKS
|
6c19771020 | Revert "Upstream 04.04-18.04" | ||
|
dootythefrooty
|
717f8404f0 |
Abductor Port (#2234)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Ports the lone abductor and possibly(?) the duo abductors. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [X] Figure out why abductors aren't spawning as the abductor race. - [X] Make sure it's not a buggy mess. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Credits Thank to [Starlight ](https://discord.com/invite/wAyQKB78fH)for the original version! Darkrell, Rinary, and Landosaur made the funny little guys.  # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 Darkrell, Rinary, Landosaur - add: The Abductors are here to replace your organs. Gleep Glorp! --------- Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com> Co-authored-by: Solstice <solsticeofthewinter@gmail.com> Co-authored-by: SX_7 <sn1.test.preria.2002@gmail.com> Co-authored-by: Theodore Lukin <66275205+pheenty@users.noreply.github.com> Co-authored-by: Piras314 <p1r4s@proton.me> Co-authored-by: Ilya246 <57039557+ilya246@users.noreply.github.com> (cherry picked from commit ea9f1526868289d20832989cb02f79c76c240918) |
||
|
RocketBoss360
|
e652a69568 |
Maint Drone Language (#2208)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Allowes drones to speak to one another with "Drone" Moreover they now understand but cannot speak TauCeti! --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] make drone lang - [x] allow drones to speak dronelang - [x] make drones beep when speaking --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - add: Maint drones can now speak to other maint drones via the Drone language! --------- Signed-off-by: RocketBoss360 <rocketboss360@gmail.com> (cherry picked from commit 69b9710e7757b3fe2fff76e890915a35806f97f8) |
||
|
Rocket
|
4e45e2a8a9 |
Fix localization
(cherry picked from commit 8c23362254b2c46d7a31ce845a0d5a6b233fb991) |
||
|
Rocket
|
39e3aee1bc |
1 comment changed
(cherry picked from commit 01d03dcbd706fe91cc36a256e47ce0fcd09d1b81) |
||
|
Rocket
|
5b4f346ed0 |
Fix Verb labels
(cherry picked from commit 190faffce4e5c93e30d53cc3af060ed76482c6ca) |
||
|
Rocket
|
a7cc8f5e2e |
Xenoglossy language tweaks
(cherry picked from commit 2ebd2a27f7f61000b38dd81f48ef84087d2f9972) |
||
|
Timfa
|
e328eee30d |
Novu-Nederic Language (#1952)
beste land <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Once the language of seafarers and merchants, now the voice of spacers, terraformers, and pioneers. Spoken in the New-Netherlands, this direct and pragmatic trade language carries the sharp consonants and clipped vowels of its old-world roots. Built on centuries of seafaring, land reclamation, and commerce, it thrives among those who shape entire worlds — just as their ancestors shaped the land from the sea. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Bitterbal eten --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - add: Added Novu-Nederic language (incl. trait) (cherry picked from commit e80684451186b99bf38538393b1e5b9f106ebb3b) |
||
|
SixplyDev
|
3bca3427ca |
Glass Cannon Shadowkin (#1531)
# Description Honestly... much needed until they can get a proper rework from the original creators. This PR nerfs them a shit ton (no more teleporting away when you're in danger, smh) to make them more in line with the other species so they aren't powergamer central. Additionally, brings them more in-line with the traditional SS13 shadowkin. Shadowkins should no longer get darkswap and such, in fact I've commented out the entire ability until it too can get a rework. --- # TODO - [x] Removed DarkSwap from Shadowkin - [x] Made shadowkins take more damage from heat, slash, and piercing - [x] Brought shadowkin much more in line with their SS13 counterparts - [x] Fixed shadowkin lore, making the guidebook entry more interesting - [x] Fixed shadowkin lore file, adding in their species lore instead of relying on a google doc - [x] Shadowkin can be chosen as a player species roundstart - [x] Rework Marish to have a more fleshed out language protoype - [ ] Make DarkSwap unable to interact with the world as a whole - [ ] Give DarkSwap a longer cooldown - [ ] Make DarkSwap unable to be used if stunned - [ ] Adjust DarkSwap glimmer production - [x] Shadowkin do not have black eyes by default - [x] Shadowkin have the black eyes trait listed (Waveform Misalignment equivalent) - [x] Shadowkin can now be mystagogue, mantis, chaplain, cataloguer, and prisoner. - [x] Shadowkin cannot have blackeye trait for mystagogue, mantis, chaplain, or cataloguer. - [x] Shadowkin must have blackeye trait for prisoner. --- # Changelog 🆑 ShirouAjisai - add: Shadowkins can now be roundstart species again - add: Shadowkins now have a lungs, yippee! - add: Shadowkins now have organs with funny little descriptions - add: Shadowkins now have a brand new and expanded list of names - add: Shadowkins now have roundstart innate telepathy ability rather than a whole new language for it. - tweak: Shadowkins take more damage from heat, slash, and piercing - tweak: Shadowkins are much more like their SS13 counterparters - tweak: Shadowkins now have much better lore in their guidebook entry - tweak: Shadowkins now have a more fleshed out language (to outside observers) - tweak: Shadowkins now can be mystagogue, mantis, chaplain, and cataloguer - tweak: Shadowkins must now have blackeye trait to play prisoner - tweak: Shadowkins no longer have blackeye trait by default - tweak: Shadowkins now take asphyxiation damage, albeit at half the rate of others. - tweak: Shadowkins now have a more pronounced snout. - remove: Removed DarkSwap from Shadowkin roundstart --------- Signed-off-by: SixplyDev <einlichen@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: ShirouAjisai <zaneromeave319@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 031a102e2fe8ca1533375168b3ae64f65f5e99ea) |
||
|
Skubman
|
a46b4f2b5a |
New Species: Plasmaman (#1291)
# Description Adds the Plasmamen as a playable species. Plasmamen are a skeletal species who depend on Plasma to live, and oxygen is highly fatal to them. Being exposed to oxygen will set them on fire, unless they wear their envirosuits. ## Species Guidebook <img width=500px src="https://github.com/user-attachments/assets/a1ef91ef-87b2-4ae0-8b5c-922a0c34777f"> <img width=500px src="https://github.com/user-attachments/assets/110f0fa0-7dc4-410b-a2c0-a517f0311484"> **SPECIAL:** - Plasmamen speak the language Calcic, a language they share with Skeletons. ## Shitmed Integration Plasmamen are the first ever species designed with Shitmed in mind, with one of their core mechanics (self-ignition) powered entirely by Shitmed. Whether or not a Plasmaman ignites from oxygen exposure depends only on their body parts. A Plasmaman with only their head exposed will not burn as much as an entirely naked Plasmaman. You can **transfer** Plasmaman body parts to non-Plasmamen through **surgery** so that they also ignite from oxygen exposure. Meanwhile, a Plasmaman with a non-Plasmaman head can expose their head without self-igniting. https://github.com/user-attachments/assets/0aa33070-04be-4ded-b668-3afb9f4ddd7c ## Technical Details This also cherry-picks https://github.com/space-wizards/space-station-14/pull/28595 as a quality-of-life feature to ensure Plasmamen keep their internals on upon toggling their helmet with a breath mask on. ## TODO ### RELEASE-NECESSARY <details> - [x] Port more envirosuits / enviro helms (job-specific) and their sprites - [x] Remove breath masks from default plasmaman loadouts because the envirohelms already allow them to breathe internals - [x] Change default plasma tank to higher-capacity version - [x] Prevent plasmamen from buying jumpsuits and helmets other than envirosuits - ~~[ ] **Client UI update for loadout groups min/max items and default items**~~ - [x] Plasmaman-specific mask sprites from TG - [x] Disable too cold alert for plasmamen - [x] Create/port sprites for these jobs - [x] Courier - [x] Forensic Mantis - [x] Corpsman (Resprite security envirosuit) - [x] Prison Guard (Resprite security envirosuit) - [x] Magistrate (No Paradise envirosuit so use new colorable envirosuit) - [x] Blueshield (Port from Paradise and tg-ify?) - [x] NanoTrasen Representative (No Paradise envirosuit so use new colorable envirosuit) - [x] Martial Artist (use new colorable envirosuit and make pure white) - [x] Musician (use new colorable envirosuit) - [x] Reporter (use new colorable envirosuit) - [x] Zookeeper (use new colorable envirosuit) - [x] Service Worker (use new colorable envirosuit) - [x] Gladiator - [x] Technical Assistant - [x] Medical Intern - [x] Acolyte / Research Assistant - [x] Security Cadet - [x] Assistant - You know what. These intern jobs are fine. They can use their normal equivalent's envirosuits. - [x] Logistics Officer (use new colorable envirosuit) - [x] Adjust sprites to be closer to actual job - [x] Captain (Shift color to be closer to ss14 captain) - [x] ~~CMO (Remove yellow accents)~~ - [x] Port HoP envirogloves sprite - [x] unique sprite for self-extinguish verb - [x] Refactor conditional gear stuff to live only in StartingGearPrototype with `SubGear` `List<ProtoId<StartingGearPrototype>>` field and `List<Requirement>` field for sub-gear requirements - [x] Add starting gear for paradox anomaly, and antags and ghost roles - [x] Paradox - [x] Nukies - [x] Disaster victims - [x] Listening post operative - [x] Make all envirosuit helmets have a glowing (unshaded) visor - [x] Envirosuit extinguish visuals - [x] JobPrototype: AfterLoadoutSpecial - [x] Set prisoner envirohelm battery to potato, command/sec/dignitary to high-powered - [x] Set base envirosuit extinguishes to 4, sec 6 and command 8 - [x] Improve plasmaman organ extraction experience - [x] Body parts now give 1 plasma sheet each, while Torso gives 3 - [x] Organs can be juiced to get plasma - [x] Make envirohelm flashlights battery-powered - [x] Plasmamen visuals - [x] Grayscale sprites for color customization, and set default skintone color to Plasmaman classic skintone - [x] Plasmaman eye organ sprite - [x] Add basic loadouts - [x] Add way to refill envirosuit charges (refill at medical protolathe after some research) </details> ### Low Importance <details> - [x] Envirogloves - [ ] (SCOPE CREEP) Plasma tanks sprite (only normal emergency/extended, rather low priority) - [ ] (SCOPE CREEP) Modify envirosuit helmet sprites to have a transparent visor - [ ] Glowing eyes/mouth marking - [x] More cargo content with plasma tanks / envirosuits - [x] Plasmaman survival kit like slime - [x] Additional plasma tanks - [ ] (SCOPE CREEP) Plasmaman EVA suits - [x] ~~Add envirosuits to clothesmate~~ - [x] Add more plasma tanks to random lockers and job lockers - [x] Turn envirosuit auto-extinguish into extinguish action - [x] move self-extinguish verb stuff to shared for prediction of the verb - [x] move self-extinguisher stuff away from extinguisher namespace - [x] unique sprite for self-extinguish icon - [x] ~~IDEA: purple glowy fire extinguisher ~~ - [x] on self-extinguish, check for pressure immunity OR ignite from gas immunity properly - [x] See envirosuit extinguish charges in examine - [x] Milk heals on ingestion - [x] Plasma heals on ingestion - [x] Self-ignition doesn't occur on a stasis bed - [x] ~~Self-ignition doesn't occur when dead~~ - [x] Guidebook entry - [x] Make self-ignition ignore damage resistances from fire suits - [x] ~~Make self-ignition ignore damage resistances from armor~~ - [x] ~~Unable to rot?~~ - [x] Make the envirosuit helmet toggle on for the character dummy in lobby - [ ] (SCOPE CREEP) One additional Plasmaman trait - [x] ~~Showers extinguish water as well as water tiles~~ - Unnecessary as stasis beds now prevent ignition, allowing surgery on a plasmaman on stasis beds. - [x] Unique punch animations for Plasmafire Punch/Toxoplasmic Punch traits - [x] Actually remove toxoplasmic it's just slop filler tbh - [ ] Talk sounds - [ ] Normal - [ ] Question - [ ] Yell - [x] Positive moodlet for drinking milk / more positive moodlet for drinking plasma - [x] Increase moodlet bonus and also minimum reagent required for the plasma/milk moodlets - [x] Increase fire rate base stacks on ignite cause putting out your helmet for a few secs isn't that dangerous due to the fire stacks immediately decaying - [x] I think halving firestack fade from -0.1 to -0.05 might work to do the same thing too - [ ] (SCOPE CREEP) Get bone laugh sounds from monke 'monkestation/sound/voice/laugh/skeleton/skeleton_laugh.ogg' - [ ] (SCOPE CREEP) When EVA plasmaman suit is added, 25% caustic resist - [x] Envirosuit helmet - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirosuit - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirogloves - [x] Equivalent of 100% bio / 95% fire / 95% acid resist - [x] Put breath mask back on - [x] Refactor: put body parts covered data into component instead of being hardcoded </details> ## Media **Custom Plasmaman Outfits** All of these use the same **absolutely massive** [envirosuit RSI]( |
||
|
sleepyyapril
|
4370ff6611 |
Chitinid (From Delta-V) (#1644)
port https://github.com/DeltaV-Station/Delta-v/pull/2707 (with permission) 🆑 ElusiveCoin - add: Added a new species, the Chitinid. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: ElusiveCoin <elusivecoin@gmail.com> Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit ce310bb7158acf0c9c2eef00a19d9ac58f8fa08d) |
||
|
Spatison
|
0e0ffb6d14 |
Upstream (#142)
* Fix Power Attacks Being Faster Than Left Clicks (#1252) # Description This fixes some stupid math. Power attacks are now correctly slower than left clicks. Previously they were faster. # Changelog 🆑 - fix: Power Attacks now correctly apply a penalty on swing speed, and are no longer faster than left clicking. (cherry picked from commit 049a995f64c42734e5286229b524161a730aaea9) * Automatic Changelog Update (#1252) (cherry picked from commit 8a88bfd11f1384fa2fb01fd7ace6477202a68499) * Tweak Wizden Trait Descriptions (#1260) # Description Converted the descriptions of most wizden traits to a more formal and roleplay-oriented style, also clarifying some aspects of other traits in the process. --- TODO: - [ ] Test this --- # Changelog 🆑 - tweak: Tweaked the descriptions of most Wizden traits to be more vivid and descriptive. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> (cherry picked from commit 411cb213ac9ab2e6a0b790e72b25a142a4945217) * More Trait Functions (PushMarkup & AddArmor) (#1253) # Description This PR effectively "Reworks" several of the Bionic Traits through use of new modular TraitFunctions. These being, **TraitPushDescription**: Ensures that an entity has the new ExtendDescriptionComponent, then writes to said component. ExtendDescriptionComponent serves as a new highly modular "One stop shop" for any system wanting to add text to the shift-click examine window. It even accepts arguments for text color, font size, and whether or not a person must be standing within touching distance to "See" the provided texts. It accepts arbitrarily any number of descriptions. **TraitAddArmor**: This takes advantage of a new functionality for the DamageableSystem, whereby entities are able to have more than one DamageModifierSet. This allows arbitrarily any number of traits to add as many modifier sets as desired, without fear of any compatibility issues. These can be both negative and positive, and as Skubman has pointed out, this can also be used to create negative traits that make a character more vulnerable to a given damage type! Additionally, most of the Bionics Traits have been reworked. CyberEyes has been split into two modules, one for the base implant, and one for the Flash Protection. Dermal Armor has been reworked using TraitAddArmor, so that it no longer replaces your original modifier set, and instead stacks multiplicatively with whatever your original species modifier set was. Thus, it can now be taken by any species. # TODO <details><summary><h1>Media</h1></summary> <p> TraitPushDescription  TraitAddArmor  </p> </details> # Changelog 🆑 - add: Five new functions for the Trait System, AddArmor, PushDescription, ModifyMobThresholds, AddSolutionContainer, and ModifyStamina. - tweak: CyberEyes Basic System has been split, now Flash Protection is a separate module. - add: Dermal Armor no longer replaces your original species damage resistances. It now stacks multiplicatively with your original resistances. - tweak: Dermal Armor can now be taken by any species, not just Humans. - add: Dermal Armor, and Bionic Arms can now be revealed by a close examination. Shift click on someone within touching distance will reveal if they have these "Obvious" cyberware. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com> (cherry picked from commit 29d2cb1ed85ab089d83c702f7405e938a0d9374c) * Automatic Changelog Update (#1260) (cherry picked from commit 8d54aa2fffdd3726e948d6d228287b01c0a81413) * Feat: Anomaly Scanner Data Copying (#1250) # Description Makes it so that using one anomaly scanner on another transfers the anomaly data onto the used scanner. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: You can now touch one anomaly scanner with another to copy the anomaly scan data from it. (cherry picked from commit 0574be444b90137808c07f85e10b59c464f054cf) * Automatic Changelog Update (#1253) (cherry picked from commit 6fa8d6817fa81e6d6d20b61f5ec4b7b96fdb185b) * Automatic Changelog Update (#1250) (cherry picked from commit 1b5704535ce42041c068d201cdb447af42004c20) * Rename "Pierce" Typo to "Piercing" (#1267) # Description Oops. Some files refer to the non-existent **Pierce** damage type when the proper name is **Piercing**. # Changelog 🆑 Skubman - fix: Piercing damage can now dismember body parts, just like Blunt and Slash damage. (cherry picked from commit 992b2e486855cea6646cf5d4af51ca8cbf61b29d) * Buff Medical Due to Shitmed Changes Cherry-Pick (#1259) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> + Buffed applicable medication heal values. + Buffed applicable medication stack sizes. + Slightly buffed dylovene, burn, and brute chems. + Buffed applicable medication doAfter delay from 3s to 2s. --- ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> This change was made with the advent of the new Limb Damage system. This PR seeks to achieve making SS14 Medical more equivalent to SS13 Medical when it comes to healing damage values. This was done as Bruise Packs and Ointment only heal 5 Brute or 5 Burn respectively when applied to a limb. When each limb has a 100 Crit threshold, this can make it extremely hard even with surgery to heal limbs in the absence of Chemicals. Furthermore on higher pop, this will lead to people burning through applicable meds even faster than before Limb Damage was implemented. It would take 34 bruise packs to heal someone with 170 Blunt spread out across their limbs, with this change it would reduce that to 12 bruise packs. Full list of numerical val changes: - Healing component doAfter Delay reduced. was 3s, now its 2s. - Applicable medical items now have a max stack size of 15 (was 10). - Ointment heals 15 of each burn type, 10 caustic (was 5 of each burn type, 1.5 caustic) - Mesh now heals 20 of each burn type (was 10 of each burn type). - Bruise Packs now heal 15 of each brute type (was 5 of each brute type) - Sutures now heal 20 of each brute type (was 10 of each brute type) - Bloodpacks now heal 2.5 Bloodloss & restore 10% bloodlevel (was .5 Bloodloss and 5%) - Gauzes now heal 15 Slash and 20 Pierce (was 5 Slash and 10 Pierce) - Dylovene now heals 1.5 Poison per .5u (was 1 Poison per .5u) - Bicaridine now heals 2.5 Brute per .5u (Was 2 Brute per .5u) - Dermaline now heals 2 Burn per .5u (was 1.5 Burn per .5u) - Epinephrine now heals 1 Burn & 1 Brute per .5u (was .5 for each per .5u) - Kelotane now heals .5 Burn per .5u (was .33 Burn per .5u) - Omnizine now heals 3 Burn, Toxin, Airloss, and Brute per .5u (was 2 per .5u) - Lacerinol now heals 4 Slash per .5u (was 3 per .5u) - Bruizine now heals 4 Blunt per .5u (was 3.5 per .5u) # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Cherry-pick Medical changes merged in Goobstation --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> --- ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Should values be overtuned, they can be reduced in a future PR or before this PR is merged. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - tweak: Increased applicable medication heal values. - tweak: Increased stack size of applicable medications. - tweak: Slightly increased dylovene, burn, and brute chemicals heal values. - tweak: Decreased Medical item application time from 3s to 2s --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit b431d24f86f94433ea0c53982db83e40ef1d3f2c) * Automatic Changelog Update (#1267) (cherry picked from commit 02dd8ab06333a5b2dabe03845bfd6719ca09ef48) * Automatic Changelog Update (#1259) (cherry picked from commit 09d59007d4c55ee9f7daa0f56cae672c51951843) * The Blood Cult (#1001) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Adds a new game mode - The Blood Cult. Hail to Nar'Sie! --- # TODO - [x] Gamemode - [x] Roles - [x] Runes - [x] Constructs - [x] Structures - [x] Forge - [x] Archives - [x] Altar - [x] Pylon - [x] Structure - [x] Placement System - [x] Airlocks - [x] Repulsor system - [x] Construction system - [x] Items - [x] Eldritch Whetstone - [x] Construct Shell - [x] Mirror Shield - [x] True Nar'sian Hardened Armor - [x] Flagellant's Robe - [x] Eldritch Longsword - [x] Zealot's Blindfold - [ ] Night vision system - [x] Shuttle Curse - [x] Veil Shifter - [x] Void Torch - [x] Reagents - [x] Holy Water - [ ] Actions - [x] Cult Magic - [x] Stun - [x] Teleport - [x] Electromagnetic Pulse - [x] Shadow Shackles - [x] Twisted Construction - [x] Summon Combat Equipment - [x] Summon Ritual Dagger - [x] Blood Rites - [ ] Cult Leader Magic - [ ] Final Reckoning - [ ] Mark Target - [ ] Eldritch Pulse - [ ] Construct's Magic - [ ] Artificer - [ ] Summon Cult Floor - [ ] Summon Cult Wall - [ ] Greater Conjuration - [ ] Summon Soulstone - [ ] Wraith - [ ] Phase Shift - [ ] Juggernaut - [ ] Shield - [ ] Gauntlet Echo - [x] Cult leader selection system - [ ] Rending/Apocalypse rune placement markers EXTRA: - [ ] Spirit Realm rune - [x] Eldritch language - [ ] Conceal magic - [ ] Ru locale --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog 🆑 - add: Added Blood Cult Gamemode. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 150020866ddd383f297dfccd7717017c23222d82) * fix * Automatic Changelog Update (#1001) (cherry picked from commit a179e186fa812e5dbce34983e11ef7af56ccdcf4) * Engine Update v237.2.0 (#1270) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Updates to engine version v237.2.0. Fixes disposals systems breaking and not using the proper direction. --------- Co-authored-by: sleepyyapril <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> (cherry picked from commit dcc1c38fb729b00fdb15b79b38372f3e1e8bc951) * [QoL] Show Oni Damage Bonus In Damage Examine (#1268) # Description Examining an item's damage values as an Oni now calculates your bonus damage, and it also works with all of the Oni combat traits. ## Technical details `OniSystem`, instead of adding melee damage through `MeleeHitEvent`, now adds damage through `GetMeleeDamageEvent`, the same event that examining melee weapon damage raises through `GetDamage`. ## Media **Normal damage values** <img src="https://github.com/user-attachments/assets/9de255ef-29e6-4119-93cc-356349812a6f" width=300px> **Oni damage values** <img src="https://github.com/user-attachments/assets/18d44aaf-5a70-4ba9-a8c8-be29e92d7267" width=300px> # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 Skubman - tweak: As an Oni, examining the damage values of weapons now takes into account the melee damage bonus from your species or trait. (cherry picked from commit 613e7937392d5d4fd9bf906f571adc237c706367) * Automatic Changelog Update (#1268) (cherry picked from commit 5fe4b1e94b987f787807cc10df06f667b87d124e) * Loadouts V4 (#1164) # Description # TODO - [x] Custom name/desc/color tint, toggleable individually per-loadout - [x] Fix them not changing correctly between profiles in-editor - [x] Preview colors in the lobby - [x] Allow the users to null the color themselves (and default it to such) - [x] Pick what should be allowed to be recolored - [x] Guidebook links - [x] Make an example - [x] Special components for loadouts - [x] Heirlooms - [x] Pick what should have heirlooms - [x] Decimate lag - [x] Fix live character preview - Maybe do characters per job - Rethink unusable --- <details><summary><h1>Media</h1></summary> <p> <!--  --> https://github.com/user-attachments/assets/bcf61517-6b64-40d2-b299-7462e2469fe2 </p> </details> --- # Changelog 🆑 - add: Players can set custom names, descriptions, and color tints for their loadout items - add: Certain loadouts may have Guidebook pages shown in the editor - add: Players can pick a list of loadout items to have one randomly be their family heirloom for a mood bonus or deficit if they are carrying it - fix: Loadouts have almost as little lag as possible (hopefully none) - fix: Everything properly updates your character editor's live preview --------- Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> (cherry picked from commit f0463062812428625da9e8adad60c8a567fdacbe) * Automatic Changelog Update (#1164) (cherry picked from commit 57917a746f514aba3f142d870a9280c9b1eb9a4f) * [Fix] Added Robust.Xaml to the Project Solution (#1266) Mirrors https://github.com/space-wizards/space-station-14/pull/31573 Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> (cherry picked from commit 1d65d548e69862295926fb08aee962d8fbd0b5c4) * Update Credits (#1274) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 39f4ad8a8884bc5bb9e64530b1a708ea41b4de32) * Fixes Make Cultist Admin Verb to Act on Target Not Self (#1289) There's a small error on the admin verb for blood cultists which made the verb only work on self. This fixes it. (cherry picked from commit 6c2b2a8a4ab7c7b0c5e18d796ccd94d09b087509) * IPC Instrument Menu Fix (#1287) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Fixes IPCs being unable to use the midi menu. --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - fix: Fixed IPCs being unable to use the midi menu. (cherry picked from commit f133b9b7cf175815a3c6de59d541e12f0fc60790) * Automatic Changelog Update (#1287) (cherry picked from commit 92a6e099fca1581ea8a0cfd16bf7f13ae8d1108a) * Change Target Doll Icon For Ashen Theme (#1282) # Description  (cherry picked from commit 327247585612d9d65e20b8b856864701ceb1c933) * Fix Applicable Medication Stack Bug (#1278) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> ## About the PR <!-- What did you change? --> - Fixed a bug where applicable medication stacks would revert back to 10 after 1 use. ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> - Did you know maxstacks were stored in a separate YML? Me neither, until now. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> <!-- --> 🆑 - fix: Fixed a bug where applicable medication stacks would revert back to 10 after 1 use from full. Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> (cherry picked from commit d4879f9129ae484f24f57eb642cc7d600f2323e0) * Automatic Changelog Update (#1278) (cherry picked from commit 8d485e8c0d4e3932835aeed210388e85988a0213) * Re-Enable Language Color and Font (#1294) # Description Re-enables language font and colors showing up in chat messages. The language font/colors were bugged after adding language names in chat (https://github.com/Simple-Station/Einstein-Engines/pull/1165) I also overhauled the format for chat messages to be more aesthetically pleasing, and made sure chat bubbles use the language color/font. ## Media **Nekomimetic**   **Bubblish**   **Tau-Ceti Basic (Default Language)**   **Rootspeak**   ## Changelog 🆑 Skubman - fix: Language colors and fonts will show up in text messages again, both on in-person messages and on the radio. - tweak: The text on chat bubbles now uses the color and font of the language being spoken. - tweak: The language prefix before the name on chat messages now uses the language's color. (cherry picked from commit 1a9763528a9b15f11f474a2fa7ecfdde98aa9a15) * Automatic Changelog Update (#1294) (cherry picked from commit 7d802e35dc45c37016681c3a009bdaebe2707178) * Shitmed Update 2 - [Insert Snarky Remark] (#1271) # Description  Honey wake up, another shitmed PR with 5 features and a trillion bugs! I love bloat. --- # Known Bugs - A lot of shit with changelings lol - Markings suddenly disappear from your entity apparently at random. Wizden exclusive issue as of now. - Fire heretics explode when ascending due to part damage shitcode (sorry) - Some exceptions/null point references at round end, tentatively related to salvage corpses. - Slots having wonky behavior due to not being networked. More of a broad issue with how I implemented them initially. - Arachne are FUCKED with surgery, I was incredibly tempted to set them to roundstart: false, but I'll try to hotfix it this week. --- # Changelog 🆑 Mocho, Deltanedas - add: Ported Ghetto Surgery from Deltanedas! - add: Ported fishops organs from Deltanedas! - add: Added different step durations to each surgery step. - add: Added a T2 research for advanced surgical tools - add: Added a T3 research for an omnitool for surgery. - add: Added Surgical and Advanced Surgical modules for Mediborgs - add: Mediborgs can now perform surgery! - add: Added lobotomies as an operation. Godspeed you psychopaths. - add: Added cybernetic arms, legs and eyes. - add: Added EMP weaknesses to all cybernetic parts (the day of reckoning will come for IPCs soon) - add: Losing your eyes now blinds you. - fix: Fixed a few species that did not inherit from BasePart's, thus taking damage types they shouldn't on their limbs. - fix: Fixed harpy lungs not being usable in surgeries. - fix: Fixed biosynthetic and other printable parts not allowing you to attach body parts to them. - fix: Fixed fire being able to destroy your chest. - fix: Fixed entities being able to take over your body by just inserting a brain or another head on top of you. - fix: Fixed some shitcode that didnt let rejuvenate or godmode work properly. - fix: Fixed bionic arm, and cybernetic eyes traits not working properly due to shitty networking. - tweak: Increased tend wounds's speed by double, and bumped up the values on its calculations. DEATH TO TOPICALS, LEAVE THOSE TO TIDERS. - tweak: Beheading an entity now doesnt let it move, speak, and forces it to the ground immediately (literally 1984!!11!!) - tweak: Changed sprites on most surgical tools to now use /tg/ sprites. - tweak: Unbound shitmed targeting doll keybinds by default (did you know we have those). --------- Signed-off-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: Saphire Lattice <lattice@saphi.re> (cherry picked from commit 2eafa0d47e7b9a3270ae797f82dd7b1772dffb15) * Admin Tooling Cherry Picks (#1290) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Link to every PR I cherry-picked: 1. https://github.com/new-frontiers-14/frontier-station-14/pull/2283 2. https://github.com/space-wizards/space-station-14/pull/29219 3. https://github.com/space-wizards/space-station-14/pull/30075 4. https://github.com/space-wizards/space-station-14/pull/28639 5. https://github.com/space-wizards/space-station-14/pull/32527 6. https://github.com/space-wizards/space-station-14/pull/28030 7. https://github.com/space-wizards/space-station-14/pull/28178 The main purpose of this PR is the first cherry-picked PR. It adds the ability for admins to reply to ahelps via discord using an HTTP POST request. See all relevant details in the initial PR by Myzumi. --------- Co-authored-by: Myzumi <34660019+Myzumi@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> (cherry picked from commit b8e75dae0e25301da4ffdd1f6ca5b4aebdf5a2b8) * Automatic Changelog Update (#1271) (cherry picked from commit d58d397a69fc2bb5b2bbce9280a978d5d899bba0) * More Loadout Equipment (#1281) # Description This PR adds a bunch more equipment selections for Engineering loadouts, plus Suit/Skirt selections for the jobs that were missing it. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: All engineering roles have had their equipment loadouts significantly expanded upon. Engineers can now buy construction materials with their loadout points. - fix: All engineering jobs now have their Suit/Skirt selection via loadouts. - add: Salvage techs can now select from a variety of knife options to start their spess adventures with. - add: Epistemics staff now have *some* equipment selection options that they share. More to come when I finish making the Potentiometer. (cherry picked from commit 0bd9a9ea81c2e6e9ef775a131b547b8b861548b1) * Automatic Changelog Update (#1281) (cherry picked from commit c7f1b4fa3c57f3650154150e1c30ce28e3302230) * Dynamic Hostname System (#1296) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Change your hostname whenever map, preset, or runlevel changes! Variables given on all hostname locale strings: - {$mapName} - The name of the current map. - {$preset} - The name of the current preset. - {$originalHostname} - What you originally had game.hostname set to, before updating. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>     </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> nah (cherry picked from commit de98c2aec2c072abeb6c81c74b830d72e29ba0c8) * Religious Headgear For Character Customization (#1297) # Description This PR adds a few articles of various kinds of religious headgear to loadouts, namely a Hijab, Turban, and Kippah. All 3 are whitescale items that are set as colorable, allowing players to make them whatever color is desired. Farida can finally have the pink Hijab she was always supposed to have. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: Added various articles of religious headgear to loadouts, such as Hijab, Kippah, and Turban. All of these are set to allow custom colors. (cherry picked from commit e46a8636eb235e627023cdd3d42428b34c134353) * Automatic Changelog Update (#1297) (cherry picked from commit 56be69053045a2d2184c975c2325889df69838e0) * Don't Require Running in Release to Test Mood (#1257) (cherry picked from commit f2871885b6dd13b418dfd7ff55ffe0559a4f7044) * Update Credits (#1300) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 9ef825252a0dc0054b1ba9626e7283d296150f3b) * Start of Lore Documents (cherry picked from commit dfb12e53abf1ef5d767240a19b28ba12dd35ef9b) * Finally Done (cherry picked from commit 2a8bf58dfc61f24796a55940e4a7ab6be3ced3ec) * Automatic Changelog Update (#1298) (cherry picked from commit 8a368bbdce5dd05adae998ec55f15fd5ff04b52f) * Fashion Update: Earrings & Makeup (#1299) # Description Adds **38** new earrings, **31** new face markings, and **16** bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings. Most notably, the new face markings unlock **full customization of every pixel** in the 5x4 pixel space of the face. Examples of this are shown below. Arachne now have access to **more than a hundred** markings above the leg, after not having any markings in their 2 years of existence. ## Media ### Pauline <img height=270px src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2"> <img height=270px src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5"> **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue <img height=270px src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895"> **Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right) **Head (Side):** Double Gemstone Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Watch (Colorable) **Left Arm:** Left Arm Bracelet **Right Hand:** Right Watch (Colorable) **Right Arm:** Right Arm Bracelet ### Pink <img height=270px src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6"> **Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Bracelet **Left Arm:** Left Arm Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Psychic <img height=270px src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a"> **Head:** Bindi, Full Blush **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Hand:** Left Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Cyclops <img height=270px src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b"> **Head [Eyes]:** Bindi, Glabella, Nose Tape **Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips **Head (Side):** Cross Earrings (Left), Cross Earrings (Right) ### 😂 <img height=270px src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a"> ### Arachne  **Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick) **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Arm:** Left Robotic Arm from Hesphiastos Industries **Left Hand:** Left Robotic Arm from Bishop Cybernetics **Right Arm:** Right Arm Bracelet **Right Hand:** Right Watch (Colorable), Right Nail Polish ## Technical Details I did a quick fix in [MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings. # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 Skubman - add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before! - add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more! - tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings. - tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories. (cherry picked from commit 932f9e31eab9b2c11c4429b7c9c36effc327e733) * Automatic Changelog Update (#1299) (cherry picked from commit b05ab8e0d1e8aa043a60ca96843061f4778136e6) * ♂️ Add Male Arachne (#1301) # Description Adds the ability for Arachne to be male. Also in this I added chest/arm Arachnid markings for Arachne to use. I enabled footstep sounds for Arachne since it doesn't seem that they were intended to have silent footsteps. ## Media <img height=160px src="https://github.com/user-attachments/assets/04e3b066-e75c-4ee7-bfd6-762c2defcaf8"> <img height=160px src="https://github.com/user-attachments/assets/d4582c12-72d8-413f-92e6-145cb90c76c3"> ## Changelog 🆑 Skubman - add: Arachne can now be Male instead of only being Female. They can now also wear Facial Hair. - add: Arachne can use Arachnid chest and arm markings. - fix: Arachne will now have footstep sounds instead of being quiet when moving. (cherry picked from commit 1bab6b8844c679897b3a695b363620589292d783) * Automatic Changelog Update (#1301) (cherry picked from commit 5476ee090bd735d7791b4ae7f1e8aeea674cd55a) * Add Localization for Senior Physician and Senior Engineer (#1302) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds localization for the Senior Engineer and Senior Physician roles that were recently enabled. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> n/a --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 zelezniciar - fix: Fixed Senior Engineer and Physician names not appearing correctly (cherry picked from commit 4bf762411e866952c0257ce7d255b2610d7a3a21) * Automatic Changelog Update (#1302) (cherry picked from commit 9169818f60ef0cf156bb1b095d66e5e9d0b4575b) * Make Cultist Constructs Speak Eldritch (#1303) # Description Fixes cultist constructs only speaking Universal and not being able to understand anyone else due to a missing `LanguageKnowledgeComponent`. ## Changelog 🆑 Skubman - tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and Eldritch. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 8573914e8b6183197abc250d3e8f3c186194b0a6) * Automatic Changelog Update (#1303) (cherry picked from commit 114ecde8384ae3d98350aa80d38b96766dc49cfa) * Fix Lobotomy (#1306) # Description Fixes several bugs in the lobotomy procedure. The lobotomy effect is now stored in the brain instead of the body, so transferring a lobotomized brain will still give the lobotomy effects, and a brain transplant to a body where a lobotomy occurred no longer applies the lobotomy effects. The "Mend brain tissue" procedure to reverse a lobotomy has been unlocked after a bug prevented it from showing in the surgery UI. Lobotomies now add the `ClumsyComponent`, which makes the lobotomized target as clumsy as clowns. ## Technical Details This deletes [SurgeryComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-3786e2be1879fd877a8b501352bbd92baa3a17aecfa4a62827ad41497deb0fd7) which was only used for the lobotomy procedures (incorrectly, it was checking for `OhioAccentComponent` in the body part) in favor of [SurgeryPartComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-7e180742b3a6f00b9f867d3ee4e8891dd00587dc4a2da8ad5e199180a387d18d) and [SurgeryBodyComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-249e5a937ba929ffc76f85e8a43f17918afc9ba866e81f4ea4eba2c90fd0c408). These two components are currently unused as the lobotomy procedures use a new condition component checking for the brain's `OrganComponent.OnAdd` field, but they provide a way to check for components on the body part and on the body, respectively. ## Media **Lobotomy**  **Mend brain tissue**  **Remove organ step picture**  ## Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 Skubman - add: The lobotomy procedure makes the target clumsy like the clown. This makes them bonk when climbing tables and makes guns they're shooting blow up on their face. - tweak: The lobotomy step now requires a scalpel instead of a drill. - fix: Enabled the "Mend brain tissue" surgical procedure on a lobotomized target. - fix: The lobotomized effect is now stored in the brain instead of the body. The same brain stays lobotomized throughout brain transplants, and transferring a normal brain to a body where a lobotomy occurred no longer applies the lobotomized effect. - fix: The lobotomy procedure now shows the proper popup during the lobotomization step. - fix: Removed the ability to perform lobotomies on bodies without a brain. - fix: The "Remove organ" surgery step on the UI now properly shows the retractor sprite instead of the hemostat. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 1895f3addc871e3ad18845c22c61f422f9807107) * Automatic Changelog Update (#1306) (cherry picked from commit 71c641283a13fc79c68f8ad23fa1397052b7e74b) * You Can Now Drag People Into Deep Friers (#1279) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> You can now drag entities like people into deep fryers. Yes, this will cook them. Yes, you can cannibalize your own dead crew. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [ ] Add a doafter - [ ] Add a popup warning everyone of what you've done --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> obs is broken part 295 </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - add: You can now shove people into deep fryers by drag-dropping them onto it. --------- Signed-off-by: Eris <erisfiregamer1@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 82b2b28f3ee0f534b7f32fe54a70ba58d9ebbe1c) * Automatic Changelog Update (#1279) (cherry picked from commit cbc76ef649396a827a6c3b38b83c4a20f1affc7b) * Revert "Emp Flashlight (#5)" This reverts commit |
||
|
Spatison
|
a2557f75a6 | Upstream (#129) | ||
|
VMSolidus
|
d30b987f93 |
Unathi Lore Update (#1008)
# Description This PR updates the Localizations relevant to the Reptilian species by significantly expanding upon them as Unathi, which is how they are typically referred to as in both /tg/station and Baystation12 derived codebases in SS13. I have added a new "Rare" language taken from Aurora, called Azaziba, which can only be taken by Unathi as a bonus language trait. Translators for this new language Azaziba are intentionally not obtainable ingame except as spawned by Admins. This is a "Rare" language, and shouldn't be accessible to players outside of Unathi obtaining the trait. The biggest change in this update however is a massive expansion upon the Unathi Guidebook entry, providing a significant volume of Lore, which is largely taken(with slight modifications) from https://wiki.aurorastation.org/index.php?title=Unathi (Which, I can do this since their wiki has a Creative Commons license). This is probably the best way to get good quality lore for them, other than by writing it myself. <details><summary><h1>Media</h1></summary> <p>     </p> </details> # Changelog 🆑 - add: Localizations for Reptilians that acknowledge them now as Unathi. - add: Azaziba has been added as a new "Rare" language that can only be taken by Unathi. Translators between Azaziba and Tau-Ceti Basic do not exist, please do not make them. - add: SIGNIFICANTLY expanded upon the Guidebook for Unathi by including a large volume of lore taken from the Aurora Station Wiki. |
||
|
VMSolidus
|
34f0316d74 |
Harpy Language! (#968)
# Description This PR adds a new Language specific to the Harpy species, which is composed of syllable charts taken from Polish, Serbian, Greek, and Turkish. It uses Cambria as its font, which is modestly different from the standard font, but still reasonably readable. This also adds a Language menu trait that allows people to buy the language with a trait point. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: Harpies now have their own species-specific language, called Valyrian Standard - add: Valyrian Standard can now be bought as an extra language in the Traits menu. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
||
|
VMSolidus
|
bac1956387 |
Basic Language Menu (#936)
# Description This is a very _early_ take on a Language menu, making use of the new CharacterItemGroups functionality, as well as functionality added to the trait system that allows it to add and remove languages directly. This PR adds in the languages Tau-Cetic Basic(taking the place of Galactic Common), Tradeband, Freespeak, Elyran Standard, and Sol Common(I'm replacing the extremely basic bastardized Sol Common we had before with the fully realized version of it from Bay12). <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: A basic Languages menu has been added into the Traits tab. - add: Tau-Ceti Basic, Tradeband, Freespeak, Elyran Standard, Sol Common, and Sign Language have been added to the Languages tab. |
||
|
Mnemotechnican
|
b15d096a3e |
Minor Language Fixes (#618)
# Description Fixes: - Whisper not undergoing readability obfuscation when out of range - Handheld translators ignoring language knowledge requirements - Several animals not having defined languages - Computers not having languages (this primarily affects the RnD console and in the future the cargo request console which send radio messages) - Some languages lacking brightness and thus being hard to read Also makes language colors from language markers use alpha blending instead of overriding the original color. The change is subtle, kinda hard to make it noticable without defeating the original purpose... <details><summary><h1>Media</h1></summary><p> Example of the new colors  </p></details> --- # Changelog 🆑 - fix: Whisper can no longer be heard clearly outside the intended range. - fix: Translators can no longer be used without knowing the languages they require. - fix: Computers (primarily RnD console) now speak GC by default instead of Universal. - tweak: Readjusted colors of all languages to make them easier to read. |
||
|
Mnemotechnican
|
92dcd724d4 |
Refactor Sign Languages and Language Markers (#575)
# Description This refactors #510 and #553. #553 specifically was reverted and re-implemented from scratch. As a consequence to all of this, the chat system was refactored a bit too, hopefully for the best. Changes: - InGameICChatType, InGameOOCChatType, ChatTransmitRange were all moved to shared and made serializable - Added a method to wrap whisper messages to reduce code duplication in chat system - Both WrapPublicMethod and WrapWhisperMessage call the same generic WrapMessage method, which allows to add speech verbs to whispers and more. That method is also fully responsible for adding language markers and deducing speech verbs now. - Everything related to speech was moved out of LanguagePrototype and into SpeechOverrideInfo. LanguagePrototype now holds an instance of that. - Added AllowRadio, RequireSpeech, ChatTypeOverride, SpeechVerbOverrides, MessageWrapOverrides to SpeechOverrideInfo, all of which are used in implementing the sign language. - Suffered a lot # TODO - [X] Cry - [X] Fix the sign language not displaying properly over the character. - [X] Find a way to circumvent being unable to speak?? <details><summary><h1>Media</h1></summary><p>  See below </p></details> # Changelog No cl no fun --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> |
||
|
FoxxoTrystan
|
61719b756b |
Sign Languages! (#553)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Gives a new way to speak, Sign Languages using the Language system by only adding a nullable variable. Sign Language uses the default Emote system, meaning its will not get picked up by Radio or others devices or get blocked by accents. When a Sign Language is on, "Say/Whisper" will talk in Sign Language, Emote will still act like normal emotes. The Glorious Sign Language has arrived... and there can be more then one! --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 FoxxoTrystan - add: Added the ability to speak with Sign Language. |
||
|
FoxxoTrystan
|
849b33047c |
Languages Markers (#510)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Require #459 Add 3 optional settings for LanguagePrototypes to play with richtext tags to they could be reconized as Makings color - Set a specefic color to the text. fontId - Set a font to the text by using the Id. fontSize - Set the size of the text All 3 are optional if not set message will be handeled like normal. This should be mostly used to know what language your currently speaking and assist with markings. Take note those changes happent only in the TextBox chat, bubblechat is left unchanged. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add Markings - [x] Add Fonts --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 FoxxoTrystan - add: Languages are now marked in the chat! --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: fox <daytimer253@gmail.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> |
||
|
Mnemotechnican
|
9d5f3b65df |
Refactor the Language System (#459)
# Description The language PR was merged early and OH GOD I ALREADY REGRET IT This PR is intended to provide the missing refactors and address the issues that were missed due to the early merge. --- # TODO - [X] Introduced a polymorphic obfuscation property to the LanguagePrototype - now it supports more than just 2 hardcoded methods, and each method can be configured per-language. Currently there are 3 obfuscation methods: replacement (same as replacement accent), obuscation by syllables and obfuscation by phrases. - [X] Refactored the existing obfuscation methods to not be a big hardcoded mess. - [X] Updated the existing languages accordingly: animalistic languages are now less of an unreadable mess and include less syllables. Certain languages like binary and snake seriously benefit from that. - [X] Refactored the existing commands in response to the never-addressed review (it got lost among hundreds of others) - [X] Refactored the commands to be more user-friendly (you can now use the number of the language in saylang and languageselect which can allow using keybinds to switch between languages) - [X] Moved a lot of obfuscation-related stuff from server to shared. The actual obfuscation process, however, is still done on the server. That may or may not be subject to change, too. - [X] Refactored the entire process of resolution of entities' languages. Instead of raising an event every time it's required to learn what languages an entity knows, the lists of ALL languages available to the entity (including via translators) is stored in LanguageSpeakerComponent and only updated when necessary (e.g. when a translator gets toggled). The list of languages the entity knows on its own is now stored in LanguageKnowledgeComponent. - [X] Made handheld translators automatically change your current language when activated. - [X] Rewrote the translator implanter system, now using the real implants and implanters - [ ] Rebalance science stuff (translators are incredibly expensive for what they're worth) - [ ] Uhhh stuff --- <details><summary><h1>Media</h1></summary> <p> N/A for now </p> </details> --- # Changelog 🆑 - tweak: Translator implants are now proper implants that can be removed. - tweak: Animalistic languages should now look less messy. - fix: Hopefully fixed language menu desync and other issues. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> |
||
|
FoxxoTrystan
|
82edb60ac6 |
Languages (#43)
Resolves https://github.com/Simple-Station/Einstein-Engines/issues/37 # Description This PR adds languages. Every entity who can speak now speaks a specific language (or Universal, for entities that are not supposed to speak, which is understood by everyone). Other entities who do not understand this language will see gibberish (it's possible to learn how certain induvidual words are spelled. But the spelling changes between rounds). This means that certain creatures, like xenos, cats, vulps, can communicate within their species in their own languages. Similarly, it means that xenos, cats and other things cannot understand GalacticCommon speakers without a translator or cognization. An entity may be able to speak multiple languages, or understand a language but be unable to speak it. Thi PR was orignally made for Frontier but is now being ported and will be maintain here. Orignal PR: https://github.com/new-frontiers-14/frontier-station-14/pull/671 This PR was made orignally by Mnemotechnician and FoxxoTrystan. --- # TODO - [x] Language System. (Check Frontier PR for all the compleated todo list) - [x] Port PR from Frontier. - [x] QOL Changes. - [x] Missing Default Languages. (Missing default langauges for some roundstart species) - [x] Animals Languages. --- <details><summary><h1>Media</h1></summary> <p>    </p> </details> --- # Changelog 🆑 FoxxoTrystan / Mnemotechnician - add: All species can now bring their own cultures and languages --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: fox <daytimer253@gmail.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Co-authored-by: Lincoln McQueen <lincoln.mcqueen@gmail.com> Co-authored-by: Arkyfloof <Marvinlinke08@gmail.com> Co-authored-by: reese1243 <ber23027@byui.edu> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Eagle-0 <114363363+Eagle-0@users.noreply.github.com> Co-authored-by: BlitzDev <145472107+Reese1243@users.noreply.github.com> Co-authored-by: Arkyfloof <161242062+Arkyfloof@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
