Skip to content
This repository has been archived by the owner on Apr 8, 2021. It is now read-only.

Weekly Upstream Update PR #170

Open
wants to merge 120 commits into
base: master
Choose a base branch
from

Conversation

MCterra10
Copy link
Collaborator

(Here we go) Here they come they're on a roll, where they'll stop nobody knows. If you have a point to prove, they'll make a plan and see it through. They'll sign you up to join their crew, Scotty - SCOTTY! - and the Ninjas - NINJAS! - too. Here we go, come on join the prank patrol! (Here we go)

pali6 and others added 30 commits March 19, 2021 21:28
* updates handpuppet emote to respect pronouns
* replaces old "joke"
* better joke
…ctories (#4078)

* Ports tgstation/tgstation#57825: Improve tgui routing to allow interface subdirectories; apply to CyborgModuleRewriter
* Move GasCanister tgui interface into subdirectory
added ai_module/random
…liasis (#3873)

* fixes some bugs and adds a message

* clarification

* I think this is a better alert.
…pace (#4044)

* initial fix

* linter why you no yell at me

* fart
Kyle2143 and others added 27 commits March 25, 2021 06:59
PLEASE FOR THE LOVE OF GOD PING ME IF THIS MADE IT WORSE THAN BEFORE WE WILL ROLL BACK IMMEDIATELY GOD HAVE MERCY
* Resprite four items from food.dmi

* revert meatloaf to make it better later
* player panel wip

* wip

* remove commented out wip code

* remove unused lists

* fix location readout

* Tidying up PlayerPanel, implementing search, partial sort implementation

* Refactoring PlayerPanel tgui interface, (re-)implemented search and sort

* add pm and jump buttons. actions now try refs 1st

* fix merge conflict, remove debug print

* remove test data, add new verb

Co-authored-by: Mordent <mordent.goonstation@gmail.com>
Co-authored-by: BatElite <SoftBatElite@protonmail.com>
Previously this was only in the game log. Welp!
Copy link
Collaborator Author

@MCterra10 MCterra10 left a comment

Choose a reason for hiding this comment

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

reviewed, looks fine, but I need to have a look into the massive changes on z2.dmm

@MCterra10
Copy link
Collaborator Author

it just removes an old away mission (catmandu), good to go!

@MCterra10 MCterra10 added the Upstream Merge Changes pulled down from goon upstream. label Mar 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Upstream Merge Changes pulled down from goon upstream.
Projects
None yet
Development

Successfully merging this pull request may close these issues.