2023-03-12 15:56:05 +11:00
using System.Diagnostics.CodeAnalysis ;
2022-11-14 08:33:54 +11:00
using System.Linq ;
2023-07-08 14:08:32 +10:00
using System.Numerics ;
2022-09-29 15:51:59 +10:00
using Content.Shared.ActionBlocker ;
2022-11-14 08:33:54 +11:00
using Content.Shared.Administration.Logs ;
2022-09-29 15:51:59 +10:00
using Content.Shared.CombatMode ;
2022-11-14 08:33:54 +11:00
using Content.Shared.Damage ;
using Content.Shared.Damage.Systems ;
using Content.Shared.Database ;
using Content.Shared.FixedPoint ;
2022-10-04 12:12:45 +11:00
using Content.Shared.Hands ;
2022-09-29 15:51:59 +10:00
using Content.Shared.Hands.Components ;
2022-11-14 08:33:54 +11:00
using Content.Shared.Interaction ;
2022-10-16 07:20:05 +11:00
using Content.Shared.Inventory ;
2024-07-10 21:48:00 -07:00
using Content.Shared.Inventory.VirtualItem ;
2024-01-03 17:24:02 +11:00
using Content.Shared.Item.ItemToggle.Components ;
2022-11-14 08:33:54 +11:00
using Content.Shared.Physics ;
2022-09-29 15:51:59 +10:00
using Content.Shared.Popups ;
2022-11-14 08:33:54 +11:00
using Content.Shared.Weapons.Melee.Components ;
2022-09-29 15:51:59 +10:00
using Content.Shared.Weapons.Melee.Events ;
2023-05-14 13:15:18 +10:00
using Content.Shared.Weapons.Ranged.Components ;
2023-06-08 02:15:39 +00:00
using Content.Shared.Weapons.Ranged.Events ;
2023-05-14 13:15:18 +10:00
using Content.Shared.Weapons.Ranged.Systems ;
2022-09-29 15:51:59 +10:00
using Robust.Shared.Map ;
2022-11-14 08:33:54 +11:00
using Robust.Shared.Physics ;
using Robust.Shared.Physics.Systems ;
2023-10-28 09:59:53 +11:00
using Robust.Shared.Player ;
2022-11-14 08:33:54 +11:00
using Robust.Shared.Prototypes ;
2022-09-29 15:51:59 +10:00
using Robust.Shared.Timing ;
2024-01-03 17:24:02 +11:00
using ItemToggleMeleeWeaponComponent = Content . Shared . Item . ItemToggle . Components . ItemToggleMeleeWeaponComponent ;
2022-09-29 15:51:59 +10:00
namespace Content.Shared.Weapons.Melee ;
public abstract class SharedMeleeWeaponSystem : EntitySystem
{
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
[Dependency] protected readonly ISharedAdminLogManager AdminLogger = default ! ;
[Dependency] protected readonly ActionBlockerSystem Blocker = default ! ;
[Dependency] protected readonly SharedCombatModeSystem CombatMode = default ! ;
[Dependency] protected readonly DamageableSystem Damageable = default ! ;
[Dependency] protected readonly SharedInteractionSystem Interaction = default ! ;
[Dependency] protected readonly IMapManager MapManager = default ! ;
[Dependency] protected readonly SharedPopupSystem PopupSystem = default ! ;
[Dependency] protected readonly IGameTiming Timing = default ! ;
[Dependency] protected readonly SharedTransformSystem TransformSystem = default ! ;
[Dependency] private readonly InventorySystem _inventory = default ! ;
[Dependency] private readonly MeleeSoundSystem _meleeSound = default ! ;
[Dependency] private readonly SharedPhysicsSystem _physics = default ! ;
[Dependency] private readonly IPrototypeManager _protoManager = default ! ;
[Dependency] private readonly StaminaSystem _stamina = default ! ;
2022-11-14 08:33:54 +11:00
private const int AttackMask = ( int ) ( CollisionGroup . MobMask | CollisionGroup . Opaque ) ;
2023-05-08 17:46:26 +10:00
/// <summary>
/// Maximum amount of targets allowed for a wide-attack.
/// </summary>
public const int MaxTargets = 5 ;
2022-09-29 15:51:59 +10:00
/// <summary>
/// If an attack is released within this buffer it's assumed to be full damage.
/// </summary>
public const float GracePeriod = 0.05f ;
public override void Initialize ( )
{
base . Initialize ( ) ;
2022-11-04 12:18:00 +11:00
SubscribeLocalEvent < MeleeWeaponComponent , HandSelectedEvent > ( OnMeleeSelected ) ;
2023-06-08 02:15:39 +00:00
SubscribeLocalEvent < MeleeWeaponComponent , ShotAttemptedEvent > ( OnMeleeShotAttempted ) ;
2023-05-14 13:15:18 +10:00
SubscribeLocalEvent < MeleeWeaponComponent , GunShotEvent > ( OnMeleeShot ) ;
2023-05-28 03:03:25 -04:00
SubscribeLocalEvent < BonusMeleeDamageComponent , GetMeleeDamageEvent > ( OnGetBonusMeleeDamage ) ;
2023-06-07 16:26:45 -04:00
SubscribeLocalEvent < BonusMeleeDamageComponent , GetHeavyDamageModifierEvent > ( OnGetBonusHeavyDamageModifier ) ;
SubscribeLocalEvent < BonusMeleeAttackRateComponent , GetMeleeAttackRateEvent > ( OnGetBonusMeleeAttackRate ) ;
2022-09-29 15:51:59 +10:00
2024-01-03 17:24:02 +11:00
SubscribeLocalEvent < ItemToggleMeleeWeaponComponent , ItemToggledEvent > ( OnItemToggle ) ;
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>
2023-12-24 08:11:05 +02:00
2023-05-02 05:07:17 +10:00
SubscribeAllEvent < HeavyAttackEvent > ( OnHeavyAttack ) ;
2022-09-29 15:51:59 +10:00
SubscribeAllEvent < LightAttackEvent > ( OnLightAttack ) ;
SubscribeAllEvent < DisarmAttackEvent > ( OnDisarmAttack ) ;
SubscribeAllEvent < StopAttackEvent > ( OnStopAttack ) ;
2023-04-06 11:37:50 +12:00
#if DEBUG
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
SubscribeLocalEvent < MeleeWeaponComponent ,
MapInitEvent > ( OnMapInit ) ;
2023-04-06 11:37:50 +12:00
}
private void OnMapInit ( EntityUid uid , MeleeWeaponComponent component , MapInitEvent args )
{
2023-05-01 14:49:25 +10:00
if ( component . NextAttack > Timing . CurTime )
2023-06-27 23:56:52 +10:00
Log . Warning ( $"Initializing a map that contains an entity that is on cooldown. Entity: {ToPrettyString(uid)}" ) ;
2023-04-06 11:37:50 +12:00
#endif
2022-09-29 15:51:59 +10:00
}
2023-06-08 02:15:39 +00:00
private void OnMeleeShotAttempted ( EntityUid uid , MeleeWeaponComponent comp , ref ShotAttemptedEvent args )
{
if ( comp . NextAttack > Timing . CurTime )
args . Cancel ( ) ;
}
2023-05-14 13:15:18 +10:00
private void OnMeleeShot ( EntityUid uid , MeleeWeaponComponent component , ref GunShotEvent args )
{
if ( ! TryComp < GunComponent > ( uid , out var gun ) )
return ;
if ( gun . NextFire > component . NextAttack )
{
component . NextAttack = gun . NextFire ;
2023-09-06 18:30:23 +10:00
Dirty ( uid , component ) ;
2023-05-14 13:15:18 +10:00
}
}
2022-11-04 12:18:00 +11:00
private void OnMeleeSelected ( EntityUid uid , MeleeWeaponComponent component , HandSelectedEvent args )
{
2023-06-07 16:26:45 -04:00
var attackRate = GetAttackRate ( uid , args . User , component ) ;
if ( attackRate . Equals ( 0f ) )
2022-11-04 12:18:00 +11:00
return ;
2023-01-27 03:04:26 +02:00
if ( ! component . ResetOnHandSelected )
return ;
2023-04-06 11:37:50 +12:00
if ( Paused ( uid ) )
return ;
2022-11-04 12:18:00 +11:00
// If someone swaps to this weapon then reset its cd.
var curTime = Timing . CurTime ;
2023-06-07 16:26:45 -04:00
var minimum = curTime + TimeSpan . FromSeconds ( 1 / attackRate ) ;
2022-11-04 12:18:00 +11:00
if ( minimum < component . NextAttack )
return ;
component . NextAttack = minimum ;
2023-09-06 18:30:23 +10:00
Dirty ( uid , component ) ;
2022-11-04 12:18:00 +11:00
}
2023-05-28 03:03:25 -04:00
private void OnGetBonusMeleeDamage ( EntityUid uid , BonusMeleeDamageComponent component , ref GetMeleeDamageEvent args )
{
2023-06-07 16:26:45 -04:00
if ( component . BonusDamage ! = null )
args . Damage + = component . BonusDamage ;
if ( component . DamageModifierSet ! = null )
args . Modifiers . Add ( component . DamageModifierSet ) ;
}
private void OnGetBonusHeavyDamageModifier ( EntityUid uid , BonusMeleeDamageComponent component , ref GetHeavyDamageModifierEvent args )
{
args . DamageModifier + = component . HeavyDamageFlatModifier ;
args . Multipliers * = component . HeavyDamageMultiplier ;
}
private void OnGetBonusMeleeAttackRate ( EntityUid uid , BonusMeleeAttackRateComponent component , ref GetMeleeAttackRateEvent args )
{
args . Rate + = component . FlatModifier ;
args . Multipliers * = component . Multiplier ;
}
2022-09-29 15:51:59 +10:00
private void OnStopAttack ( StopAttackEvent msg , EntitySessionEventArgs args )
{
var user = args . SenderSession . AttachedEntity ;
if ( user = = null )
return ;
2023-03-12 15:56:05 +11:00
if ( ! TryGetWeapon ( user . Value , out var weaponUid , out var weapon ) | |
2023-09-11 09:42:41 +10:00
weaponUid ! = GetEntity ( msg . Weapon ) )
2023-03-12 15:56:05 +11:00
{
2022-09-29 15:51:59 +10:00
return ;
2023-03-12 15:56:05 +11:00
}
2022-09-29 15:51:59 +10:00
if ( ! weapon . Attacking )
return ;
weapon . Attacking = false ;
2023-09-06 18:30:23 +10:00
Dirty ( weaponUid , weapon ) ;
2022-09-29 15:51:59 +10:00
}
private void OnLightAttack ( LightAttackEvent msg , EntitySessionEventArgs args )
{
2024-05-25 15:13:24 +12:00
if ( args . SenderSession . AttachedEntity is not { } user )
2022-09-29 15:51:59 +10:00
return ;
2024-05-25 15:13:24 +12:00
if ( ! TryGetWeapon ( user , out var weaponUid , out var weapon ) | |
2023-09-11 09:42:41 +10:00
weaponUid ! = GetEntity ( msg . Weapon ) )
2023-03-12 15:56:05 +11:00
{
2022-09-29 15:51:59 +10:00
return ;
2023-03-12 15:56:05 +11:00
}
2022-09-29 15:51:59 +10:00
2024-05-25 15:13:24 +12:00
AttemptAttack ( user , weaponUid , weapon , msg , args . SenderSession ) ;
2022-09-29 15:51:59 +10:00
}
private void OnHeavyAttack ( HeavyAttackEvent msg , EntitySessionEventArgs args )
{
2024-05-25 15:13:24 +12:00
if ( args . SenderSession . AttachedEntity is not { } user )
2022-09-29 15:51:59 +10:00
return ;
2024-05-25 15:13:24 +12:00
if ( ! TryGetWeapon ( user , out var weaponUid , out var weapon ) | |
2023-09-11 09:42:41 +10:00
weaponUid ! = GetEntity ( msg . Weapon ) )
2023-03-12 15:56:05 +11:00
{
2022-09-29 15:51:59 +10:00
return ;
2023-03-12 15:56:05 +11:00
}
2022-09-29 15:51:59 +10:00
2024-05-25 15:13:24 +12:00
AttemptAttack ( user , weaponUid , weapon , msg , args . SenderSession ) ;
2022-09-29 15:51:59 +10:00
}
private void OnDisarmAttack ( DisarmAttackEvent msg , EntitySessionEventArgs args )
{
2024-05-25 15:13:24 +12:00
if ( args . SenderSession . AttachedEntity is not { } user )
2022-09-29 15:51:59 +10:00
return ;
2024-05-25 15:13:24 +12:00
if ( TryGetWeapon ( user , out var weaponUid , out var weapon ) )
AttemptAttack ( user , weaponUid , weapon , msg , args . SenderSession ) ;
2022-09-29 15:51:59 +10:00
}
2023-06-07 16:26:45 -04:00
/// <summary>
/// Gets the total damage a weapon does, including modifiers like wielding and enablind/disabling
/// </summary>
public DamageSpecifier GetDamage ( EntityUid uid , EntityUid user , MeleeWeaponComponent ? component = null )
2023-05-28 03:03:25 -04:00
{
if ( ! Resolve ( uid , ref component , false ) )
return new DamageSpecifier ( ) ;
2024-08-10 20:05:54 -07:00
var ev = new GetMeleeDamageEvent ( uid , new ( component . Damage ) , new ( ) , user , component . ResistanceBypass ) ;
2023-06-07 16:26:45 -04:00
RaiseLocalEvent ( uid , ref ev ) ;
return DamageSpecifier . ApplyModifierSets ( ev . Damage , ev . Modifiers ) ;
}
public float GetAttackRate ( EntityUid uid , EntityUid user , MeleeWeaponComponent ? component = null )
{
if ( ! Resolve ( uid , ref component ) )
return 0 ;
var ev = new GetMeleeAttackRateEvent ( uid , component . AttackRate , 1 , user ) ;
RaiseLocalEvent ( uid , ref ev ) ;
return ev . Rate * ev . Multipliers ;
}
public FixedPoint2 GetHeavyDamageModifier ( EntityUid uid , EntityUid user , MeleeWeaponComponent ? component = null )
{
if ( ! Resolve ( uid , ref component ) )
return FixedPoint2 . Zero ;
2023-09-06 18:30:23 +10:00
var ev = new GetHeavyDamageModifierEvent ( uid , component . ClickDamageModifier , 1 , user ) ;
2023-06-07 16:26:45 -04:00
RaiseLocalEvent ( uid , ref ev ) ;
return ev . DamageModifier * ev . Multipliers ;
}
2024-08-10 20:05:54 -07:00
public bool GetResistanceBypass ( EntityUid uid , EntityUid user , MeleeWeaponComponent ? component = null )
{
if ( ! Resolve ( uid , ref component ) )
return false ;
var ev = new GetMeleeDamageEvent ( uid , new ( component . Damage ) , new ( ) , user , component . ResistanceBypass ) ;
RaiseLocalEvent ( uid , ref ev ) ;
return ev . ResistanceBypass ;
}
2023-03-12 15:56:05 +11:00
public bool TryGetWeapon ( EntityUid entity , out EntityUid weaponUid , [ NotNullWhen ( true ) ] out MeleeWeaponComponent ? melee )
2022-09-29 15:51:59 +10:00
{
2023-03-12 15:56:05 +11:00
weaponUid = default ;
melee = null ;
2022-09-29 15:51:59 +10:00
2022-12-10 12:05:39 -05:00
var ev = new GetMeleeWeaponEvent ( ) ;
RaiseLocalEvent ( entity , ev ) ;
if ( ev . Handled )
{
2023-03-12 15:56:05 +11:00
if ( TryComp ( ev . Weapon , out melee ) )
{
weaponUid = ev . Weapon . Value ;
return true ;
}
return false ;
2022-12-10 12:05:39 -05:00
}
2022-09-29 15:51:59 +10:00
// Use inhands entity if we got one.
2023-04-07 11:21:12 -07:00
if ( EntityManager . TryGetComponent ( entity , out HandsComponent ? hands ) & &
2022-09-29 15:51:59 +10:00
hands . ActiveHandEntity is { } held )
{
2024-04-17 03:10:03 -07:00
// Make sure the entity is a weapon AND it doesn't need
// to be equipped to be used (E.g boxing gloves).
if ( EntityManager . TryGetComponent ( held , out melee ) & &
! melee . MustBeEquippedToUse )
2022-09-29 15:51:59 +10:00
{
2023-03-12 15:56:05 +11:00
weaponUid = held ;
return true ;
2022-09-29 15:51:59 +10:00
}
2024-07-10 21:48:00 -07:00
if ( ! HasComp < VirtualItemComponent > ( held ) )
return false ;
2022-09-29 15:51:59 +10:00
}
2022-10-16 07:20:05 +11:00
// Use hands clothing if applicable.
2023-03-12 15:56:05 +11:00
if ( _inventory . TryGetSlotEntity ( entity , "gloves" , out var gloves ) & &
2022-10-16 07:20:05 +11:00
TryComp < MeleeWeaponComponent > ( gloves , out var glovesMelee ) )
{
2023-03-12 15:56:05 +11:00
weaponUid = gloves . Value ;
melee = glovesMelee ;
return true ;
2022-10-16 07:20:05 +11:00
}
// Use our own melee
2022-09-29 15:51:59 +10:00
if ( TryComp ( entity , out melee ) )
{
2023-03-12 15:56:05 +11:00
weaponUid = entity ;
return true ;
2022-09-29 15:51:59 +10:00
}
2023-03-12 15:56:05 +11:00
return false ;
2022-09-29 15:51:59 +10:00
}
2022-12-12 00:37:09 +11:00
2023-02-13 07:55:39 -05:00
public void AttemptLightAttackMiss ( EntityUid user , EntityUid weaponUid , MeleeWeaponComponent weapon , EntityCoordinates coordinates )
2022-12-12 00:37:09 +11:00
{
2023-09-11 09:42:41 +10:00
AttemptAttack ( user , weaponUid , weapon , new LightAttackEvent ( null , GetNetEntity ( weaponUid ) , GetNetCoordinates ( coordinates ) ) , null ) ;
2022-12-12 00:37:09 +11:00
}
2022-09-29 15:51:59 +10:00
2023-07-06 14:42:17 +10:00
public bool AttemptLightAttack ( EntityUid user , EntityUid weaponUid , MeleeWeaponComponent weapon , EntityUid target )
2022-09-29 15:51:59 +10:00
{
2024-05-21 17:40:35 +12:00
if ( ! TryComp ( target , out TransformComponent ? targetXform ) )
2023-07-06 14:42:17 +10:00
return false ;
2022-09-29 15:51:59 +10:00
2023-09-11 09:42:41 +10:00
return AttemptAttack ( user , weaponUid , weapon , new LightAttackEvent ( GetNetEntity ( target ) , GetNetEntity ( weaponUid ) , GetNetCoordinates ( targetXform . Coordinates ) ) , null ) ;
2022-09-29 15:51:59 +10:00
}
2023-07-06 14:42:17 +10:00
public bool AttemptDisarmAttack ( EntityUid user , EntityUid weaponUid , MeleeWeaponComponent weapon , EntityUid target )
2022-09-29 15:51:59 +10:00
{
2024-05-21 17:40:35 +12:00
if ( ! TryComp ( target , out TransformComponent ? targetXform ) )
2023-07-06 14:42:17 +10:00
return false ;
2022-09-29 15:51:59 +10:00
2023-09-11 09:42:41 +10:00
return AttemptAttack ( user , weaponUid , weapon , new DisarmAttackEvent ( GetNetEntity ( target ) , GetNetCoordinates ( targetXform . Coordinates ) ) , null ) ;
2022-09-29 15:51:59 +10:00
}
/// <summary>
/// Called when a windup is finished and an attack is tried.
/// </summary>
2023-07-06 14:42:17 +10:00
/// <returns>True if attack successful</returns>
private bool AttemptAttack ( EntityUid user , EntityUid weaponUid , MeleeWeaponComponent weapon , AttackEvent attack , ICommonSession ? session )
2022-09-29 15:51:59 +10:00
{
var curTime = Timing . CurTime ;
if ( weapon . NextAttack > curTime )
2023-07-06 14:42:17 +10:00
return false ;
2022-09-29 15:51:59 +10:00
2022-10-04 12:50:09 +11:00
if ( ! CombatMode . IsInCombatMode ( user ) )
2023-07-06 14:42:17 +10:00
return false ;
2022-10-04 12:50:09 +11:00
2024-05-25 15:13:24 +12:00
EntityUid ? target = null ;
2022-12-17 14:47:15 +11:00
switch ( attack )
{
case LightAttackEvent light :
2024-05-25 15:13:24 +12:00
if ( light . Target ! = null & & ! TryGetEntity ( light . Target , out target ) )
{
// Target was lightly attacked & deleted.
return false ;
}
2023-09-11 09:42:41 +10:00
2024-05-25 15:13:24 +12:00
if ( ! Blocker . CanAttack ( user , target , ( weaponUid , weapon ) ) )
2023-07-06 14:42:17 +10:00
return false ;
2023-07-07 18:45:37 +10:00
// Can't self-attack if you're the weapon
2024-05-25 15:13:24 +12:00
if ( weaponUid = = target )
2023-07-07 18:45:37 +10:00
return false ;
2022-12-17 14:47:15 +11:00
break ;
case DisarmAttackEvent disarm :
2024-05-25 15:13:24 +12:00
if ( disarm . Target ! = null & & ! TryGetEntity ( disarm . Target , out target ) )
{
// Target was lightly attacked & deleted.
return false ;
}
2023-09-11 09:42:41 +10:00
2024-05-25 15:13:24 +12:00
if ( ! Blocker . CanAttack ( user , target , ( weaponUid , weapon ) , true ) )
2023-07-06 14:42:17 +10:00
return false ;
2022-12-17 14:47:15 +11:00
break ;
default :
2023-12-27 02:55:48 -07:00
if ( ! Blocker . CanAttack ( user , weapon : ( weaponUid , weapon ) ) )
2023-07-06 14:42:17 +10:00
return false ;
2022-12-17 14:47:15 +11:00
break ;
}
2022-09-29 15:51:59 +10:00
// Windup time checked elsewhere.
2023-06-07 16:26:45 -04:00
var fireRate = TimeSpan . FromSeconds ( 1f / GetAttackRate ( weaponUid , user , weapon ) ) ;
2023-05-14 13:15:18 +10:00
var swings = 0 ;
2022-09-29 15:51:59 +10:00
2023-05-14 13:15:18 +10:00
// TODO: If we get autoattacks then probably need a shotcounter like guns so we can do timing properly.
2022-09-29 15:51:59 +10:00
if ( weapon . NextAttack < curTime )
weapon . NextAttack = curTime ;
2023-05-14 13:15:18 +10:00
while ( weapon . NextAttack < = curTime )
{
weapon . NextAttack + = fireRate ;
swings + + ;
}
2022-09-29 15:51:59 +10:00
2023-09-06 18:30:23 +10:00
Dirty ( weaponUid , weapon ) ;
2022-09-29 15:51:59 +10:00
2023-05-14 13:15:18 +10:00
// Do this AFTER attack so it doesn't spam every tick
var ev = new AttemptMeleeEvent ( ) ;
RaiseLocalEvent ( weaponUid , ref ev ) ;
2024-11-18 14:40:52 +03:00
//CrystallEdge melee improvment
2024-04-05 20:19:33 +03:00
if ( weapon . CPSwingBeverage )
weapon . SwingLeft = ! weapon . SwingLeft ;
2024-11-18 14:40:52 +03:00
//CrystallEdge melee improvment end
2024-04-05 20:19:33 +03:00
2023-05-14 13:15:18 +10:00
if ( ev . Cancelled )
2022-09-29 15:51:59 +10:00
{
2023-05-14 13:15:18 +10:00
if ( ev . Message ! = null )
{
PopupSystem . PopupClient ( ev . Message , weaponUid , user ) ;
}
2022-10-15 15:14:07 +11:00
2023-07-06 14:42:17 +10:00
return false ;
2023-05-14 13:15:18 +10:00
}
// Attack confirmed
for ( var i = 0 ; i < swings ; i + + )
{
string animation ;
switch ( attack )
{
case LightAttackEvent light :
DoLightAttack ( user , light , weaponUid , weapon , session ) ;
2023-09-28 16:20:29 -07:00
animation = weapon . Animation ;
2023-05-14 13:15:18 +10:00
break ;
case DisarmAttackEvent disarm :
if ( ! DoDisarm ( user , disarm , weaponUid , weapon , session ) )
2023-07-06 14:42:17 +10:00
return false ;
2023-05-14 13:15:18 +10:00
2023-09-28 16:20:29 -07:00
animation = weapon . Animation ;
2023-05-14 13:15:18 +10:00
break ;
case HeavyAttackEvent heavy :
2023-08-06 12:55:38 +10:00
if ( ! DoHeavyAttack ( user , heavy , weaponUid , weapon , session ) )
return false ;
2023-05-14 13:15:18 +10:00
animation = weapon . WideAnimation ;
break ;
default :
throw new NotImplementedException ( ) ;
}
2024-10-14 00:40:59 -05:00
DoLungeAnimation ( user , weaponUid , weapon . Angle , TransformSystem . ToMapCoordinates ( GetCoordinates ( attack . Coordinates ) ) , weapon . Range , animation ) ;
2022-09-29 15:51:59 +10:00
}
2023-10-11 03:55:53 +01:00
var attackEv = new MeleeAttackEvent ( weaponUid ) ;
RaiseLocalEvent ( user , ref attackEv ) ;
2022-09-29 15:51:59 +10:00
weapon . Attacking = true ;
2023-07-06 14:42:17 +10:00
return true ;
2022-09-29 15:51:59 +10:00
}
2022-11-14 08:33:54 +11:00
protected abstract bool InRange ( EntityUid user , EntityUid target , float range , ICommonSession ? session ) ;
2023-02-13 07:55:39 -05:00
protected virtual void DoLightAttack ( EntityUid user , LightAttackEvent ev , EntityUid meleeUid , MeleeWeaponComponent component , ICommonSession ? session )
2022-09-29 15:51:59 +10:00
{
2023-08-06 16:01:44 +00:00
// If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant
var damage = GetDamage ( meleeUid , user , component ) * GetHeavyDamageModifier ( meleeUid , user , component ) ;
2023-09-11 09:42:41 +10:00
var target = GetEntity ( ev . Target ) ;
2024-08-10 20:05:54 -07:00
var resistanceBypass = GetResistanceBypass ( meleeUid , user , component ) ;
2023-02-13 07:55:39 -05:00
// For consistency with wide attacks stuff needs damageable.
2023-09-11 09:42:41 +10:00
if ( Deleted ( target ) | |
! HasComp < DamageableComponent > ( target ) | |
2024-05-21 17:40:35 +12:00
! TryComp ( target , out TransformComponent ? targetXform ) | |
2023-02-13 07:55:39 -05:00
// Not in LOS.
2023-09-11 09:42:41 +10:00
! InRange ( user , target . Value , component . Range , session ) )
2022-11-14 08:33:54 +11:00
{
2023-02-13 07:55:39 -05:00
// Leave IsHit set to true, because the only time it's set to false
// is when a melee weapon is examined. Misses are inferred from an
// empty HitEntities.
// TODO: This needs fixing
2023-08-04 21:17:13 -05:00
if ( meleeUid = = user )
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Low ,
2023-08-04 21:17:13 -05:00
$"{ToPrettyString(user):actor} melee attacked (light) using their hands and missed" ) ;
}
else
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Low ,
2023-08-04 21:17:13 -05:00
$"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed" ) ;
}
2023-12-27 22:11:13 -05:00
var missEvent = new MeleeHitEvent ( new List < EntityUid > ( ) , user , meleeUid , damage , null ) ;
2023-02-13 07:55:39 -05:00
RaiseLocalEvent ( meleeUid , missEvent ) ;
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
_meleeSound . PlaySwingSound ( user , meleeUid , component ) ;
2022-11-14 08:33:54 +11:00
return ;
}
// Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
// Raise event before doing damage so we can cancel damage if the event is handled
2023-12-27 22:11:13 -05:00
var hitEvent = new MeleeHitEvent ( new List < EntityUid > { target . Value } , user , meleeUid , damage , null ) ;
2023-02-13 07:55:39 -05:00
RaiseLocalEvent ( meleeUid , hitEvent ) ;
2022-11-14 08:33:54 +11:00
if ( hitEvent . Handled )
return ;
var targets = new List < EntityUid > ( 1 )
{
2023-09-11 09:42:41 +10:00
target . Value
2022-11-14 08:33:54 +11:00
} ;
2023-09-11 09:42:41 +10:00
var weapon = GetEntity ( ev . Weapon ) ;
2024-07-30 04:35:30 -04:00
// We skip weapon -> target interaction, as forensics system applies DNA on hit
2023-09-11 09:42:41 +10:00
Interaction . DoContactInteraction ( user , weapon ) ;
2022-11-14 08:33:54 +11:00
// If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
// somewhat messy scuffle. See also, heavy attacks.
2023-09-11 09:42:41 +10:00
Interaction . DoContactInteraction ( user , target ) ;
2022-11-14 08:33:54 +11:00
// For stuff that cares about it being attacked.
2023-05-14 13:15:18 +10:00
var attackedEvent = new AttackedEvent ( meleeUid , user , targetXform . Coordinates ) ;
2023-09-11 09:42:41 +10:00
RaiseLocalEvent ( target . Value , attackedEvent ) ;
2022-11-14 08:33:54 +11:00
2023-05-14 13:15:18 +10:00
var modifiedDamage = DamageSpecifier . ApplyModifierSets ( damage + hitEvent . BonusDamage + attackedEvent . BonusDamage , hitEvent . ModifiersList ) ;
2024-08-10 20:05:54 -07:00
var damageResult = Damageable . TryChangeDamage ( target , modifiedDamage , origin : user , ignoreResistances : resistanceBypass ) ;
2022-11-14 08:33:54 +11:00
2024-05-31 14:28:11 +12:00
if ( damageResult is { Empty : false } )
2022-11-14 08:33:54 +11:00
{
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
if ( damageResult . DamageDict . TryGetValue ( "Blunt" , out var bluntDamage ) )
{
2023-09-11 09:42:41 +10:00
_stamina . TakeStaminaDamage ( target . Value , ( bluntDamage * component . BluntStaminaDamageFactor ) . Float ( ) , visual : false , source : user , with : meleeUid = = user ? null : meleeUid ) ;
2022-11-14 08:33:54 +11:00
}
2023-02-13 07:55:39 -05:00
if ( meleeUid = = user )
2022-11-14 08:33:54 +11:00
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Medium ,
2024-01-22 02:59:14 +01:00
$"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(target.Value):subject} using their hands and dealt {damageResult.GetTotal():damage} damage" ) ;
2022-11-14 08:33:54 +11:00
}
else
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Medium ,
2024-01-22 02:59:14 +01:00
$"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(target.Value):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.GetTotal():damage} damage" ) ;
2022-11-14 08:33:54 +11:00
}
}
2022-09-29 15:51:59 +10:00
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
_meleeSound . PlayHitSound ( target . Value , user , GetHighestDamageSound ( modifiedDamage , _protoManager ) , hitEvent . HitSoundOverride , component ) ;
2024-02-03 02:00:14 +01:00
2024-01-22 02:59:14 +01:00
if ( damageResult ? . GetTotal ( ) > FixedPoint2 . Zero )
2022-11-14 08:33:54 +11:00
{
DoDamageEffect ( targets , user , targetXform ) ;
}
2022-09-29 15:51:59 +10:00
}
2022-11-14 08:33:54 +11:00
protected abstract void DoDamageEffect ( List < EntityUid > targets , EntityUid ? user , TransformComponent targetXform ) ;
2023-08-06 12:55:38 +10:00
private bool DoHeavyAttack ( EntityUid user , HeavyAttackEvent ev , EntityUid meleeUid , MeleeWeaponComponent component , ICommonSession ? session )
2022-09-29 15:51:59 +10:00
{
2022-11-14 08:33:54 +11:00
// TODO: This is copy-paste as fuck with DoPreciseAttack
2024-05-21 17:40:35 +12:00
if ( ! TryComp ( user , out TransformComponent ? userXform ) )
2023-08-06 12:55:38 +10:00
return false ;
2022-11-14 08:33:54 +11:00
2024-10-14 00:40:59 -05:00
var targetMap = TransformSystem . ToMapCoordinates ( GetCoordinates ( ev . Coordinates ) ) ;
2022-11-14 08:33:54 +11:00
if ( targetMap . MapId ! = userXform . MapID )
2023-08-06 12:55:38 +10:00
return false ;
2023-05-08 17:46:26 +10:00
var userPos = TransformSystem . GetWorldPosition ( userXform ) ;
2022-11-14 08:33:54 +11:00
var direction = targetMap . Position - userPos ;
2023-07-08 14:08:32 +10:00
var distance = Math . Min ( component . Range , direction . Length ( ) ) ;
2022-11-14 08:33:54 +11:00
2023-08-06 16:01:44 +00:00
var damage = GetDamage ( meleeUid , user , component ) ;
2023-09-11 09:42:41 +10:00
var entities = GetEntityList ( ev . Entities ) ;
2022-11-14 08:33:54 +11:00
if ( entities . Count = = 0 )
{
2023-08-04 21:17:13 -05:00
if ( meleeUid = = user )
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Low ,
2023-08-04 21:17:13 -05:00
$"{ToPrettyString(user):actor} melee attacked (heavy) using their hands and missed" ) ;
}
else
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Low ,
2023-08-04 21:17:13 -05:00
$"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed" ) ;
}
2023-12-27 22:11:13 -05:00
var missEvent = new MeleeHitEvent ( new List < EntityUid > ( ) , user , meleeUid , damage , direction ) ;
2023-02-13 07:55:39 -05:00
RaiseLocalEvent ( meleeUid , missEvent ) ;
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
// immediate audio feedback
_meleeSound . PlaySwingSound ( user , meleeUid , component ) ;
2023-08-06 12:55:38 +10:00
return true ;
2022-11-14 08:33:54 +11:00
}
2023-05-08 17:46:26 +10:00
// Naughty input
if ( entities . Count > MaxTargets )
{
entities . RemoveRange ( MaxTargets , entities . Count - MaxTargets ) ;
}
2023-05-02 05:07:17 +10:00
// Validate client
for ( var i = entities . Count - 1 ; i > = 0 ; i - - )
{
2024-10-14 00:40:59 -05:00
if ( ArcRaySuccessful ( entities [ i ] ,
userPos ,
direction . ToWorldAngle ( ) ,
component . Angle ,
distance ,
userXform . MapID ,
user ,
session ) )
2023-05-02 05:07:17 +10:00
{
continue ;
}
// Bad input
entities . RemoveAt ( i ) ;
}
2022-11-14 08:33:54 +11:00
var targets = new List < EntityUid > ( ) ;
var damageQuery = GetEntityQuery < DamageableComponent > ( ) ;
foreach ( var entity in entities )
{
if ( entity = = user | |
! damageQuery . HasComponent ( entity ) )
continue ;
targets . Add ( entity ) ;
}
// Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
// Raise event before doing damage so we can cancel damage if the event is handled
2023-12-27 22:11:13 -05:00
var hitEvent = new MeleeHitEvent ( targets , user , meleeUid , damage , direction ) ;
2023-02-13 07:55:39 -05:00
RaiseLocalEvent ( meleeUid , hitEvent ) ;
2022-11-14 08:33:54 +11:00
if ( hitEvent . Handled )
2023-08-06 12:55:38 +10:00
return true ;
2022-11-14 08:33:54 +11:00
2023-09-11 09:42:41 +10:00
var weapon = GetEntity ( ev . Weapon ) ;
Interaction . DoContactInteraction ( user , weapon ) ;
2022-11-14 08:33:54 +11:00
// For stuff that cares about it being attacked.
foreach ( var target in targets )
{
2024-07-30 04:35:30 -04:00
// We skip weapon -> target interaction, as forensics system applies DNA on hit
2022-11-14 08:33:54 +11:00
// If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
// somewhat messy scuffle. See also, light attacks.
Interaction . DoContactInteraction ( user , target ) ;
}
var appliedDamage = new DamageSpecifier ( ) ;
2024-08-04 20:14:01 -07:00
for ( var i = targets . Count - 1 ; i > = 0 ; i - - )
2022-11-14 08:33:54 +11:00
{
2024-08-04 20:14:01 -07:00
var entity = targets [ i ] ;
2023-12-27 02:55:48 -07:00
// We raise an attack attempt here as well,
// primarily because this was an untargeted wideswing: if a subscriber to that event cared about
// the potential target (such as for pacifism), they need to be made aware of the target here.
// In that case, just continue.
if ( ! Blocker . CanAttack ( user , entity , ( weapon , component ) ) )
2024-08-04 20:14:01 -07:00
{
targets . RemoveAt ( i ) ;
2023-12-27 02:55:48 -07:00
continue ;
2024-08-04 20:14:01 -07:00
}
2023-12-27 02:55:48 -07:00
2023-09-11 09:42:41 +10:00
var attackedEvent = new AttackedEvent ( meleeUid , user , GetCoordinates ( ev . Coordinates ) ) ;
2023-05-14 13:15:18 +10:00
RaiseLocalEvent ( entity , attackedEvent ) ;
var modifiedDamage = DamageSpecifier . ApplyModifierSets ( damage + hitEvent . BonusDamage + attackedEvent . BonusDamage , hitEvent . ModifiersList ) ;
2022-11-14 08:33:54 +11:00
var damageResult = Damageable . TryChangeDamage ( entity , modifiedDamage , origin : user ) ;
2023-12-27 02:55:48 -07:00
if ( damageResult ! = null & & damageResult . GetTotal ( ) > FixedPoint2 . Zero )
2022-11-14 08:33:54 +11:00
{
2024-10-20 00:41:44 -03:00
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
if ( damageResult . DamageDict . TryGetValue ( "Blunt" , out var bluntDamage ) )
{
_stamina . TakeStaminaDamage ( entity , ( bluntDamage * component . BluntStaminaDamageFactor ) . Float ( ) , visual : false , source : user , with : meleeUid = = user ? null : meleeUid ) ;
}
2022-11-14 08:33:54 +11:00
appliedDamage + = damageResult ;
2023-02-13 07:55:39 -05:00
if ( meleeUid = = user )
2022-11-14 08:33:54 +11:00
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Medium ,
2023-12-27 02:55:48 -07:00
$"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using their hands and dealt {damageResult.GetTotal():damage} damage" ) ;
2022-11-14 08:33:54 +11:00
}
else
{
2024-10-14 00:40:59 -05:00
AdminLogger . Add ( LogType . MeleeHit ,
LogImpact . Medium ,
2024-01-22 02:59:14 +01:00
$"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.GetTotal():damage} damage" ) ;
2022-11-14 08:33:54 +11:00
}
}
}
if ( entities . Count ! = 0 )
{
2024-02-03 02:00:14 +01:00
var target = entities . First ( ) ;
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
_meleeSound . PlayHitSound ( target , user , GetHighestDamageSound ( appliedDamage , _protoManager ) , hitEvent . HitSoundOverride , component ) ;
2022-11-14 08:33:54 +11:00
}
2023-12-27 02:55:48 -07:00
if ( appliedDamage . GetTotal ( ) > FixedPoint2 . Zero )
2022-11-14 08:33:54 +11:00
{
2022-11-15 11:56:10 +11:00
DoDamageEffect ( targets , user , Transform ( targets [ 0 ] ) ) ;
2022-11-14 08:33:54 +11:00
}
2023-08-06 12:55:38 +10:00
return true ;
2022-11-14 08:33:54 +11:00
}
2023-05-02 05:07:17 +10:00
protected HashSet < EntityUid > ArcRayCast ( Vector2 position , Angle angle , Angle arcWidth , float range , MapId mapId , EntityUid ignore )
2022-11-14 08:33:54 +11:00
{
// TODO: This is pretty sucky.
var widthRad = arcWidth ;
var increments = 1 + 35 * ( int ) Math . Ceiling ( widthRad / ( 2 * Math . PI ) ) ;
var increment = widthRad / increments ;
var baseAngle = angle - widthRad / 2 ;
var resSet = new HashSet < EntityUid > ( ) ;
for ( var i = 0 ; i < increments ; i + + )
{
var castAngle = new Angle ( baseAngle + increment * i ) ;
var res = _physics . IntersectRay ( mapId ,
2024-10-14 00:40:59 -05:00
new CollisionRay ( position ,
castAngle . ToWorldVec ( ) ,
AttackMask ) ,
range ,
ignore ,
false )
. ToList ( ) ;
2022-11-14 08:33:54 +11:00
if ( res . Count ! = 0 )
{
resSet . Add ( res [ 0 ] . HitEntity ) ;
}
}
return resSet ;
}
2024-10-14 00:40:59 -05:00
protected virtual bool ArcRaySuccessful ( EntityUid targetUid ,
Vector2 position ,
Angle angle ,
Angle arcWidth ,
float range ,
MapId mapId ,
EntityUid ignore ,
ICommonSession ? session )
2023-05-02 05:07:17 +10:00
{
// Only matters for server.
return true ;
}
2022-11-14 08:33:54 +11:00
public static string? GetHighestDamageSound ( DamageSpecifier modifiedDamage , IPrototypeManager protoManager )
{
var groups = modifiedDamage . GetDamagePerGroup ( protoManager ) ;
// Use group if it's exclusive, otherwise fall back to type.
if ( groups . Count = = 1 )
{
return groups . Keys . First ( ) ;
}
var highestDamage = FixedPoint2 . Zero ;
string? highestDamageType = null ;
foreach ( var ( type , damage ) in modifiedDamage . DamageDict )
{
if ( damage < = highestDamage )
continue ;
highestDamageType = type ;
}
return highestDamageType ;
2022-09-29 15:51:59 +10:00
}
2023-02-13 07:55:39 -05:00
protected virtual bool DoDisarm ( EntityUid user , DisarmAttackEvent ev , EntityUid meleeUid , MeleeWeaponComponent component , ICommonSession ? session )
2022-09-29 15:51:59 +10:00
{
2023-09-11 09:42:41 +10:00
var target = GetEntity ( ev . Target ) ;
if ( Deleted ( target ) | |
user = = target )
{
2022-09-29 15:51:59 +10:00
return false ;
2023-09-11 09:42:41 +10:00
}
2022-09-29 15:51:59 +10:00
2022-11-14 08:33:54 +11:00
// Play a sound to give instant feedback; same with playing the animations
Upstream, Yay (#27)
* 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 6de5fbfafbde700d711a566f6a43f05f7a99e455.
* Revert "Spray Paint (Review Ready) (#23003)"
This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.
# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
* Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb
Co-authored-by: Plykiya <plykiya@protonmail.com>
* MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises
* finished
* cleanup
* cleanup
* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* _Style
* Fix merge
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount
* Fixtures removal
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update submodule to 217.2.1 (#26599)
* disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.
This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Make the buttons on the map ui not squished (#26604)
Make the map ui work
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Combine flower crown and wreath (#26605)
* Combine flower crown and wreath
* huh
* huuh :trollface:
* Automatic changelog update
* Add AP damage to throwing knives (#26380)
* add
* ap
* no more stam dmg
* Automatic changelog update
* cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave
* Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Automatic changelog update
* Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly
* Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup
* also add to lawdrobe
* Automatic changelog update
* Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status
* Fix overflow in examine tooltip
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Adds two milk cartons to the BoozeOMat (#26635)
* Automatic changelog update
* made the hover text less vague (sorry) (#26630)
* blacklisted throwing knifes from pneumatic cannon (#26628)
* Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
* Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable
Co-authored-by: hamurlik <renoDeath@protonmail.com>
* Automatic changelog update
* Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds
* Fix attribution source for drill_hit.ogg
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Audio/Items/attributions.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.
* Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction
* adjustments to sum stuff
* Automatic changelog update
* Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems
* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic changelog update
* Add ValueList import (#26640)
* Change assault borg modules texture (#26502)
* Update borg_modules.yml
* Fix borg_modules.yml?
* Uh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote
* Add Chime emote & Change variation to 0.05
* Modify Buzz emote
* Add Buzz-two emote
* modified Horn
* add ping emote
* add slowclap emote
* Convert slowclap.ogg to mono, reflect change in attribution.yml
* fix capitalization for all chatMessages && change all catagory to category
* remove all traces of slowclap.ogg
* forgor one file smh
* collating copywrite
* spelling mistakes will be the death of me
* more spelling mistakes
* change yml string to list
* Automatic changelog update
* Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!
Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:
- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
position they are at. Effectively not teleporting them.
* Actually make the defaults sane which I forgor in the last commit
* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.
* Address reviews as much as possible
* Address reviews
* Refactored AdvertiseComponent (#26598)
* Made it better
* ok
* alright
---------
Co-authored-by: wrexbe <wrexbe@protonmail.com>
* Bartender "Essentials" (#25367)
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Automatic changelog update
* Add ERT Chaplain (#25956)
* ERT Chaplain
* Make BibleUser
* It was not intended
* reword my poor words
* 1984 a comment that I decided was unnecessary.
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories
The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".
* Update guides.ftl
* Update chemicals.yml
Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml
Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml
Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!
A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!
* Update settings.json
* Fix?
---------
Co-authored-by: exincore <me@exin.xyz>
* Automatic changelog update
* Anomalies behaviours (#24683)
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary
* Fix bug where shrinking window would cause elements to overlap
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency
* Tweaked variable names
* Fixed order to match UI
* Renamed set chat window transparency function
* Changed and refactored to opacity instead of transparency
* Remove unnecessary int to float conversions
Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.
* Round the value to two decimal points
* Remove rounding for now
* Rename
* Unhardcode chat color by moving to stylesheet
* Fix indent
* Make opacity slider only change opacity
---------
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Automatic changelog update
* Infinity books (#25840)
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* Automatic changelog update
* Resprite ambuzol plus pills (#26651)
* Automatic changelog update
* Fixed air injector visuals (#26654)
* Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.
* undo changes
* Epic rename fail
* Explosion recursion data field
* Logic for data field
* Automatic changelog update
* Automatic changelog update
* Make typing indicator shaded (#26678)
* Automatic changelog update
* Validate wire layout prototypes and remove invalid WiresComponents (#26682)
Validate wire layout prototypes; delete invalid wirescomponents.
* Increase time inbetween anomaly pulses (#26677)
nerf anomaly pulse delays
* Automatic changelog update
* Fix for items dropped being rotated to world north (#26662)
* Fix rotation of dropped items
* combined world position rotation function for dumpable
* scuffed implementation?
* less scuffed?
* even less scuffed... I guess
* capital D
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Automatic changelog update
* fix typo
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: J. Brown <DrMelon@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: avery <51971268+graevy@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: Zealith-Gamer <61980908+Zealith-Gamer@users.noreply.github.com>
Co-authored-by: hamurlik <75280571+hamurlik@users.noreply.github.com>
Co-authored-by: hamurlik <renoDeath@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com>
Co-authored-by: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: c4llv07e <38111072+c4llv07e@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: Sk1tch <ben.peter.smith@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
2024-04-03 10:33:34 +03:00
_meleeSound . PlaySwingSound ( user , meleeUid , component ) ;
2022-09-29 15:51:59 +10:00
return true ;
}
2023-10-17 20:12:00 -05:00
private void DoLungeAnimation ( EntityUid user , EntityUid weapon , Angle angle , MapCoordinates coordinates , float length , string? animation )
2022-09-29 15:51:59 +10:00
{
// TODO: Assert that offset eyes are still okay.
2024-05-21 17:40:35 +12:00
if ( ! TryComp ( user , out TransformComponent ? userXform ) )
2022-09-29 15:51:59 +10:00
return ;
2023-05-08 17:46:26 +10:00
var invMatrix = TransformSystem . GetInvWorldMatrix ( userXform ) ;
2024-06-02 05:07:41 +01:00
var localPos = Vector2 . Transform ( coordinates . Position , invMatrix ) ;
2022-09-29 15:51:59 +10:00
2023-07-08 14:08:32 +10:00
if ( localPos . LengthSquared ( ) < = 0f )
2022-09-29 15:51:59 +10:00
return ;
localPos = userXform . LocalRotation . RotateVec ( localPos ) ;
2022-11-09 07:28:49 +11:00
// We'll play the effect just short visually so it doesn't look like we should be hitting but actually aren't.
2023-03-12 15:56:05 +11:00
const float bufferLength = 0.2f ;
var visualLength = length - bufferLength ;
2022-11-09 07:28:49 +11:00
2023-07-08 14:08:32 +10:00
if ( localPos . Length ( ) > visualLength )
localPos = localPos . Normalized ( ) * visualLength ;
2022-11-09 07:28:49 +11:00
2023-10-17 20:12:00 -05:00
DoLunge ( user , weapon , angle , localPos , animation ) ;
2022-09-29 15:51:59 +10:00
}
2023-10-17 20:12:00 -05:00
public abstract void DoLunge ( EntityUid user , EntityUid weapon , Angle angle , Vector2 localPos , string? animation , bool predicted = true ) ;
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>
2023-12-24 08:11:05 +02:00
/// <summary>
/// Used to update the MeleeWeapon component on item toggle.
/// </summary>
2024-01-03 17:24:02 +11:00
private void OnItemToggle ( EntityUid uid , ItemToggleMeleeWeaponComponent itemToggleMelee , ItemToggledEvent args )
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>
2023-12-24 08:11:05 +02:00
{
if ( ! TryComp ( uid , out MeleeWeaponComponent ? meleeWeapon ) )
return ;
if ( args . Activated )
{
if ( itemToggleMelee . ActivatedDamage ! = null )
{
//Setting deactivated damage to the weapon's regular value before changing it.
itemToggleMelee . DeactivatedDamage ? ? = meleeWeapon . Damage ;
meleeWeapon . Damage = itemToggleMelee . ActivatedDamage ;
}
meleeWeapon . HitSound = itemToggleMelee . ActivatedSoundOnHit ;
if ( itemToggleMelee . ActivatedSoundOnHitNoDamage ! = null )
{
//Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
itemToggleMelee . DeactivatedSoundOnHitNoDamage ? ? = meleeWeapon . NoDamageSound ;
meleeWeapon . NoDamageSound = itemToggleMelee . ActivatedSoundOnHitNoDamage ;
}
if ( itemToggleMelee . ActivatedSoundOnSwing ! = null )
{
//Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
itemToggleMelee . DeactivatedSoundOnSwing ? ? = meleeWeapon . SwingSound ;
meleeWeapon . SwingSound = itemToggleMelee . ActivatedSoundOnSwing ;
}
if ( itemToggleMelee . DeactivatedSecret )
meleeWeapon . Hidden = false ;
}
else
{
if ( itemToggleMelee . DeactivatedDamage ! = null )
meleeWeapon . Damage = itemToggleMelee . DeactivatedDamage ;
meleeWeapon . HitSound = itemToggleMelee . DeactivatedSoundOnHit ;
if ( itemToggleMelee . DeactivatedSoundOnHitNoDamage ! = null )
meleeWeapon . NoDamageSound = itemToggleMelee . DeactivatedSoundOnHitNoDamage ;
if ( itemToggleMelee . DeactivatedSoundOnSwing ! = null )
meleeWeapon . SwingSound = itemToggleMelee . DeactivatedSoundOnSwing ;
if ( itemToggleMelee . DeactivatedSecret )
meleeWeapon . Hidden = true ;
}
Dirty ( uid , meleeWeapon ) ;
}
2022-09-29 15:51:59 +10:00
}