## About The Pull Request
Partially reverts #4614.
Exploitables, background, and security are now separate.
## Why It's Good For The Game
This was never a good change. Exploitables and sec records hold
completely separate purposes. Sec should not see every single
exploitable node you have, basically. Additionally, some people have
stuff in their exploitables and background they cant access right now.
Exposing them again lets people retrieve them.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
<img width="787" height="620" alt="image"
src="https://github.com/user-attachments/assets/b8b464a8-ff4a-40f1-a48f-086c99abb6af"
/>
</details>
## Changelog
🆑
add: Exploitables, background, and security records are now distinct
record fields, instead of being combinced.
/🆑
## About The Pull Request
- Fixes the privacy policy still showing up after accepted.
- Makes it so closing out of the window kicks you.
- Converts the whole thing from preference based to SQL based.
## Why It's Good For The Game
Fixes and polish for a previously accepted PR are good for the game,
yes.
## Proof Of Testing
I can't take a screenshot of a privacy policy that didn't show up the
second time around after I accepted it, but it properly filled out the
database and worked during testing.
## Changelog
🆑
add: Closing out of the Privacy Policy window instead of accepting it
now kicks you.
fix: Fixed the Privacy Policy window showing up after you've already
accepted it once, for real this time.
/🆑
## About The Pull Request
Does as the title suggests, I also put the files into proper folders
while I was in there per where they would be on base /tg/ based on where
they were in the Effigy PRs. This is a port of all three of these PRs:
https://github.com/effigy-se/effigy/pulls?q=is%3Apr+is%3Amerged+blooper
## Why It's Good For The Game
This lets us change vocal barks easier, as well as letting us have more
control over how easily and quickly we can remove and add specific ones
if necessary.
## Proof Of Testing
It compiled and ran without any runtimes. I would still highly recommend
test merging this for a few weeks to get everything transferred over.
## Changelog
🆑 xPokee, LT3, TealSeer
refactor: Refactored vocal bloopers to be a config based subsystem.
config: Added all the previous vocal bloopers to the new config, as well
as some new ones, look for them!
/🆑
---------
Co-authored-by: gavla <96078776+shayoki@users.noreply.github.com>
<!-- 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
See the title. Also fixes:
https://github.com/Bubberstation/Bubberstation/issues/5297
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Fixes good
<!-- 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. -->
## Proof Of Testing
It didn't pop up when I joined the game locally.
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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. -->
🆑
fix: The privacy policy no longer pops up after you've already accepted
it once.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
## About The Pull Request
Adds a Privacy Policy popup, informing players that we use their data
for CentralHub (ERP CentCom and eventually Statbus).
## Why It's Good For The Game
I don't really want to get slapped with legal.
## Proof Of Testing
See the image below.
<details>
<summary>Screenshots/Videos</summary>
<img width="1011" height="922" alt="image"
src="https://github.com/user-attachments/assets/7c3a3420-815b-45e0-96f9-2d9778b6c7c3"
/>
</details>
## Changelog
🆑
server: Added a Privacy Policy, be sure to read it.
/🆑
## About The Pull Request
Makes you able to see one extra tile to the left/right, making it feel
as if you have a wider screen. But you can also keep the original 19x15
if you want.
## Why It's Good For The Game
I feel like it looks better? Less square? Mode modern and widescreen?
idk. I feel like people will generally like this.
If you think it doesn't look better? stick with 19x15, the choice is
yours.
<details>
<summary>Before</summary>
<img width="1258" height="989" alt="afbeelding"
src="https://github.com/user-attachments/assets/3a7b259c-bd22-4fbd-94f5-6257d2c13772"
/>
</details>
<details>
<summary>After</summary>
<img width="1384" height="989" alt="afbeelding"
src="https://github.com/user-attachments/assets/bdebd573-4920-4cc1-b7be-9d99ef961062"
/>
</details>
## Proof Of Testing
With chatbar because someone told me they were worried the chatbox would
be too small with the change
<details>
<summary>After with chatbar</summary>
<img width="1920" height="1080" alt="afbeelding"
src="https://github.com/user-attachments/assets/55ca42ae-391d-4d38-9069-730669f53c9a"
/>
</details>
<details>
<summary>Before with chatbar</summary>
<img width="1919" height="1030" alt="afbeelding"
src="https://github.com/user-attachments/assets/34b443ea-ffaa-49b7-97d4-baef56f67f01"
/>
</details>
## Changelog
🆑
add: There's a new widescreen dropdown within game preferences, letting
you pick between 15x15 (4x3), 19x15 (widescreen), and 21x15 (ultrawide)
/🆑
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
## About The Pull Request
First PR. All I know is that it works.
Anyway, this PR ports customisable (barefoot) footstep sounds from Nova
Sector. It incorporates the update PRs to the best of my very limited
ability thanks to Artur.
Various high heel footwear items are also updated with the additional
footstep noises for the hell of it, going from 2 possible sounds to 4,
reducing the looping effect.
_Footstep options include:_
- Default
- Shoes (shoe SFX while barefoot)
- Highheels
- Claws (Ian/similar mob SFX)
- Hooves (New SFX added by PR)
Files are distributed a little haphazardly. Some in the modular Zubbers
folder, some in the old skyrat modular folder. I am lazy.
Original PRs code was taken from (credit to https://github.com/Neocloudy
for the first PR on Nova):
1. [https://github.com/NovaSector/NovaSector/pull/3404](url)
2. [https://github.com/NovaSector/NovaSector/pull/4475](url)
3. [https://github.com/NovaSector/NovaSector/pull/6035](url)
## Why It's Good For The Game
I forgor to fill this out. Uhm. Customisation good I guess. Also stops
SLAPPY SLAP HUMAN FLESH FEET NOISES despite being a robot etc.
## Proof Of Testing
https://github.com/user-attachments/assets/aa1227fa-aea5-43f4-87a8-d52f65c752ce
video WAS longer but had to cut significantly
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
add: Ability to customise barefoot footstep sounds in character
preference menu.
/🆑
---------
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
## About The Pull Request
Technically, this is also a bugfix for the removed portion of the evil
quirk.
This is a blood colour quirk which aims to create an entirely new
blood_type datum per color-modified base type, and acts as a launching
pad into developing more blood stuff.
As an additional note: In our testing injected blood wouldn't override
the recipient's blood colour. However if this does happen at all in
live, do state such!
## Why It's Good For The Game
Blood colour good? Near-fully custom blood color better?
## Proof Of Testing
oh hey it works now. The three lizards in the video use red blood,
cyan/vox blood, and white/nanite blood respectively.
https://github.com/user-attachments/assets/cec6465f-68de-4c6f-97f4-58061f4f7241
Not rigorously tested, but my process was to only dev the lizard type
then copy to everything else... so it should be fine? Just to show it
should work on blood types with existing compatible_type fields though -
as in, it actually copies the list:
<img width="491" height="260" alt="Screenshot_92"
src="https://github.com/user-attachments/assets/9c257d44-1233-4276-9d88-599e124b2838"
/>
## What We Learnt
Trust our gut. We shouldve replaced it ages ago but thought original
refactorer knew better
## Changelog
🆑
add: blood colour quirk. it's mechanically near-identical to the normal
type.
code: more blood colour presets. yum.
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
## About The Pull Request
https://github.com/tgstation/tgstation/pull/92779 refactored some code
so you check `covered_slots` on the mob to determine whether body parts
are obscured by clothing, updates some of our modular code to reflect
this
## Why It's Good For The Game
I know this for sure fixes#4780, there's a few other issues that sound
related to this bug but I couldn't reproduce them so I can't determine
whether this fixes it
## Proof Of Testing
Tested it with the hoodie, ears came back after lowering the hood
</details>
## Changelog
🆑
fix: fixed some bugs related to clothes hiding body parts
/🆑
## About The Pull Request
Adds three new small input fields in the Character Lore section.
these are short flavor text for low, medium, and high arousal.
they will show up when being examined while mechnically aroused and both
the examiner and examined have ERP interactions turned on in their
prefs.
Leaving the fields blank also stops any flavor text from showing up for
that arousal level
From what I can tell the implemented feature works fine.
Minor issue remains in that the fields to enter these flavor texts are
ordered a bit weird. If anyone who knows how fix that, please tell me.
## Why It's Good For The Game
Currently, mechanical arousal has either no impact or is annoying and
distracting.
This change hopes to make mechanical arousal actually add to the
roleplay rather than distracting from it.
This should hopefully also make the arousal system actually usable for
other features.
## Proof Of Testing
From what I can tell the implemented feature works fine.
<details>
<summary>Screenshots/Videos</summary>
<img width="991" height="239" alt="image"
src="https://github.com/user-attachments/assets/1bc50e31-7d7b-463d-ba24-491498f2fba0"
/>
<img width="358" height="146" alt="image"
src="https://github.com/user-attachments/assets/ffcabb66-b6d8-4bd3-85b9-d61acd74545a"
/>
<img width="356" height="145" alt="image"
src="https://github.com/user-attachments/assets/a3057d96-6a47-498f-84a3-f4374419f102"
/>
<img width="417" height="145" alt="image"
src="https://github.com/user-attachments/assets/0fcf03d2-b386-4304-b811-05feffabc8c5"
/>
</details>
## Changelog
🆑
add: Added the ability to set short Flavor Text for three levels of
mechanical arousal.
/🆑
## About The Pull Request
Ports https://github.com/NovaSector/NovaSector/pull/5923 which was a
port of https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/pull/9 the new
menu can be accessed via a toggle in the admin preferences in game
options. To see what it looks like, see the attached video in Proof of
Testing
It also adds a new verb, `Toggle-Admin-TGUI` which can be found in the
debug tab and will toggle ***EVERYONE'S*** UI preference to old TGUI it
also reverts the player panel to the old one in case you have the
preference enabled and are unable to access the preferences menu.
## Why It's Good For The Game
It makes things easier on the staff members to find buttons, plus it is
100% optional.
## Proof Of Testing
See the video below.
<details>
<summary>Screenshots/Videos</summary>
https://github.com/user-attachments/assets/4098bc35-95e1-4ae5-91dd-27cb2564c350
</details>
## Changelog
🆑
admin: Ported a new, toggleable, player panel from NovaSector/SPLURT
admin: Adds a new verb in the debug panel: Toggle Admin TGUI
/🆑
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
## About The Pull Request
This PR does four things:
- Shortens and simplifies the medical records template, making it more
accessible
- Expands Security records flavor into a personnel file that includes
exploitables and your character's background, so that you can have
Security records without having a criminal history
- Creates defaults for medical records, general records, and Security
records in the character creator, rather than just the wiki.
- Removes exploitables and background records as they've now been
integrated into Security records.
## Why It's Good For The Game
This PR should make records more accessible for individual players by
reducing the amount of work involved, as well as expanding Security
records to be more useful.
## Proof Of Testing
<img width="656" height="494" alt="image"
src="https://github.com/user-attachments/assets/2b5455b2-0e73-4e0a-b9c8-fd278db85040"
/>
## Changelog
🆑 ReturnToZender (code)
add: All records now have enhanced defaults when making a new character
add: Security records have been expanded into personnel records,
containing more information on your character
del: Exploitables and Background records have been merged into the
definition of Security records, which are now Personnel Records.
/🆑
## About The Pull Request
Add a new volume pref in game options that controls how loud emotes that
have sound effects are.
Note: This PR was made to fulfill a bounty by @NanoCats
## Why It's Good For The Game
Quality of life improvement, we have many emotes that play sounds here
and not everyone wants to hear them. Also there's that one scream that's
insanely fucking loud
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
Note: the emote cooldown was disabled in this video for demonstration
purposes
https://github.com/user-attachments/assets/1e465ad1-6be9-4113-a564-72ace0c78118
</details>
## Changelog
🆑
qol: added a volume slider for emote sounds to game options
/🆑
## About The Pull Request
Upstream now has a system for this, removes all our override code and
changes the relevant quirks to use the upstream system instead
## Why It's Good For The Game
Fixes#3732
## Proof Of Testing
Tested it on a local with sol weakness, masquerade, and hydrophillic,
the latter wasn't selectable unless you were a slime, the former two
weren't selectable unless you were a hemophage. Sol weakness was still
removed as normal if you turned into a bloodsucker
## Changelog
🆑
fix: fixed species-locked quirks not actually working
/🆑
## About The Pull Request
- Consolidate all the code into one file in `modular_zubbers`
- Fix some edge cases with species not displaying right on NPC mobs
- Stop preventing GC on mobs by adding Destroy handling
## Why It's Good For The Game
Less hard dels and cleaner code
## Proof Of Testing
I didddd but I can't catch all edge cases but also it should function
exactly as before
## Changelog
Shouldn't have any visible changes to players
## About The Pull Request
Fix screen color not cleaning up and add erroring on invalid usage, this
includes the echolocation quirk, NV helmet, frenzy.
https://github.com/tgstation/tgstation/pull/89843 refactored the procs
and we didn't update our usage of it
## Why It's Good For The Game
Bug fixes
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
:blushes: umm
</details>
## Changelog
🆑
fix: Fixes NV helmets, frenzy, echolocation quirk leaving screen colors
permanently on
/🆑
## About The Pull Request
Fixes https://github.com/Bubberstation/Bubberstation/issues/2879
The reason for the issue seems rooted in skyrat's own port of the
original json configs on tg (or perhaps the loads of changes they've
made to it over the years). This pr patches it so that characters won't
reset between rounds.
original fixes by smartkar
## Why It's Good For The Game
Guess
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
</details>
It saves the character on creation and works fine after re-accessing the
savefile
## Changelog
🆑
fixes: fixes the issue where characters would reset after a round or on
switching character slots
/🆑
## About The Pull Request
Forgot to check if I could make it modular before making pull request,
it can be. Updating a previous PR to be modular where it makes sense.
Some files are left as commented edits where it makes more sense to do
so.
## Why It's Good For The Game
Better follows contribution guidelines.
## Proof Of Testing
Functions the same way/no changes in how it runs, just how code is
structured.
## About The Pull Request
Fixes issues with sol weakness quirk not giving you cheaper healing in a
coffin and the quirk whitelist being buggy when changing characters and
restarts.
Also makes the sol quirk disable healing when sol is active to save on
blood, useful if you're hiding in a closet instead of a coffin.
## Why It's Good For The Game
Fixing bugs with old features is a good thing
## Proof Of Testing
Went ingame, made sure that the blood cost was correct and that quirks
worked properly
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
fix: Quirks with whitelists should no longer randomly dissapear
fix: Sol weakness quirk should actually make your healing cheaper if
you're in a coffin
add: Sol weakness quirk will prevent hempohage healing working while Sol
is active
/🆑
## About The Pull Request
Makes some pref code correctly use apply_to_human and dna. This means
that if you switch mind around the prefs stay the same... I wonder why
I'm adding that
Removes deprecated headshot var from preferences. This used to be the
universal one on skyrat but since we have one for humans one for
silicons it was never really used in any place that couldn't be replaced
by dna on here.
## Why It's Good For The Game
Makes the code more consistent. And more ready for certain *fun*
activities
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
code: Makes headshot and nsfw preference code handling more consistent
with the rest. Savefiles are untouched by this
/🆑
## About The Pull Request
Tears these two out, they weren't doing much
## Why It's Good For The Game
I like to make as many .dme edits as possible
## Proof Of Testing
if it compiles that probably means it worked
## Changelog
I'm not gonna cl this because it's not player facing.
## About The Pull Request
Title. This WILL break shit. Probably. Help me sweet Jesus.
## Why It's Good For The Game
House of Leaves is less confusing than our file structure.
## Proof Of Testing
## Changelog
🆑
fix: MASSIVE File Structure clean-up.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
<!-- 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
This PR adds Transmasc and Transfem to the list of available genders in
the Character Directory list, because sometimes you need to know the
body 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! -->
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Enhances the ERP experience by differentiating between types of trans
<!-- 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. -->
## Proof Of Testing
It do compile
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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 it's 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. -->
🆑 ReturnToZender
balance: Releases two new genders, Transmasc and Transfem, for use in
the Character Directory.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
<!-- 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
You know how bloodsuckers are weak to Sol? Now you can be too! Only as a
hemophage.
Features included: The very same warnings and UI that bloodsuckers get
to know when they are in danger!
This quirk also makes healing in a coffin cost only half blood, neat
huh?
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
People wanted to suffer, and why am I to deny them pain?
<!-- 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. -->
## Proof Of Testing
HUD/ burning / healing works fine
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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 it's 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. -->
🆑
add: Adds the hemophage-only quirk, Sol weakness
code: Refactors the sol subsystem so that itself decides if it should
run or not based on if anyone is using it.
code: Refactors bloodsucker UI elements so that they can function fine
outside a bloodsucker antag datum
code: bloodsucker_blood_volume, humanity_lost, bloodsucker_level and
bloodsucker_level_unspent are now private variables due to them being
used for UI updates, if you need to change them, use the procs that are
written in the autodoc
code: Quirk species whitelists no longer use bitflags, but use the
species ID's. Easily allowing you to add new whitelists without having
to mess around with making a new bitfield
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
<!-- 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! -->
I honestly forgot what I changed, but thankfully Visual Studio Code
tells me what I changed.
This PR makes it so that autopunctuation properly checks the pref again.
Additionally, all Advert preferences have been moved to a new game
preferences category: ADVERT.
Second to last, the Character Directory will now show on the Title
Screen under the Crew Manifest.
Finally, The character directory's sort function has been repaired, and
it has received two extra buttons:
One, a search bar, which allows you to search characters by name.
Two, a randomizer, which selects a random player's flavor text and opens
it for you. Feeling lucky?
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
This makes the Character Directory more intuitive and accessible, while
also adding some new, fun stuff to work with.
<!-- 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. -->
## Proof Of Testing
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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 it's 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. -->
🆑 ReturnToZender (code)
fix: Character Directory sorting now works on all variables.
fix: autopunctuation respects prefs again
qol: Advert settings have been moved to a new category, ADVERT.
add: Character directory now has a search function on the name var.
add: Character directory now shows on the Main Menu under the Crew
Manifest.
add: Character directory now has a randomizer, which will open a random
player's flavor text when clicked. Click if you dare.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
<!-- 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
This PR adds NSFW flavor text, and adds it to the examine panel. It also
adds preferences for when NSFW flavor text shows and doesn't show on a
per character basis: Always On, Nude Only, and Never.
The flavor text is in a dropdown, so people can't be flashbanged by borg
cock. It even has a silicon flavor text variant!
PR is tested and ready for testmerge.
Also akes it so the minimum flavor text check applies to silicons!
Pictured: 300 characters of regular flavor text, but no silicon flavor
text
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
ERP rule 4 is no longer necessary after this, reducing rules bloat.
Additionally, this will increase the roleplay standard by separating
NSFW and regular flavor texts. Gone are the days of 4 paragraphs of ERP
text making up for your lack of writing skill.
And finally, this will make it so you are no longer flashbanged with
NSFW details once and for all. Simply do not click the reveal button,
and all will be hidden to you.
Additionally, Silicons are required to have 300 characters of flavor
text, but not of the type that actually relates to their job. This gives
silicons similar roleplay standards to everyone else.
<!-- 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 it's 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. -->
🆑 ReturnToZender, LT3, Waterpig
add: NSFW flavor text (for players and silicons)
add: New examine panel with slightly bigger font, easier to read, also
integrates most of the new preferences
add: Flavor text requirements now respect silicon flavor text, thanks to
@lessthnthree
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
commit d537e88ba23629870d4c1425f6c74193419e0531
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Fri Dec 22 22:08:18 2023 -0700
Update sol_defense.dm
commit a6f98b9260baaedbf83ed1f1d2c0606bdaea5d0c
Merge: 9aceef22008 ea5eef9e70
Author: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Fri Dec 22 21:52:56 2023 -0700
Merge branch 'master' into upstream-12/19/2023
commit 9aceef22008bcb20d4adb188c535fe8df1a105e1
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 23:30:07 2023 -0700
^ This is a combination of 14 commits.
^ This is the 1st commit message:
Upstream merge edits
removes nulls
JSX memes
Update FishingBubbers.tsx
repathing on maps
Update tgstation.dme
prettier + GOBLIN gas canister color
Update secmed_closet.dmi
I fixed shadekin, your welcome
I fixed this too
waddle failed my CI :(
Reduces the frequency of miasma notifications/coughing. (#872)
Automatic changelog for PR #872 [ci skip]
Rebalances Sol-Fed Guns (#831)
<!-- 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. -->
This rebalances Sol-Fed weapons to be more distinct from each other, as
well as more balanced in terms of damage and wounding.
Update: Now has basic Sol-Fed sidearms behind weapons permit.
This also makes each of the Sol-Fed weapons distinct from each other in
purpose, rather than all of them being all-around.
All weapons have been tested by hand!
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
This prevents antagonists from being shut down in 5 seconds (hyperbole)
like before, and allows for longer engagements and more opportunities to
escape. Which is always better.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender, The Sharkening
add: Department ordered SolFed guns
add: Sol-Fed Firearms now require a weapons permit to order
fix: Adjusted Sol weapon balance to be more fair
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Automatic changelog for PR #831 [ci skip]
This thing is still busted
More shadekin memes
Update human.dm
Update human.dm
I fixed the changelog
more changeling
oh
I inch closer to removing shadekin
please..
Ok Kilo
Stuff
I wasted 4 fucking hours over this one line
sure
god dammit
Reverts icon cutting (for now)
[MIRROR] Fixes input boxes [No gbp] [MDB IGNORE] (#25761)
* Fixes input boxes [No gbp] (#80490)
One of the quirks of react is that we're no longer using onChange the
same as Inferno - React's version is a synthetic event. I made the
mistake of thinking it would be okay. Many interfaces are using onChange
events to send messages to byond (very laggy), others are using it to
close the input (closes each keypress).
So this was the alternative- I hope to replicate the behavior via onBlur
&& onEnter. I went through to undo most of the onInput -> onChange
replacements of #80340 where it made sense. Other inputs which should
safely use onChange (DEFINITELY to send messages) remain as such.
Example of an input which used onChange now working with this PR:
Bug fixes
Fixes#80486🆑
fix: Name input in character setup should work properly now.
fix: Many inputs should feel more responsive.
/🆑
* Fixes input boxes [No gbp]
---------
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
[MIRROR] Fixes dropdowns not rendering the selection's displayText post-selection [MDB IGNORE] (#25755)
* Fixes dropdowns not rendering the selection's displayText post-selection (#80464)
What it says on the tin. Dropdowns were displaying the `selection`
instead of `displayText` after clicking an option.
Note: this bug was only _noticeably_ affecting dropdowns whose
`selection` differed from `displayText`. In the below example, the
dropdown uses numeric indices for `selection` and a string for
`displayText`. In those cases the `displayText` should take precedence,
not the other way around.
<details><summary>From this</summary>
</details>
<details><summary>To this</summary>
</details>
Fixes a minor bug
🆑
fix: fixes some dropdowns not displaying the right text after selecting
something
/🆑
* Fixes dropdowns not rendering the selection's displayText post-selection
---------
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
[MIRROR] Fixes some missed tgui files that needed prettier run on them [MDB IGNORE] (#25756)
* Fixes some missed tgui files that needed prettier run on them (#80466)
that's it.
Nothing player facing
* Fixes some missed tgui files that needed prettier run on them
---------
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
I wasted 4 fucking hours over this one line
sure
god dammit
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
^ This is the commit message #2:
removes nulls
^ This is the commit message #3:
JSX memes
^ This is the commit message #4:
Update FishingBubbers.tsx
^ This is the commit message #5:
repathing on maps
^ This is the commit message #6:
Update tgstation.dme
^ This is the commit message #7:
prettier + GOBLIN gas canister color
^ This is the commit message #8:
Update secmed_closet.dmi
^ This is the commit message #9:
I fixed shadekin, your welcome
^ This is the commit message #10:
I fixed this too
^ This is the commit message #11:
waddle failed my CI :(
^ This is the commit message #12:
Reduces the frequency of miasma notifications/coughing. (#872)
^ This is the commit message #13:
Automatic changelog for PR #872 [ci skip]
^ This is the commit message #14:
Rebalances Sol-Fed Guns (#831)
<!-- 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. -->
This rebalances Sol-Fed weapons to be more distinct from each other, as
well as more balanced in terms of damage and wounding.
Update: Now has basic Sol-Fed sidearms behind weapons permit.
This also makes each of the Sol-Fed weapons distinct from each other in
purpose, rather than all of them being all-around.
All weapons have been tested by hand!
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
This prevents antagonists from being shut down in 5 seconds (hyperbole)
like before, and allows for longer engagements and more opportunities to
escape. Which is always better.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender, The Sharkening
add: Department ordered SolFed guns
add: Sol-Fed Firearms now require a weapons permit to order
fix: Adjusted Sol weapon balance to be more fair
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Automatic changelog for PR #831 [ci skip]
This thing is still busted
More shadekin memes
Update human.dm
Update human.dm
I fixed the changelog
more changeling
oh
I inch closer to removing shadekin
please..
Ok Kilo
Stuff
I wasted 4 fucking hours over this one line
sure
god dammit
Reverts icon cutting (for now)
[MIRROR] Fixes input boxes [No gbp] [MDB IGNORE] (#25761)
* Fixes input boxes [No gbp] (#80490)
One of the quirks of react is that we're no longer using onChange the
same as Inferno - React's version is a synthetic event. I made the
mistake of thinking it would be okay. Many interfaces are using onChange
events to send messages to byond (very laggy), others are using it to
close the input (closes each keypress).
So this was the alternative- I hope to replicate the behavior via onBlur
&& onEnter. I went through to undo most of the onInput -> onChange
replacements of #80340 where it made sense. Other inputs which should
safely use onChange (DEFINITELY to send messages) remain as such.
Example of an input which used onChange now working with this PR:
Bug fixes
Fixes#80486🆑
fix: Name input in character setup should work properly now.
fix: Many inputs should feel more responsive.
/🆑
* Fixes input boxes [No gbp]
---------
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
[MIRROR] Fixes dropdowns not rendering the selection's displayText post-selection [MDB IGNORE] (#25755)
* Fixes dropdowns not rendering the selection's displayText post-selection (#80464)
What it says on the tin. Dropdowns were displaying the `selection`
instead of `displayText` after clicking an option.
Note: this bug was only _noticeably_ affecting dropdowns whose
`selection` differed from `displayText`. In the below example, the
dropdown uses numeric indices for `selection` and a string for
`displayText`. In those cases the `displayText` should take precedence,
not the other way around.
<details><summary>From this</summary>
</details>
<details><summary>To this</summary>
</details>
Fixes a minor bug
🆑
fix: fixes some dropdowns not displaying the right text after selecting
something
/🆑
* Fixes dropdowns not rendering the selection's displayText post-selection
---------
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
[MIRROR] Fixes some missed tgui files that needed prettier run on them [MDB IGNORE] (#25756)
* Fixes some missed tgui files that needed prettier run on them (#80466)
that's it.
Nothing player facing
* Fixes some missed tgui files that needed prettier run on them
---------
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
I wasted 4 fucking hours over this one line
sure
god dammit
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
Revert "Fixes false walls icons using the wrong icon files (#80175)"
This reverts commit 4dce402e72.
Revert "Reverts icon cutting (for now)"
This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758.
lets gooo
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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. -->
The PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Less runtimes in the runtime menu. God there's so many.
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Oops! Broke Job Estimation! (#877)
<!-- 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. -->
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
Job estimation my beloved
<!-- 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. -->
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Automatic changelog for PR #878 [ci skip]
Automatic changelog for PR #877 [ci skip]
wee
commit ea5eef9e70
Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri Dec 22 05:51:27 2023 +0100
Automatic changelog for PR #877 [ci skip]
commit 1f2f7ecad1
Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri Dec 22 05:51:07 2023 +0100
Automatic changelog for PR #878 [ci skip]
commit ea7f9a92c3
Author: ReturnToZender <donwest947@gmail.com>
Date: Thu Dec 21 22:43:24 2023 -0600
Oops! Broke Job Estimation! (#877)
<!-- 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
I accidentally removed an ! in the job estimation menu, meaning only
people who switched it on actually showed on the menu.
Of course, people didn't know this, and didn't turn off their
preference. This fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Job estimation my beloved
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: job estimation actually works again
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
commit 756f2af7c7
Author: ReturnToZender <donwest947@gmail.com>
Date: Thu Dec 21 22:43:03 2023 -0600
Fixes Obscurity examine prefs runtiming on punpun (#878)
<!-- 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 PR that added this forgot to include a ?, so mobs without a client
return null, and runtime, sometimes hundreds of time in a shift.
This PR fixes that.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Less runtimes in the runtime menu. God there's so many.
<!-- 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 it's 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. -->
🆑 ReturnToZender
fix: Runtime on obscurity examine prefs when the mob in question lacks a
client
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
commit 4189c63872
Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Thu Dec 21 03:51:11 2023 +0100
Automatic changelog for PR #831 [ci skip]
commit 739b286578
Author: ReturnToZender <donwest947@gmail.com>
Date: Wed Dec 20 20:50:02 2023 -0600
Rebalances Sol-Fed Guns (#831)
<!-- 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
This rebalances Sol-Fed weapons to be more distinct from each other, as
well as more balanced in terms of damage and wounding.
Update: Now has basic Sol-Fed sidearms behind weapons permit.
This also makes each of the Sol-Fed weapons distinct from each other in
purpose, rather than all of them being all-around.
All weapons have been tested by hand!
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
This prevents antagonists from being shut down in 5 seconds (hyperbole)
like before, and allows for longer engagements and more opportunities to
escape. Which is always better.
<!-- 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 it's 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. -->
🆑 ReturnToZender, The Sharkening
add: Department ordered SolFed guns
add: Sol-Fed Firearms now require a weapons permit to order
fix: Adjusted Sol weapon balance to be more fair
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
commit 250f472b8a
Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Wed Dec 20 18:11:22 2023 +0100
Automatic changelog for PR #872 [ci skip]
commit 8d86f7e276
Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Date: Wed Dec 20 09:10:54 2023 -0800
Reduces the frequency of miasma notifications/coughing. (#872)
commit 4d98032937bc448bc29a0d4ce69b4138f89efaa2
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 22:51:56 2023 -0700
Revert "jsx renames (hopefully shit works)"
This reverts commit 4d766404667227ea6efd00be7b7773345009bd55.
commit 4d766404667227ea6efd00be7b7773345009bd55
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 21:14:39 2023 -0700
jsx renames (hopefully shit works)
commit 308bd0af73fc1e1609cd73fc08fb74d47529ec01
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 20:38:12 2023 -0700
i hate tgui
commit deaf6b7a285bfbe7c687028c56bf22d8c38f651f
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 19:15:30 2023 -0700
Revert "Merge branch 'upstream-12/19/2023' of https://github.com/StrangeWeirdKitten/Bubberstation into upstream-12/19/2023"
This reverts commit 49d8e940ebc5df43b5b6bf0770185fcbaa682b87, reversing
changes made to 4bc68a4cb7d02eb74d03a430de934bddb229bcfb.
commit 49d8e940ebc5df43b5b6bf0770185fcbaa682b87
Merge: 4bc68a4cb7d 515d34fa683
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 19:09:48 2023 -0700
Merge branch 'upstream-12/19/2023' of https://github.com/StrangeWeirdKitten/Bubberstation into upstream-12/19/2023
commit 4bc68a4cb7d02eb74d03a430de934bddb229bcfb
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 19:09:37 2023 -0700
Revert "tgui memes"
This reverts commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505.
commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 18:34:12 2023 -0700
tgui memes
Update FishingBubbers.tsx
Revert "tgui memes"
This reverts commit 26907a086b59455a9ac347da4c268cf9c7f529f8.
memes tgui fuck shit
commit 515d34fa68333dc3d86f69f56c6897b2c70378b4
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 18:51:22 2023 -0700
memes tgui fuck shit
commit 44f8f3cea56ad024f85c986837f64661200d80a3
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 18:42:22 2023 -0700
Revert "tgui memes"
This reverts commit 26907a086b59455a9ac347da4c268cf9c7f529f8.
commit 26907a086b59455a9ac347da4c268cf9c7f529f8
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 18:34:12 2023 -0700
tgui memes
Update FishingBubbers.tsx
commit a32a682f40d9aa5e01dd277c125a2a7c8ef63612
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 18:10:13 2023 -0700
security medic was murdered
commit 27c369d73da847091b81aaf8b7dbef723cebcacd
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 17:29:54 2023 -0700
Removes more synth stuff + rewords defines for borgs
commit 154c07704e740a122a13e2b89c8d9bc202b6bff9
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 17:12:44 2023 -0700
Canister + loot removal + synth recharging code removal
commit b17764f46c58ceb9818834d426d595e435a19d08
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 17:03:11 2023 -0700
map fixes for lockers
commit d9c129425dc4df90ba938f172474a0b8b1241ecb
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 16:56:44 2023 -0700
Some fixes
commit 28a4a6f6e16c2dfe275d5cfdfc21f774d699f35d
Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue Dec 19 09:25:32 2023 -0700
missed comma
<!-- 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
Source Inspiration:
(https://github.com/DaedalusDock/daedalusdock/pull/377)
This pull request will add estimates of jobs to the statpanel before the
game, meaning you can see what jobs are filled before the game.
<img width="127" alt="image"
src="https://github.com/Bubberstation/Bubberstation/assets/110273561/8cf34509-7b3e-49e3-aa2a-8dd4f67217a3">
To-do:
Actually make the code appear on the statpanel: Done!
Make it read character names as opposed to ckeys: Done!
This PR is fully tested and ready to merge!
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
This will help people understand, before the round, what jobs are filled
and what aren't, so they can adjust their choices as needed.
This should help people ready up more often.
<!-- 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 it's 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. -->
🆑 ReturnToZender, Waterpig, Shadow-Quill
add: Job estimation statpanel from Daedalus Dock
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
<!-- 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
Source Inspiration: https://github.com/ARF-SS13/coyote-bayou/pull/3415
Adds the character directory from like, three different codebases, to
Bubberstation!
Pr is tested and ready for merging!
Big thanks to @lessthnthree for helping me debug the TGUI, a lot. This
PR wouldn't have been possible without the assistance.
<!-- 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 make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Helps people find other people to roleplay with! ...And get sloppy with.
<!-- 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 it's 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. -->
🆑 ReturnToZender, LT3, Waterpig, Nevimer
add: Character directory from SPLURT, originally, I think?
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
shayoki