Conversation
…… (#44258) itemIconStyle: BigAction, added to the three purchasable revenant actions (Defile, Overload Lights, Malfunction) in Resources/Prototypes/Actions/revenant.yml.
* Pointing at inventory items with mouse binding * Make it work for items in containers too * Deduplicate * documentation and minor change * more documentation * caes switch --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: jessicamaybe <jessica@jessicamaybe.com>
* Smartfridge sprite reflects being unpowered * Update Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update smartfridge.yml --------- Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
* fix chat highlights double quote * localize the quotes
* documentation pass on content.server -> E! * APi pass on content.server for the E folder. * documentation pass on content.shared for e. * Apply suggestions from code review Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * fixing documentation according to review part 1. * typo * Very minor fixes * And a short explanation about EUI --------- Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
* Instument cargo * slight changes and cleanup * price fix * actually fix the pricing * added my credit * clarification
…#44454) * Added EntitySystemSubscriptionsGenerator project to content solution. * Added imports to Content.Client/Server/Shared projects.
* Fix electrified objects not shocking on world activation * add ordering for event subscription * Something definitely went wrong --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* the fix * remove white space * switcharoo
* Axes the easy IMapManager references * Axes the references to unported (obsolete) IMapManager methods * Converts salvageruler command to a LocalizedEntityCommand so it can use SharedMapSystem * Removes IMapManager from GameTicker This required axing the map nuke during restart, but that should be fine? Maps are entities so EntityManager.FlushEntities should delete them all and that's the preceding line * submodule update(?) --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Update server_config.toml * Typos
* borgfix * new event * clean includes * final cleanup * removed _physics * itemdroping * Revert "itemdroping" This reverts commit 78c55010753a0dbc00bf2c5dc8e7c865b82df518. * some gib loot * formating fix
* redundant members * catch IonLawSystem instances * return the ion law sawmill, fix LogMan instances * SalvageSystem LogManager inst * IonLawSystem: public Sawmill * what even is initialization order?
Removed unused methods
…l qualities (#44441) ToolRefinableSystem: check used tool before evt
* Convert DeathMatchRule to EntityTableSelector * Might as well also change that
* CustomBulletRenderer * CustomIconStatusControl * custom ammo counter system * custom sprite ammo counter comp * client custom ammo counter system * need to register the component * have tiles show in the ammo counter for the tile gun * comment * more sprites * dont try to make 2 controls * update mini tile sprite * add horizontal mult * remove horizontal mult and fix the math * ensure there is no errors * replace magical number * simpler to understand * remove unecessary stuff * remove HasComp<CustomSpriteAmmoCounterComponent * forgot those * add important stuff back * explanation * damn, so simple * make it better * use item instead of icon * remove useless comment * set number of rows * fix odd number * component to hide the name * update ammo capacity * set the aligment to vertical * add 2 px of margin * move the margin up (that fixes things somehow) * comment good
* add new logos * fix logo resolution, and replace all icons * update source URL
Changed OrganBaseTorso's parent from OrganBaseOrganic to OrganBase.
* needs to be anchored datafield * add verb * improve description * Use Captalization Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * remove redudant thing * remove redudant check * update examine text * make stinkt person not show examine text of a gas miner * Update Content.Shared/Atmos/Components/GasMinerComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Blindfold test * Eye Damage Tests * Review cleanup * Remove welder test double space * WelderCausesEyeDamageTest confirms expected damage amount * Sleeping blindness test * Apply suggestions from code review Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* init * tweak lightness * add randomize helpers, refactor to use * wip * wip * wip * wip * docs, cleanup * review partial * review wip (doesnt build) * wip (now working, but found a bug) * touchups * less ambiguity * Tweak the UI, make LockButton a BoxContainer --------- Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
* Fix Flare Copyright * Fix Link
…ation-4 Upstream Merge Progress 9-9-26
…ation-4 Upstream Merge Progress 9-9-26 part 2
…6-merge/wizden-iteration-4 Revert "Upstream Merge Progress 9-9-26 part 2"
github-actions
Bot
added
S: Untriaged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
About the PR
Added Donk pocket recipes and changed the omnizine in donk pockets to be Tric for balancing. the pockets are craftable from the donk co microwave only.
Media
Requirements