Commit Graph

1076 Commits

Author SHA1 Message Date
metalgearsloth 9c1204ae08 Update b2dynamictree (#30630) 2025-03-09 23:24:40 +00:00
deltanedas f5e36cd0cd Add AssertMultiple to ContrabandTest (#35662)
* add AssertMultiple to ContrabandTest

* do the same for magazine visuals test

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-09 23:24:39 +00:00
deltanedas 9a82e8cee5 nuke metempsychosis 2025-03-09 21:02:29 +00:00
deltanedas f5035365a4
fix thaven mood test (#3158)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-08 19:42:27 +00:00
deltanedas f97350b31e
fine-grained mapping prevention (#3076)
* add all code for mapping categories

* add some mapping categories

* add categories to a few things

* ignore prototypes on client

* gaming

* shoukou ops

* chibi ops

* cc real

* sid meiers pirates!

* old ai sat

* pen

* make test errors better, listening post

* fix remaining tests, remove turret toolbox from a wreck

* john gaming

* reduce diff on stamps file

* update test

* :trollface:

* :trollface:

* :trollface:

* :trollface:

* :trollface:

* aaaa

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* resave centcomm

* orphan is good??

* gnu world order

* ok good

* update test to skip old files, not merge for maps

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-06 13:10:24 +00:00
deltanedas f411ef7f0e merge master but real 2025-03-04 12:32:35 +00:00
deltanedas 0f3edc0b39
port better borgs from frontier (#3110)
* BetterBorgs: droppable, swappable cyborg item interactions (#2766)

* WIP: droppable, swappable, insertable cyborg items

* Half-baked borg HandPlaceholderComponent

* cyborg: sprite representation for empty slots

* nullable prototype

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>

* BorgSystem: check droppable items for duped mods (#2887)

* BorgSystem: check droppable items for duped mods

* Cache item comparer

* BorgSystem: Unremoveable after equip (#2854)

* raise interaction events to add fibers to things

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-04 12:10:32 +00:00
deltanedas 21e9219e5e make centcomm a grid 2025-03-04 12:09:42 +00:00
deltanedas ffeec8f481 centcomm isnt a grid 2025-03-04 12:07:39 +00:00
deltanedas 0bd022a8eb grrr... kitten... put on your uniform NOW! 2025-03-03 17:54:55 +00:00
deltanedas c978732b91 major cleanup of roboisseur test 2025-03-02 23:55:40 +00:00
deltanedas a1f67dd325 update shipyard test 2025-03-01 21:28:37 +00:00
Winkarst 721c722695 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``StartingGearPrototypeStorageTest`` (#35474)
* Cleanup

* Fix
2025-03-01 14:28:21 +00:00
Winkarst 3f0791cb09 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``MindTests`` (#35473)
* Cleanup

* Fix
2025-03-01 14:28:21 +00:00
Winkarst b8169082f2 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``MaterialPrototypeSpawnsStackMaterialTest`` (#35472)
* Cleanup

* Fix
2025-03-01 14:28:21 +00:00
Winkarst b8d6a344e2 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``MaterialArbitrageTest`` (#35471)
Cleanup
2025-03-01 14:28:21 +00:00
Winkarst 3da42b2b7b Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``InteractionTest`` (#35470)
Cleanup
2025-03-01 14:28:21 +00:00
Winkarst fe7234184c Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``HumanInventoryUniformSlotsTest`` (#35469)
* Cleanup

* Fix
2025-03-01 14:28:21 +00:00
Winkarst 9ffa277f40 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``HandTests`` (#35468)
* Cleanup

* Update

* Fix
2025-03-01 14:28:21 +00:00
Winkarst afb99ac2e4 Cleanup: Use ``MapSystem.DeleteMap`` instead of ``IMapManager.DeleteMap`` in ``CargoTest`` (#35467)
* Cleanup

* Update

* Fix
2025-03-01 14:28:21 +00:00
metalgearsloth 6613a4622e Fix admin test arena (#35444)
* Fix admin test arena

* Add to GridsLoadableTest

* QueueDel map, remove nullable

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-03-01 14:18:37 +00:00
Tayrtahn 4174396b8d Add interaction tests for prying airlocks (#35409) 2025-03-01 14:13:56 +00:00
Leon Friedrich 42bc746ad0 Remove unnecessary prototype reloading in integration tests (#35199) 2025-03-01 13:36:44 +00:00
Ignaz "Ian" Kraft 30c8a2b16b Added a test for the MagazineVisualsComponent and fixed found issues (#34491) 2025-03-01 13:36:43 +00:00
Leon Friedrich f9aeb28bc7 "DO NOT MAP" items integration test (#34711) 2025-03-01 13:27:39 +00:00
ElectroJr e8bf7a09d7 Expand whitelist 2025-03-01 13:24:45 +00:00
ElectroJr 38a250f1bd Fix merge conflict 2025-03-01 13:23:48 +00:00
Leon Friedrich 6d25660029 Refactor map loading & saving (#34020) 2025-03-01 13:20:37 +00:00
metalgearsloth 9c7766c9bd Add planet lighting (#32522)
* Implements a Dynamic Lighting System on maps.

* Edit: the night should be a little bit brighter and blue now.

* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.

* Edit: The offset is now serverside, this makes the time accurate in all situations.

* Removing ununsed import

* Minor tweaks

* Tweak in time precision

* Minor tweak + Unused import removed

* Edit: apparently RealTime is better for what I'm looking for

* Fix: Now the time is calculated correctly.

* Minor tweaks

* Adds condition for when the light should be updated

* Add planet lighting

* she

* close-ish

* c

* bittersweat

* Fixes

* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"

This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.

* Europa and day-night

* weh

* rooves working

* Clean

* Remove Europa

* Fixes

* fix

* Update

* Fix caves

* Update for engine

* Add sun shadows (planet lighting v2)

For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.

* Documentation

* a

* Fixes

* Move blur to an overlay

* Slughands

* Fixes

* Remove v2 work

* Finalise

---------

Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com>
2025-03-01 13:18:06 +00:00
Leon Friedrich aa389ebd9f Update StaticFieldValidationTest (#34287) 2025-03-01 13:17:03 +00:00
Tayrtahn 06b75a444e Filter prototypes checked by NoStaticPriceAndStackPrice test and skip spawning (#35136)
* Filter NoStaticPriceAndStackPrice ents for StaticPriceComponent

* Remove redundant TryComp

* Use dependency shortcuts

* hol' up

* This filter is redundant

* Don't need EntityManager now
2025-03-01 13:06:48 +00:00
Ed 54dc36cab1 RoomSpawner mask (#33110)
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one
2025-03-01 12:52:39 +00:00
kushbreth 490a208e6f
Porting Thaven from Impstation (#2948)
* thaven time

* Added No Contraction accent for mood, added missing Action prototype, added missing species yml, added missing marking bundle from Impstation.

* Adds shitmed changes from impstation PR.

* hands 1984

* Fix yaml linter

* Add thaven mood upsets

* delicious soda

* emagging begone

* yaml linting fixes

* everything everything everything in it's right place

* skibidi

* skeebert d. oilet

* unusual memes compilation v307

* mods, fish react this man

* uuuuunnnghhhhhhhgghghhhh pain

* guh

* fuck

* now that's what i call music 75

---------

Co-authored-by: AirFryerBuyOneGetOneFree <jakoblondon01@gmail.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
2025-02-25 09:45:29 +00:00
BombasterDS2 3e701a3359 Fix Alerts Test (#1584)
Alert Test Fix

Co-authored-by: BombasterDS <deniskaporoshok@gmail.com>
2025-02-14 16:10:02 +00:00
deltanedas bf07ed78c7 edit RE test to use packs
move RE test stuff into research test
2025-02-14 16:10:02 +00:00
deltanedas b38b5a32a2 move lathe recipes into packs (easier for forks and maintaining) (#33095)
* add LatheRecipePackPrototype

* change Lathe and EmagLathe to use packs

* add AddRecipesFromPacks helper to SharedLatheSystem

* update lathe logic to work with packs and clean up some stuff

* migrate individual recipes to recipe packs

* update client

* remove node/artifact scanner from techs

* :trollface:

* fix test and make it include emag recipes

* add test that every dynamic recipe must be researched

* pro

* fix

* fix

* fix all tests, genuinely good test i wonder who made it

* add unused uranium and incendiary drozd mags to tech and lathe

* add recipes

* add incendiary prototype

* undo some changes

* troll

* :trollface:

* true

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* shitmed real

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* update funny test

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-14 16:09:57 +00:00
ActiveMammmoth 397ef7345d Store Test Change (#34844) 2025-02-14 16:09:53 +00:00
deltanedas 4a1acbf863
fix nukies ipc test fail (#2957)
Fix NukeOps Test (#1585)

Fix Nukes Ops Test

Co-authored-by: BombasterDS2 <shvalovdenis.workmail@gmail.com>
Co-authored-by: BombasterDS <deniskaporoshok@gmail.com>
2025-02-11 00:17:17 +00:00
Spielern 4ee3aa4dc5
Merge branch 'master' into port-ipc 2025-02-02 14:14:00 -05:00
This_Is_Gray bb4ff6497c
Elegance Station (#2020)
* Elegance Time..

* Elegance Evac & Job List Update

It's so real.

* Actual Elegance Job Slot Changes

* Potential Invalids Fix???-

* Elegance Last(?) Changes

Second to last, if not the last changes to Elegance for a good while.
We're so back!

* Oops :3

* I'm Trying

Fixed some wiring and lighting issues at the bridge.

* More changes

Ditto

* Invalids 2: Electric Boogalo

Hopefully this actually works. If not, I'm going to.. do something, for sure-

HUGE thanks to Velcro for helping me with this one!!

* Removed the paper slip from Transport.

It was causing invalid errors...

* Elegance Maints Update

Greatly improves the maintenance tunnels on the station, as wells as fixes some minor issues.

* Another Small Update

Fixed some complaints with Chemistry, the kitchen, and added some goodies to the outside of the station.

And trash. A lot of trash.

* Minor Changes

The Space View in med is so real.
Also forgot to color some pipes...

* More Tweaks

Added a toilet to Perma, among other minor changes, and some prototype file changes.

* Even More Tweaks

There were a few wiring issues, so I fixed those. Also some very minor maints updates, along side some decoration.

* Armory Changes

The entire armory got an overhaul, to sum this commit up. Not much changed other than this besides the salvage magnet's orientation.

* Changes... Again.

Fixed some minor oopsies and oversights.

I'm also calling this one the fill-in-ing. Cluttered various rooms because they were way too empty for their own good.

* Actually made the updates this time

I'm stupid, to sum this commit up...

* Epistemics Rework

COMPLETELY overhauled this fucking department. It was terrible and empty before and I hated it.

* Stupid Fucking Grille

* Botany Overhaul

Botany has received a major overhaul. I've also added late join spawn points and cryopods because I forgot to do this. Rejoice.

* Final Final Touch-ups

Real this time, I swear.

* I lied.

Who's surprised?

* Curse of EVERYTHING

God this was fucking abysmal but I DID IT

* That Fucking Thing That I Hate

* The Greening of '24

* The Christmas Update

* Update elegance.yml

* Elegance Assistants

* Head Bedroom Updates

* Elegance Hotfixes

* More hotfixes

* Elegance Review Fixed 2/?

* I'm going fucking nuts

* Update elegance.yml

* Moar...

* Update elegance.yml

* Update elegance.yml

* Added Salvage Spawns

* Review Fixes (1/3)

* Velcro's lighting fix!!

It's here!~

* Update NTES_Transport.yml

* Update elegance.yml
2025-02-01 22:03:33 -06:00
Spielern 7249b53b6c
Merge branch 'master' into port-ipc
Signed-off-by: Spielern <iesteed2@gmail.com>
2025-01-31 16:42:40 -05:00
Ignaz "Ian" Kraft 37be490332 added missing allowed department to the restricted severity (#34558)
* added missing allow job to the base restricted severity

* no need to make a list

* no more linq in ContrabandTest

* less nesting in ContrabandTest
2025-01-28 04:33:54 +00:00
iesteed 021dc93627 ports most IPC code 2025-01-24 21:08:31 -05:00
deltanedas 111724d045 other fix 2025-01-12 09:13:11 +00:00
deltanedas 22ad62dc61 :trollface: 2025-01-12 09:01:26 +00:00
deltanedas 7bcce16ac2
fix bounty arbitrage test (#2651)
* fix bounty arbitrage test

* fishie

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-08 05:49:40 +00:00
Velcroboy 838ca862c5
Adds Purchasable Arena Mob Crates (#2563)
* Adds purchasable mobs for the Arena

* price fix

* accuracy

* more a

* arbritrargre

* Fix crazy high pricetag

* comment

* DeltaV -> _DV

* Increase Killer Tomatoes

* Big group of small mobs in large crate

* Oops

* merpo

* bruh

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-07 13:37:10 -06:00
deltanedas 83a8002922
Merge pull request #2542 from deltanedas/shitmed-ops
shitmed real
2025-01-07 17:15:23 +00:00
deltanedas 1f01adef38
Merge pull request #2589 from deltanedas/upstream-ops
upstream merge 2/1/25
2025-01-06 01:35:55 +00:00
Field Command af30a00dba
Add new station: Byoin (#1965)
* Add new station: Byoin

* Fix syntax error

* Changed accented letters

* Reverted accented letters

* Removed UID's with no prototype

* Fixed failed test issue

* Minor fixes and adds to map

* Minor changes to evac and job roles

* Major edits to station to fix issues

* Foxmin found some small problems, now solved

* Complying with latest mapping standards

* Engineering rework and Velcro found some small problems, now solved

* Removed "CargoAssistant" from the map prototype file

* Re-added "Cargo Assistant" to map prototype file

* More minor edits

* Fix evac shuttle file location

* Last minor fixes

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2025-01-04 01:14:21 -06:00