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

party toilet only for flushing illegal stuff #77086

Closed
wants to merge 28 commits into from

Conversation

Kamejeir
Copy link
Contributor

Summary

None

Purpose of change

image
mr harakka suggested this, and I chose to pick it up. After further deliberation, it turned into removing stuff that didn't make sense to hide

Describe the solution

New "stash_drugs_illegals" itemgroup for use in private resort toilets. I am keeping in tobacco pipes and glass pipes (bongs) because I guess they would be able to be crushed and flushed, and the party people didn't want the police to find traces.

Describe alternatives you've considered

Testing

Added various debug items to the itemgroup in question to know that the private resort toilets (like in picture) are the ones currently being changed, then removed said debug items along with all other nonsensical items after making sure by seeing. Then did a non-exhaustive test to see that weird legals aren't spawning.
image

Additional context

Please correct me on missing illegal stuff and potentially kept legal stuff, I only made very shallow searches.

SurFlurer and others added 10 commits October 14, 2024 14:44
Move charge check to check_consistency(), return default count to (1,1), remove Item_spawn_data::finalize()
The source of the explosion for grenades was being passed as the
character they were (potentially) on, because no other character was
available to be responsible at that point. To make a character
available, whenever an item is activated or thrown, set an item var with
the last character to do so on it. Then, use that to find the explosion
source.

Also, ignore it in checking if an item stacks with another.
When you can smash something, but it will be difficult, you need to
repeatedly press 's' and then a direction key. This is tiresome, and
there's no real reason for it - we can just ask the player if they want
their character to keep smashing until it's gone.

Move noninteractive bashing code for avatars into an avatar:: function,
and return some info about how the bash went - if it didn't succeed but
could with more effort, ask if they want to keep bashing until it does.

Also fix types for a bashing debug message.
-dialogue debug menu picks NPCs correctly from the list
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Oct 16, 2024
"type": "item_group",
"id": "stash_drugs_illegals",
"items": [
{ "prob": 5, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_30" },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is like the most normal sleep medication in the universe in a group with illegal drugs

@PatrikLundell
Copy link
Contributor

If people were flushing drugs down the toilets you wouldn't be able to find them, as they'd be flushed away. However, if they hid it in the toilet tanks in some kind of water proof containers it would make some kind of sense (the "sense" being that police would be too ignorant or, more probably, lazy or subject to accepting incentives, to look in such obvious hiding spots).

Maleclypse and others added 6 commits October 16, 2024 13:21
…-bugfix

Cache dialogue conditional results, fix dialogue hotkeys
…ems it's charging (CleverRaven#77059)

* Initial commit

* >0 (no divide by zero)

* We love janky solutions to get around integer limits

* Linting
…ills

Track kills through grenades and other explosives
…-overload

[Aftershock] Fix incorrect EoC name
…xt-fix

Fixed issue where extra cursor was drawn in ImGui InputText field on TUI builds erroneously
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 16, 2024
LyleSY and others added 7 commits October 16, 2024 16:22
* Update zinosaur_upgrade.json

* Update zinosaur_upgrade.json
Allow any grade of steel chunk for the makeshift hammer
Option to start bash activity on partial bash
* Add spell

* Add spell scroll

* Add spell components

* Add goodberry item

* Add spell scroll

* Add scroll

* Add dabbler hobby

* Update data/mods/Magiclysm/Spells/druid.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Magiclysm/items/ethereal_items.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Updates

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven#77063)

* Removed several skin mutations that previously prohibited installation of Alloy Plating CBM

* Changes names of Alloy Plating bionics
Spawn emergency drugs in pharmacy, update quests text
@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership Info / User Interface Game - player communication, menus, etc. Mods Issues related to mods or modding Missions Quests and missions Bionics CBM (Compact Bionic Modules) Map / Mapgen Overmap, Mapgen, Map extras, Map display Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mechanics: Enchantments / Spells Enchantments and spells EOC: Effects On Condition Anything concerning Effects On Condition Mods: Mind Over Matter ImGui Anything related to the new ImGui UI for SDL/tiles or ImTui for curses builds labels Oct 17, 2024
@Kamejeir
Copy link
Contributor Author

huh why github. why did you do that

@Kamejeir Kamejeir closed this Oct 17, 2024
@Kamejeir Kamejeir deleted the only-illegals-flushing branch October 17, 2024 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Crafting / Construction / Recipes Includes: Uncrafting / Disassembling EOC: Effects On Condition Anything concerning Effects On Condition ImGui Anything related to the new ImGui UI for SDL/tiles or ImTui for curses builds Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mechanics: Enchantments / Spells Enchantments and spells Missions Quests and missions Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.