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 ocky icky phobia to more modern lingo #1089

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25571
Original PR: tgstation/tgstation#80247

About The Pull Request

As requested by the administrative team; ocky icky phobia has been updated with some all new lingo
Please give more ideas in the comments if you feel like something is missing!
Full list of words added:
"amogus",
"chat",
"c*der",
"coder",
"coders",
"erp",
"joever",
"kys",
"lmao",
"lol",
"mapper",
"muderbone",
"murderboning",
"powergame",
"rp",
"sprite",
"spriter",
"sus",
"tide",
"ur",
"5head"

Why It's Good For The Game

The ocky icky phobia is currently out of date with the hip and cool lingo the kids are using nowadays, this updates it for any admin feeling like granting a smite to an intrepid twitch user who is attempting to emote twitch emotes ic.

This improves the game because it allows for the currently very un-used ocky icky phobia smite to be more relevant in our current day and age.

Changelog

🆑 Rex9001
admin: Updates the admin smite "Ocky icky phobia" with some new words
/:cl:

…#25571)

* Updates ocky icky phobia to more modern lingo (#80247)

## About The Pull Request
As requested by the administrative team; ocky icky phobia has been
updated with some all new lingo
Please give more ideas in the comments if you feel like something is
missing!
Full list of words added:
		"amogus",
		"chat",
		"c*der",
                "coder",
		"coders",
		"erp",
		"joever",
		"kys",
		"lmao",
		"lol",
		"mapper",
		"muderbone",
		"murderboning",
		"powergame",
		"rp",
		"sprite",
		"spriter",
		"sus",
		"tide",
		"ur",
		"5head"
## Why It's Good For The Game
The ocky icky phobia is currently out of date with the hip and cool
lingo the kids are using nowadays, this updates it for any admin feeling
like granting a smite to an intrepid twitch user who is attempting to
emote twitch emotes ic.

This improves the game because it allows for the currently very un-used
ocky icky phobia smite to be more relevant in our current day and age.
## Changelog
:cl:
admin: Updates the admin smite "Ocky icky phobia" with some new words
/:cl:

* Updates ocky icky phobia to more modern lingo

---------

Co-authored-by: Rex9001 <[email protected]>
@Iajret Iajret merged commit 9380f53 into master Dec 13, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25571 branch December 13, 2023 09:35
AnywayFarus added a commit that referenced this pull request Dec 13, 2023
Iajret pushed a commit that referenced this pull request Feb 22, 2024
…cargo (#1089)

* Adds a missing servo into the MK1 Ripley crate ordered from cargo (#81587)

## About The Pull Request
So cargo can order a box containing all the components you need to build
a ripley mech from the ground up.

Except a servo, which is required in the building process, and is needed
for the mech to move around anywhere.
This adds the missing part, so that the only thing you need is metal and
tools. (And a battery.)
## Why It's Good For The Game
If you order a crate containing (almost) all the components you need to
build a mech, and its missing a key part, I wouldn't call that a very
complete set. So having the servo included makes it complete.

Also, the chances are this crate was forgotten about when the servos
became a needed part of mech construction, so this fixes the
consistency.
## Changelog
:cl:
fix: Adds a missing servo component into the MK1 Ripley Crate ordered
from cargo.
/:cl:

* Adds a missing servo into the MK1 Ripley crate ordered from cargo

---------

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