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] Make Chefs show up as service on the crew monitor #2094

Merged
merged 1 commit into from
Feb 24, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1095
Original PR: tgstation/tgstation#81597

About The Pull Request

One of the cooks will always be 'promoted' to chef, which has a different trim assignment. Because the crew monitor didn't account for this in its display priorities, anyone with a card using its trim would be displayed as a having departmentless job.
Adding its trim assignment name to the list like departmental security fixes this.
I put it above cook as it's kind of the head cook.

Why It's Good For The Game

It was mildly annoying.

Changelog

🆑 00-Steven
fix: Chefs (not to be confused with cooks) actually display as being a part of service on the crew monitor.
/:cl:

* Make Chefs show up as service on the crew monitor

* Fixes conflict, increases  job numbers by one

---------

Co-authored-by: _0Steven <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Iajret Iajret merged commit 965f4e5 into master Feb 24, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1095 branch February 24, 2024 22:23
AnywayFarus added a commit that referenced this pull request Feb 24, 2024
Iajret pushed a commit that referenced this pull request Apr 20, 2024
* Adds a Wizard-themed map to the deathmatch (#81640)

## About The Pull Request
Deathmatch is severely lacking in HIGH IMPACT MAGIC LARPING. So I added
a big ass wizard arena. The arena itself is based off the wizard den.

Loadouts:
**Wizard:** Standard all-rounder. Got magic missile, jaunt, and
forcewall. Regular gear.
**Pyromancer:** Fire guy. Red robes, fireball, smoke.
**Electromancer:** Zappy guy. Lightning and tesla shock.
**Necromancer:** Is a skeleton. Has Scream for Me and blink.
**LARPer:** Straight from Station & Spessmen. Fake robes and can only
throw lightning and repulse.
**Chuunibyou:** Classic animage. Got chuuni buff and magic cards.
**Battlemage:** Melee fighter. Got some armor and a big hammer with
instant summons.
**Apprentice:** Underpowered until they find a mystery box. Got charge.
**Gunmancer:** Who needs magic when you have guns? Starts with an m1911,
lesser gun summons, and knock.
**Monkeymancer:** Is a monkey. Can summon monkeys and gorillas. Has a
banana.
**Chaosmancer:** Jumbled robes. Starts with a chaos rod. Can rod form
and summon traps for high chaos.
**Funnymancer:** It's just a clown with a banana staff.

The map itself is a pretty standard arena with a long sightline in the
middle. Each participant spawns in their own room complete with a magic
item box. The very southern portion of the ship has a standard mystery
gun box. Soon after the round starts, a hostile gelatinous cube in the
center of the map will break out and attack whoever it sees. Inside its
enclosure is a free death wand. Map has been tested to make sure
deathmatch participants can't escape the deathmatch.
## Why It's Good For The Game
Deathmatch provides a unique opportunity for people to play with
mechanics they will not often get to use. Allowing people to play wizard
for a few minutes shouldn't cause too much harm aside from admin logging
from explosions, which hopefully a fix is in the pipeline for.
## Changelog
:cl:Motho
add: Added wizard-themed deathmatch map.
add: Added mystery wand box.
/:cl:

* Adds a Wizard-themed map to the deathmatch

---------

Co-authored-by: Name <[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