Upstream #167
Merged
Upstream #167
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
* Remove plushie_lizard_mirrored.png * Remove from meta.json * Replace mirrored state from yml --------- Co-authored-by: LevitatingTree <None>
* Initial commit * AIs get a warning when trying to answer long distance calls * Better handling of ending telephone calls * Fixed issue with duplicated holopad window when an AI answers a summons * Changed how ranges are handled, added the bluespace holopad * Bug fixes * More bug fixes * More bug fixes * Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
Update armor crate
[pull] dev from space-wizards:master
Co-authored-by: Emisse <[email protected]>
* update fland for holopads * fix duplicate holopad name
…botics (space-wizards#33960) removed borg spawnpoint from engineering, added one to robotics Co-authored-by: august-sun <[email protected]>
Co-authored-by: PJBot <[email protected]>
[pull] dev from space-wizards:master
Initial commit
Mainly useful for medicalborg so you can get a looping sound and not footsteps playing over and over. Didn't actually update medborg because footsteps need updating. Not needed for AI.
[pull] dev from space-wizards:master
Revert "New Nukie Song (space-wizards#25765)" This reverts commit 806c0d1.
fix Communication console
* merge licence files * actual commit * whoops
[pull] dev from space-wizards:master
* All hostile turret * Other factions are now hostile against "all hostile" too
* First commit * Fix silly test * Swiched stuff up * Update Content.Shared/Medical/DefibrillatorComponent.cs * remove unneeded visuals --------- Co-authored-by: slarticodefast <[email protected]>
…pace-wizards#32515) * Weh Weh * Now hostiles too! Added Dragon to hostile factions for Hostiles * Nah Better not do this, I think
* Add description of tool qualities to entity * LMAO I FORGOT FUCKING FTL FILE * minor cleanup --------- Co-authored-by: slarticodefast <[email protected]>
* Adds chirping to adult diona * Added vocals for diona nymph * Nymphs now have a speechsound
[pull] dev from space-wizards:master
* Increase uplink discounts from 3 to 7 * nevermind, 6
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * Fixed construction instructions for wooden wall * Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * Fixed construction instructions for wooden wall * fixed linter error * Update Resources/Prototypes/Entities/Structures/Walls/walls.yml Reasonable suggestion Co-authored-by: Thomas <[email protected]> * Update Resources/Prototypes/Entities/Structures/Walls/walls.yml spelling error Co-authored-by: slarticodefast <[email protected]> * removed ability to build wall from 'junk' wood barrier' * fixed ability to pry overlay barricades and not allow them to extend to full wood walls * renamed incorrectly named entity * fixed default entity graph so as to not complain for unit tests * corrected my incorrect assumptions and fixed destroy cost --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: slarticodefast <[email protected]>
* Update GasTileOverlayState * Update DecalGridState * Update NavMapState * poke * poke2 * poke3 * Implement field deltas for guns * Content done * Update --------- Co-authored-by: ElectroJr <[email protected]>
github-actions
bot
added
S: Untriaged
size/M
Changes: Sprites
Changes: UI
Changes: Map
Changes: Audio
and removed
S: Untriaged
size/M
labels
|
RSI Diff Bot; head commit fd586cb merging into 0b7f3ae Resources/Textures/Objects/Specific/Medical/defib.rsi
Resources/Textures/Objects/Fun/toys.rsi
|
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.