Upstream sync #907
Merged
Upstream sync #907
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
* took a two month nap. accidentally pushed too many buttons. let's try this again. added thieves to antagonists.xml * even after that nap, i don't feel well-rested at all. * please don't kill me for using webedit * capitalization, typo * Apply suggestions from code review (more period moving) Thanks Evan, very cool Co-authored-by: slarticodefast <[email protected]> * guess you could say im not pro-proper noun * typo * Update Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml * ok Co-authored-by: SlamBamActionman <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> Co-authored-by: SlamBamActionman <[email protected]>
* Add hand-labeler to nukie planet * Rearrange nukie chem table
* move popup call out of `CanInsert` into `OnInteractUsing` * im stupid and `reason` is completely unnecessary Signed-off-by: Brandon Li <[email protected]> * return early when `itemSlots.Slots.Count == 0` * tweak logic for triggering popups * change popup logic again * Consolidate whitelist check * Get any popup message not just last failed slot * Apply suggestions from code review Co-authored-by: chromiumboy <[email protected]> * yoink Co-authored-by: ShadowCommander <[email protected]> --------- Signed-off-by: Brandon Li <[email protected]> Co-authored-by: ShadowCommander <[email protected]> Co-authored-by: chromiumboy <[email protected]>
* Add on-call functionality for adminning The first time an ahelp gets SOS it gets relayed to the specified channel with the specified ping. Every time after that it doesn't until it gets a non-SOS response received. * Remove redundant name Pretty sure this already gets chucked on the name of the msg itself I think it just didn't show in screenshot because they were subsequent. * Update Content.Server/Administration/Systems/BwoinkSystem.cs Co-authored-by: Chief-Engineer <[email protected]> --------- Co-authored-by: Chief-Engineer <[email protected]> Co-authored-by: deathride58 <[email protected]>
* idk how to revert a pr so I just deleted some lines * pill destructible with explosion resistance * comment for explosion resist * "and" to "but" --------- Co-authored-by: SlamBamActionman <[email protected]>
* med lathe gauze price reduction * gauze craft doafter time * 3 second doafter craft
* add * Revert "add" This reverts commit 25da34b0fead5812fe5800c9bf5dd7b10ef48d7d. * antagonism allowed:tm:
* Changes the AME sound effect to not be the default MetalThud. * Was told on discord to make a minor change to autorerun the tests due to the Build & Test Debug failing! * Attribution and licensing, as requsted by deathride58 * Fixes the high-pitched squeak audible to some people! * Audio file tweaked by SlamBamActionMan to eliminate a weird squeak they were still able to hear. Thanks!
* Allow for the ai's laws to be changed from its core and eye * Address reviews
* clean up tools lathe recipes * add medical and cooking tools * add result * add result to others * review * engine --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Deduping of recent messages should consider the channel it's being sent to * rerun actions
added headphones to trinkets
* capacity upgrade * comment update
* Adds storage sprites for combat knife and survival knife. Replaces inhand sprites. * Fixes meta.json copyright
fix broken computer white shadows
Co-authored-by: PJBot <[email protected]>
Make wielding system use identity
* Initial commit * Change burst fire variable to be a set value rather than a multiplier
fixed cog again
…unds (#32981) remove chair + changed maints db to rubber
* fix * oops, used savemap instead of savegrid
link air alarm in coms room
fix invalids
* Fix reserach disk crash * remove extra whitespace * removed args.handled where args are not handled
* One line fix * Removed redundant using * Allocation improvement
* pass Actor to cartridge messages * NonSerialized gaming --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container * copy cigarette visualiser * prevent aghost throwing an error * make disguises die in space * fuck it rewrite it to not use polymorph * fix action troll * oop * add vebr * add access to the components * 2/3 * fix * relay damage from disguise to user * fix integrity **
# Conflicts: # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 9cfe64b merging into 2096e22 Resources/Textures/Structures/Machines/computers.rsi
Resources/Textures/Structures/Wallmounts/mirror.rsi
Resources/Textures/Structures/Wallmounts/signs.rsi
Resources/Textures/Structures/conveyor_old.rsi
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi
Resources/Textures/Objects/Weapons/Melee/survival_knife.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.
🆑