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] Updates examine text for Nukie & ERT defibs #707

Merged
merged 1 commit into from
Nov 19, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25096
Original PR: tgstation/tgstation#79806

About The Pull Request

Description of these two items tells you how to attack people with them, but it's outdated and tells you to use disarm or aggressive intent. Since those aren't part of the game any more, I changed it so it tells you to use combat mode instead.
Also a minor rewording both to stop the word 'combat' being used twice in quick succession to mean different things (looks awkward), and to make it technically more correct (old description implies you need combat mode on to revive someone in the middle of a fight)

Why It's Good For The Game

Intents aren't in the game so mini tutorials like this shouldn't refer to them.

Changelog

🆑 DaCoolBoss
spellcheck: Nukie and ERT defibrillators now reference combat mode instead of intents.
/:cl:

…5096)

* Updates examine text for Nukie & ERT defibs (#79806)

## About The Pull Request
Description of these two items tells you how to attack people with them,
but it's outdated and tells you to use disarm or aggressive intent.
Since those aren't part of the game any more, I changed it so it tells
you to use combat mode instead.
Also a minor rewording both to stop the word 'combat' being used twice
in quick succession to mean different things (looks awkward), and to
make it technically more correct (old description implies you need
combat mode on to revive someone in the middle of a fight)
## Why It's Good For The Game
Intents aren't in the game so mini tutorials like this shouldn't refer
to them.
## Changelog
:cl:
spellcheck: Nukie and ERT defibrillators now reference combat mode
instead of intents.
/:cl:

* Updates examine text for Nukie & ERT defibs

---------

Co-authored-by: Da Cool Boss <[email protected]>
@Iajret Iajret merged commit 0824634 into master Nov 19, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25096 branch November 19, 2023 09:43
AnywayFarus added a commit that referenced this pull request Nov 19, 2023
Iajret pushed a commit that referenced this pull request Jan 31, 2024
* Icebox service changes (#81127)

## About The Pull Request
Slightly rearranges Icebox station kitchen and service machinery. Adds a
bio generator next to the service hall entrance.



![StrongDMM_Sum3wUm2vt](https://github.com/tgstation/tgstation/assets/157846764/ad11bfa2-5320-4780-a1b1-8ff474b78349)
## Why It's Good For The Game
Cooks and Bartenders on IceBox may now access the limitless bounty of
the bio generator.
Cooks now have the ever-convenient produce order console in their
kitchen.
The old bio generator in the lower z level of botany remains, frugal
Botanists can ration the biomass if they choose.
## Changelog
:cl:
add: [IceBox] Botany now has a service accessible bio generator
qol: [IceBox] Kitchen and service hall rearranged

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

* Icebox service changes

---------

Co-authored-by: Kian <[email protected]>
Co-authored-by: sylvia <[email protected]>
ReezeBL pushed a commit that referenced this pull request Feb 6, 2024
* Icebox service changes (#81127)

## About The Pull Request
Slightly rearranges Icebox station kitchen and service machinery. Adds a
bio generator next to the service hall entrance.



![StrongDMM_Sum3wUm2vt](https://github.com/tgstation/tgstation/assets/157846764/ad11bfa2-5320-4780-a1b1-8ff474b78349)
## Why It's Good For The Game
Cooks and Bartenders on IceBox may now access the limitless bounty of
the bio generator.
Cooks now have the ever-convenient produce order console in their
kitchen.
The old bio generator in the lower z level of botany remains, frugal
Botanists can ration the biomass if they choose.
## Changelog
:cl:
add: [IceBox] Botany now has a service accessible bio generator
qol: [IceBox] Kitchen and service hall rearranged



* Icebox service changes

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Kian <[email protected]>
Co-authored-by: sylvia <[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