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

Rulebreaking Content Removal #5

Merged
merged 1 commit into from
Mar 25, 2023
Merged

Conversation

nednaZ
Copy link
Member

@nednaZ nednaZ commented Mar 25, 2023

About The Pull Request

Removes as much sexual, offensive and modern political content as I could find on a first pass.
Removes a directly sexual religion from the chaplain.
Removes the WGW book.
Removes accessories related to sexuality and the Pride Week holiday due to the potential of them being taken as offensive parody. We've already had one ban related to them and we're not even live.
Removes the Ukrainian Independence Day holiday due to political rules.
Removes a couple of vox and robot lines.
Removes the "yiffinhell", "furrypride" and "antilizard" drawings
Removes some brain trauma lines that either were offensive, or sexual in nature.
Removes a massive number of CAS card strings.
Removes "Jihad" and "Muhammad" station prefixes from the Ramadan holiday after consulting Beans
Tourette's is now less offensive and more silly.

Note that I have NOT removed the Beepsky emag line as I do not have a suitable replacement voice line at this time, that will need to be taken care of in another PR.

Why It's Good For The Game

Sexual, political and offensive content is very clearly against our server rules and shouldn't be in the codebase.
As the server is mainly a streamer server, we have to ensure that no content is potentially rulebreaking or enough to cause controversy.
There should be zero actual gameplay changes here, only covering our rears when it comes to Twitch.

I've likely missed a good amount of content, but I think this was a fair first pass.

Changelog

🆑
del: Removed possible Twitch rule-breaking content
/:cl:

Removes as much sexual, offensive and modern political content as I could find on a first pass.

Removes a sexual religion from the chaplain.

Removes the WGW book.

Removes accessories related to sexuality due to the potential of them being taken as offensive parody.

Removes Pride Week and Ukrainian Independence Day events due to sexual content and political rules.

Removes a couple of vox and robot lines.

Removes some brain trauma lines that either were offensive, or sexual in nature.

Tourette's is now less offensive and more silly.

Note that I have not removed the Beepsky emag line as I do not have a suitable replacement voice line at this time.
@dwasint
Copy link
Collaborator

dwasint commented Mar 25, 2023

its a shame about the pride week getting canned but such is life, other than that i agree

@dwasint dwasint merged commit a7224f5 into Monkestation:master Mar 25, 2023
github-actions bot added a commit that referenced this pull request Mar 25, 2023
@nednaZ nednaZ deleted the content_removal branch March 25, 2023 19:31
dwasint pushed a commit to dwasint/Monkestation2.0 that referenced this pull request Aug 22, 2023
…nent (#77539)

Hey there,

I've personally fallen for this stupid thing twice (in #77503 and #75627
(d357516)), so I decided to spend a few
hours to crack out a unit test to ensure that I (and no one else) falls
for this stupid thing again.

Let me know if there's a smarter way to code something like this, but I
couldn't figure out a better way to accomodate the current framework and
be as agnostic to certain oddities as possible.
Catches stuff like this:

```txt
[2023-08-11 21:10:04.019]     FAILURE #1: The mob Garden Gnome does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE #2: The mob the morph does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE #3: The mob the guard spiderling (946) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#4: The mob the ambush spiderling (255) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#5: The mob the scout spiderling (375) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#6: The mob the flesh spiderling (337) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#7: The mob the hunter spiderling (869) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#8: The mob the nurse spiderling (629) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#9: The mob the tangle spiderling (19) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#10: The mob the broodmother spiderling (855) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#11: The mob the viper spiderling (519) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#12: The mob the tarantula spiderling (963) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
 -     FAILURE Monkestation#13: The mob the spiderling (100) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45
```

(ignore the part about gnomes and morphs, this was an earlier version of
the unit test. everything else was relevant and is fixed)
:cl:
fix: Growing spiders will now retaliate against you like they were
always meant to.
/:cl:
ThePooba added a commit that referenced this pull request Nov 11, 2024
* Update TGS DMAPI

* Revert "Automatic TGS DMAPI Update"

* i think this fixes it!!

* Changed the logic addid a check in sec storage one

* bar drone

* Testing out links in antag info and bardrone updates

* fghj

* Update colors.dm

* ghj

* Changed slime heal

* this took way too fucking long

* fghjfjgh

* Omnitraitor picking moved to mind to be tracked

* Nerfed stardust

* soup

* Update monkestation/code/modules/storytellers/converted_events/_base_event.dm

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

* Update monkestation/code/modules/storytellers/gamemode_subsystem.dm

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

* drones

---------

Co-authored-by: tgstation-server <[email protected]>
Co-authored-by: Lucy <[email protected]>
Addust added a commit to addusts-shenanigans/github-fix-your-shit-i-swear-to-god that referenced this pull request Dec 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants