Added Pipi #1
Merged
Added Pipi #1
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
…29135) Add ClothingUniformJumpskirtColorPink to an OrGroup
* clean up weather systems * Update WeatherComponent.cs * Update SharedWeatherSystem.cs * some fix * Update SharedWeatherSystem.cs * Update WeatherComponent.cs * Update WeatherComponent.cs * revert autoPause * Update SharedWeatherSystem.cs
* Implement crucial chef's hat functionality * Unified stopping code and added events. * Added documentation to events * Rerun tests * Made review changes, and fixed potential desync bug. * Update whitelist
* Fix conveyor mispredicts Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely. * Fix ActiveConveyor * Fix lerping
* Revert "Rotate and Offset station CCVar nuke (space-wizards#26175)" This reverts commit 44b20f6. # Conflicts: # Content.Server/Station/Systems/StationSystem.cs # Resources/Prototypes/Maps/europa.yml * Fix * Review
Add cones to engivend
arachnid inventory layout fixC
…9168) * Turn InteractionAttemptEvent into a struct event * readonly * GettingInteractedWithAttemptEvent * ConsciousAttemptEvent
…29103) * Foam Force * make it available somewhere * add clumsyproof and nuke dev item * reorganize * oopsy files * Strap! * woopsie layering * fix grammar to rerun tests for rogue unrelated test fail. * cleanup * I eepy layer forgetti spaghetti * For real last necessary commit * Oops I broke the law! feexed * Decided to just change it to the same source as the poster source in our repo for consistency.
|
Oh whoops this also includes a bunch of updates from the main ss14 branch. If you want me to not have them in this PR lmk. |
Whoops forgot her pet line
medabunny
pushed a commit
that referenced
this pull request
Jun 27, 2024
Reduced Rat King's claw weapon attack from 12 slash 8 piercing to 10 slash 7 piercing Reduced Rat King's fist attack rate from 0.75 to 0.55 Reduced Rat King's fist attack damage from 66 to 54 Added following text in rules on rat king selection: "Your primary goal is getting food. Killing should be used as a last resort. You are still subject to Mass Chaos RDM rules unless declared an enemy of the ship.
TGRCdev
pushed a commit
to TGRCdev/imp-station-14
that referenced
this pull request
Sep 10, 2024
add MiddleName string
formlessnameless
pushed a commit
that referenced
this pull request
Oct 18, 2024
New Gray Customization and reorganziing
formlessnameless
pushed a commit
that referenced
this pull request
Nov 30, 2024
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.
Added Pipi to station pets, includes the ability to get Pipi from cat crates from cargo and for the thief to be able to have stealing her as an objective. That last one is going to require adding her spawnpoint to maps though.