Upstream Sync #17
Merged
Upstream Sync #17
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
* Update pebble.yml * Update pebble.yml * Update pebble.yml * Update pebble.yml * Update pebble.yml * pebble --------- Signed-off-by: Carolyn3114 <[email protected]>
* Fixes * lmao later
* Felinid own stomach * Remove glorius death * removes glorus deat lrp * removes glorus death because lrp * removes glorus death because lrp * removes glorus death because lrp * Added respective comment * Update traitor.yml added comment Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Sif <[email protected]> Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
* Higher Reflection + Only Energy Reflection Hard Counter to Lasers and Disablers in exchange of not being able to reflect bullets * Lower Price In Exchange of reflection Only energy reflection and no one really bought deswords because it is too expensive for their jobs. * Update Resources/Prototypes/Catalog/uplink_catalog.yml adjusted comment Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Tryded <[email protected]> Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
reverts the godmode 100% reflect chance for energy weapons on double e-sword
* Rename and refit brigmedic Renames brigmedic to corpsman, fits them out in new drip, everything should be commented a-okay and working properly. * quickfix meta * Update belts.yml Signed-off-by: Tad "Taddy" Johnson <[email protected]> * Update job-names.ftl Signed-off-by: Tad "Taddy" Johnson <[email protected]> --------- Signed-off-by: Tad "Taddy" Johnson <[email protected]>
Signed-off-by: Velcroboy <[email protected]> Co-authored-by: Jeff <>
* buh * ye rip * copypaste is fun
* Stop singing when muzzled * Changes to when harpies can sing Stops harpies from opening the MIDI UI while muzzled. Also reworks how harpies are stopped from singing when incapacitated, so that harpies are allowed to sing while cuffed. And for UX sake, tells the player why they can't sing when applicable. This should fix some of #180. * Refactor to remove SingerIncapacitatedEvent * Significantly clean up HarpySingerComponent * Do not allow singing while zombified, also refactoring * Additional singing conditions Now stops singing if knocked down, stunned, or asleep. Also prevents singing if the player for any reason can not talk. * Stop singing when muted status effect is applied * Damage interrupts harpies when singing * Rename cantSpeak to canNotSpeak * Remove most cant-sing explanations * Change can-not-sing feedback message Co-authored-by: Debug <[email protected]> Signed-off-by: Bakke <[email protected]> --------- Signed-off-by: Bakke <[email protected]> Co-authored-by: Debug <[email protected]>
* woo cornmeal exist * mothic all the food * typo * fixes * sigh
Signed-off-by: Debug <[email protected]>
* mothroach event * slightly more
Made the events slightly less exciting.
* Nyano port of every moth markings * update path * Classic-ify everything * Make sprite 32, update locale, classic * Truly make them uncolorable moth happy +1 * Remove duplicate coloring
* whynot * buh
* Expedition board is now researchable Adds the Salvage Expedition Computer board recipe Adds the board recipe to the Salvage Equipment research * Update Rules.txt Updated the rules since expeditions are coming back.
fixed cargo shuttle not having room to dock changed maintenance hatch access where it should have been maints locked
* merge maildrobe and courierdrobe * combine the sprite
* Reverse engineering guidebook * Make it so upgrades actually increase scan bonus * i love when uncommenting creates spaces * the code checks for capacitor * Revert capacitor changes and change code * fix the guidebook still using scanning module * woops
* Arena Rebase * Updates proto file --------- Co-authored-by: Jeff <>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Jeff <>
Signed-off-by: Debug <[email protected]>
Co-authored-by: Jeff <>
* fix * add icons for actions with target
* Trimming the bird emotes * Guh
* Update pets.yml * Added proper description in locale folder * Double checking my grammer Boy is it going to be weird if this needs to be fixed later and only gets reverted * using their instead of his/her/their * Update pets.yml added comment Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
* glimmer machines reskin * Update glimmer_prober.yml add comments Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
…to upstream-sync
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.
Changes