Skip to content

Vanderport#25

Draft
DovaKitty wants to merge 47 commits into
mainfrom
Vanderport
Draft

Vanderport#25
DovaKitty wants to merge 47 commits into
mainfrom
Vanderport

Conversation

@DovaKitty
Copy link
Copy Markdown
Contributor

Vandeport merge PR up to 3/4/25, including naming refactor for objects/jobs.

CannibalHunter and others added 30 commits February 21, 2025 15:18
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Fixes being unable to cuff the legs of people, that simple. For some
reason it broke a while back and nobody noticed besides a few people
(such as me) so I fixed it.

You can now target a leg with a rope/chains and tie thier legs to slow
them down once again.

## Why It's Good For The Game
Fixing broken features is good because the feature is no longer broken.

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

Adds Astrata's Daywalker, a combat migrant-wave role that's meant to go
around getting into scuffles with deadites, vampires, and anyone who has
red eyes. This is a reference to Blade 3: Trinity.

## Why It's Good For The Game

Might be overtuned, might not be overtuned, it's got a low weight so i
(fucking hope) that means it's rarely going to happen. One per round,
and not invincible.

![literally
blade](https://github.com/user-attachments/assets/9b3db384-2b8a-4726-9c1d-d63abfd14ea7)


## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
The cursor now finally uses the charge up percent icons when you are
doing an attack that uses a charge, such as bows, spells, and flails.

I've made it easy for others to add NEW charge up icons for their
intents. You just need to modify the two vars on your intent
`charge_pointer` and `charged_pointer`

As so
```
charge_pointer = 'icons/effects/mousemice/charge/shield_charging.dmi'
charged_pointer = 'icons/effects/mousemice/charge/shield_charged.dmi'
```


https://github.com/user-attachments/assets/0cc03d7d-2d49-433c-ae54-f8b5de33d529

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game

It's hard to tell how long untill your windup is done charging for most
things like firearms, axes, flails, and other stuff. I think this will
help a lot.

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

<!-- Documenting changes -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

Adds the song [Retina by Flleeppyy (me)](https://youtu.be/uJdHFSfHiqA)
as a new title song.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
- Forest Ranger gets +2 perception
- Forest brawler now has +3 str, +2 con, +2 end, -2 spd to bring total
stat changes in line with other subclasses.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Forest brawler may be a little overtuned with +4 STRENGTH
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: tonty <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
#817 redone, plus mountain this time.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
See #817.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

---------

Co-authored-by: AberrantQuerist <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Includes legendary skill level in butchering reward calculation, cleans
up the code.
Changes the chance to get botched result from 50% at levels 0 and 1 to
50% at level 0, 25% at level 1
Changes the chance to get perfect result from 10% at level 3, 50% at
level 4, 100% at level 5, 0% at level 6 to 25% at level 3, 50% at level
4, 75% at level 5, 100% at level 6.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Now legendary butcher gets the same result as an average. This PR fixes
it and makes the code three times smaller
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Prison Convoy was rolling three times as often because its downgrades
rolled as individual waves, this fixes that
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Fixes Prison Convoy rolling three times as often as it should
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [X] You tested this on a local server.
- [X] This code did not runtime during testing.
- [X] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: tonty <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

Adds the song 'Black Powder' by T87-Sulfurhead, replaces the old
Grenzelhoft theme - applies it to various Grenzelhoft migrants/jobs
aswell as updating the credits document.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
## About The Pull Request

Adds 4 mobtimer helpers that covers all of the *conventional*
mob_timers.
All mob_timer IDs have now been made into defines.

## Why It's Good For The Game

Code readability and general maintainability.

## Pre-Merge Checklist
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
- ~~Fixes stress to make it actually work~~ Atomized due to severe
balancing issues
- New overlay to show fingerless hands
- Fixes revival not properly grabbing ghost and removing gray death
overlay
- Fixes sleep healing at double the rate as well as prosthetic sleep
healing
- Black gem made easier to see when dropped
- Changes redstone logic to be more consistent. Link a redstone
structure to itself to remove all links
- **Hunted flaw users now must wait 60 seconds to descend to the
underworld upon death**
- Adds dart pouch
- Replaces sexy dress of legendary sewists with silky dress of legendary
sewists. Sprite by @cre
- **City Watch cuirass to Men at Arms Pikeman. City Watch Footman and
Pikeman get maille and a gambeson.**
- Makes men at arms loadouts a little more unique compared to the city
watch.
- Fixes Jester randomized stats
- Gives artificer key from Carpenter to Miner
- Makes putting books on shelves faster (this was just annoying)
- Fixes observers inheriting dead body mob verbs
- **Lets projectiles embed into simple mobs**
- **Adds a 5 second delay to making graves, because we can't have nice
things can we**

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Please don't close my PR for not atomizing tonyGH.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## Matthios dungeon map uploads. Two new maps, one is acidmagetower
which was made 30x30 and the other is thelastbreath which is a 45x45
tile dungeon. Both shouldn't need editing to make them work in the rng
pool. The editing to the code is for the rooms to spawn in and it should
be correct with its placement.

![image](https://github.com/user-attachments/assets/535741cb-e2e9-48bd-8f50-8113ee6c09fb)

![image](https://github.com/user-attachments/assets/05e0bcfb-255f-4780-b59e-57ca137f4e58)

![image](https://github.com/user-attachments/assets/db9ffafe-53bf-464c-9cd4-78f6efe1153f)

![image](https://github.com/user-attachments/assets/ed38ede2-0ff7-4674-9fe9-b3ae9180cc0d)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## This adds more maps for the Matthios dungeon that not only increase
the danger but increase the randomization of the dungeon rooms.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [X] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

---------

Co-authored-by: tonty <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Its more fitting then a game_mode system that only spawns 1 antag and
then calls it quits.

The god telling the story changes based on the current highest devotion
power, so the more worshippers of a god means the better chances its
telling the story.

Each god will have their own intervention events which are storyteller
specific events that only they fire so their is some boons and malus for
each god.

Villians are added up to a cap based on living town members with royalty
and guards adding extra value.

Omens were moved to the new system so that now each omen increases the
speed at which omens get called, and omens are a unique track on the
storyteller.



Orignal storyteller from [Camper12345](https://github.com/Camper12345)
and [NanakoAC](https://github.com/NanakoAC), modified storyteller
subsystem from Horizon by Azarak (azarak908 on discord) and Burger.
Credits were grabbed from the Bubber port of Storytellers as the
original repo no longer exists.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

![2bd166e1995cb0798ca02f1fb00fed90](https://github.com/user-attachments/assets/58fa22a3-0c33-4538-9459-64ee52a6dde7)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
adds testmerges section to issue template
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## Two new maps for Matthios Dungeon.

![image](https://github.com/user-attachments/assets/992d8297-10e4-4859-a89d-1682554d5758)

![image](https://github.com/user-attachments/assets/eabdaec0-b289-4d12-ae0a-8f766fa61173)

![image](https://github.com/user-attachments/assets/d9d278df-1a07-4618-af1b-4a729db7fe5a)

![image](https://github.com/user-attachments/assets/c197b2e9-8b19-4ca4-8cfd-d706db75ab68)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Adds a new dungeon and a new resting zone for players.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [X] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [X] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

---------

Co-authored-by: dwasint <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
the icons of the rust pants and boots were not correct, this will fix
it.

## Why It's Good For The Game
bug fix good

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
1. Open mob's VV menu
2. Click the drop down menu
3. Pick `Give Control To Player`
4. Choose a player from the input
5. Player now controls that mob


![image](https://github.com/user-attachments/assets/34d99b68-5d71-4f2b-b570-8bbd12526531)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
admin asked for it, admin qol
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
ARefrigerator and others added 17 commits February 27, 2025 14:05
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
- Updates all current fish
- Adds crab and octopus sprites (for future use)
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
People have complained about some of the older sprites so hopefully this
helps make the game more pretty.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: tonty <[email protected]>
…#865)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
the implementation is a bit scuffed so if you have some suggestions on
how to make it better do make a code review

- more options for `change view range`
- ghost dead hud will not show for adminned people

<details>
<summary> before </summary>


![image](https://github.com/user-attachments/assets/d278055b-b7e0-4a8d-b1c4-570d8c541d18)

</details>

<details>
<summary> after </summary>


![image](https://github.com/user-attachments/assets/83b41248-49f7-425a-89d7-29da356344b4)

</details>

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
I think it makes it easier to see what you need to admin
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Powder currently always qdels when thrown, this seems incorrect. Changes
the behaviour to only delete if you make someone sniff it via throwing.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
A merchant or apothecary could easily delete valuable drugs
unintentionally.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Adds two new tomb rooms. Also renames certain maps to allow them to
spawn in dungeon generation.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
More dungeon map variation is good.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

Gives every alchemical potion a random color, assigned at roundstart.
Controversial for sure.

## Why It's Good For The Game

Prevents meta-knowledge of potion colors, might be worth asking before
you swig.
I plan on making another PR that lets you label bottles with parchment.

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

---------

Co-authored-by: tonty <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

This PR adds smelling (inspecting with nose targeted) of reagents from
open containers!
You must either hold, or be next to the container.
The smell will be the same as the taste, unless a different smell is
specified in the object's scent_description.

The apothecary has a better sense of smell, and can identify liquids
from their scents.

## Why It's Good For The Game

I think that you should be able to give your bottles a sniff before
drinking them.
_Is this wine or lifeblood?_

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
## About The Pull Request

Touches up Vanderlin for some fixes and very minor QOL changes post
merge conflict cast

## Why It's Good For The Game

Fixes some open turfs over the river and in the sewer, touches up the
tailor some to not be traffic hell

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

acidfight - fix base closed turf
AcidMageTower - fix duplicated window, stairs
Allbutwesthall - fix turf on door, extend balcony (openspace extended it
anyway)
Bathhouse Dungeon - fix stairs
DarkCorridors - fix stairs
drugden - bedrock borders for Z2
fightpit - fix stairs, add roof to the sleeping area, turf/closed, door
dirs
ForgottenInn - fix stairs, fix every door and window except one being
blocked by walls, fix window dirs
goonies - Window dirs
goblincamp - fix open turf on bottom layer
goblininfestedjoint - fix some incorrect openspace
graveend - fix closed turf on door
hctomb01 - fix stairs and ladder
LavaMedium/Small - fix open turf under stairs
queensretreat - fix stairs

skeletonroom
- Add turfs to the top part so you can actually use it to travel without
jumping
- Fix open turfs under the upstairs doors
- Fix the door dirs upstairs and lock them like the downstairs ones
- Shrink the upstairs south entry to 3 tiles to match the north side
- Bedrock borders for Z2

small lab - replace wall ladders with real ones and stairs since they
don't actually work like ladders
TownRuins - fix base type bucket
thelastbreath - fix two stairs

wild dungeon medium/small - fix stairs
puzzle trap large/medium/small - fix stairs

lamptern hallway - fix turfs
tented entrance - fix turfs
eastern entrance - fix turfs

Note that fix stairs means it had wrong dirs or a closed/openspace turf
beneath it, openspace isn't always bad since the wall below is what
determines behaviour of turf spawning above, but this can either make a
floor or an indestructible wall depending what that turf it is so its a
good idea to just NOT have openspace below stairs ever.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Some of these aren't even possible to clear because of broken stairs,
blocked entry or broken ladders. We do not want broken maps.

Please check maps throughly...
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Half orcs are now understandable! Their accents will likely be added to
in time.
Aligns some in-game lore references to Vanderlin's world. These were
missed in the initial lore pass.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

---------

Co-authored-by: AberrantQuerist <[email protected]>
…ot (#801)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

Increases PQ Requirements for certain roles as requested by Ook

Monarch: 25
Priest: 20
Captain, and sheriff when it is added: 15
Inquisitor: 15
Dungeoneer: 10
Hand: 10
Court Agent: 10
Templar: 8
Adept: 5
Orphan: 2
Prince: 4
Warden: 8
Mercenary: 5
Hunter: 0
Jester: 5

Adds an additional Job Slot for Tailor, for a total of 2

Removes Jailor in a very scuffed way (Just has 0 job slots available)

## Why It's Good For The Game

Increased PQ should help fix some moderation issues, as the roles now
require a higher amount of overall player roleplay and playtime. No more
bows for shitters with - PQ

Additonal job slot for Tailor should manage workload better

Jailor sucks, his life serves 0 purpose, therefore he has been nuked in
the most scuffed way I can.

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: tonty <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Tweaks the horc accent as problem phrases are found.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
This is supposed to make them easier to understand.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: AberrantQuerist <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request
Finishes up all the temporary food eating progress sprites.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

## Why It's Good For The Game
Consistency is nice. 
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Co-authored-by: AberrantQuerist <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- Note: PRs including balance changes authored by anyone other than
maintainers and official devs will not be considered. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review or prevent the PR from being merged!
-->

makes it a copper knife instead, since it can't be used as a wedge like
daggers are supposed to

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

huh, hu whu

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->
@github-actions github-actions Bot added the github label Mar 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.