Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IDB Ignore] Some fresh Cherry Picks #649

Merged
merged 22 commits into from
Jan 25, 2025
Merged

[IDB Ignore] Some fresh Cherry Picks #649

merged 22 commits into from
Jan 25, 2025

Conversation

MrMelbert
Copy link
Owner

Including

  • Footstep sound for white / kitchen / bathroom floor tiles
  • Snore SFX
  • Sigh SFX
  • Fire SFX
  • Writing SFX
  • Looking down ladders
  • Gas mask FOV gone
  • Less invisible moths/lizards
  • Funky mouse cursors

Also

  • Adds a Dance animation to *Dance
  • Disables the Nar'Sie summoning music

MrMelbert and others added 16 commits January 23, 2025 01:54
more immersion

:cl: grungussuss and redemptionarc
sound: snoring now has sounds, snoring will happen more often while
asleep
/:cl:
Emotes allow to express yourself in more ways than words, sighing is
great for expressing your frustration with someone, sniff gives more
feedback about someone's sickly status, including allowing people to rp
as if something stinks.

:cl: grungussuss
sound: added sniff sounds
sound: added sigh sounds
/:cl:
more variety than previously and I think these are better, also they're
made by us and not taken from 3rd parties.

:cl: grungussuss and redemptionarc
sound: sigh sounds have been improved
/:cl:
Add ignition sound to whenever a hotspot is created and add a grouping
system for hotspot to play a sound at its "center"
Drafting for now for review
For such an engaging part of our simulation it really does lack sound
maybe now someone will notice you wrote something

:cl: grungussuss
sound: writing something now produces sound
/:cl:
…ually (#88876)

Even though you (logically) should be able to peer down a ladder before
you step down, to know if you're going to climb directly into a meat
grinder, you cannot. Now you can.

Gas still does not travel between ladders. Maybe later

:cl: Melbert
qol: You can now look down ladders, both via the look down verb/hotkey
and by just looking with your eyes
/:cl:
…hed off (#87102)

Gas masks and all their subtypes no longer have fov.
Using pepperspray on gas mask wearer applies 1 tint per 5u of spray. At
3 tint the wearer becomes fully blind.
If you wanna use the mask again you'll have to wash off the pepperspray
from it using soap or shower.

Gas mask assistants are peak soul and removing it was a terrible
disaster. FoV is too annoying to ever deal with, so it ends up with gas
masks never being worn. Gas filter doesn't make up for it whatsoever,
it's only use is shoving cigarettes in it to look cool. This PR makes it
so pepperspray/tear gas is still useful against mask wearers, albeit
less efficient.
… to indicate they are clickable (windows style) (#88470)

Basically just goes through and adds `mouse_over_pointer =
MOUSE_HAND_POINTER` to a bunch of screen elements (player hud and lobby
menu)

Also adds it to very small wall mounted objects like buttons, fire
alarms, and light switches

- Makes interacting with screen elements a bit more tactile
- Makes it a bit easier to click on tiny buttons and such (being able to
know when you're actually hovering the thing)
- Maybe can be expanded to more world objects to indicate they are
clickable vs non-interactable?

:cl: Melbert
qol: Hovering over clickable screen elements will now update your mouse
cursor to indicate they're clickable
qol: Hovering over small wall mounts (light switches, buttons, fire
alarms) will now update to mouse cursor indicating you're hovering them
/:cl:
…" to contraband of the autodrobe (#85724)

Adds a copy of the famous 1995 musical "Space Station 13: The Musical"
to contraband of the autodrobe

It's a "skillchip" that forces you to sing while implanted and active

(these messages were typed normally)

Makes it easier for entertainers to put on their own version of that
historic musical

:cl: Melbert
add: Adds a copy of the famous 1995 musical "Space Station 13: The
Musical" to contraband of the autodrobe
/:cl:
@github-actions github-actions bot added Modularity Suggested Read the README in "maplestation_modules" and follow the instructions or risk doom Cherry Picked We're behind on schedule; and this is something we fucking need Non-Module Code Touches main files. Proceed with caution labels Jan 23, 2025
@MrMelbert MrMelbert removed the Modularity Suggested Read the README in "maplestation_modules" and follow the instructions or risk doom label Jan 23, 2025
## About The Pull Request

Node 16 actions are deprecated, we need to use Node 20 actions now (as
noted by this handy screenshot which spams it on every CI run)


![image](https://github.com/tgstation/tgstation/assets/34697715/24ea3013-c762-4027-951c-d598b1eec8a3)

You may see
https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/
for more information.
@github-actions github-actions bot added Maintenance Little spring cleaning never done anyone wrong Modularity Suggested Read the README in "maplestation_modules" and follow the instructions or risk doom labels Jan 23, 2025
MrMelbert and others added 5 commits January 23, 2025 20:13
- Matches can be ignited with boots.
- Matches have a rare chance of failing to ignite (prompting you to try
again) or an even rarer chance of snapping (wasting it).
- Also makes ignition span use mostly-consistent (using rose span for
the "cooler" ignition effects).

You may be thinking "hey, matches won't light on just friction unless
they're from the 1800s", and you'd be right. But it's a cool movie
trope, which means it should be possible, I don't make the rules.

:cl: Melbert
add: You can light matches on the heel of your boots - Just don't do it
too hard.
/:cl:
Spessmen now need to blink! If you have non-robotic eyes, you'll
automatically blink every once in a while. Lizards have asynchronous
blinking, and whenever they blink one of their eyes (chosen at random)
will blink slightly sooner.

You can also blink manually, as emotes now fire the animations.

Adds a new eye-related quirk, Fluoride Stare! It will spawn you without
eyelids, preventing random or manual blinking and forcing you to wet
your eyes with some saline solution (of which you get a bottle, and a
dropper to apply it) every minute or so.
Additionally, eyes now display their color on their organ sprite,
instead of always showing up as blue.

(Don't tell roleplayers, but Fully Immerse smite now blinds you when you
blink, for true full immersion)

Spessmen blinking is just soulful, and brings some life into the game.
As for the quirk, its just a funny bit/reference that people can use
to... torture themselves?

:cl:
add: Spessmen now blink.
image: Eyes now display their color on their organ sprite, instead of
always being displayed as blue.
/:cl:
@MrMelbert MrMelbert marked this pull request as ready for review January 25, 2025 08:21
@MrMelbert MrMelbert enabled auto-merge (squash) January 25, 2025 08:21
@MrMelbert MrMelbert merged commit 98a57ce into master Jan 25, 2025
9 of 22 checks passed
@MrMelbert MrMelbert deleted the ports_2025 branch January 25, 2025 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cherry Picked We're behind on schedule; and this is something we fucking need Maintenance Little spring cleaning never done anyone wrong Modularity Suggested Read the README in "maplestation_modules" and follow the instructions or risk doom Non-Module Code Touches main files. Proceed with caution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants