Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-21 15:38:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
24,576 Commits 1 Branch 0 Tags
98bfbde6c2fc3ccdaa4dfd220e92ac4b0d5fd8fd
Commit Graph

79 Commits

Author SHA1 Message Date
SimpleStation14
dfeb3b986d Mirror: Fix Recycled Containers Deleting Items Inside Them (#267) 
## Mirror of PR #26045: [Fix recycled containers deleting items inside
them](https://github.com/space-wizards/space-station-14/pull/26045) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `d7484ae9f57477a5ec5c575e3077aa94c0564db6`

PR opened by <img
src="https://avatars.githubusercontent.com/u/83650252?v=4"
width="16"/><a href="https://github.com/SlamBamActionman">
SlamBamActionman</a> at 2024-03-12 16:16:42 UTC

---

PR changed 2 files with 19 additions and 1 deletions.

The PR had the following labels:
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> 
> Right now you can delete any item that fits in a survival box by
placing it inside of one and then recycling the box in a
Recycler/Material Reclaimer. This PR fixes this by dumping out any item
inside containers.
> 
> - For Reclaimers, any recyclable items inside the container get placed
on top of the Reclaimer.
> - For Recyclers, any recyclable items inside the container get
recursively recycled as well.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> 
> I doubt it's intended behavior to be able to effectively delete any
item that fits in a box. Also ensures a recycled box provides the
correct amount of material as its contents also get recycled.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> When trying to recycle, once all checks are passed it iterates through
the object's containers if it has any and dumps out any items onto the
machine doing the recycling.
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
![image](https://github.com/space-wizards/space-station-14/assets/83650252/9e95b099-ab95-449d-b5a1-25b80afda8cd)
> The result of recycling a survival box in a Recycler/Reclaimer.
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 🆑
> - fix: Recyclers no longer delete items stored inside of recycled
entities.
> 


</details>

---------

Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
 2024-07-11 17:43:32 -07:00
VMSolidus
4634419935 Update Submodule to 217.2.1 (#534) 
Ready to Merge Now
(I had to go to 217.2.1 because the prior versions of 217.0.0 weren't
viable)

Includes the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26387
https://github.com/space-wizards/space-station-14/pull/25963

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-11 17:25:06 -07:00
Krunklehorn
1fb8bad18f Weight based AreaInsert and Dumpable delay, a janitor qol tweak (#24899) 
Weight based delay, retuned average, fixed comments

(cherry picked from commit c775410370a650aa51a1feda99f45cefda0c811e)
 2024-03-07 01:17:27 +01:00
Pieter-Jan Briers
e7a3b82a8d Use new ComponentPauseGenerator (#25183) 
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.

(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
 2024-03-07 00:57:05 +01:00
Krunklehorn
a8d9ddd53e Fix candy bowls (#25514) 
* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics

(cherry picked from commit 902198d7e0c85f62ac91a0ff2cd275c0e7e77d56)
 2024-03-07 00:52:26 +01:00
Pieter-Jan Briers
ccea85136b Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
 2024-02-18 23:02:29 +01:00
Debug
d8df4327ec Fix PseudoItems (#821) 
* Fix PseudoItem

* Add pain

* Cancel attack events
 2024-02-12 21:52:49 +01:00
metalgearsloth
c639a4efbb Predicted movement opening lockers (#24937) 
Relay wasn't really networked properly and this annoys me.

EntityStorage is still pretty skrunkly but this fixes the main issue I think.

(cherry picked from commit 042feae2e91f41f7d39e55340405e3c448903d61)
 2024-02-08 12:36:12 +01:00
Leon Friedrich
dcf188f617 Fix storage destruction/deletion bug (#24882) 
(cherry picked from commit 3ffa15ce3434f84012785c696c7d403bf3574f17)
 2024-02-08 12:27:14 +01:00
Arendian
46fe22709b Prevent EntityStorages from being opened while inside another container (#24253) 
* Prevent EntityStorages from being opened while inside a mech.

* compressed into few lines

* unneeded line

* Popup client

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit e89be95d4c3085d7d6d08ad5aafa942cfc32c934)
 2024-01-26 23:13:33 +01:00
metalgearsloth
62c2728e38 Fix storage state (#23852) 
slughands

(cherry picked from commit 24f8da8f0ce01b3523434e954d4d71e8193e75b5)
 2024-01-26 22:22:41 +01:00
metalgearsloth
404ac576b8 Fix storagecomp serialization (#23780) 
* Fix storagecomp serialization

* Fix state

(cherry picked from commit b22c9aa5e265994f87c9a3f41a95e0aef611b61d)
 2024-01-26 22:17:53 +01:00
Nemanja
57d762185c Allow storage to specify a default orientation for stored items. (#23594) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit a448e5fa567e8e781b9b3093376312cc9f654533)
 2024-01-26 21:47:41 +01:00
Debug
e644725860 Fix missing imports 2024-01-22 18:55:26 +01:00
TemporalOroboros
aebae6fab7 Content ecs containers (#22484) 
(cherry picked from commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67)
 2024-01-22 18:47:55 +01:00
Leon Friedrich
46f411ef85 Cache ItemSizePrototype in StorageSystem (#22611) 
(cherry picked from commit 364ecae94f66dc0a4e87760def5203cca4745cee)
 2024-01-22 18:44:26 +01:00
Leon Friedrich
309ca8224c Fix closet skeletons spawning in nullspace (#22942) 
(cherry picked from commit 0baffe32435341a066198805c94f38fd049395ae)
 2024-01-22 18:36:51 +01:00
Debug
18f0af1f68 Implement gridinv, proper (#703) 
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
 2024-01-21 19:58:28 +01:00
Debug
985b2f96f9 Prevent pseudoitems from being transferred between bags (#553) 
* Update PseudoItemSystem.cs

* Rider full cleanup

* Also abort in sharedstorage

* Make the comp shared

* Why drop the bags?
 2023-12-29 20:38:03 +01:00
Leon Friedrich
adee2a7465 Fix various errors/exceptions (#22841) 
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
 2023-12-22 23:25:06 +01:00
LordCarve
65a15cada1 DumpableComponent on an empty container no longer stops other interactions (#22831) 
DumpableComponent does not block the entity from being disposed via InteractOn a DisposalUnit
 2023-12-22 23:25:06 +01:00
deltanedas
40ec5595be open bag in combat mode (#22512) 
* open bag in combat mode

* !!!!!

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-16 20:23:25 +01:00
Leon Friedrich
485d658bd1 Inventory slot enumerator rejig (#21788) 2023-12-16 19:30:03 +01:00
Tom Richardson
3501b01957 Add water cups to water coolers (#22073) 
* add water cup bin to water cooler

* Fix punctuation, and add proper components/tags on init

* I forgor and refactoring event construction
 2023-12-16 19:21:30 +01:00
metalgearsloth
b1ee2d48ff Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-12-02 20:16:36 +01:00
metalgearsloth
52104a45c1 Revert Arch testmerge 2 (#21901) 2023-12-02 19:05:12 +01:00
metalgearsloth
39ad6db5c3 Update submodule to 182.1.0 (#21900) 2023-12-02 19:05:11 +01:00
metalgearsloth
9741d9916c Revert the other arch changes (#21871) 2023-12-02 19:05:11 +01:00
metalgearsloth
333096b19e Content arch (#20107) 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-12-02 19:04:08 +01:00
Christopher Thirtle
1d2fc544b6 Use object-spaced bounding boxes for putting stuff in crates (#21427) 
* Use object-spaced bounding boxes for putting stuff in crates

* Use existing _lookup.GetAABB, different component

* PR edits updated

* Remove unused bits from around GetAABB

* Use GetAABBNoContainer
 2023-12-02 18:56:20 +01:00
Ed
30fd037189 Pet Carrier (Zookeeper gameplay?) (#21545) 
* add visual

* fix item + entityStorage problem, add generation in maints

* make pet carrier two-handed

* added to cargo

* add resistlocker component
 2023-11-19 22:07:42 +01:00
Stray-Pyramid
ecf231e6e2 Fix ore bag not picking up artifact fragments (#21195) 2023-10-24 18:03:52 +02:00
DrSmugleaf
9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
Leon Friedrich
5e737cdb4d Add new entity spawn test & fix misc bugs (#19953) 2023-10-20 15:29:43 +02:00
Debug
fd2cc8570d Sync master up to 1/10 (#74) 
* Automatic changelog update

* Make NPC names proper nouns & fix some genders (#20534)

* Proper names & genders

* Uppercase proper names

* Make Smile female

* fix bingus wrinkly head (#20531)

* rouny meat and steak (#20526)

* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

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

* Automatic changelog update

* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311)

* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable

* Automatic changelog update

* Minor slippery stuff (#20535)

* Update submodule to 162.2.0 (#20570)

* Predicted armor (#20560)

* clean up some lines in smile the slime prototype (#20552)

* Revert "Use full file path for temp replays (#19002)" (#20545)

* Add EyesGlasses into ClothesMate (#20523)

* Automatic changelog update

* Fix Punpun crew monitor sensor (#20484)

* Automatic changelog update

* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Make arcades hackable again (#20555)

* Automatic changelog update

* Health alert tweaks (#20557)

* Automatic changelog update

* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564)

* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent

* Nukeops todo and cleanup

* Remove Active field

* Add EndedGameRuleComponent

* bartender suit (#20521)

* give me a drink bartender

* guh

* aARG

* Necropolis and mine walls (#20578)

* Automatic changelog update

* archaic accent tweaks (#20567)

* Automatic changelog update

* Add confirmation to kick and respawn in the admin player actions panel (#20542)

* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540)

* Change .editorconfig to keep existing attribute arrangement (#20538)

* Automatic changelog update

* Catch replay start and end errors on round restarts (#20565)

* Update trivial components to use auto comp states (#20539)

* Fix role unbans not applying in real time (#20547)

* Disable AHelp buttons when no player is selected, update button styling (#20568)

* Automatic changelog update

* Added a toggle fullscreen button (default F11) (#20272)

* Added a toggle fullscreen button (default F11)

* Removed un-needed comments

* Review Requested Changes

* Fixed Acidental Spacing Change

* bwoink, removed extraneous code

* nothing, litterally

* Automatic changelog update

* Fix not networking markings (#20588)

* Automatic changelog update

* Update RobustToolbox to v162.2.1 (#20590)

* Automatic changelog update

* Glorfcode (force say on damage/stun/crit) (#20562)

* Automatic changelog update

* Fix AHelp progressively showing more AHelp panels (#20591)

* Automatic changelog update

* caninsert entitystorage tweaks (#20589)

* Automatic changelog update

* Fix mapping actions crashing on load (#20592)

* Fix loading a map with a ThirstComponent crashing the game (#20594)

* Fix electrocution displaying real name of disguised players (#20603)

* Organ fixes (#20488)

* Automatic changelog update

* Kettle medical rework (#20435)

* Initial try at medical rework for kettle

* Re-add decal decorations to Kettle's medical

* Add more lockers to kettle's med

* Actually upload kettle's map, not its proto

* Automatic changelog update

* Added blocked visuals to volumetric pump (#20610)

* Automatic changelog update

* Move TimedDespawn to engine (#20515)

* Update submodule to 163.0.0 (#20616)

* Remove v0.1 version number from local main menu screen (#20617)

* Remove cloneData parameter from AutoNetworkedField (#20596)

* Update submodule to 164.0.0 (#20618)

* fix cognizine ghost role (#20632)

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

* Automatic changelog update

* Move ID layer one pixel to correct alignment (#20630)

* Update nukie hardsuit descriptions (#20529)

* Make holofans destructable (#20445)

* Automatic changelog update

* bowl is open (#20453)

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

* Add TestPair.WaitCommand() (#20615)

* Rename ThreatPrototype and mark fields as required (#20611)

* Adjust hard bomb shape (#20608)

* dragon refactor, objectives and use GenericAntag (#20201)

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

* Automatic changelog update

* Added generic empty liquids tank (#20563)

* Move view variables verb to the top of the list with no category and localize it (#20546)

* saltern update (#20325)

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

* Fix followers leaking (#20643)

* Add Winter Boots (#20622)

* add

* fix prototype

* Add QM mantle (#20621)

* add

* fix prototype

* Automatic changelog update

* Slime mobs breathe nitrogen and resprite their organs (#20577)

* Slimes breathe nitrogen and resprite their organs

* ups

* mmm

* Automatic changelog update

* Fix the new lizard horn's consistency + issue (#20620)

* fix

* add

* Revert "add"

This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.

* Add RandomHumanoidAppearance component to for space ninjas (#20605)

* Automatic changelog update

* Space cat breathes space (#20550)

* Space cat breathes space

Made Space Cat lungs ROBUST

* Made Space Cat's lungs ROBUST 2.0

* Automatic changelog update

* Wide anomaly locator (#20581)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* add textures

* fix encoding

* fix 2

* Automatic changelog update

* Fixed Telescopic Shield Lighting (#20650)

* Fixed Telescopic Shield Lighting Bug fix #20199

* no need for these at all

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Add a special hardsuit for nukie medic (#20471)

* Automatic changelog update

* Carry over other mutations when doing species mutation (#20551)

* Automatic changelog update

* Add Spanish accent to poncho and sombrero (#20377)

---------

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com>
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com>
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
 2023-10-03 14:15:46 -05:00
Kara
b8f401d664 Bows & arrows (#19771) 2023-09-27 21:59:12 +02:00
metalgearsloth
716a093674 Fix magnet pickup (#20212) 
Flipped sign moment.
 2023-09-27 21:59:12 +02:00
metalgearsloth
a7208af7d6 Add ore bag area pickups (#19358) 2023-09-27 21:59:12 +02:00
DrSmugleaf
f1487348b6 Fix failing to insert into storage messages not being localized (#20049) 2023-09-27 21:59:12 +02:00
metalgearsloth
f38f0ab614 Predict StorageComponent (#19682) 2023-09-27 21:59:12 +02:00
metalgearsloth
c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
metalgearsloth
db1ff07821 Weldable cleanup (#19809) 2023-09-05 00:07:01 +10:00
Nemanja
f5d961e7be Fix foldables (#19717) 2023-09-01 12:30:40 +10:00
metalgearsloth
ef5a4ec306 More ent storage ref (#19693) 2023-08-31 22:29:11 +10:00
metalgearsloth
609bf63893 Remove entity storage compref (#19557) 2023-08-31 18:32:03 +10:00
metalgearsloth
b08967b752 Remove disposals compref (#19558) 
This one was relatively painless.
 2023-08-30 19:08:23 -06:00
metalgearsloth
735626654a Remove FixtureId (#19280) 2023-08-23 18:55:58 +10:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Nemanja
4b15a1d9ce Hotfix entitystorage (#19206) 2023-08-16 09:08:52 -04:00
Nemanja
b8250f9601 entity storage tweaks (#19182) 2023-08-15 16:49:30 -06:00