Skip to content

adds a malk psych ward - #107

Open
buffyuwu wants to merge 25 commits into
ApocryphaXIII:masterfrom
buffyuwu:malk-psych-ward
Open

adds a malk psych ward#107
buffyuwu wants to merge 25 commits into
ApocryphaXIII:masterfrom
buffyuwu:malk-psych-ward

Conversation

@buffyuwu

@buffyuwu buffyuwu commented Jul 30, 2026

Copy link
Copy Markdown

About The Pull Request

This PR adds a (mostly) abandoned psych ward under the clinic, as well as some minor tweaks the clinic layout to accommodate new cool things like an elevator and the clinic directors office.

Why It's Good For The Game

malkavians need a haven!

Testing Photographs and Procedure

Details {063BE982-DCA7-461E-A0E3-5BE8B0A8CB95} {703B1724-D183-4DD5-847C-C82D67C9B4D1} {52DBD412-6D1F-4746-9F83-8278170C861C} {C06BD5AA-14BE-4809-AD4B-25D06335942F} {42D78047-35CD-4173-B6C8-340CB2AC38BA} {EDCE2178-0818-487E-9BB5-BA2136F1C47C}
Screenshots & Videos {C573914E-57E5-4106-9BFC-8376C69C07E7} {74E372E9-091D-4E71-868C-F6B04CC99620} {47FFA8BB-1030-46E5-9F83-D0B472E5BB50}

Changelog

🆑
map: Adds an 'abandoned' psych ward below the clinic for Malkavians
/:cl:

tgstation-ci Bot and others added 21 commits July 27, 2026 02:42
## About The Pull Request

from w20 core
## Why It's Good For The Game

from w20 core and honestly kinda funny
<img width="1172" height="783" alt="Screenshot 2026-07-26 122725"
src="https://github.com/user-attachments/assets/b9b9aea5-c569-44e1-945a-877fc167e7bd"
/>
## Changelog
:cl:
add: Added Monochrome Vision flaw for Garou
/:cl:
## About The Pull Request
Breaks the guestbook code up slightly and rewrites the code so that the
primarly used define returns the MOB instead of the name.
This means that in all scenarios where we directly imbued into a string
(all of current uses), text macros work as intented
https://ref.dm-lang.org/DM/text/macros/
I didnt check if this fixes anything persay but it likely affects
situations for everything that is not a human (as they use macros alot
more often)


Also fixes 
<img width="1179" height="79" alt="image"
src="https://github.com/user-attachments/assets/23501f8b-7c9d-4b86-8028-fa65ff9732fa"
/>
I discovered caused by a recent pr while leaving my game open (the dog i
was testing barked)

I orginnaly assumed this was what caused DarkPack13#1130 but that was acctually
its own issue but i fixed it.
## Why It's Good For The Game
Grammer good.
Bugs bad.
Fixes DarkPack13#1130
## Changelog
:cl:
fix: Guestbook should handle text macros better
fix: Dogs are treated as an improper noun
/:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Moves hunger multipliers from
DarkPack13#857 to a config rather
then being in two seperate places which made it so our code has a * 0.04
of normal tg which is why no one got hungry.
Default config value is set to 0.5 of normal TG values. This is
something that should likely be tweaked.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
hunger rate is pretty subjective and depends on the length of the round
and population imo.

Having a ton of stores/food/cooking but NO reason to ever eat is bad. I
might follow this up with a minor buff for eating player made food.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Hunger is no longer accidentally soft-removed
config: Hunger rate is on a config for easier tweaking
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
## About The Pull Request

Adds the Cast-Iron Stomach from Bygone Bestiary.
## Why It's Good For The Game

It's not a hugely important trait so honestly it isn't but I do like to
eat raw meat as a Lupus so.


https://github.com/user-attachments/assets/3abe68ce-58df-47d9-bbc4-5ce0cf6ceaab
## Changelog
:cl:
add: Added Cast-Iron Stomach as a merit
/:cl:
## About The Pull Request
Fixes Condottieri job's supervisor, changing it from SHERIFF to SOCIETY
OF LEOPOLD
## Why It's Good For The Game
Bugfix
## Changelog
:cl:
fix: Fixed Condottieri's supervisor property.
/:cl:
## About The Pull Request
Reworks the spawns for artifacts to defavor klaives extreamly hard, but
put better spawns (that are guarded) into the umbra.
Spawners work off a pool of points and match the power of artifacts
spawned with banes guarding them.
<img width="670" height="501" alt="image"
src="https://github.com/user-attachments/assets/9540d448-44e6-40c8-9f2c-5a71a7418a3d"
/>

Also adds a new merit that lets you spawn with a **RANK 1** fetish round
start. I could prob also extend this to a separate one for
ghouls/vampires if thats desired.
<img width="504" height="246" alt="image"
src="https://github.com/user-attachments/assets/a5ef86d3-c577-4831-b431-65c2a01f9e4e"
/>

Adds a new homebrew fetish that listens VERY good and repeats random
messages back when used.


https://github.com/user-attachments/assets/cb2b076b-cba0-4e68-8e33-d46ccbc04324
## Why It's Good For The Game
Current spawns and systems dont have any particuarly leaning towards
werewolves which feels strange as it ends up with alot of
vampires/humans getting there hands on artifacts that werewolves will
murder the fuck out of you for having. While they are still
obtained-able through the means the strong ones should be alot rarer.
And now the werewolves have a good reason to visit the umbra or spend
points into merits.
## Changelog
:cl:
add: The umbra now spawns corpses with fetishes and banes surronding
them
add: Adds new minor werewolf fetish: Magpie's Ears
add: Adds merit to have a roundstart fetish owned by you.
balance: Klaives are MUCH rarer from normal spawns
/:cl:
## About The Pull Request

ran into this harddel downstream. this should hopefully fix it?
```
[2026-07-27 00:50:20.585] REFSCANNER: native refscan complete for /datum/discipline_power/bloodheal/one ([0x210ed59c]), took 2539 ms
 - === 1 finding(s)===
 - [finding]    datum #971514 (/datum/discipline/bloodheal).current_power
```

## Why It's Good For The Game

harddel bad

## Changelog
:cl:
fix: Fixed a laggy hard delete related to disciplines.
/:cl:
## About The Pull Request
Runtime from not having an auspice, Prob corax.
<img width="1238" height="262" alt="image"
src="https://github.com/user-attachments/assets/49fdee93-13b9-4dae-a94f-c03b59acf265"
/>

Runtime from trying to check the beating of a heart for a a heart that
doesnt exist.

Kinfolk dont have a tribe so runtime trying to compare tribes. 
<img width="1127" height="410" alt="image"
src="https://github.com/user-attachments/assets/5e61da48-55aa-4cbc-a892-54b4b4863857"
/>

Bad arg order on planter.
<img width="1348" height="252" alt="image"
src="https://github.com/user-attachments/assets/87203bbd-8f9d-46f0-aba7-5d561aa141fa"
/>
## Why It's Good For The Game
Runtimes bad.
## Changelog
:cl:
fix: Improves handling for detecting a heartbeat to be more consistent
code: Fixes random runtimes
/:cl:
@buffyuwu

Copy link
Copy Markdown
Author

i think my fork is more up to date than the apoc fork's master branch

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.

5 participants