Commit Graph
52 Commits
Author SHA1 Message Date
+37 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00
RoxyandGitHub 5a721d165a Fix ready button (#5124)
## About The Pull Request

Fix the ready button

## Why It's Good For The Game

The people want to be ready

## Proof Of Testing

Trust me

## Changelog

🆑
fix: fixed ready button on title screen
/🆑
2026-01-13 20:29:13 -05:00
Soot-IXandGitHub f1ea0f27e3 Naked Spawn No More (#4938)
## About The Pull Request

Fixes #2023 
Readying up when the game is in the START: SOON phase can spawn you
naked in the interlink with nothing.
This PR blocks the player from being able to join when it says START:
SOON as this can cause many code issues down the line.
They will either have to ready up before START: SOON or late-join,
otherwise they are stuck respawning anyways or ahelp and will explain
below why.

When players clicked "ready up" just as the game entered the
GAME_STATE_SETTING_UP state, they would be marked as ready but not
properly initialized with their equipment.

This happens because:

The HUD button for ready-up correctly disables when the round starts,
However, the Topic handler in the Skyrat title screen module
(/mob/dead/new_player/Topic with the toggle_ready href) didn't check the
game state.
This allowed a race condition where a player's click could pass through
the handler after the round had already begun setting up, the player
would then get marked as ready but not go through the proper
equip_characters() procedure, spawning them naked on the interlink

I have tested this, if you try to ready up when it says round starting
soon, you will remain in the lobby, thus preventing this bug from being
able to happen.

## Why It's Good For The Game

This bug is still in the game and kind of annoying when you spawn with
absolutely nothing on interlink, you can't open any doors and are stuck.
This makes the player confused, forces them to ahelp or get answers if
they are stuck, and inevitably respawn to fix the problem. This check
will circumvent that entirely, also encourages people to ready-up early
or latejoin.

## Proof Of Testing

Tested the PR on my server. I readied up as soon as I saw it say
Starting Round: SOON cause that's how I had gotten this bug reproduced
on live before. Now it blocked me from joining the round, just leaving
me at the lobby screen even though the job slot was open.

## Changelog

🆑 Soot-IX

fix: Joining during Round: SOON would cause player to spawn with nothing
at all. Now prevents player from readying up during this phase to stop
this bug.

/🆑
2025-11-23 10:27:06 -08:00
LT3andGitHub af01b10d08 Fixes map specific title screens (#4549)
## About The Pull Request

Fixes loading map specific title screens, which was omitted for some
reason when the HTML title screen was created.

## Changelog

🆑 LT3
server: Title screens can now be assigned to a specific map
/🆑
2025-08-28 21:10:22 -07:00
Roxy 4dddfe90af Change title screen config to match live server
Apparently the live server (only one of the two) secretly had a fix for the transparency thing already in the config but never committed to git, so changes the values to match those
2025-06-17 00:12:48 -04:00
RoxyandGitHub bdc3bf9302 Fix title screen buttons being semi transparent (#4062)
## About The Pull Request

`.menu_button` was being affected by the `.container_nav` opacity
property because the former is contained in the latter, changes the
styling to stop using the opacity property and shift the opacity change
to `container_nav`'s `background` property for the same effect. Also
deletes the unused skyrat titlescreen config file

## Why It's Good For The Game

Fixes #3235 

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/5b6a0099-27e8-4bac-88aa-30050a35dca5)

</details>

## Changelog
🆑
fix: fixed title screen stylesheet making the menu buttons semi
transparent
/🆑
2025-06-17 00:01:43 -04:00
RoxyandGitHub dd312cbc51 Change vetted deadline to June 16 2025 (#4006)
## About The Pull Request

The timetable has been accelerated

## Why It's Good For The Game

Yes

## Proof Of Testing

Yes

## Changelog
🆑 Bubberstation Staff
balance: Time is almost up.
/🆑
2025-06-10 04:00:47 -04:00
RoxyandGitHub f1ee0e7427 The vettening (#3937)
## About The Pull Request

Add watermark to unvetted clients, add warning to unvetted clients when
attempting to join the game, eventually locking out access on September
1st. Add warning text to examine for unvetted clients

## Why It's Good For The Game

The time has come

## Proof Of Testing

Tested it extensively last night

## Changelog
🆑 Bubberstation Staff
add: The clock is ticking.
/🆑
2025-06-01 02:00:57 -04:00
RoxyandGitHub 157956cdfa Fix loading screen messages not appearing (#3925)
## About The Pull Request
516 fucked with href stuff and so this request never sends and the
client is never marked ready so init loading messages don't get sent

## Why It's Good For The Game
Cool live loading messages

## Proof Of Testing
This is a web edit from bed that I tested earlier and it worked

## Changelog
🆑
fix: fixed loading screen not updating as subsystems init
fix: fixed character name on title screen not updating when changing
slots
/🆑
2025-05-29 04:14:50 -04:00
RoxyandGitHub 77f91e43c9 Remove unused maturity guard subsystem (#3900)
## About The Pull Request

Removes an unused skyrat subsystem that asked players for their DOB on
first connection, we are whitelist-only and do vettings manually over
discord so there's no need for this and it has never been enabled
anyways

## Why It's Good For The Game

Remove unused subsystem and dead code

## Proof Of Testing

It works no runtimes

## Changelog

No player facing changes
2025-05-26 15:52:53 -04:00
Roxy 1cdfdb238e Fix player polls button
Add Topic handling for clicking the polls button on the lobby screen
2025-05-16 21:43:48 -04:00
Shadow-Quill 99f0b4c950 Fixes Part Dos 2025-04-29 21:06:24 -06:00
RoxyandGitHub 5020cec410 Fix define sanity linter failures (#3209)
Fix all of the define sanity failures, either by adding an `#undef`
where needed or moving them to a file in `code/__DEFINES`

![image](https://github.com/user-attachments/assets/abd76dcd-d610-4567-801e-ee7fc477d58c)
2025-03-06 03:24:59 -05:00
RoxyandWaterpig 7600837c59 Upstream lint fixes (#3186)
Fixes all the failing grep checks in #3157, doesn't fix the define
sanity fails because im tired

![image](https://github.com/user-attachments/assets/b40fc081-a5c9-4f46-9cf5-18ed85199435)
2025-03-05 13:23:05 +01:00
Majkl-J 1289ccf9de fixes byond href styles 2025-02-26 02:25:38 -08:00
The SharkeningandGitHub 34a040e35d Fixes the swap server button (#2746)
Fixes this one thing for possible future memes.
2024-12-22 00:08:12 -07:00
WaterpigandGitHub ea02989f38 [SKYRAT CLEANUP] Removes / updates all bubber comments in the skyrat modular file as we are no longer their subject (#2330)
## About The Pull Request

"I'm going to extend my break" - Me, 2 days ago

"Hey I should start cleaning up the Skyrat modular folder" - Me, Today

I yet again fall victim to my own hubris

Left out some BUBBER TODOs, feel free to do these if you find them
manageable

## Why It's Good For The Game

We made some old mistakes with some edits (Like commenting out ruins
instead of making them unpickable for the ruin system) (This I fixed,
admins can now bus them in!)

We also made a lot of edits to Skyrat code, a lot of which can be
cleanly merged into their code now

## Proof Of Testing

If it compiles, it works.

Unlike my modularization PR from a year ago this is less fuckupable

## Changelog

N/A, not player facing
2024-11-16 14:20:10 +00:00
Majkl-J 50cced00b0 please help 2024-10-24 02:58:19 -07:00
nevimer 0df79089cd Merge remote-tracking branch 'skrat/master' into new-bubbermaster 2024-05-18 18:31:13 -04:00
GandalfandGitHub 2fb0a27baf adds skub compatibility to trait button (#27529)
wew
2024-05-15 02:13:42 +02:00
nevimer fa65d517dd fixups 2024-04-28 19:24:33 -04:00
WaterpigandGitHub 35e7b4994a Revert "kia soul" (#1423)
This reverts commit 499e688291.

## About The Pull Request

We love unannounced changes directly to the master branch. Gotta be my
favorite gender

## Why It's Good For The Game

There is a thing known as "Terrible UI design" and a Marquee is very
much part of the things you do NOT want to use under any circumstance.
(Aside from a meme with the announce/narrate verbs)

Please the lobby now looks way too dumb

## Proof Of Testing

A revert.

## Changelog

🆑
fix: Fixes horrendous ui design
/🆑
2024-04-24 07:33:28 +00:00
nevimer 499e688291 kia soul 2024-04-23 20:39:14 -04:00
nevimer 2d9383101e Revert "remove be_antagonist edits"
This reverts commit 7747616a45.

# Conflicts:
#	modular_skyrat/modules/title_screen/code/new_player.dm
#	tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/be_antag.tsx
2024-04-23 20:20:55 -04:00
a9ff046352 Administrator Cherrypick (#27405)
* Admin Verb Datums MkIII | Now with functional command bar (#82511)

* Modular stuffs

* Put some admin jump verbs back into the context menu | sorts area jump list again (#82647)

## About The Pull Request

See title.

## Why It's Good For The Game

Some admins wanted all the jump verbs back, aswell as making them not
AGhost you.
Also make the Jump To Area verb use a sorted list again

* Hey what if admins were allowed to use the player panel (#82682)

Re-adds the player panel verb to the verb panel.

* Controller Overview UI (#82739)

* Fixes a minor spelling mistake on the admin panel/verb list (#82747)

## About The Pull Request

Corrects `inisimin` to `invisimin`. This addresses #82728, but only
fixes one of the two issues mentioned

## Why It's Good For The Game

-1 spelling mistake

## Changelog
🆑
spellcheck: 'inisimin' verb corrected to 'invisimin'
/🆑

* Player Panel-age (#82757)

* Admin Forced Mob Rename and Preference Update (#82715)

---------

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: chel <64568243+iliyaxox@users.noreply.github.com>
2024-04-23 20:43:45 +02:00
9823af69de Misc. fixes to the character directory and some of my PRs (#1209)
<!-- 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

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/7952b553-6e43-4ec1-a9da-c63f65aff22b)

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/c5db8abb-a207-466b-9312-a4448ba1738f)

<!-- 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>
2024-02-29 11:14:11 +01:00
The SharkeningandGitHub 1e7fb0471b Merge branch 'master' into upstream-2024-02-03 2024-02-07 07:51:25 -07:00
4e0c620618 Fixes flavor text ready up text (#1112)
<!-- 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! -->
A while ago, I created Silicon Flavortext requirements. However, I had a
minor oopsie. In the ready up checks, I made it so that the
uses_normal_flavortext variable would check your normal flavor text, but
if you didn't have enough, say you lacked silicon flavor text rather
than the intended regular flavor text. This PR fixes that.
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

<!-- 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. -->
It's good for players to know what the real issue is here.
## 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. -->
Normal character:
<img width="284" alt="image"
src="https://github.com/Bubberstation/Bubberstation/assets/110273561/9ce21b14-5d77-48df-823e-18bd26c02927">

Silicon character:
<img width="285" alt="image"
src="https://github.com/Bubberstation/Bubberstation/assets/110273561/bac778d6-2bf9-4938-b7a9-9933c7945a09">


## 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: Readying up without proper flavor text now reports the correct
flavor text source instead of saying you need silicon flavor.
/🆑

<!-- 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: Esixdotnet <156951974+Esixdotnet@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Co-authored-by: thegrb93 <grbrown93@sbcglobal.net>
Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
2024-02-04 23:57:11 -05:00
nevimer 4d8898fdef Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03
# Conflicts:
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/controllers/subsystem/statpanel.dm
#	code/datums/chatmessage.dm
#	code/datums/quirks/negative_quirks/claustrophobia.dm
#	code/game/objects/items/tools/weldingtool.dm
#	code/modules/client/preferences/middleware/quirks.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/living_say.dm
#	code/modules/modular_computers/file_system/programs/jobmanagement.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/research/designs/mechfabricator_designs.dm
#	code/modules/research/machinery/_production.dm
#	code/modules/surgery/organs/internal/_internal_organ.dm
#	html/changelogs/archive/2024-01.yml
#	modular_skyrat/modules/automapper/code/area_spawn_entries.dm
#	modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
#	modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
#	modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
#	tgstation.dme
#	tgui/packages/tgui/components/Dropdown.tsx
#	tgui/packages/tgui/components/Input.tsx
#	tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
#	tgui/packages/tgui/interfaces/Jukebox.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
#	tgui/packages/tgui/interfaces/common/SearchBar.tsx
2024-02-03 21:08:40 -05:00
0eff73e892 Prompt for declaration of a player's date of birth + autobanning (#26041)
* Initial commit, not even half-done yet

* A second commit as I stumble towards a working solution

* Theeere we go, another step , I suppose

* fixes and one prompt per player

* yaya

* a

* okaaay, a step further

* not done yet but soon

* Theeere we go...

* feeex

* no interact till ss done

* Update maturity_subsystem.dm

* Okay, maybe it works now

* Ready for tests

* At last... now to test with a db.

* oh well, it's not like it needs to be the first one to init

* undoes the changelog clusterfuck

* now undoes it for real

* autoformatter-b-gone

* okay we don't want it on by default

* Well, it is ambiguous now that I look at it.

* Okay, now it should work 95%

* Oh well

* This should be straight up faster

* y u no auto tick

---------

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2024-01-27 19:22:35 -05:00
9d6996d23e NSFW flavor text, silicon flavor text requirements, new examine panel, fixes character directory (partially) (#851)
<!-- 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.

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/abd74b5c-ec82-4b56-b277-6c1b4282a27b)

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/61191a1d-1dcf-4256-958e-b663b5918934)

Also akes it so the minimum flavor text check applies to silicons!

Pictured: 300 characters of regular flavor text, but no silicon flavor
text

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/90af3fb8-ea27-4f76-a5fc-40a978843204)

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/375e69f5-bdba-4e52-a335-a637d4f9d7c9)

<!-- 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>
2024-01-14 22:51:21 -05:00
nevimer 0a432b7eed Merge remote-tracking branch 'skrat/master' into upstream-christmas
# Conflicts:
#	README.md
#	code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
#	code/game/machinery/bank_machine.dm
#	code/modules/unit_tests/station_trait_tests.dm
#	html/changelogs/archive/2023-12.yml
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/contractor/code/datums/midround/event.dm
#	modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgui/packages/tgui/interfaces/Fabrication/SearchBar.tsx
#	tgui/packages/tgui/interfaces/Spellbook.tsx
2023-12-24 23:15:34 -05:00
d718af9913 [MIRROR] Bridge Assistant Station Trait [MDB IGNORE] (#25667)
* Bridge Assistant Station Trait

* Diffs

* fixes

* Update job_traits.dm

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-12-24 22:54:11 +00:00
55482d6880 [MIRROR] Sign up for Cargorilla from the lobby [MDB IGNORE] (#25572)
* Sign up for Cargorilla from the lobby

* Modular

* Update jobs.dm

* our title screen compat

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-12-24 20:14:28 +00:00
lessthanthreeandGitHub 92dc422dc2 Modularized loading/title splash CSS (#856)
## About The Pull Request

Moves the loading/title splash CSS and HTML to its own file in the
bubbers config directory, allowing the server to modify it as they
please without worrying about upstream.

Tidies up the loading screen CSS and matches the colors with the main
menu.

## Why It's Good For The Game

Better CSS, creates a distinct visual identity, more moff.


https://github.com/Bubberstation/Bubberstation/assets/83487515/3f038003-b735-4cc3-9599-da541dfbd4d2

## Changelog

🆑 LT3
code: Loading and title splash are now modularized
/🆑
2023-12-15 21:42:16 -07:00
nevimer 7747616a45 remove be_antagonist edits 2023-09-03 18:07:23 -04:00
18ee10a18b [SEMI-MODULAR] Ports config-based flavor text requirements from TaleStation (#21063)
* y'all gonna like this

* Update config/skyrat/skyrat_config.txt

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-06-07 20:28:49 -04:00
+6 699e9f8150 [MIRROR] TGUI Latejoin Menu! [MDB IGNORE] (#18025)
* TGUI Latejoin Menu!

* [PR PR] Fixes up the TGUI Latejoin Menu! (#18044)

* Makes Angel, Dragon and Robotic wings available in the preferences menu again (#18013)

Makes Angel, Dragon and Robotic wings available in the prefs menu again

* Automatic changelog for PR #18013 [ci skip]

* [MIRROR] Petrified human statues now drop a (stone) brain on destruction [MDB IGNORE] (#18026)

* Petrified human statues now drop a (stone) brain on destruction (#71816)

## About The Pull Request
Destroying a petrified human statue will now drop their brain, albeit a
little more statue-like.

![image](https://user-images.githubusercontent.com/41448081/206316168-e902d6e4-1cb8-4498-80c8-891c59ae638b.png)

Changed from original PR after talking w/ Fikou about it

## Why It's Good For The Game
While the combo *does* step on the toes of Smite, the statue+rod combo
is capable of fully removing you from the round without a way back very
quickly. This keeps the strength of the combo while not making it
entirely impossible to get back into the round.

## Changelog
🆑
balance: Destroying a petrified human statue will now drop their brain.
/🆑

* Petrified human statues now drop a (stone) brain on destruction

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Automatic changelog for PR #18026 [ci skip]

* [MIRROR] Chaplain armor beacon now uses radial + previews possible armor sets, plus some choice beacon code cleanup. [MDB IGNORE] (#18019)

* Chaplain armor beacon now uses radial + previews possible armor sets, plus some choice beacon code cleanup. (#71674)

## About The Pull Request

- The chaplain choice beacon now uses a radial to select the armor set,
instead of a list, giving the user a preview of what each looks like.

![image](https://user-images.githubusercontent.com/51863163/205417930-f5ceab11-6974-48a9-a871-abcb8228bcf2.png)

- Lots of additional cleanup to choice beacon code in general. Less copy
pasted code.
- All beacons now speak from the beacon with their message, instead of
some going by "headset message". Soul removed

## Why It's Good For The Game

I always forgot when selecting my armor which looks like what, and
choosing an ugly one is a pain since you only get one choice. This
should help chaplains get the armor they actually want without needing
to check the wiki.

## Changelog

🆑 Melbert
qol: The chaplain's armament beacon now displays a radial instead of a
text list, showing previews of what all the armor sets look like
qol: (Almost) all choice beacons now use a pod to send their item,
instead of just magicking it under your feet
code: Cleaned up some choice beacon code.
/🆑

Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>

* Chaplain armor beacon now uses radial + previews possible armor sets, plus some choice beacon code cleanup.

* update modular

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Automatic changelog for PR #18019 [ci skip]

* [MIRROR] Fixed an improper proc ref. [MDB IGNORE] (#18031)

Fixed an improper proc ref.

Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Automatic changelog for PR #18031 [ci skip]

* Fiiix!

* Fuck

* [MIRROR] Windoors are vulnerable to a jaws of life [MDB IGNORE] (#18040)

* Windoors are vulnerable to a jaws of life (#71733)

## About The Pull Request
Windoors can be pried by a jaws of life now
## Why It's Good For The Game
Windoors are already immune to any kind of deconstruction outside of
bashing it, so making it immune to the jaws of life as well seems
excessive
## Changelog
🆑
balance: jaws of life can pry windoors
/🆑

Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>

* Windoors are vulnerable to a jaws of life

Co-authored-by: texan-down-under <73374039+etherware-novice@users.noreply.github.com>
Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>

* Automatic changelog for PR #18040 [ci skip]

* Automatic changelog compile [ci skip]

* [fix] fixes det revolver icons (#18049)

* Delete guns.dmi

* Add files via upload

* Automatic changelog for PR #18049 [ci skip]

* [MIRROR] Fixes fake links in Adminwho that led to "no_feedback_link" [MDB IGNORE] (#18027)

* Fixes fake links in Adminwho that led to "no_feedback_link" (#71804)

## About The Pull Request
Basically, sometimes, very rarely, it was possible for this to happen,
when it shouldn't be happening. I was wondering for a little while what
it was about, and then I finally downloaded my chat logs for a round and
realized what was going on. It should no longer happen.

## Why It's Good For The Game
Clickable links that lead nowhere (and thus don't do anything) aren't
very good for the game.

## Changelog

🆑 GoldenAlpharex
fix: There shouldn't be clickable names in Adminwho that don't do
anything anymore.
/🆑

* Fixes fake links in Adminwho that led to "no_feedback_link"

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Fix: Self-Actualization Device Doubling Damage (#18015)

* Change adjustOrganLoss/BruteLoss/FireLoss to set

* Reverts my naive soluton

* Automatic changelog for PR #18027 [ci skip]

* Automatic changelog for PR #18015 [ci skip]

* Fix TGUI latejoin menu not closing properly, properly this time

* Oh yea, flavourtext requirement exists. Not that we actually have it enabled upstream.

* Revert "Merge remote-tracking branch 'upstream/upstream-merge-71883' into fixlatejoinmenu"

This reverts commit 3279e73418f95637162a2923b0431e9e26b43403, reversing
changes made to d46aab7b421fee94d49b57e863bfd8e0917fc43f.

* Fucking stupid code merge shit

* Cool newline bro

* Dumb stupid commented code

* Also this

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
Co-authored-by: texan-down-under <73374039+etherware-novice@users.noreply.github.com>
Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com>
Co-authored-by: Dani Glore <fantasticdragons@gmail.com>
Co-authored-by: distributivgesetz <distributivgesetz93@gmail.com>

* fix

Co-authored-by: Rimi Nosha <riminosha@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
Co-authored-by: texan-down-under <73374039+etherware-novice@users.noreply.github.com>
Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com>
Co-authored-by: Dani Glore <fantasticdragons@gmail.com>
Co-authored-by: distributivgesetz <distributivgesetz93@gmail.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-12-15 16:18:28 -05:00
SkyratBotandGitHub b9b6a803b0 [MIRROR] Throws a bunch of parenthesis around to ensure dear Aunt Sally is always properly excused. [MDB IGNORE] (#17654) 2022-11-22 19:44:59 -08:00
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
375fea374a [MIRROR] Optimizes qdel related things (slight init time savings) [MDB IGNORE] (#17240)
* Optimizes qdel related things (slight init time savings)

* lang holder

* cleanup custom spawners slightly

* ref update

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-30 23:15:38 -04:00
TastyfishandGitHub 783e9a6465 [MODULAR] make title screen progress bar pacing work a little better (#16861)
make progress bar pacing work with numbers better
2022-10-16 10:45:09 -04:00
a00cad0164 [MIRROR] Clean up subsystem Initialize(), require an explicit result returned, give a formal way to fail (for SSlua) [MDB IGNORE] (#16248)
* Clean up subsystem Initialize(), require an explicit result returned, give a formal way to fail (for SSlua)

* [PR for MIRROR PR] Changes for 16248 (#16277)

* Merge skyrat changes, update SR SS's, and remove lobby_eye

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/autotransfer/code/autotransfer.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* restore lobby_cam for now

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-09-24 17:32:40 -04:00
TastyfishandGitHub 4bcebbc7bc [MODULAR] properly fixes titlescreen glitching in dreamseeker launch (#16222)
properly fixes titlescreen gltiching in dreamseeker launch
2022-09-14 15:13:27 -07:00
ZonespaceandGitHub 3a8cf57e4a Fixes the endless title screen error bug (#15923)
my pain for months
2022-08-29 21:11:54 -04:00
TastyfishandGitHub 28d52e2df4 [MODULAR] slightly improved title loading screen (#15382)
slightly improved title loading screen
2022-08-04 15:50:05 +01:00
GoldenAlpharexandGitHub fbbecbdba5 Fixes the issues with the database that have been forcing us to have #10823 test-merged for half a year (#15061)
* Don't try to make a query on a client that doesn't exist

* If this is actually why it's been shitting the bed, I swear to god
2022-07-20 04:12:35 +02:00
GhomandGitHub edaaa91e5b fixes an issue with indentation in the version of select_job() that Skyrat uses (#14856) 2022-07-11 17:07:53 -04:00
5131104c88 [MIRROR] New player job selection fixes pack [MDB IGNORE] (#14818)
* New player job selection fixes pack

* Update job.dm

* Reflects the changes to our modularized Topic() proc

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-07-10 08:56:20 -07:00
TastyfishandGitHub 643b5748f4 makes status bar not show when title screen up (#14241) 2022-06-11 13:33:30 +01:00