-
Notifications
You must be signed in to change notification settings - Fork 14
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
Merge in changes from our upstream #457
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A variety of smaller fixes
Adds sanity check to spin()
Attempts to fix two different cascading runtimes
Tweaks a couple things relating to gateway and redgate maps Renames all of the map templates to have Gateway or Redgate prefixes, that way it's more clear what they are intended for when referred to in game Removes 'Abandoned Island' from the redgate rotation pending a redesign. Also touches up a couple things with it. Makes a 140x140 compatible version of the zoo gateway map. Does not add this to rotation for now, I would like to further revamp this later.
A bunch of small fixes
Offmap housecleaning
Adds a seagull
Revises the OOC notes panel a bit, and removes the OOC notes panel from character setup, in favor of just adding buttons to set the likes and dislikes there, rather than maintaining two different versions of the panel. Additionally, adds a 'print to chat' button to the panel, and to examine for the OOC notes. Changes the way the window is sent to the client so that it behaves more like character setup. This should mitigate edge cases where the panel appears off screen when SS13 is not being displayed on the primary monitor. It SHOULD also remember its position between sessions. Either way it should stay on your screen now. Also, for the print to chat, character directory, and any OOC notes panel that isn't yours, the LIKES and DISLIKES sections will show up conditionally depending on if they are actually set up. If there's nothing there, then they won't show up. This is presently an imperfect revision, as it only allows you to have one OOC notes panel open at a time. I would like you to be able to have more than one at a time, while also having the features to allow it to always appear on the screen, however, that will take some extra development time. Apart from that, this is fully functional.
Char Setup: Reset Buttons
Revise OOC notes panel
Fixes some shadekin issues
Staff may make an atom ProcCall on painting frames to load any painting desired from persistence.
removes(blood): Removes remove_blood scaling with mob size tweak(blood): Simplifies minimum process check in take_blood
Lovec fluff item
Adds the ability for staff to spawn specific paintings onto existing frames on demand
Emergency Beacon!
Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens
Unscheduled Update (19/08/2023)
9/11/23 - It's late!
Normally, TGUI is fine to be observed by ghosts - thus attack_ghost() calls it on left click in addition to examining. Unfortunately, NIFs require ishuman() vars to be accessed, causing runtime errors. Unfortunately x2, the way TGUI is set-up, observers override tgui_state checks that would enforce ishuman() state checks. Therefore, we must modify tgui_interact to reject attempts to call the interface for non-human mobs.
fix(nif_tgui): Fixes TGUI interact on ghosts
Blood Reagents Refactor
Also removes some old lore references from the listening post
modifies puffercarp cataloguer entry
Health & Damage in Mob Spawner
Remove all mention of nazis from code
HOT Paper Scooping ACTION: the SEQUEL
9/17/23 - Map swap
Tk420634
approved these changes
Sep 19, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My god
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.