* added optional delay to DragInsertContainerComponent

* comments

* Change EntryDelay on DragInsertContainerComponent to use TimeSpan + cleanup

* changed drag insert container comp to match naming conventions

* Reduce NukeOps Reinforcement to 25TC from 35TC

* price adjustment to 30

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.

* revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule?! YAML preserve me...

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule!?!? yaml save me

* attempt Elijahrane#2 at changing to 30

* Elf Supremacy

* Delete old ears

* Review Fix

* Make hacking energy swords predicted

* Fix up component, add dirty call

* access

* Dirty Entity<T>

* false

* Increases Disabler Bolt to 47 stamina damage per. Increases fire rate to 3 and lowers shot cost by 50 for practice and disabler

* lowers stam per shot to 40

* increases disabler proj speed to 35

* ACTUALLY 4 shot

* Reverts disabler projectile to be 33 stamina damage per again. decreased disabler fire rate to 2.5 and increased projectile speed to 35. decrease disabler smg fire rate to 3.5

* Fire rate back down to 2

…-14 into staging

* Added Genderqueer pin! (Properly this time.)

* Update meta.json

bagel update

* > Swapped the butter in boiled spaghetti with olive oil

* Update meal_recipes.yml

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Test entered tree fix

* Use Opened override

* Fix keyboard focus on window open for DialogWindow

This affects Phone, Pray, Rename, and multiple other admin verbs.

* Clean up

fix minibomb implant not exploding

* cleanup not needed locale string

* Update Resources/Prototypes/Actions/types.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Remove custom character description after using DNA scrambler

* Mark grammar as dirty when updating identity

* Update Content.Server/Implants/SubdermalImplantSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

fixed control button - a single line of code

Might want more flexibility in future but weather needs some polish and this is fine for now.

* Fix hitscan visuals

* remove unnecessary changes

* rename `mapDirection`

fix sync issue with paramed siren

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>

People with VarEdit can use VV but can't use visualize, makes no sense. 

Has headmin approval here: https://canary.discord.com/channels/310555209753690112/1193403928096821358/1340756276371787827

…ants (#34994)

* Prevents admin ghosts from being shown with ghost event

* Changes summon ghost tooltip to permanently visible

* Adds AllowGhostShownByEvent tag, adds it to regular observers, removes ghost hands check & revenant check and replaces it with a tag check.

init

* Replaced Bulldog beanbag drum with lethals drum

* Update Resources/Locale/en-US/store/uplink-catalog.ftl

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update duffelbag.yml bulldog bundle description.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

…on-14 into upstreamsync