581ca2f5efefe8aeb53397af1f02bdf52012abea
148 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Ed
|
59e6435fe2 |
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
# Conflicts: # .github/CODEOWNERS # Content.Client/Construction/UI/ConstructionMenuPresenter.cs # Content.Shared/Construction/Prototypes/ConstructionPrototype.cs # Content.Shared/Damage/Systems/SharedStaminaSystem.cs # Content.Shared/Lock/LockSystem.cs # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Procedural/vgroid.yml |
||
|
Princess Cheeseballs
|
9c165cb5a0 |
StaminaSystem to SharedStaminaSystem (#37199)
* Init Commit * Partial class * Hands system slipped through |
||
|
Ed
|
ef6d973301 |
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml |
||
|
Gagarinten-Noverdo
|
e1326c00b1 |
sharpness reduce on throw hit (#1164)
* sharpness reduce on throw hit * kill me please, submod update --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> |
||
|
metalgearsloth
|
9d03081fda |
Predict DamagePopup (#36547)
* Predict DamagePopup Pretty easy one. * cleanup and localize * oops --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> |
||
|
Арт
|
709b78080f |
Weapon Sharpening System Update & Bread Slicing Fix (#915)
* SharpeningUpdate * BreadSlicingFix Before that, bread slices could be cut endlessly into new bread slices. --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> |
||
|
Ed
|
07e0606ecf |
Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts: # Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs # Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml |
||
|
SlamBamActionman
|
3200ba88a5 |
Add ability for +VVEDIT users to scale damage/healing in the game (#35255)
* Initial commit * Add universal modifier for all damage/heals, make guidebooks work. * help text |
||
|
Ed
|
7328f3449c |
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts: # Content.IntegrationTests/Tests/EntityTest.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Procedural/DungeonSystem.Rooms.cs # Content.Server/Procedural/RoomFillComponent.cs # Content.Server/Procedural/RoomFillSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Projectiles/SharedProjectileSystem.cs # Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs # Resources/Prototypes/Maps/Pools/default.yml # Resources/migration.yml |
||
|
IProduceWidgets
|
fe064adaec | Allows pacifists to throw Items with DamageOnLand (#31060) | ||
|
Ed
|
a0a827ea5a |
Upstream sync (#846)
* Additional Ionstorm Law Updates (#34197) * Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment" * Fixed another awkward grammar situation * Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas * Reverted pylons, and added more entries to help fill out the lists more * reverted all deletions * implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there * realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error * Removed Portugal again, added more Musts since that list was the new shortest one. * Automatic changelog update * Add option to disable bwoink sound. (#33782) * Add option to disable bwoink sound. * Now it's working only with active admin status. * No bwoink, only "notification sound" * Moar changes * Another one * Automatic changelog update * Pride Scarves (#34448) * More scarfs (#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix * Resolved merge conflict * Moved scarves around * Moved scarf textures out of the _CD directory * Removed final CD folder * Removed extra scarfs * Removed extra scarfs, again * Replaced ClothingNeckBase with ClothingScarfBase --------- Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com> Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com> * Automatic changelog update * Replace the djstation intercoms with freelance intercoms (#34478) * Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys * removed a new line * Update nix flake for .NET 9 (#34480) * Automatic changelog update * Holopad networking rework (#34112) * Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references * Make GasMixture enumerable I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works. * Improve canister admin logs. 1. Now clearly says "opened"/"closed" when changing the release valve. 2. Clearly says whether the valve was opened while a canister was inserted or not. 3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment. Fixes #34488 * Optimize & clean up RadiationSystem (#34459) * Optimize & clean up RadiationSystem * comments * Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update engine to v240.0.1 (#34497) * Various Locale Typo Fixes (and spaces) (#34483) Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that) * Space lizard plushie can now be worn on your head (#33809) * space weh can now be work on top of head * space weh can now be worn on top of head * trim out unnecessary comps * Automatic changelog update * Adds bullet collision to wall mounted cameras (#34500) * Automatic changelog update * Change MaskComponent to accommodate sprites namings (#33451) Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> * Automatic changelog update * Add a 10u vial of plasma to the chemical locker (#33871) Add 10u plasma to the chemistry locker so the chemists stop stealing tables. * Automatic changelog update * Rarer Highcaps (#34469) * Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5 * Automatic changelog update * New dry fire sound (#34447) * new empty.ogg * source to tg commit * Automatic changelog update * CentComm Map Updates (#34475) * Bandage fix denied animations playing on devices without them * CentComm blast door prototype * CentComm button * CentComm window shutters * CC Updates * Save as grid * Remove an extra detective figurine I like them better in the interrogation room * Remove paramed locker, let pumps shut off * Fix wrong HOP locker prototype * Automatic changelog update * Cog power setup fix (#34188) * many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa * decals and maints * aaa * bbb * ccc * cog power setup was bad * made it artsy --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Add Airlocks with Bar and Kitchen access (#33821) * Add kitchen access to Bar-Cafeteria airlocks on Cog * Fix merge conflict * Remove mapping changes * Add Glass and Maints versions * Fixed minor spelling mistake in Noir Trenchcoat description. (#34519) Update coats.yml * Update Credits (#34507) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Make storage implant drop items on gibbing (#33493) * Make storage implant drop items on gib/removal * Better way * Fix error * Forgotten trash * Cleanup * Unused var * Update Content.Server/Implants/ImplantedSystem.cs Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: 0x6273 <0x40@keemail.me> * Automatic changelog update * Fix `emergency_elkridge` being saved as a map (#34496) Save `emergency_elkridge` as a grid * Update engine to v240.1.0 (#34524) * Fixes some mobs not being able to honk/weh (#33777) * fixes some mobs not being able to honk/weh * addresss review * Automatic changelog update * Welding gas mask toggleable with action (#32691) welding mask removable * Automatic changelog update * Update engine to v240.1.1 (#34527) * Automatic changelog update * Plasma Dirt Fix (#34534) did the dirt thing * Plasma station population tweak (#34549) * Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts * Update population caps Removed population cap of 60 players to make plasma into a highpop map - it's that easy! --------- Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * Job contraband rework (#33385) * contraband system rework to allow restriction by job, not just department * Fixing detective trenchcoat inheritance * removing unnecessary using declarations * trying to fix testing error by re-adding diagnostics using declaration * removing unecessary dependency, making allowedJobs nullable * Adding all of slarti's requested changes except for the hacky job icon method fix * removing accidental whitespace * choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english * removing unneeded using dec, fixing nesting logic problem * didn't remove the old nesting, doing that now * using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead. * rewrite some stuff * fixes * fix energy pen --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502) * new tips to open doors (throwing PDA/ID, dragging body) * electrified door sprite for players * tooltip to reset AI electrified doors * windoor electrified sprite * highsec electrified visual * increase tip dataset to 138 * corrected square bracket convention in this commit * removed door corpse tip from prior commit * Automatic changelog update * Blueprint double emergency tank (#34232) * blueprint * NitrogenTank * description * Automatic changelog update * Add system to kick people if they connect to multiple servers at once. (#34563) * Automatic changelog update * bagel update (#34572) * bagel update * Decal fault tolerance * Also fix writes * fix mv cable, decal issues, yar * fix a floor tile and some other shit --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * remove tropico from devmap (#34585) * Update wizden config to disallow multiple connections to multiple wizden servers (#34584) * Give the chef access to cloth boxes (#34403) * Give the chef access to fiber bags * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * lecter visual update (#34589) * Automatic changelog update * Box Station - Update (#34605) * Various changes * Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well * Added reporter to prototype, and fixed dirt * Resolved outstanding issues * Fixed a floating camera * pluralize the job name in the contra description (#34559) * pluralize the job name in the contra description * pluralization specific to contraband descriptions * Automatic changelog update * Feature/make radial menu great again (#32653) * it works! kinda * so it works now * minor cleanup * central button now is useful too * more cleanup * minor cleanup * more cleanup * refactor: migrated code from toolbox (as it was rejected as too specific) * feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame * refactor: major reworks! * renamed DrawBagleSector to DrawAnnulusSector * Remove strange indexing * Regularize math * refactor: re-orienting segment elements to be Y-mirrored * refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button * refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius. * refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters * refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly * fix: enabled any functional keys pressed when pushing radial menu buttons * fix: radial menu sector now scales with UIScale * fix: accept only one event when clicking on radial menu ContextualButton * fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Automatic changelog update * Return Drozd full-auto and semi-auto firing modes (#34604) return drozd full auto and firerate, arrange available modes in alphabetical order * Automatic changelog update * added missing allowed department to the restricted severity (#34558) * added missing allow job to the base restricted severity * no need to make a list * no more linq in ContrabandTest * less nesting in ContrabandTest * Automatic changelog update * C4 Helmet (#34076) * worn bomb * Update meta.json * Update meta.json * Automatic changelog update * Make radioactive material radioactive (#34436) * Make radioactive material radioactive * Increase the slopes of item uranium No free power for engineering * Glowing uranium * Revert "Increase the slopes of item uranium" This reverts commit 2acbda26 * Nerf Wall Rocks * Automatic changelog update * Small fixes for Meta station (#34613) * Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory. * Added back salvage shuttle equipment, now in a crate * Fix * replace all instances of "department-{id}" with department.name (#34607) replace all instances of "department-{id}" with department.name" * Renaming sexy mime and clown mask (#34258) * Renamed sexy clown and mime mask and removed lusty xenomorph poster. * removing odd file changes. not sure why these were edited at all. * gaaaahhh * removed some of the old templates * Renaming sexy mime and clown instances. * removed unwanted gitignore edit * Renaming sexy clown and sexy mime mask and Removing lusty exomorph poster. * Remove lusty xenomorph poster. * reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits * requested changes * lusty migration removal * dirty hanging whitespace * correct date format comment --------- Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com> * Automatic changelog update * Moved Cyborg Recharging Circuit Board from Lathe to Circuit Imprinter (#34612) Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter * Automatic changelog update * Replace starter borg brain with Positronic (#34614) THE FLESH IS WEAK * Automatic changelog update * Elkridge Depot fixes and changes (#34539) * fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller * added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot * removed interrogator lamp and some more gamer loot * fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault * added clothing drobes to arrivals, added bin to HoP, more stuff i forgot * i forgot to move the file from /bin to /resources... * delete radstorm locale (#34630) * display the current version in the changelog window (#34556) * just works first try * introduce more magic numbers into the codebase * idiot doesnt know the difference between AND/OR * Update Credits (#34644) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224) * New solar sprites, new solar panel upgrades, and some solar panel fixes. This adds and changes a few things for solar panels! * New sprites for all solar panels and all related states. * Move from xform.WorldRotation to _xformSystem.SetWorldRotation within the solar code. * Few random fixes that Rider suggested as warnings. * Solar Tracker Electronics was using what looks like to be the airlock controller electronics, so that's now updated to something a bit more realistic. It also uses the engineering circuit sprite instead of the generic * New Solar Panels! Adds Plasma and Uranium Glass solar panels. These can be constructed by adding the respective glass to the panel. Plasma is a slight increase of power and health, and uranium is double the power and health of glass. Thus giving engineers something to update if they want to use solar panels and possibly giving small outposts a way to make a bit more power without a large and complex power setup. * Add in solar sprites that were not in the meta file. * Updated sprites based on feedback. * Fix the rotation of the solar panel sprites. * Automatic changelog update * Added Unused HoS's Flask to HoS locker (#34658) added hos flask to locker spawn * Automatic changelog update * Fland Fix (#34670) Update fland.yml * Reroute Meta station power, engineering cosmetic changes, minor fixes (#34669) * reroute meta power plus cosmetic fixes * fix a lot of other things * make changes from conflict * Amber Station Changes (#34656) * various changes * Increased player limit * slight modification * Followed proper yaml formatting, increased lawyers * Box Station Changes (#34655) * Various changes * Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well * Added reporter to prototype, and fixed dirt * Resolved outstanding issues * Fixed a floating camera * Added cameras to TEG, and some minor changes * Fix mv cable crate typo (#34673) fix mv cable crate typo * Plasma station patch 1 (#34602) * Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts * Update population caps Removed population cap of 60 players to make plasma into a highpop map - it's that easy! * Map fixes 11 * Map fixes 12 * Map fixes 13 * Map fixes 14 Now it's personal * Map fixes 15 --------- Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * add a chem dispenser to the nukie planet (#34674) * add a chem dispenser to the nukie planet * begone test fail * Adds better description to pneumatic valve and build menu description (#32655) * adds description to pneumatic valve and build menu description * Change one atmosphere to kPa * Automatic changelog update * fixrotations - Modified Targetted Entities (#34638) * Fix match box (#34632) FixMatchBox Now you can't put anything but matches in a box of matches. Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com> * Automatic changelog update * Hi-viz vest now actually hi-viz (#34087) * 27-12-2024-light-hi-viz * 28-12-2024-meta-fix * Storage UI V2 (#33045) * Automatic changelog update * Added Pain Numbness Trait (#34538) * added pain-numbness component and system * added numb as a trait that pulls the pain numbness component * removed new event as mob threshold event as already being fired * checked for MobThresholdsComponent first before running VerifyThresholds * refacted force say to using LocalizedDatasetPrototype and added numb messages * added severity check alert * added comment for BeforeForceSayEvent * removed space formatting * changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb * changed prefix damage-force-say-numb to 5 (whoops) * Automatic changelog update * Update submodule to 241.0.0 (#34678) * Add puddle drawdepth (#32369) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Revert "Fix match box" (#34681) Revert "Fix match box (#34632)" This reverts commit |
||
|
Coolsurf6
|
012c835559 |
Added Pain Numbness Trait (#34538)
* added pain-numbness component and system * added numb as a trait that pulls the pain numbness component * removed new event as mob threshold event as already being fired * checked for MobThresholdsComponent first before running VerifyThresholds * refacted force say to using LocalizedDatasetPrototype and added numb messages * added severity check alert * added comment for BeforeForceSayEvent * removed space formatting * changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb * changed prefix damage-force-say-numb to 5 (whoops) |
||
|
Ed
|
d67f7619c4 |
Edgefication (#590)
* bloat * bloat 2 * bloat 3 * final bloat * Update icon.ico * Create integration_test_run.bat * Arggh * Disable some tests * revert roomfill clearexisting changes |
||
|
Ed
|
955145a9a5 |
Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream
# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml |
||
|
Moomoobeef
|
cf0d6c482e |
ExaminableDamage now puts its message at the bottom and in color (#32820)
* the examineableDamage component now puts its messages at the bottom, and in color * god help us if something is priority -100 :godo: |
||
|
Ed
|
5b2020d708 |
Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/Station/Systems/StationSpawningSystem.cs # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml |
||
|
Mervill
|
3414abb970 |
Remove unused IoC dependency references. (#31704)
Remove unused IoC dependencies |
||
|
Ed
|
c82b17a65e |
Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs # Content.Shared/Clothing/Components/ClothingComponent.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/atlas.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/Traits/speech.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/secret_weights.yml |
||
|
Cojoke
|
6c3dad4330 | Fix Pacified Damage Dealing Thrown Objects (#31183) | ||
|
Ed
|
599c599a4e |
Some shit (#380)
* telegraphy effects * shadow step spell backend * add component spell * predict sharpening * Update ring.yml * locale sync * Update entities.ftl * icon shadow step |
||
|
Gagarinten-Noverdo
|
cb3c6b555a |
Selfdamage for melee (#85) (#342)
* Selfdamage for melee. * Update base.yml --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> |
||
|
Ed
|
ca843bd84a |
Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls
# Conflicts: # Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs |
||
|
Plykiya
|
6d18dff33d |
Fix for thrown items dealing damage twice to first target (#30115)
* FUCK YOU * fine --------- Co-authored-by: plykiya <plykiya@protonmail.com> |
||
|
Ed
|
04d29b6268 |
Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream
# Conflicts: # Resources/Prototypes/Maps/oasis.yml |
||
|
Nemanja
|
748e5831e8 | Add moon boots (#29009) | ||
|
Tayrtahn
|
6c343ddae2 |
Move SleepingSystem to Shared & cleanup (#28672)
* Move SleepingSystem to Shared & cleanup * Remove empty OnShutdown handler |
||
|
Ed
|
8ff09f552b |
Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2
# Conflicts: # Content.Client/Guidebook/GuidebookSystem.cs # Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs # Content.Shared/Guidebook/GuideEntry.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Maps/arenas.yml # Resources/Prototypes/Maps/atlas.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/debug.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/oasis.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Maps/reach.yml # Resources/Prototypes/Maps/saltern.yml # Resources/Prototypes/Maps/train.yml # Resources/Prototypes/lobbyscreens.yml |
||
|
Ed
|
5e78ac2c22 |
Revert "Ed 09 06 2024 upstream (#230)"
This reverts commit
|
||
|
Ed
|
bb3c74d557 |
Revert "Revert "Ed 09 06 2024 upstream (#230)" (#233)"
This reverts commit
|
||
|
Ed
|
b89117f8e6 |
Revert "Ed 09 06 2024 upstream (#230)" (#233)
This reverts commit
|
||
|
Ed
|
50470c3aaa |
Ed 09 06 2024 upstream (#230)
* Revert "Buff the AME until somebody fixes engineering" (#28419) * Automatic changelog update * hand teleport portals now may start in the same grid. (#28556) * Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities (#28225) * Automatic changelog update * Add "fill level" sprites to mops and damp rag (#28590) * Automatic changelog update * Reword some criminal records text (#28597) * Update criminal-records.ftl * Update criminal-records.ftl * Update criminal-records.ftl * Remove obsolete VisibilitySystem functions (#28610) Remove obsolete visibility functions Co-authored-by: plykiya <plykiya@protonmail.com> * Prayable datafield typo (#28622) * notifiactionPrefix -> notificationPrefix * notifiactionPrefix -> notificationPrefix * Update engine to v224.1.0 (#28624) * Use dummy sessions in NukeOpsTest (#28549) * Add dummy sessions * Update NukeOpsTest * Fix PvsBenchmark * Update engine to v224.1.1 (#28632) * Add Job preference tests (#28625) * Misc Job related changes * Add JobTest * A * Aa * Lets not confuse the yaml linter * fixes * a * Add logs that provide session to player admin logs (#28628) * Cluster Update (#28627) done here * Automatic changelog update * minor banner changes (#28636) * minor banner changes * Uhrmm actchually it's you're, not your * Update banners.yml props Hyenh * Revenant spell catalog locale (#28638) locale * Make cuff default range again (#28576) * Make cuff default range again * uncuff distance * how about ONE --------- Co-authored-by: plykiya <plykiya@protonmail.com> * Automatic changelog update * Machine-code cleanup (#28489) * Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571) * Automatic changelog update * Fix Smoke-grenade.ogg not being mono (#28593) * Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641) * Automatic changelog update * Clean up Eva and Hardsuit helm yml + Lets atmos firesuit helm work as a BreathMask (#28602) * Shifts borgs hats to the right a bit (#28600) * Fix mouse inhands (#28623) * Adjust some touch reaction damage levels (#28591) * Automatic changelog update * Add closing storage UIs to StorageInteractionTest (#28633) * Update rules (#28452) * Add support for LocalizedDatasets to RandomMetadata (#28601) * Fix Admin Object tab sorting and search (#28609) * Automatic changelog update * Internals are kept on as long as any breathing tool is on (#28595) * Automatic changelog update * Convert rules to use guidebook parsing (#28647) * Gives Insulation and NoSlip to all bots (#28621) * Gives Insulation and NoSlip to all bots * remove NoSlip from children * Automatic changelog update * Nerfs welderbombing (#28650) nerf welderbombing * Automatic changelog update * Give jobs & antags prototypes a guide field (#28614) * Give jobs & antags prototypes a guide field * A * space Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Add todo * Fix merge errors --------- Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Automatic changelog update * Fix typo in Space Law's restricted gear (#28668) This typo was included in the wiki as well. Reported-by: Bobberson in the Discord * Automatic changelog update * fixed "silicones" typo in new rules (#28671) fixed all appearances of silicone where it should have been silicon * fix janitor not spawning with a survival box (#28669) hi * Automatic changelog update * Fix typo in slime naming conventions (#28682) * Flatpacker fixes (#28417) * Return medicine recipe solid material costs to 1 (#28679) Set material costs of medicine recipes to 1 * Automatic changelog update * Update Core (#28689) add * Fixed the guidebook listing every single rule (#28680) * Well i tried this way * New approach (start) * Did it * makes spacelaw available, put it under sec * Automatic changelog update * rule fixes first pass (#28701) update * Add JobRequirementOverride prototypes (#28607) * Add JobRequirementOverride prototypes * a * invert if * Add override that takes in prototypes directly * Tweak chapel salvage wreck (#28703) add * Fixes client having authority over rules popup cvars (#28655) * Fixes client having authority over rules popup cvars * Delete duplicate migration * Pre-update * Post-update * Add locale support for booze and soda jugs labels (#28708) * Swap some InRangeUnobstructed for InRangeUnoccluded (#28706) Swap InRangeUnobstructed to InRangeUnoccluded Co-authored-by: plykiya <plykiya@protonmail.com> * Automatic changelog update * Ports the singularity's values from vgstation (#28720) * ports the singularity values from vgstation * guidebook fix * 5000 energy level 6 singulo * Fix action icons when dragging an active action to another slot (#28692) * Add DoPopup data field to OnUseTimerTrigger (#28691) * Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) * Update DevourSystem.cs * Update DevourSystem.cs * Update Content.Server/Devour/DevourSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Improve grammar of various petting messages (#28715) Improve grammar of various petting message * Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690) * Update Core (#28735) add * Fix flatpacker (#28736) * Fix flatpacker * a * rn, atp (#28674) * Update speech-chatsan.ftl * Update word_replacements.yml * Atm-at the moment * Atm * Update Resources/Locale/en-US/speech/speech-chatsan.ftl * Update Resources/Prototypes/Accents/word_replacements.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Add loadout group check for role proto (#28731) MFW same bug twice at 2 layers because I'm stupid. * Automatic changelog update * Try fix RGBee (#28741) * Automatic changelog update * Ensure packager creates a release folder (#28426) I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail. * allow ' in character names (#28652) * Automatic changelog update * Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664) * Automatic changelog update * fix singulo decay (#28743) * Automatic changelog update * Don't use invalid defaults for loadouts (#28729) At the time it made more sense but now with species specific stuff it's better to have nothing. * Maybe fix invalid loadout prototypes (#28734) * Maybe fix invalid loadout prototypes So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout. Need someone affected to send me their loadout to confirm it's fixed. * Better fix * Automatic changelog update * Fix null ref exception in PrayerSystem (#28712) * Fix null ref exception in PrayerSystem * Also check that prayable ent/comp still exist * Guidebook Updates for the Amateur Spessman (#28603) * Created NewPlayer.xml * Created NewPlayer.yml and added it to guides.ftl * shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later * switched some stuff between the New? entry and the Space Station 14 entry * Made everything so nice!!!!!!!!!!!!!! * fixed formatting inconsistencies * added a How to use this guidebook section * build correction and guidebook clarification for other servers * wrote character creation ig probs fo shizzle * added new terms to the glossary and alphabetized it * meh this seems important enough to add * okay no more shitsec bad idea * I HATED Roleplaying.xml ANYWAY!!! * I REALLY REALLY HATED IT ACTUALLYLLL * Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete * Separated the character creation bits that are just cosmetic from the ones that matter * also put all the related new player xml files in their own folder * expanded Radio.xml, kinda fixed survival.xml * removed the line that mighta maybe sorta possibly could encourage self antag * thought about this randomly but ICK OCK * talking is no longer a key part of this game * moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around * ah probably should make sure this works first also me when i lie on the internet * don't be such a grammar nukie Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * okay nevermind that's justified Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * prepare. it is coming. the great reorganization... * yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP. * rename that real quick * step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete. * update shiftandcrew.yml to only have departments as children also fuck it alphabetization * consolidated salvage into cargo * made a new entry for command * gave salvage a home and service an existence * made some XML files to be filled out later * quick rename... * took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml * The Great Writing about Departments (25XX, black and white) * added a bunch of links everywhere * biochemical is no longer a thing * service formatinaaaaaaa * shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,, * let's get that fixed * second time i made a typo there as well * we hate fun around here * grammar?!???/ * various fixes and more linkings * oops * wewlad lol!! --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: AJCM <AJCM@tutanota.com> * Automatic changelog update * Add suffixes to excap survival boxes (#28755) Update emergency.yml * Add Jani lobby background (#28724) * Add jani lobby background * Actually make new lobby screen functional * Fix license * Automatic changelog update * Strip markdown from silicon laws before saying them (#28596) * saltern update (#28773) Co-authored-by: deltanedas <@deltanedas:kde.org> * revert Tornado regex * Update HumanoidCharacterProfile.cs * Update arenas.yml * test * fix locale * Update options-menu.ftl * Update species-names.ftl * Update debug.yml * aaaaaa --------- Co-authored-by: Moony <moony@hellomouse.net> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Hmeister-real <118129069+Hmeister-real@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com> Co-authored-by: AJCM <AJCM@tutanota.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> |
||
|
DrSmugleaf
|
a7c7cd74ec | Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690) | ||
|
Ed
|
b891542ca9 |
Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream
# Conflicts: # Resources/Prototypes/Accents/word_replacements.yml |
||
|
Verm
|
31eb3ed62c | Welding tweaks (#27959) | ||
|
Ed
|
6a5fae3403 | Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream | ||
|
Nemanja
|
68992735d8 |
Clean up command perms (#28451)
* Change BanExemption command to AdminFlags.Ban permissions * Change LOOC to check for Moderator permission * Change ListVerbs from Admin to Debug AdminFlags * Change RunVerbAs from Admin to Fun AdminFlags * More permission changes * Change GhostKick to Moderator perm * Clean up command perms * fuck --------- Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> |
||
|
Leon Friedrich
|
54337911d3 |
Only auto-enable internals when necessary (#28248)
* Only auto-enable internals when necessary * Add toxic gas check * Rename Any -> AnyPositive |
||
|
Ed
|
a899122d1b |
Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Recipes/Lathes/electronics.yml # Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png # Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png # Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png |
||
|
Ed
|
ca01030da1 | Fucking big refactor | ||
|
Nemanja
|
a47c5561a9 |
add fuel costs back to finishing welding (#27030)
* add fuel costs back to welding * ack * meh * eek! |
||
|
Ed
|
485873839b |
Работа для кузнеца (#80)
* add content * Update CPSharpenedComponent.cs * Update twoHandedSword.yml * update |
||
|
Ed
|
c7b2c19dd1 |
Upstream suka (#45)
* Make BaseMedicalPDA abstract (#26567) * Fix GasMixers/Filters not working (#26568) * Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * Industrial Reagent Grinder Hotfix (#26571) fixed * Give stores the ability to check for owner only (#26573) adds a check if the store belongs to the user * Fix round start crash (causing instant restart) (#26579) * Fix round start crash * Make `TryCreateObjective` more error tolerant * Update engine to v217.1.0 (#26588) * Fix initial infected icon hiding (#26585) * Fix Meta evac shuttle name (#26587) * Make timer ignore client predict setting (#26554) * Make timer ignore client predict setting * making tests run --------- Co-authored-by: wrexbe <wrexbe@protonmail.com> * Make advertise system survive no map inits (#26553) * Make advertise system survive no map inits * Add comment to try prevent future bugs * Update Credits (#26589) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fix fox spawn on reach (#26584) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Removes SCAF armor (#26566) * removes scaf armor * replace maint loot spawner spot with basic helmet * Update Patrons.yml (#26578) * Automatic changelog update * Make aghost command work on other players using optional argument (#26546) * Translations * Make aghost command work on other players using optional argument * Reviews * Automatic changelog update * Add new component to Make sound on interact (#26523) * Adds new Component: EmitSoundOnInteractUsing * Missed an import * File-scoping * Replace ID check with Prototype check * Moved component and system to shared. Set prediction to true. * Removed impoper imports and changed namespace of component to reflect changed folder. * Following function naming theme * All this code is basically deltanedas's, but it was a learning experience for me * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Increase syndi duffelbag storage (#26565) * Increase syndi duffelbag storage * weh * Automatic changelog update * Adds construction/decon graphs for plastic flaps (#26341) * Adds construction/decon graphs for plastic flaps * Dang arbitrage * undo conflict --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> * Automatic changelog update * Makes secglasses roundstart (#26487) * makes secglasses roundstart * fix epic fail * fix tests questionmark? * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Toilet Upgrade (needs review) (#22133) * Toilet Draft * fixes * toilets now have secret stash to place items in cistern. * fixes * plungers now unblock toilets. * fix sprite * new sprites and fix * fixes * improve seat sprites. * fix * removed visualisersystem changed to genericvisualizers * flush sound for toilets and copyright for toilet sprites. * fix atrributions * fixes * fix datafield flushtime * sprite improvements * fixes * multiple changes * fix * fix * fixes remove vv * moved stash related functions to secret stash system from toilet. * fix * fix * changes for recent review. * fix * fix * Automatic changelog update * Uplink store interface searchable with a searchbar. (#24287) * Can now search the uplink store interface with a searchbar. * Search text updates no longer send server messages. Persists listings locally. * Formatting fixes and tidying. * Added helper method to get localised name and description (or otherwise, entity name and description) of store listing items. * Update Content.Client/Store/Ui/StoreMenu.xaml * Review change; moved localisation helper functions to their own class. * Prevent thread-unsafe behaviour as-per review. * Remove dummy boxcontainer --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Improved RCDs (#22799) * Initial radial menu prototyping for the RCD * Radial UI buttons can send messages to the server * Beginning to update RCDSystem * RCD building system in progress * Further updates * Added extra effects, RCDSystem now reads RCD prototype data * Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken * Added extra functionality to RadialContainers plus documentation * Fixed localization of RCD UI strings * Menu opens near cursor, added basic RCD * Avoiding merge conflict * Implemented atomized construction / deconstruction rules * Increased RCD ammo base charges * Moved input context definition to content * Removed obsoleted code * Updates to system * Switch machine and computer frames for electrical cabling * Added construction ghosts * Fixed issue with keybind detection code * Fixed RCD construction ghost mispredications * Code clean up * Updated deconstruction effects * RCDs effects don't rotate * Code clean up * Balancing for ammo counts * Code clean up * Added missing localized strings * More clean up * Made directional window handling more robust * Added documentation to radial menus and made them no longer dependent on Content * Made radial containers more robust * Further robustness to the radial menu * The RCD submenu buttons are only shown when the destination layer has at least one children * Expanded upon deconstructing plus construction balance * Fixed line endings * Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag * Bug fixes * Revert unnecessary change * Updated RCD strings * Fixed bug * More fixes * Deconstructed tiles/subflooring convert to lattice instead * Fixed failed tests (Linux doesn't like invalid spritespecifer paths) * Fixing merge conflict * Updated airlock assembly * Fixing merge conflict * Fixing merge conflict * More fixing... * Removed erroneous project file change * Fixed string handling issue * Trying to fix merge conflict * Still fixing merge conflicts * Balancing * Hidden RCD construction ghosts when in 'build' mode * Fixing merge conflict * Implemented requested changes (Part 1) * Added more requested changes * Fix for failed test. Removed sussy null suppression * Made requested changes - custom construction ghost system was replaced * Fixing merge conflict * Fixed merge conflict * Fixed bug in RCD construction ghost validation * Fixing merge conflict * Merge conflict fixed * Made required update * Removed lingering RCD deconstruct tag * Fixing merge conflict * Merge conflict fixed * Made requested changes * Bug fixes and balancing * Made string names more consistent * Can no longer stack catwalks * Automatic changelog update * Update submodule to 217.2.0 (#26592) * Southern accent (#26543) * created the AccentComponent and the AccentSystem * word replacement schtuhff * made it a trait fr ongg!!1 * Update Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Prevent storing liquids in equipped buckets (#24412) * Block access to solutions in equipped spillables. * Stop Drink verb appearing if the solution can't be accessed. * Automatic changelog update * Fix 'Hypopen shouldn't display solution examine text' (#26453) * stealthy hypo * ExaminableSolution hand check when in covert implement. ExaminableSolution now has 'hidden' datafield to enable chemical inspection only in hand. * cleaning code * more cleaning * Hidden datafield renamed to HeldOnly * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Revert Paint (#26593) * Revert "Fix build (#26258)" This reverts commit |
||
|
Dae
|
e7fda78a18 |
Damage popup type can now be changed with a left click if allowed via component boolean. (#26734)
* Update DamagePopupSystem.cs * Update DamagePopupSystem.cs * Add ability to allow or deny type change via component bool |
||
|
LankLTE
|
407d4aed58 |
Diona Nymphs & Splitting (#24630)
* Porting & implementation * Fix two stupid errors * Human not humans * fix audio path * Fix test fails & update cooldown * Work on reviews & test fail * Rework nymph organ system. * Make the nymph organs nospawn. * IsDeadIC |
||
|
LordCarve
|
c77eb8691d |
DamageSpecifier Total => GetTotal (#24160)
* DamageSpecifier [Obsolete] Total => GetTotal() * Remove obsolete Total member from DamageSpecifier. |
||
|
DrSmugleaf
|
d79ead6fb1 | Make DamageOtherOnHitSystem only flash an entity red if damage was dealt (#23612) | ||
|
themias
|
0235b196dc |
refueling lit welder explosion fix (#23469)
* refueling lit welder explosion fix * add DamgeOnToolInteract to wall dispenser |
||
|
metalgearsloth
|
2166958bd0 |
AutoCompState + ItemToggle fixes (#23422)
* AutoCompState + ItemToggle fixes Fix a lot of the comp states that are never actually networked and also cleaned up ItemToggle events a bunch. ItemToggle will still need some future work for lights and sounds. * Also catch these |
||
|
Darkie
|
a3fbab84e6 |
ItemToggle system expansion (#22369)
* Fixed EnergySword and variants having incorrect sound on attacking when in their Off state. * Removed the unused ItemToggle from the serverside and created a new shared ItemToggleComponent and System, now used for the e-blade family of items. Also added e-blade hum and swing sounds. Thanks Sloth for the initial code! * Changing Stunbaton system to include the itemToggle system. * Adapted changes that have come up in the meantime. * Changed damagespecifier to be serializable and autoNetworked in melee weapon components. Fixes a bug that makes it so client-side, damage values are not updated on toggle. * Made the ItemToggleSystem have both a shared and a server component. Ported the Stun Baton and Stun Prod to the new toggleable system. Added a failure to activate noise component. * Ported the welders to the new item toggle system. Set it so deactivated damage and item size default to the item's regular options. * Removed unnecessary usings. * Small modification to the stun prod. * Made the integration test use the new method to turn the welders on. * Fixed a few testing issues, applied a few changes requested by Delta. * Updated Stunbaton code for consistentcy when it comes to calling the itemToggle component. * Removed a redundant return; as per Delta. Made examining the stun baton for charge rely on the battery component instead. * Removed the welder visualizer system, now using the generic one. Removed some unused usings. Removed the welder visuals and layers. Ported lighters to the new system. Added zippi (sic) lighters. * Renamed variables used to make them less generic. * Simplified the light update code. * Fixed the unit test to use the itemToggle system for welders now. * Made the name shorter. I can't tell if the welding damage when interacted with actually does anything though. I can't figure out how to trigger it. * Fixed some YML issues. * Added a client side item toggle system just to make the shared code run on local UID's too. * Fixed some more Yaml. * Made the Zippi lighter have its own parent item, so it doesnt' conflict with the random pattern on the regular lighter. * Made the zippi lighter its own in-hand sprites. * Added a summary for the activated property in itemtoggle component. * Fixed a typo in the itemToggle Component. * Fixed a typo. * Added to the remarks for the ItemToggleComponent. * Fixed up the lighter yaml to make it use a generic term instead of a toggle layer enum for the random skin. * Fixed a bug I introduced accidentally with the humming sound. * Removed 2 unnecessary events from the ItemToggleSystem and component. * Fixed a bug by only making the server run the item activation code, since the client cannot predict whether or not the activation will be cancelled. * Cleaned up some names and functions getting called. * Renamed a couple of variables and removed the explicit datafields from the component. Removed "activated: false" from yml since they're already deactivated by default. * Added an IsActivated function, used it in the welder and stun baton systems code. Refactored welder code to remove the WelderToggle event, now using the ItemToggleActivatedEvent instead for eye protection check. * Fixed a typo. Added some comments. * Split the ItemToggle into smaller components. Changed the items that used the toggle system to work with the smaller components. Made the mirror shield reflect energy shots with a 95% chance. * Fixed the namespaces for the server components and whatnot. * Fixed a doubled deactivation sound from using activated wieldable items (like the double Esword). Fixed wrong yml with the e-dagger. Fixed the disarm malus code. * Added the zippo lighter to the detective's trench coat. * Removed the default hit sound for the double e-sword since it was unnecessary. * Changed e-sword damage numbers to be in line with the changes made by Emisse. * Made no damage sounds be autoNetworked, so it changes can be changed on activation/deactivation of items. Made Welders and Eswords sound like themselves but quieter if they hit for 0 damage, instead of taps. You can choose what sound to play when a weapon does 0 damage when activated now. Fixed a bug with swing sounds. * Typo. * Fixed a bug where the welder would blind you if you used it while it was off. * Created a single abstract method called when an item has completed its toggle. * Update Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Fixed a comment. * Made most component variables readOnly for ItemToggle. There is no need to be able to change them from within the variable viewer. * Removed trailing white spaces. * Made the Use a field instead of a property in the itemToggleActivation/Deactivation attempt events. * Small fixes. * Removed ForceToggle, just use the toggle method instead. * Fixed a bug with item sharpness staying even after getting deactivated, if the item gained sharpness that way (esword). * Used ProtoId in the welder component. * Made damage NetSerializable as well. * Added networking and data fields to a couple of components. * Made component variables autonetworked. Added some comments. * Moved the events that modify item components on toggle to events, handled (where possible) in the systems linked to said components. * Made all the component variables readWrite again. * Added the component get to the WelderStatus. * Added a predictable bool to the item toggle component. * Replaced the Activated/Deactivated events with ToggleDone, with an Activated argument. Used that to simplify some systems. * Added a reflect update raise event. * Removed the Zippo changes. To add in a later PR. * Removed the zippo from meta.json too. * Small fix. * Another small fix. * Fixed the wieldable system thing in ItemToggle. --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> |
||
|
KP
|
d0085f9428 | Prevent pacified players from throwing dangerous stuff (#22268) |