Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove drag & drop dropping items from containers #32706

Merged

Conversation

SlamBamActionman
Copy link
Member

@SlamBamActionman SlamBamActionman commented Oct 8, 2024

About the PR

This PR makes dragging items out of the container UI no longer drop the item on the ground.

Why / Balance

The drag & drop is a nice feature to have, but it bypasses a few key systems in a way that wouldn't be intuitive. This includes forensics, glue/lube and dual wielding.

Originally the PR hindered players from moving items entirely in their bag while their hands were full, however after discussion this was decided to be QoL to justify it. Dropping, on the other hand, was seen as more of an obscure mechanic and since it changes the item state it's less desireable.

Technical details

This simply removes the drop functionality and all accompanying code.

Media

Requirements

Breaking changes

Changelog

🆑

  • tweak: It's no longer possible to drag an item out of a container's UI to drop it.

@bruhmogus
Copy link

i don't see why this would make sense, irl you can just... move it with your arm

@packmore
Copy link
Contributor

packmore commented Oct 8, 2024

how is this any more intuitive than just being allowed to move things in your inventory whenever? this is a goofy space game, no reason to be going anti-QoL just for realism.

@metalgearsloth
Copy link
Contributor

how is this any more intuitive

Moving entities around your inventory already requires a hand, making storage require it is more consistent and I would argue more intuitive due to this.

@SlamBamActionman
Copy link
Member Author

i don't see why this would make sense, irl you can just... move it with your arm

You have to make concessions for stuff like glue and forensics to work, or something like #25253. If you're moving an object around, you're interacting by touching it, and if you're touching it you should require a free hand.

@Erisfiregamer1
Copy link
Contributor

Moving entities around your inventory already requires a hand, making storage require it is more consistent and I would argue more intuitive due to this.

while I agree it'd be slightly more intuitive, this is just annoying as a casual player. in a real life situation, as bruhmogus said, I'd just use my arm to move it if my hands were full.

@packmore
Copy link
Contributor

packmore commented Oct 9, 2024

Moving entities around your inventory already requires a hand, making storage require it is more consistent and I would argue more intuitive due to this.

i guess i'm looking at it from the perspective of "intuitive for a video game" and not "intuitive for someone who has never played a video game". like, i wouldn't automatically assume that my item not moving in my inventory is because of my filled hand, i'd assume i'm lagging or that there's a bug. i might figure it out quickly, but i think it would just be more frustrating and be an overall negative payoff.

@metalgearsloth
Copy link
Contributor

i wouldn't automatically assume that my item not moving in my inventory is because of my filled hand

Does this mean you should be able to unequip inventory items even if your hands are full?

@packmore
Copy link
Contributor

packmore commented Oct 9, 2024

Does this mean you should be able to unequip inventory items even if your hands are full?

