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

Bomber-type logs now mention if the bomber has the pacifist trait. #823

Merged
merged 5 commits into from
Jan 14, 2024

Conversation

LikeLakers2
Copy link
Collaborator

@LikeLakers2 LikeLakers2 commented Dec 31, 2023

About The Pull Request

The Pacifist quirk is supposed to prevent you from harming creatures. In most cases, it works - the character will refuse to attack with lethal objects or lethally-loaded guns, as well as silly stuff like not stomping cockroaches.

However, it's possible for the player to bypass this pacifism. One way is through grenade-type items.

This PR doesn't block players from using grenades if they're pacifist, but it DOES cause logs to mark if they were a pacifist at the time of priming the grenade.

image

ADMIN LOG: MichiRecRoom/(Duncan Kelly)(?) (FLW) (pacifist) at Primary Tool Storage (137,139,2) (JMP) primed a cleaner grenade at Primary Tool Storage (137,139,2) (JMP) containing: (beaker 1 : Fluorosurfactant, 40); (beaker 2 : Water, 40 | Space Cleaner, 10);.

image

[2023-12-30 21:27:55] MichiRecRoom/(Duncan Kelly) (Primary Tool Storage (137,139,2)) (Event #​3)
(while pacifist) primed a cleaner grenade at Primary Tool Storage (137,139,2) containing: (beaker 1 : Fluorosurfactant, 40); (beaker 2: Water, 40 | Space Cleaner, 10);.

Note the (pacifist) and (while pacifist) added near the beginning of these logs. These appear if the user has the Pacifist trait. Users without the Pacifist trait have the same logs as before.

This PR also makes a small change to c4 explosives - now they're logging using the proper method instead of manually logging.

Why It's Good For The Game

Pacifist characters shouldn't be using dangerous items! While this doesn't block them from using them, it makes it much easier for admins to spot whether a player was pacifist at the time of priming a grenade - from there, the admin can tell if a pacifist player used said grenade in a non-pacifist way.

Changelog

🆑 MichiRecRoom
admin: Admin logs that relate to priming grenades or planting bombs will now contain "(pacifist)" or "(while pacifist)" near the beginning of the log, if the mob had the Pacifist trait at the time of the log being generated.
code: log_bomber() now has a new targeted variant, which should be used whenever a bomb has a target (such as with C4 or X4, which are used on mobs or turfs, rather than primed and thrown like grenades).
/:cl:

@wraith-54321 wraith-54321 merged commit d658a4a into Monkestation:master Jan 14, 2024
18 checks passed
github-actions bot added a commit that referenced this pull request Jan 14, 2024
@LikeLakers2 LikeLakers2 deleted the log-pacifist-bombers-2 branch January 14, 2024 17:41
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