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

Merge in changes from our upstream #457

Merged
merged 1,246 commits into from
Oct 1, 2023
Merged

Merge in changes from our upstream #457

merged 1,246 commits into from
Oct 1, 2023

Conversation

DameonOwen
Copy link
Contributor

No description provided.

Heroman3003 and others added 30 commits August 15, 2023 15:16
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.
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.
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
Adds the ability for staff to spawn specific paintings onto existing frames on demand
Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens
Unscheduled Update (19/08/2023)
Very-Soft and others added 25 commits September 11, 2023 22:38
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
Also removes some old lore references from the listening post
Fixed wall behind a door in city warehouse.

Fixed chairs ontop of vending machines in the train.

Fixed there being no radio upstairs in the train.
modifies puffercarp cataloguer entry
Remove all mention of nazis from code
HOT Paper Scooping ACTION: the SEQUEL
Copy link
Contributor

@Tk420634 Tk420634 left a comment

Choose a reason for hiding this comment

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

My god

@DameonOwen DameonOwen merged commit 8450532 into master Oct 1, 2023
3 of 7 checks passed
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.