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.

Sign up for GitHub

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

Jump to bottom

Antag times #206

Merged
merged 4 commits into from
Oct 20, 2023
Merged

Antag times #206

merged 4 commits into from
Oct 20, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Oct 20, 2023 •
edited
Loading

About the PR

I expected someone to have done it by now.
Loneops uses the nukeops antag role so couldn't make them separate I guess.
I forgot to mention #192 but here it is so it appears in the issue :trollface:

Why / Balance

Traitor: 24h
Nukie, regular: 30h and 10h security
Nukie, medic: 30h and 10h medical
Nukie, cmdr: 60h and 10h security and 10h command
Nukie, lone: 48h and 10h security
Revolutionary, head: 48h and 10h command
Infected, initial: 12h
Ninja: 72h

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

@github-actions github-actions bot added the Changes: YML Changes any yml files label Oct 20, 2023
@DebugOk
Copy link
Contributor

DebugOk commented Oct 20, 2023

Loneops uses the nukeops antag role so couldn't make them separate I guess.

Whats stopping you from just adding it here https://github.com/DeltaV-Station/Delta-v-rebase/blob/master/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml#L78

@FluffiestFloof
Copy link
Contributor Author

Loneops uses the nukeops antag role so couldn't make them separate I guess.

Whats stopping you from just adding it here https://github.com/DeltaV-Station/Delta-v-rebase/blob/master/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml#L78

The YAML linter

@DebugOk
Copy link
Contributor

DebugOk commented Oct 20, 2023

Loneops uses the nukeops antag role so couldn't make them separate I guess.

Whats stopping you from just adding it here https://github.com/DeltaV-Station/Delta-v-rebase/blob/master/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml#L78

The YAML linter

You have to put it within GhostRole, not the entity

@FluffiestFloof
Copy link
Contributor Author

Loneops uses the nukeops antag role so couldn't make them separate I guess.

Whats stopping you from just adding it here https://github.com/DeltaV-Station/Delta-v-rebase/blob/master/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml#L78

The YAML linter

You have to put it within GhostRole, not the entity

yep

@DebugOk DebugOk merged commit b0cbae3 into DeltaV-Station:master Oct 20, 2023
@Colin-Tel
Copy link
Contributor

My dumbass reviewing a merged branch

@FluffiestFloof
Copy link
Contributor Author

blunt

@FluffiestFloof FluffiestFloof deleted the antagplaytime branch October 20, 2023 21:23
@FluffiestFloof FluffiestFloof mentioned this pull request Oct 21, 2023
Closed
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@SimpleStation14
Mirror: add more carp plushies (DeltaV-Station#206)
f24bca6 
## Mirror of PR #26081: [add more carp
plushies](space-wizards/space-station-14#26081)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `f8305a26a9bd1dc080daca8f45f7289829b91682`

PR opened by <img
src="https://avatars.githubusercontent.com/u/39013340?v=4"
width="16"/><a href="https://github.com/deltanedas"> deltanedas</a> at
2024-03-13 14:44:55 UTC

---

PR changed 8 files with 408 additions and 320 deletions.

The PR had the following labels:
- No C#
- Changes: Sprites


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> holocarp and magicarp getting their attention
> 
> ## Why / Balance
> :fish:
> 
> ## Technical details
> :fish:
> 
> ## Media
> :fish:
>
![14:42:24](https://github.com/space-wizards/space-station-14/assets/39013340/d85d0c3f-579b-4e42-a8f9-be065cea02ae)
> 
> 
> 🐟
>
![14:43:32](https://github.com/space-wizards/space-station-14/assets/39013340/35bb09c9-e498-457b-b4f1-694a005e2ea0)
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> 🐟
> 
> **Changelog**
> 🆑
> - add: Holocarp and Magicarp plushies can now be found in maintenance.
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Colin-Tel Colin-Tel Colin-Tel approved these changes

Assignees
No one assigned
Labels
Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@FluffiestFloof @DebugOk @Colin-Tel