this is a false equivalence imo. equipped items are inserted into your hands when unequipped, and there is no other way to take the equipped items off (as far as i'm aware). also, the equip UI has no reason to be organized and it doesn't really affect QoL in any way. being able to move things around while holding an item then quickly store the item makes sense and doesn't even require you to put that item down IRL - why should it in game when it only adds needless frustration? not to mention, being able to organize your items in a container UI is a pretty obvious game abstraction that doesn't really make sense to force into being more realistic.

@UbaserB
Copy link
Member

UbaserB commented Oct 9, 2024

I actually never knew it was possible to move items with something in your hand, I always picked it up and placed back into the inventory... I've been playing the game wrong lol (but honestly this pr will change nothing for me so its fine)

@Centronias
Copy link
Contributor

To set a bit of context, presently with full hands, you can

  • Click and drag to rearrange items in storage
  • Click and drag to remove items from storage (they're dropped on the floor under your sprite)

, and you cannot

  • Click and drag to pick up items from the world, either to inventory (ie. pockets) or storage; or to equip
    • because click and drag doesn't do anything to items in the world -- the click tries to pick up, but fails because full hands
  • Click and drag to equip items from storage, either to equipment slots, pockets or hands
    • This is perhaps the most inconsistent one for somebody who doesn't know how the UI works because...
    • It just drops the item on the ground. The clicked-and-dragged ghost UI thingy doesn't interact with the inventory/pockets/hands UI at all, and it acts like you're just dropping the item in the world

So, perhaps the broader question @metalgearsloth is asking here is whether or not the inventory/hands/pockets should work more like storage. That is, specifically, if it should have the same sort of click-and-drag capability.
And then the flipside would be if storage should work more like the inventory/hands/pockets and require an open hand to make any position changes.

@Graded5
Copy link

Graded5 commented Oct 10, 2024

i dont really like that you cant move items if you have a empty hand but its not your active hand

@PJB3005 PJB3005 added the S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure. label Oct 11, 2024
@SlamBamActionman SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024
@beck-thompson beck-thompson added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 17, 2024
@github-actions github-actions bot added the size/M Denotes a PR that changes 100-999 lines. label Nov 18, 2024
@SlamBamActionman
Copy link
Member Author

Based on a Maintainer Discussion, this PR has been adjusted to still allow moving items in your inventory when your hands are full; however dropping items from your inventory or a container with drag & drop has been removed completely. The reasoning for this is that it bypasses some checks, and that it's a fairly unintuitive and hidden mechanic to begin with.

@SlamBamActionman SlamBamActionman changed the title Make moving items inside containers require an empty hand Remove drag & drop dropping items from containers Nov 18, 2024
@metalgearsloth metalgearsloth merged commit 89392e2 into space-wizards:master Nov 20, 2024
12 checks passed
@cfif126

This comment was marked as spam.

Merrokitsune added a commit to Merrokitsune/ronstation-dev that referenced this pull request Nov 21, 2024
@thebadman4662
Copy link

Borgs no longer can get bodybags from boxes because doctors are allergic to preventing rot. :mistake:
Mice griefers no longer can get shit out to drag spill and otherwise abuse bugs as much. :godo:

@archee1
Copy link

archee1 commented Nov 26, 2024

Personally I disagree with the core reasons for this PR's balancing, I am a very avid user of this feature and can attest to having never seen any of the points made happen in real gameplay, while yes they are odd interactions such as dropping glued items, this rarely occurs. nor for experienced players is it ever considered as an option in the first place.

As for forensics I doubt its a problem to add to the code to put glove-fibres/fingerprints onto items interacted this way, akin to how bags are apparently touched when opened despite never entering your hands (even if said item has an 'opened' sprite in the case of pizza boxes/honk meal boxes/toolboxes). likewise transmitting lube-dropping onto something bag-dropped or preventing glued items from being bag-dropped would also be better solutions to prevent these points.

To say this feature is obscure however is a fair point to make (Though a large portion of this game is niche knowledge, we arent hailing the removal of drag-emptying jugs into a chemmaster for this reason), there-in a setting to enable/disable the overall functionality would also be a more acceptable alternative to removing it, while also dealing with its 'obscureness'.

Overall this change came out of left field to me and has heavily upset my micro with inventory interactions and I would very much be pleased to see it undone.
Managing bags will always be a chore, this was an incredibly useful QOL that has vanished; For the same reason that needing a free hand to re-arrange your bag was scrapped, speaks volumes regarding my stance.

Kirus59 pushed a commit to SerbiaStrong-220/space-station-14 that referenced this pull request Dec 1, 2024
* Cog fixes (space-wizards#33285)

fixed the map (for real this time)

* Window sprite tweaks (space-wizards#33282)

* add

* yes

* Automatic changelog update

* tag:with toolshed command (space-wizards#31751)

* Automatic changelog update

* Ethereal Jaunt Spell for Wizard & Jaunt ECS (space-wizards#33201)

* Act

* Adds Jaunt ECS and related prototypes

* Adds jaunt sounds

* Adds enter and exit sound support to polymorphs

* Updates jaunt description

* Adds jaunt action sprite and changes jaunt polymorph to use it

* Adds Jaunt and upgrade to the wizard grimoire

* Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt

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

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <[email protected]>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <[email protected]>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <[email protected]>

* removes meta changes

* removes other meta changes

* adds context menu and a description to basemobjaunt

* comments for jaunt component and adds on component shutdown method

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Resources/Prototypes/Catalog/spellbook_catalog.yml

---------

Co-authored-by: lzk <[email protected]>
Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* derelictn't (for now)

* Update Label workflows to use new labels (space-wizards#33310)

* Update labeler.yml

* Update labeler-needsreview.yml

* Update labeler-staging.yml

* Update labeler-stable.yml

* Update labeler-untriaged.yml

* Create labeler-size.yml

* Update labeler-size.yml

* Update labeler-size.yml

* Update conflict-labeler.yml

* Rename conflict-labeler.yml to labeler-conflict.yml

* guh

* derelicn't for real

* progress

* Yippee!

* Fix mime broken vow alert (space-wizards#33303)

Swap VowAlert and VowBrokenAlert on lines 149 and 150 so that the proper alerts are cleared and shown

* Automatic changelog update

* Borg type switching. (space-wizards#32586)

* Borg type switching.

This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything.

New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis.

These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI.

The modules that each borg type starts with:

* Generic: tools
* Engineering: advanced tools, construction, RCD, cable
* Salvage: Grappling gun, appraisal, mining
* Janitor: cleaning, light replacer
* Medical: treatment
* Service: music, service, clowning

Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5.

Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire.

The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs.

Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those.

The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future.

There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code.

* Fix sandbox failure due to collection expression.

* Module tweak

Fix salvage borg modules still having research/lathe recipes

Engie borg has regular tool module, not advanced.

* Fix inventory system breakage

* Fix migrations

Some things were missing

* Guidebook rewordings & review

* MinWidth on confirm selection button

* Automatic changelog update

* slash

* epic empty commit

* or was it

* Marathon Station: Added air alarms to CMO, Surgery, Security Checkpoint (space-wizards#33213)

* add air alarms to sec checkpoint, cmo and western surgery

* decals and cleanup

* Meta Station: Add a fully functional TEG room (space-wizards#32941)

* initial commit

* delete WIP-marker.md

* add TEG room, move gas chambers up

* remove outside burn chamber button, add naming to APC, SMES, Substation

* add HV below TEG Substation

* removed invalids

* Rule amendment -  Remove role abandonment aHelp requirement. (space-wizards#33287)

* Role abandonment aHelp requirement.

* disable roundstart chat message

---------

Co-authored-by: slarticodefast <[email protected]>

* Note expiry time is now relative instead of using timestamps (space-wizards#33262)

* Add the stuff

* Loc fix

* fixes

* Change

* Automatic changelog update

* Update Core (space-wizards#33325)

add

* Prevent Digiboard recycling (space-wizards#33315)

* add `HighRiskItem` tag

* Correct tags

Co-authored-by: slarticodefast <[email protected]>

---------

Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Command external airlocks (space-wizards#33333)

add

* New ruin variant (space-wizards#33332)

add

* Edited Snow White reaction to output proper amount of drink. (space-wizards#33331)

Co-authored-by: RedBookcase <[email protected]>

* Automatic changelog update

* Add succumb action 10 sec delay (space-wizards#32985)

* Add succumb action 10 sec delay

* add somthing

* add delay to last words as well

---------

Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Adds gorilla gauntlet storage sprite and updates hit sound (space-wizards#33167)

* Adds storage sprite for gorilla gauntlet

* Specifies a heavier hitsound for gorilla gauntlet

* Modifies gauntlet icon and storage sprite

* Updates credit to my new username

* Clumsy system refactor (space-wizards#31147)

* First commit

* Fixes

* Added the noise

* Renames

* Timespan

* Fixed space

* entity -> ent

* This shouldn't work

* opps....

* Datafield name change

* Better comments

* small comment

* Personal skill issue

* Event renames and stuff

* Couple fixes

* Defib ref fixes (Silly me)

* Added clumsy back!

* no hard code clumsy!

* Identity fix

* Event name change

* Comment change

* Function name change

* opp

* Update names

* Damage stuff!

* Fixes!

* Fixes

* opps

* This was hidden away!!

* negative diff feeds me

* Automatic changelog update

* S: Awaiting Changes

* Improve crayon UI to not be stuck in 1996 (space-wizards#33101)

* Improve crayon UI to not be stuck in 1996

* Make a horrifying crayon spaghetti

* Crayon

* Undeprecate the crayon, describe the crayon

* Automatic changelog update

* BRB sign in the Bureaucracy Crate (space-wizards#33341)

Added the brb sign to the Bureaucracy Crate

* Automatic changelog update

* Fix utensils not being thrown away (space-wizards#33326)

* Automatic changelog update

* Fix server crash when the seed extractor is used on the dev map (space-wizards#33312)

handle event when using seed extractor

Co-authored-by: slarticodefast <[email protected]>

* Solar assembly crate buff (space-wizards#33019)

* more flatpacks + glass

* solar crate price increase

* price increase

* 1250 spesos

* Update Resources/Prototypes/Catalog/Fills/Crates/engines.yml

---------

Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Add admin remarks button to lobby (space-wizards#31761)

* Automatic changelog update

* Cog christmas update (space-wizards#33344)

christmas updoot

* Box Holiday Update (space-wizards#33340)

Added holiday decorations with presents and various fixes

* Marathon holiday update (space-wizards#33335)

* Added holiday decorations, and modified emergency lights to have a better layout.

* Added a couple more emergency lights after finding a couple spots that were wway too dark during testing, also gave the warden a crew monitor

* bagel christmas update (space-wizards#33347)

* Temporarily make singularity a bit harder to loose as non-antag

* Fix Fluent string ID copypaste fail

* Fix the component defaults

* Throwing Knife description tweak (space-wizards#33349)

changed description

* Update Credits (space-wizards#33360)

Co-authored-by: PJBot <[email protected]>

* Adds paper label visuals to closets and lockers (space-wizards#33318)

* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component

* Automatic changelog update

* Omega Update (Christmas Edition) (space-wizards#33357)

* Christmasift Omega station.

* Add cryosleeper to bridge.

* Packed Update (Christmas Edition) (space-wizards#33356)

Christmasified Packed station.

* Wizard Summon Guns/Magic (space-wizards#32692)

* mostly done but there's a bug with spawning

* RandomGlobalSpawnSpellEvent now actually works

* Summon Guns/Magic is working

* Added sound, cap gun, and auto pick up

* Added all requested changes/fixes from reviews

* Halving cooldowns

* Changes + Cleanup

* Chemical synthesis kit tweak (space-wizards#33345)

* butcherable surgery caps

* readded cardboard box

* butcherable now?

* butcherable now?

* one day ill figure this out

* changed label of hyperzine syringe

* removed the thing in hats.yml that wasn't supposed to be here

* Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

---------

Co-authored-by: slarticodefast <[email protected]>

* Reduced cost of coloured light fixtures

* Dim light bulbs (space-wizards#33383)

add

* Automatic changelog update

* Shift air alarm sprites to better reflect their direction (space-wizards#33379)

* Shift Air Alarm sprites to better reflect their direction

* Fix two frames of west-facing sprite being one pixel off

* Indicate that sprites are no longer exactly tgstation's

* Replace direct uses of GameTicker dictionary with `TryGetValue` (space-wizards#33222)

Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario

* Service Worker Job Icon Change (space-wizards#33361)

* Changes the Server Worker job icon to a bowtie.

* Removes grey from icon to better fit existing art.

* Updated ID card sprite.

* Edit respective meta.json files.

* Bump the failsafe timer down

* Cog update (space-wizards#33410)

removed fun

* fix viewing nav slowing shuttle down (space-wizards#32381)

fix

* Automatic changelog update

* Welded secret doors no longer say they are welded shut. (space-wizards#33365)

Init

* Automatic changelog update

* Increase softcap back to 80 (space-wizards#33400)

* Toggle clothing fix (space-wizards#32826)

* toggle clothing fix

* some adding

* Automatic changelog update

* .NET 9 forward compatibility changes (space-wizards#33421)

This doesn't switch the projects over to .NET 9, but it does make them work on .NET 9 when we decide to switch in the future.

* Fix security riot crate (space-wizards#33415)

* move riot crate from security to armory category

* Move riot crate to armory, actually make it require armory access to unlock

* Localize planet dataset names (space-wizards#33398)

* Localize planet names (borer)

* DatasetPrototype -> LocalizedDatasetPrototype

* Apply requested changes

* Automatic changelog update

* Remove drag & drop dropping items from containers (space-wizards#32706)

* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops

* Automatic changelog update

* Automatically add "Approved" to maintainer PRs (space-wizards#33337)

* Add an Approved labeler for maintainer PRs

* Be extra safe with conditions

* Crew monitoring crate updated to contain flatpacks, science access instead of engi (space-wizards#33417)

* Make a crew monitoring crate with flatpacks

* fix image

* migration

* Automatic changelog update

* Add emag functionality

* Move some of the new singularity code into shared

Hopefully without explosions yay

* Fix toggle verbs (space-wizards#32138)

First commit

Co-authored-by: metalgearsloth <[email protected]>

* Construction menu grid view (space-wizards#32577)

* button

* implement populate grid view

* tweak min width

* Make grid button toggle visible

* tweak min window size

* fix missing recipe button when mirroring item

* make grid buttons toggleable

* align button texture vertically

* selected grid item has plain color background

* tweak window width so all buttons look good

* rename select method, defer colouring

* get icon better

* whoops

* simpler button toggle

* spritesys frame0, move spritesys

* delete old sprite system refs

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Actually make the emagging popup work properly

* Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared

* Fix imports

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Set airlock unlit layers as invisible (space-wizards#32484)

Doesn't really affect anything due to appearance bulldozing this but this aligns with their actual normal states so.

* Update salvage.yml

* Update cargo_vending.yml

* Update salvage.yml

* Update salvage.yml

* Update to Robust v237.2.0

* Syndicate item fix ups (space-wizards#33435)

tweaks and fixes

* Coal presents and chrimmas tree options. Presents no longer itemify (space-wizards#33147)

* Dont ensure ItemComp because it could lead to weirds, and also PickupOrDrop handles non-items already.

* presents and tree

* woops

* reviews a

* Automatic changelog update

* Fix approval labeler (space-wizards#33440)

* Fix approval labeler

* Update labeler-review.yml

* Update labeler-review.yml

* electrification hud

* Fix admin ghosts not being able to see items in pockets or interact with them (space-wizards#31076)

* Fix admin ghosts not being able to see items in pouches or interact with them

* fix

* oops

---------

Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Gas pipe sensors (space-wizards#33128)

* Initial commit

* Monitored pipe node is now referenced by name

* Review changes

* Simplified construction

* Tweaked deconstruction to match other binary atmos devices

* Helper function removal

* Updated attribution

* Automatic changelog update

* Add telegram to the server info-links (space-wizards#33459)

* Fix sandbox error with new HWID code. (space-wizards#33461)

Oops

* cleanup

* rename

* another rename

* baby proof the terminal (space-wizards#33281)

* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Disable submit admin note button on switch to note (space-wizards#33456)

Co-authored-by: Winkarst <[email protected]>

* Automatic changelog update

* Fix startingGear storage (space-wizards#33394)

* fix starting gear storage

* removal of unused

---------

Co-authored-by: MetalSage <[email protected]>

* Minor improvements & fixes to Shuttle Console UI (space-wizards#31623)

* Fix grids and docks being culled from display prematurely

* Fix inconsistent disabling of "Undock" buttons

* Add a radar icon to indicate where the controlling console is

* Tidy up math

Remove lots of sketchy transforms-of-transforms, which should have been
as single matrix multiply. Assign proper names to matrices. Remove some
redundant calculations.

* Feedback

* Fix door animations mispredicting if closing is interrupted (space-wizards#33481)

* Fix door animations mispredicting if closing is interrupted

On master it will flicker states a little bit partially due to it not being predicted.

Instead we'll just set it straight back to opening (no animation is ever played anyway).

* no log

* Automatic changelog update

* Don't show drag-drop outline if climbing (space-wizards#33477)

It won't actually do anything.

* Automatic changelog update

* Ensure wires can always be cut (space-wizards#32447)

ensure wires are always cut

* Automatic changelog update

* babyproof arrivals shuttle (space-wizards#33284)

* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Add delay to AutoOrient (space-wizards#33479)

It functions identically to how V1 of orientation worked and it's incredibly annoying.

* Automatic changelog update

* Update Credits (space-wizards#33503)

Co-authored-by: PJBot <[email protected]>

* Draw muzzle flash below mobs (space-wizards#33465)

* Draw muzzle flash below mobs

* Better naming

---------

Co-authored-by: Winkarst <[email protected]>

* Automatic changelog update

* Allow shuttles on planets to make FTL jump (space-wizards#33507)

This check conflicts with an attempt to FTL from the planet before expedition ends

* Automatic changelog update

* fix exped caves generation (space-wizards#32890)

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

* Automatic changelog update

* various material & ore inhands (space-wizards#33342)

* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <[email protected]>

* pyrottOn

---------

Co-authored-by: slarticodefast <[email protected]>

* Delete HOS headset from warden's locker (space-wizards#33234)

* add headset

* Add icons

* Meta change

* fix

* Revert + delete headset from locker

* fix airlocks inconsistently auto-closing after unbolting (space-wizards#33524)

fix door auto close timer

* Automatic changelog update

* baby proof the terminal (space-wizards#33281)

* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again

* babyproof arrivals shuttle (space-wizards#33284)

* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <[email protected]>

* [BUGFIX] "Ghost" in the lobby lets you see the whole chat (space-wizards#33529)

* fix bug, in ghost command lobby

* fix

* Fix build

* Automatic changelog update

* removed obsolete netmessage creator (space-wizards#33542)

removed opsolete netmessage createor

* Fix RA0003 warning for ChatBox (space-wizards#33531)

* Shark plushies now goes rawr on hit. (space-wizards#33540)

Shark goes rawr more

* Automatic changelog update

* Turn off PointLights on VendingMachines when broken or off. (space-wizards#33513)

The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.

Fixes  space-wizards#33382

* Automatic changelog update

* Adds more diona names (space-wizards#33066)

* adds more diona names

* more stuff

* AHHHHHHHHHHHHHHHHHHHHHHH

* further additions

* removes depression + adds comment

* fixes + remove some weird stuff + more stuff

* remove haste

* minor AI cleanup (space-wizards#33555)

* minor cleanup

* to

* Simplify separated screen top menu (space-wizards#33047)

* Automatic changelog update

* Ghost role drop-down alignment (space-wizards#33397)

* dropdown shares margin width with children

* removed dependency that rider added for some reason

* reduced vertical margin from 8 to 2

* Greytide Virus station event (space-wizards#33547)

* proof of concept

* full implementation

* I commited a crime

* t

* min players increase

* Make shuttle airlocks not snapcardinals (space-wizards#33557)

* Make shuttle airlocks not snapcardinals

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <[email protected]>

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <[email protected]>

---------

Co-authored-by: Winkarst <[email protected]>
Co-authored-by: slarticodefast <[email protected]>

* Automatic changelog update

* Added two N2 lockers to Reach (space-wizards#33409)

Co-authored-by: dylanstrategie <[email protected]~>

* Hotfix the randomly occurring DeleteAllThenGhost test failures (space-wizards#33582)

* clear mindrole on component shutdown

* let it go

* Fix space ambient music (space-wizards#33594)

* Automatic changelog update

* Fix windoor and high security door not showing electrocution HUD (space-wizards#33551)

* Automatic changelog update

* Removes burnt tiles (space-wizards#33422)

remove burnt tiles

* Added Oppenhopper poster to the game. (space-wizards#33588)

* o7

* -

* oppenhopper v2

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

---------

Co-authored-by: slarticodefast <[email protected]>

* Fix version for electril_grill meta.json (space-wizards#33611)

fix

fixing the version thing in meta json for electril grill textures

Co-authored-by: Arthur Kustenko <[email protected]>

* Fix gauze eyepatch flying pixel (space-wizards#33564)

boo

* Fix swapped uniform printer east/west sprites (space-wizards#33442)

Fix uniform printer sprites rotating the wrong way

* Makes knives fly straight when thrown (space-wizards#33615)

Gives knives a thrown angle

* Light verb is now predicted (space-wizards#33622)

Fix

* Automatic changelog update

* Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (space-wizards#33559)

Update Content.PatreonParse to use net8.0 targetframework

* Approval labeler fix electric boogaloo (space-wizards#33633)

Nik told me to not name this "nya"

* Fix gender, maybe (space-wizards#33631)

Co-authored-by: Alpha-Two <[email protected]>

* Display GPS coordinates on their own line (space-wizards#33625)

* Automatic changelog update

* Remove grasshopper from the panic bunker message (space-wizards#33638)

Can be retargetted to stable if preferred, which will then be a hotfix

* Add admin log for ghost warping (space-wizards#33636)

* Automatic changelog update

* Rename nitrogen internals crate (space-wizards#33545)

* rename nitrogen internals crate

* nitrogen internals crate description

* migrate CrateNitrogenInternals ID

* Automatic changelog update

* Cleanup some Client atmos systems (space-wizards#33634)

* Cleanup `ScrubberControl.xaml.cs`

* Minor cleanups

* Another pile of minor cleanups

* Apply requested changes

* Rename "which" into "bound". Add whitespace after "if"

* Fix for arrivals deleting nuke (space-wizards#33659)

Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <[email protected]>

* Automatic changelog update

* add locale to Shuttle Console Map tab (space-wizards#33651)

fixed

* Automatic changelog update

* fix PermanentBlindnessComponent to be not so permanent (space-wizards#33292)

* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>

* Cog/Marathon: Airlock fixes (space-wizards#33621)

* Fixes the TEG airlock on marathon

* Fixes the atmos external airlock on cog

* Automatic changelog update

* Fix for handcuffing someone more than once (space-wizards#33646)

* Fix for over-cuffing someone

* comment

* Automatic changelog update

* Fix for inspecting entities in hand (space-wizards#33642)

Actually inspect entity in hands

* Automatic changelog update

* Fix for inspecting entities in the stripping window (space-wizards#33644)

Handle it

* Automatic changelog update

* Fix borgs not getting names on roundstart (space-wizards#33578)

* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <[email protected]>

* Automatic changelog update

* Borer ru locale

* Silicon law fix

* GhostCommand merge fix

* Return CCVars 220 removed by merge conflict

* Fix ThrowingKnife after merge

* CombatKnife prototype merge fix

* Fix braking changes after PR 33466

* Remove contraband from merged prototypes

* ClosetBase prototype merge fix

* Fix breaking changes after PR 32138

* Return SS220 IonStormRework after merge conflict

* Fixed broken borg construction

* Fix MobEN

* Fixed window_diagonal.yml merge

---------

Co-authored-by: Spessmann <[email protected]>
Co-authored-by: Ubaser <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: Vasilis <[email protected]>
Co-authored-by: dffdff2423 <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: ScarKy0 <[email protected]>
Co-authored-by: ScarKy0 <[email protected]>
Co-authored-by: SlamBamActionman <[email protected]>
Co-authored-by: CheddaCheez <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: scrivoy <[email protected]>
Co-authored-by: Repo <[email protected]>
Co-authored-by: beck-thompson <[email protected]>
Co-authored-by: Saphire <[email protected]>
Co-authored-by: Preston Smith <[email protected]>
Co-authored-by: RedBookcase <[email protected]>
Co-authored-by: RedBookcase <[email protected]>
Co-authored-by: SpaceRox1244 <[email protected]>
Co-authored-by: Southbridge <[email protected]>
Co-authored-by: MossyGreySlope <[email protected]>
Co-authored-by: K-Dynamic <[email protected]>
Co-authored-by: Emisse <[email protected]>
Co-authored-by: ThatGuyUSA <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Spanky <[email protected]>
Co-authored-by: ActiveMammmoth <[email protected]>
Co-authored-by: Justice League <[email protected]>
Co-authored-by: SpaceManiac <[email protected]>
Co-authored-by: faint <[email protected]>
Co-authored-by: Ilya246 <[email protected]>
Co-authored-by: nikthechampiongr <[email protected]>
Co-authored-by: ArZarLordOfMango <[email protected]>
Co-authored-by: Plykiya <[email protected]>
Co-authored-by: MilenVolf <[email protected]>
Co-authored-by: SlamBamActionman <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: qwerltaz <[email protected]>
Co-authored-by: DrSmugleaf <[email protected]>
Co-authored-by: MissKay1994 <[email protected]>
Co-authored-by: IProduceWidgets <[email protected]>
Co-authored-by: DrSmugleaf <[email protected]>
Co-authored-by: chromiumboy <[email protected]>
Co-authored-by: c4llv07e <[email protected]>
Co-authored-by: Winkarst <[email protected]>
Co-authored-by: Winkarst <[email protected]>
Co-authored-by: MetalSage <[email protected]>
Co-authored-by: MetalSage <[email protected]>
Co-authored-by: eoineoineoin <[email protected]>
Co-authored-by: goet <[email protected]>
Co-authored-by: deltanedas <[email protected]>
Co-authored-by: mubururu_ <[email protected]>
Co-authored-by: kosticia <[email protected]>
Co-authored-by: Schrödinger <[email protected]>
Co-authored-by: Errant <[email protected]>
Co-authored-by: Ben <[email protected]>
Co-authored-by: Nikolai Korolev <[email protected]>
Co-authored-by: Minemoder5000 <[email protected]>
Co-authored-by: Niels Huylebroeck <[email protected]>
Co-authored-by: Flareguy <[email protected]>
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com>
Co-authored-by: dylanstrategie <[email protected]>
Co-authored-by: dylanstrategie <[email protected]~>
Co-authored-by: AlexUm <[email protected]>
Co-authored-by: Arthur Kustenko <[email protected]>
Co-authored-by: Mifia <[email protected]>
Co-authored-by: Alpha-Two <[email protected]>
Co-authored-by: Alpha-Two <[email protected]>
Co-authored-by: Alice "Arimah" Heurlin <[email protected]>
Co-authored-by: Gansu <[email protected]>
Co-authored-by: aa5g21 <[email protected]>
Co-authored-by: VideoKompany <[email protected]>
Co-authored-by: lunarcomets <[email protected]>
Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
Co-authored-by: compilatron <[email protected]>
Doctor-Cpu pushed a commit to Doctor-Cpu/space-station-14 that referenced this pull request Jan 24, 2025
* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops
Doctor-Cpu added a commit to Doctor-Cpu/space-station-14 that referenced this pull request Jan 24, 2025
* Revert "tweak: orange bulbs"

This reverts commit 2011709.

* fix service radio

* fix rnd console

* fix cyborg names

* Revert "Remove drag & drop dropping items from containers (space-wizards#32706)"

This reverts commit 89392e2.

* transfer forensics on dragging an item out of storage
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. D3: Low Difficulty: Some codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure. size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.