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

[MIRROR] Airlock/status light overlays maintenance #2184

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1058

Mirror of Skyrat-SS13/Skyrat-tg#26502 with Nova specific file structure

About The Pull Request

Modified version of effigy-se/effigy-se#705 with Nova edits.

  • Cleans up airlock emissives code, fixes some bugs with airlock/fire alarm/firedoor overlays.
  • Emissives only applied once, so they are the correct intensity and detail
  • Engineering Override no longer flashes like the firedoors, replaced with a fire access/overlay instead.
  • Adds a handful of missing airlock overlays.

How This Contributes To The Nova Sector Roleplay Experience

  • Fixes some visual bugs related to layering of airlocks/firedoors and the fire alarms/status displays.
  • Sec level orange (engineering override) I sprited and seeing it in practice the flashing is overly distracting, and annoying. Alert orange is commonplace enough and specific enough it doesn't really warrant to be flashing lights constantly.

Proof of Testing

Screenshots/Videos

Airlock with flashing fire alarm status, non-flashing engineering override, firedoors that aren't clipping airlock emissives

dreamseeker_IVgNbZAeNL

image

Changelog

🆑 LT3
qol: Airlocks don't flash constantly on engineering override, override/overlay added for fire alarm
fix: Airlock lighting should no longer render on top of player characters
fix: Airlock emissives no longer overlap firedoors
fix: Fixed missing overlays on various airlock types
/:cl:

* airlock overlay maintenance

* Create shuttle.dmi

* document update_fire_status

* change fire status to firedoor yellow

* vault

* fix unrestricted airlocks showing engi alert
@Iajret Iajret merged commit 447f259 into master Feb 29, 2024
25 checks passed
@Iajret Iajret deleted the upstream-mirror-1058 branch February 29, 2024 18:41
AnywayFarus added a commit that referenced this pull request Feb 29, 2024
Iajret pushed a commit that referenced this pull request Apr 25, 2024
…keys no longer catatonic (#2184)

* Monkey eyes fix and noticable organ display refactor; AI monkeys no longer catatonic (#82669)

## About The Pull Request

It turns out monkeys being catatonic got broken 2 years ago in a PR that
was meant to fix something else; also, it turns out monkeys are supposed
to have primal eyes when turned into humans, and that got broken too. I
fixed both of those things, and while I was at it I did a refactor to
make it easier to give noticable organs (or anything else that you'd
want correct pronoun and verb tenses) easier to implement.

1) AI controlled mobs now properly display their noticable organs when
appropriate
2) Added some macros and a helper proc for replacing appropriate
pronouns and verb tenses in text
3) The noticable organ HTML is no longer broken, so you can pass text
with spans into it, if you want the text to be pretty or big or whatever
4) Monkeys are no longer catatonic if they have an active AI controller;
this goes for any carbon actually but I think monkeys are the only one
with AI controllers at the moment
## Why It's Good For The Game

Fixes the logic for displaying organs on AI controller mobs (currently
monkeys)
Makes it easier to add these kind of organs for carbons, AI controlled
or not, in the future

Look! An actual use-case for split editor:

![image](https://github.com/tgstation/tgstation/assets/49173900/8cd0d69e-8091-4431-9418-6bd29e1713b5)
## Changelog

Humanized monkeys now have their primal eyes again; monkeys with active
AI are no longer catatonic.
:cl: Bisar
fix: AI controlled monkeys are no longer catatonic, and they have primal
eyes again when turned into humans.
spellcheck: Noticable organs now have more modular grammar, and their
current grammar is fixed.
refactor: Refactored the code for displaying the messages for noticable
organs.
config: Added a documented define of all our pronouns
/:cl:

---------

Co-authored-by: MrMelbert <[email protected]>

* Monkey eyes fix and noticable organ display refactor; AI monkeys no longer catatonic

---------

Co-authored-by: Joshua Kidder <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
ReezeBL pushed a commit that referenced this pull request Apr 26, 2024
…keys no longer catatonic (#2184) (#3060)

* Monkey eyes fix and noticable organ display refactor; AI monkeys no longer catatonic (#82669)

## About The Pull Request

It turns out monkeys being catatonic got broken 2 years ago in a PR that
was meant to fix something else; also, it turns out monkeys are supposed
to have primal eyes when turned into humans, and that got broken too. I
fixed both of those things, and while I was at it I did a refactor to
make it easier to give noticable organs (or anything else that you'd
want correct pronoun and verb tenses) easier to implement.

1) AI controlled mobs now properly display their noticable organs when
appropriate
2) Added some macros and a helper proc for replacing appropriate
pronouns and verb tenses in text
3) The noticable organ HTML is no longer broken, so you can pass text
with spans into it, if you want the text to be pretty or big or whatever
4) Monkeys are no longer catatonic if they have an active AI controller;
this goes for any carbon actually but I think monkeys are the only one
with AI controllers at the moment
## Why It's Good For The Game

Fixes the logic for displaying organs on AI controller mobs (currently
monkeys)
Makes it easier to add these kind of organs for carbons, AI controlled
or not, in the future

Look! An actual use-case for split editor:

![image](https://github.com/tgstation/tgstation/assets/49173900/8cd0d69e-8091-4431-9418-6bd29e1713b5)
## Changelog

Humanized monkeys now have their primal eyes again; monkeys with active
AI are no longer catatonic.
:cl: Bisar
fix: AI controlled monkeys are no longer catatonic, and they have primal
eyes again when turned into humans.
spellcheck: Noticable organs now have more modular grammar, and their
current grammar is fixed.
refactor: Refactored the code for displaying the messages for noticable
organs.
config: Added a documented define of all our pronouns
/:cl:

---------



* Monkey eyes fix and noticable organ display refactor; AI monkeys no longer catatonic

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Joshua Kidder <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants