Commit Graph

83 Commits

Author SHA1 Message Date
William Lemon 29e55b9464
Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)
* Fix the sensor monitoring console forcing a GC every 3 seconds (#38146)

* Optimize sensor monitoring window graph drawing

* Add shared static Vector2 pool for all GraphView instances

* Address requested changes

* remove lock

* Update submodule to 264.0.0 (#38629)

* Toy/Plushie Inhands and Wearables (#38514)

* Fixed dependency injection and some other issues in a few places.

* More issue fixes

* patchfor broken NetworkConfiguratorLinkMenu (#38632)

fix

* Fix solutions flickering when transferring contents (#34838)

* Use Solution clones when applying SolutionComponent states

* Revert "Use Solution clones when applying SolutionComponent states"

This reverts commit 013fd111cf92b22562e00f98a7aaa49bc4b4ed62.

* Make Solution implement ICloneable and rename Clone method.

* Copy CanReact value when cloning a Solution

* Convert to IRobustCloneable

* Fix typos in guidebook: Buisness → Business (#38636)

* Fix typo in `MinorAntagonists.xml`

Buisness → Business

* Fix typo in `YourFirstCharacter.xml`

Buisness → Business

* Various Headphones Fixes and Tweaks (#38479)

* sprites, wearables

* neck

* icon-on sprite

* Cleanup prototype instantiation in `DamageTest` (#38639)

Cleanup prototype instantiation in DamageTest

* Cleanup prototype instantiation in `ExplosionSystem` (#38642)

Cleanup prototype instantiation in ExplosionSystem

* AddBodyPartCommand localization. (#38612)

commit

* fix ItemSlotsSystem debug assert (#38655)

* Allow the Command & Super door remotes to use the access of their user. (Re-creation of PR due to changes to game balance) (#35536)

* Added directional beacons (#38284)

* Added directional beacons

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Power stat and nuke codes commands get some LEC love. (#38585)

* commit

* requested changes.

* Dsay Dirty and Follow commands converted to LEC and localized. (#38666)

* commit

* whoopwhoopwhoop

* Retro laser sprite fix (#38676)

* Fixed everything except the icon

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed icon

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix water coolers (#38681)

* Monochromacy typo fix (#38686)

* fixes the typo

* Fixed cloning looking for the trait, not the component, RE https://github.com/space-wizards/space-station-14/pull/38686#issuecomment-3025093504

* Apply suggestions from code review

---------

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

* Validate `CloningSettingsPrototype`s (#38688)

* Validate CloningSettingsPrototypes

* Update Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs

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

* Check EventComponents too

---------

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

* Add test of objective-related console commands (#36400)

* Add test of objective add/list/remove commands

* Not sure why we're validating test prototypes, but sure

* We don't need a map

* Improvements and fixups for New Status Effect API (#38660)

* Predict healing and bloodstream (#38690)

* initial commit

* reapply 38126

* fix rootable

* someone missed an important minus sign here

* try this

* fix

* fix

* reenable crit hits

* cleanup

* fix status time dirtying

* fix

* camelCase

* Healing and bloodstream prediction fixes.

* Resolving Wizard casting recall on nuke disk making it impossible to disarm (#38661)

* Resolving Wizard Recall on Nuke disk making it impossible to disarm
- Adding a DisarmBomb case to nuke status update loop
- Changing a few methods and parameters to properly follow formatting standards
- Updating some names to follow camelCase

* Updating missed tag

* Reverting DataField change

Should prevent this preventative bugfix being a breaking change.

* Switch HSV to the default colorspace for character customization (#38434)

* Made HSV default for character editor

* Adds/fixes comments to HSV defaulting

* Added dropbox fix, potentially cursed

* Revert "Added dropbox fix, potentially cursed"

This reverts commit a709883366fbee813e839742125e70844672af29.

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* Fix: Don't deploy foldables when clicking on items inside containers (#38709)

* Fix

* Apply suggestions from code review

---------

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

* Pressure Relief Valve (#36708)

* initial system (this math is probably WRONG)

* General code cleanup and OnExamined support
(holy moly this code sucks)

* UICode and related events foundation
TODO:
- Actually write the XAML UI and the underlying system
- Un-shitcode the entire thing
- Actually test everything...

* Working UI code
TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't.

* Remove one TODO for unshitcoding the examine code

* Add reminder
yea

* Make predicted (defenitely isn't)
(also defenitely isn't a copypaste from pressure pump code)

* It's predicted!
TODO:
- Give it snazzy predicted visuals!
- Have a different field for pressure entry, lest it gets bulldozed every UI update.

* Improve gas pressure relief valve UI
TODO: Reminder to reduce amount of dirties using deltafields

* Implement DirtyField prediction

* Entity<T> cleanup
A lot of Entity<T> conversions and lukewarm cleanup.

Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell.

* More cleanup and comments

* Remove TODO comment on bulldozing window title

* """refactoring"""
- Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance.
- More Entity<T> conversions because I like them.
- Move UI creation handling over entirely to the ActivatableUI system.
- Fix a hardcoded locale string (why????).

* Add visuals

* Revert debugging variable replacememt
yea

* Revert skissue

* Remove unused using directives and remove TODO

* Localize, cleanup, document

* Fix adminlogging discrepancy

* Add ability to construct, add guidebook entry

* Clear up comment

* Add guidebook tooltip to valve

* Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor

* Adds more input handling and adds autofill on open

* Un-deepfry input validator shitcode
Genuinely what was I smoking

* improve visuals logic

* Refactor again
- Update math to the correct implementation
- Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs

* I'm sorry but I hate warnings

* Remove unused using directive in AtmosphereSystem.Gases.cs

* Review and cleanup

* Lukewarm UI glossup

* Maintainer for the upstream project btw

* Remove redundant state sets and messy logic

* Unduplicate valve updater code

* Redo UI (im sorry Slarti)

* run tests

* Test refactored UI messaging

* Second round of UI improvements
- God please find a way to improve this system. Feels bad.

* Update loop implementation

* Further predict UI

* Clear up SetToCurrentThreshold

* cleanup

* Update to master + pipe layers and bug fixes
want to run tests

* fixes

* Deploy rename pipebomb

* Documentation and requested changes

* Rename the method that wiggled away

* Undo rounding changes

* Fix comment

* Rename and cleanup

* Apply suggestions from code review

---------

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

* Fix TextLinkTag (#32203)

* Adjust uplink buy button to be under item icon (#38596)

* Adjusted uplink buy button to be under item icon

* Put the discount subtext under the icon

* Indent fixes, added margin

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* Scurrets - Audio Improvements (#38482)

* Scurret audio tuning

* Add new sfx

* Update sneezing sfx

* YAML support

* Rename a folder

* make telesci wreck easier (#37569)

rel

* Validate `ShaderPrototype` IDs (#38728)

* Convert all shader prototype string literals to protoids in overlays

* Convert more shader prototype literal strings to protoids

* Convert ValidatePrototypeId to ProtoId

* Later

* [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664)

* fixed

* clean up

* orks fix smart

* review fix 1

* more requested changes

* less cursed

* more descriptive description

* better wording

* Tiny Tiny Cleanup of the EyeClosingSystem. (#38734)

Update EyeClosingSystem.cs

* Fix human skin tone distribution (#38701)

* fix: Use PredictedQueueDel for gib spell (#38729)

* fix: don't default to uncharged sprite state for cells (#38730)

* Fix Hristov description - remove inaccurate technical specs (#38746)

- Removes inaccurate 'armor piercing 14.5mm shells' reference
- Replaces it with a more funny description, matching the style of the other snipers and guns
- Keeps ammunition type '.60 anti-materiel ammo' specification
- Fixes issue #38590

Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br>

* feat: allow mopping evaporating puddles (#38743)

* Validate remaining `ProtoId` strings (#38747)

Validate remaining ProtoId strings

* Validate `ProtoId`s in tests (#38745)

* Convert string literals to protoids in Content.Tests

* Convert string literals to protoids or consts in Content.IntegrationTests

* Fix linter failures
Tricksy static using misled me

* Cleanup warning in StomachSystem (#38748)

you did not see this

* Vox scars (#38592)

* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl

* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"

This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.

* locale key fix

* Changed top surgery scar names to be more generalized

* Adjusted face scars

* Formatting fixes

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* UnlockNode command to LEC. (#38751)

* commit

* Update UnlockNodeCommand.cs

* commit

* move command locale to its own file.

* Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs

---------

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

* Typofixes for figurine dialogue (#38737)

* Typofixes for figurine dialogue

* Forgot two

* Janitor Tool: Wire Brush (#38667)

* Wow! It's -brush-

* spacing.

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* fixed changes

---------

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

* Minor escape menu UX improvements (#38650)

* fix: spellbooks can have infinite charges (#38376)

* fix: spellbooks can have infinite charges

* refactor: indicate infinite spellbook charges with null

Not sure if I like this much better...
2025-11-06 18:22:39 +00:00
biddygelson 4df5693322
Map academy (#4192)
* academy station map with evac shuttle and prototype

* Added Academy to list in PostMapInitTest.

* Academy station
- tweak: added empty crates in engineering to help with PA setup.
- removed: physics grid

NTES_Academy shuttle
- added: firelocks
- added: decals
- removed: physics grid

maps Pools
- added academy to list.

* Academy Station
- added buttons for janitor lights.
- tweaked several areas
- added more intercomms

Evac
- added warp point
- added "device network .... shuttle timer"
- tweak linked airlock doors in rear - oops.

* - tweak removed mining shuttle console and airlock

* - fix removed physics from anchored barrier

* fix - replaced some barriers causing errors in the whole hallway.

* working through feildcommands requested changes.
* arrivals/dorms done
* engineering in progress

* working through fieldcommander's requests.
* eng - done.
* cargo - done
* service - done
* evac - done

* working through changes.

* working through changes.
* law done
* ai done
* bridge done
* perma done

* working through changes:
* perma done
* sec done
* epi brig done

* working through changes
* chapel - done
* park - done
* epi - in progress

* working through changes
* epi - done
* medical - done

* working through changes.
* TODO - evac shuttle
* TODO - playtest

* evac commit before adding devicenetwork component for shuttle timer

* added shuttle timer to evac

* changed NY to DV in prototype

* fixed rotations, tiles.
added archivist temp space.
changed min pop to 50.

* minor edits for power, air, and buttons on map.

* oops! forgot a comma.

* RE-added Academy to initTest.
upped max pop to 100

* updated path of shuttle to match new directory schema.
minor edits for air alarms on evac and map.

* perhaps this comma at the end is causing undue stress on the integration tests. Let's find out!

* fixes and tweaks for Velcro's first step in reviewing this behemoth.
* added LO, MG beacons
* removed trash piping in old surgeon theater
* connected LV to APC in maints near west solar
* replaced viro janitor button to be for medical instead of service
* linked security airlock to bolt airlocks when opening to space
* re-fanagled viro atmos piping to rooms
* replaced honklaw maints door - not service access anymore!
* linked other jani-light in delta-phi dorms

* Fixed invalid scrubber in viro

* alphabetized the //DeltaV maps in the list per Velcro's ask.

* removed bomb tagets in; arrivals, med, epistemics, evac.

* oops.

* * fixed missing window in viro checkpoint - how did that happen?
* added curtains to entertainers rooms
* connected captain's toilet to disposals
* replaced intercom outside command with working one
* replaced maint access in honklaw and mimelaw with theater access to match
* fixed space and pods sign directions to make more sense
* fixed unreinforced wall at salvage external airlock
* fixed unreinforced walls at atmos
* added crematorium in chapel morgue
* replaced epi lock with chapel lock for chapie chapalino chaplinsky charles chaplin
* fixed mantis maints door
* made cloister public access to players can talk to the oracle - sorry epistemics
* moved cargo dock emergency lights off normal lights
* made boxketball lockers public access - go play!
* made distro public access - unless by popular demand you all tell me that it be jani locked. snicker snicker.
* replaced hydroponics access to the freezer to be hydroponics only - sorry kitchen staff.
* added nutrimax for hydroponics
* fixed conveyor direction in perma disposals
2025-10-31 04:20:03 +00:00
Vape 03cdc672c7
Submarine Returns (#4497)
* Testing phase 1

* Official ready for review

* Fixed the mapping oopsie

* Map Fixes, and cleanup

* 123

* Evac Shuttle updated

* Updated YML of the protothingy

* Fixed fails, cried a few times

* More Fixes. I've ran out of tears

* Revert "More Fixes. I've ran out of tears"

This reverts commit afeefedf3a.

* Had to revert. I feel as though I am going bald, send help, or rogaine

* Subfloor PT1, Many Fixes, Multiple Crying Sessions

* Fixes / Changes / tweaks

* Changes requested

* I broke it

* notepad savior
2025-10-18 17:26:03 +01:00
Cepelinas1 97e0999980
Medieval Arena (#4244)
* first commit

* updated PostMapInitTest.cs

* pda box issue fixed

* UI box error (wow)

* made an oopsie deleting the wrong lines

* prisoner PDA fix
2025-08-26 00:39:39 -05:00
SirrRequiem ab4232cc7a
Adding the new Terra Station! (#4005)
* Adding the new Terra Station!

* Renamed a BUNCH of doors, Substations, and SMES. Fixed EVA doors, piping. Added BecomeStation component. Removed invalids from yml

* Added Sophic Grammateus, some decals, and APC to power Genpop. Renamed some cameras

* Made Sec and Epi maints not deadends

* Added Mr Butlertron and some beacons

* Loooots of changes

* Lots more updating, changing pipes, making things not as bright, etc etc

* Moved a few unreachable devices, AI can't use fancy turrets yet so you get bullets, and the screens finally show Evac ETA!
2025-07-30 01:30:18 -05:00
Colin-Tel 1227a0cc4e
Adds Division Station (#4006)
* Adds Division Station

new station woo hoo

* other nonsense

can't a guy just make a map without doing all this other stuff

* Update division.yml

AI turrets, cargo dock changes, added missing LV, added light to HoS, made freezer cold, added minimoog to maid cafe, made firing range better

* Update division.yml

added tile in captain's room lol, changed around perma wall layout by cells.

* Update division.yml

Made CJ's closet into a room.

* Adjust prototype and map

adjusts some jobs and adds atmos burning stuff, also replaces explosive landmines with shrapnel landmines

* Updated map & prototype

I CHANGED A LOT OKAY

* Update division.yml

Added CMO air alarm, added scrubbers to some rooms, added some lights, added robodrobe

* Update division.yml

added emergency lights and other stuff

* Update division.yml

fixed recycler directions, etc

* Update division.yml

Tucked in AI satellite shielding to remove potential obstruction to the shipyard dock.

* Update division.yml

Added parallax

* Update division.yml

Added screens and some posters

* minor adjustments & MaxPlayers

* Update division.yml

removed duplicate HOS locker, misc decal and decor changes

* Added detective slot

also added another forensic scanner

* Update division.yml

* Update division.yml

added logic gates, misc changes

* Update division.yml

added hats, made kitchen nicer

* Lowered minimum & midround antag spawns

* added maxPlayers of 70

there are bigger stations

* Update division.yml

added LV to cold loop pumps, added some decals to TEG area, moved TEG south 1 tile, gave engineering generators, added a toolbox to medical Substation room, gave MG a pretty painting & poster, removed mirrors in barber shop because they looked dumb and were inaccessible.

* Update division.yml

added a few mob spawners with a 5% chance to spawn something scary in maints

* Update division.yml

made requested changes per Velcroboy

* Update division.yml

more requested changes

* Update NTES_Right.yml

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2025-07-29 00:08:46 -05:00
Tobias Berger d90638474d
Fix indentation (#4007) 2025-06-24 16:36:14 +01:00
Tayrtahn 0df4732375 Fix migrations not being applied to PostMapInitTest (#35933)
* Fix migrations not being applied to PostMapInitTest

* formatting

* Raise the event outside the loop so it only happens once
2025-03-23 16:59:12 +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
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
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
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
deltanedas 22ad62dc61 :trollface: 2025-01-12 09:01:26 +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
deltanedas ec94579ebc
the great namespace refactor (#2574)
* refactor DeltaV/deltav resources to _DV

* change DeltaV namespaces to _DV

* add space before all DeltaV comments

* update xamls

* fix and move arena parallax to _DV

* more fix

* refactor even more stuff

* fix the grid fills

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-01 07:50:34 +00:00
metalgearsloth 389a92a317 Fixup playerspawn stuff (#31546)
* Fixup playerspawn stuff

- Also removed arrivals forcing, this should just turn containerspawnpoint off.

* fix this one

* test fix

* really fix
2024-08-30 08:07:09 +01:00
metalgearsloth af6d5bddc0 Fix PostMapInit tests not considering job containerspawns (#31538)
* Fix PostMapInit tests nto considering job containerspawns

* fix
2024-08-30 07:53:59 +01:00
Errant 820935fd85 Fix replayghost spawning location (#30252)
Fix replayghost spawn
2024-08-09 17:54:45 +01:00
IProduceWidgets 396e0ed171 Nukie Outpost is no longer a station map (#30090)
* I dunno, break shit I guess.

* Actually fix some shit for once.

* test flakey or me flakey?

* Test were not flakey, they just didnt make any sense anymore.

* more stationy tests

* undo abuncha shit I can set in yml instead

* forgor an assert

* unneeded usings

* 1984

* I made github angy

* yoink

* the end is never the end is never the end is never the end is never the end is never the end is never the

* Im going to commit sudoku
2024-08-09 17:53:06 +01:00
Tayrtahn 169280a80a Code Cleanup: Integration Tests (#29584)
* Cleanup PuddleTest

* Cleanup GravityGridTest

* Cleanup PowerTest

* Cleanup SaveLoadMapTest

* Cleanup Body tests

* Cleanup ContainerOcclusionTest

* Cleanup AirlockTest

* Cleanup DamageableTest

* Cleanup EntityTest

* Cleanup FluidSpillTest

* Cleanup FollowerSystemTest

* Cleanup HandCuffTest

* Cleanup InteractionSystemTests

* Cleanup InRangeUnobstructed

* Cleanup SimplePredictReconcileTest

* Cleanup PostMapInitTest

* Cleanup SalvageTest

* Cleanup SaveLoadSaveTest

* Cleanup ShuttleTest

* Cleanup MaterialArbitrageTest

* Cleanup PrototypeSaveTest

* Fix ShuttleTest

* Bunch of small ones

* Move JobTests to Station directory

* More small fixes

* Cleanup InteractionTest.Helpers
Had to change a method signature, so some callers were modified too.

* Missed one
2024-08-09 17:26:13 +01:00
Colin-Tel 5ad3e029f0
Adds Chibi Station (#1495)
* Adds Chibi Station

* Made changes based on feedback

also added slot for CE

* botany changes

* Added traitor objective items

also bolted open the front of engineering, and dirtied up Salvage some more.

* Added evac

* :trollface:

* Added Autodrobe

* Update chibi.yml

moves a wall over and makes a maintenance shaft a little bigger

* Update chibi.yml

galoshes, brig timer, atmos airlock stuff, logistics door remote, the spare ID cabinet unlock thing in the vault, vault being doublethick on the exterior, medibot/cleanbot spawns, uhhh yeah

* Update chibi.yml

intercoms

* added the oracle

* Update chibi.yml

added screens and soap, fixrotations, tilewindows, variantized

* Update chibi.yml

fugitive spawn points, circuit imprinter, added the shitter to the prison cell

* invalids

:trollface:

* Added the paper

* Update chibi.yml

linked disposals conveyor/recycler to lever, added animal spawners, moved/added some beacons

* Update chibi.yml

Named SMESs, added library beacon

* Update chibi.yml

added more posters

* Update chibi.yml

Post-Velcro review changes; EVA suit in epi, replaced arrivals screens, unlinked air sensor in cargo, removed nuke disk from jail /j
2024-07-30 16:06:49 +00:00
deltanedas 8588bb0e0d
glacier real (#1169)
* glacier real

* troll

* atmosia tweaks

* 1 less can of plasma not too op

* replace troll generator with solar crate

* add StationSurface to glacier

* add surface map

* biome stuff upstream #28017

* unpause after loading

* fix no terrain

* comment out the surface spawning

* shipyard

* glacier justiceroid

* updateprototype and cleanup

* fix random shit

* untroll

* courier

* add to test :trollface:

* fix

* futureproofing

* hot loop inlet lmao

* tweak some pumps in atmosia

* carpy and make salv locker lighting better

* Edit lights, move salv dock, add justice maints, edit entity names for casing consistency, other minor edits

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-07-17 11:39:09 -05:00
deltanedas b7b41b38bb
Centcomm justice update (#1352)
* centcom legal update

* centcom beacons maps vendis update

* put centcomm in DeltaV folder

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-19 16:48:59 +02:00
null 5ab73ea298
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/06/06-upstream-merge
# Conflicts:
#	Resources/Prototypes/Maps/submarine.yml
2024-06-08 21:03:00 +02:00
Leon Friedrich e0ea8adb9a
Add Job preference tests (#28625)
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
2024-06-08 20:19:39 +02:00
rosieposie 71733f3705
Subpatch 1984 (#1307)
* derotate sub

* Update PostMapInitTest.cs

* Delete submarine.yml
2024-06-07 16:37:29 +02:00
Colin-Tel f72da319a0
Micro station (#1251)
* Adds Micro

* Update micro.yml

Added parallax, warp points, and several minor changes.

* Update micro.yml

Added intercoms, folders, a fax, and other stuff

* Update micro.yml

Added notes, defib cabinets, a little lighting, uh yeah I think it's ready.

* Update micro.yml

named all faxes & added one to epi, changed an air can to CO2, gave atmos a Plasma can, added emergency lights, added perma cryosleep, added DOG beds for CATs

* Update micro.yml

added detdrobe and repdrobe

* Update micro.yml

medbay curtains!!1

* Update micro.yml

invalid configurators removal

* Thanks Velcro!

lighting changes, added sec and med camera routers and telecoms.

* the classic last minute change

service telecoms and camera router
2024-05-28 23:10:40 -05:00
Leon Friedrich 0924633508
Try fix random shuttle test failures (#27186)
(cherry picked from commit c4f050259d7dc6da5c81187d4a575413685b1f6b)
2024-04-21 23:38:18 +02:00
deltanedas 37c0bc8795
port lighthouse real (#883)
* port lighthouse and dosome work

* fix evil things

* add to pool and test

* most of the logi rework, replace viro with some cryo beds

* more reworks

* fixes

* updatey

* more fix

* techie spawn and more suit storage

* actually add the techie spawns

* name every door

* gaming

* mostly fix/add cameras

* warp point gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-06 18:38:40 -05:00
Rainfey b9d2f5a409
Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
778b e51ff3d3bf
Added ContainerSpawnPoint check for integration test (#25446)
* Added logic for ContainerSpawnPoint checks

* Improved with template function

* fixed nullable

* hehe

* hehe T?

* added type check before cast

* another nullable fix

* and another one

* return to old code (found typo)

* Code cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 87def406bc2cb3121888d162c8fe707ff937dd6f)
2024-03-07 00:52:41 +01:00
Ed c2995bb848
Train station (#24927)
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e

(cherry picked from commit f64a32990a27cec5bd958180eb833b9efffeb565)
2024-02-21 04:06:36 +01:00
UnicornOnLSD 469bf66aa4
Submarine Station (#704)
* wawa

* A LOT of changes, will write a proper commit

* Final tweaks for Submarine station.

* Finaler tweaks, fixed power on a few places etc etc.

* edits 4 map

* fix sln file

* woopsies, fix !

* removed mediborg from available jobs

* Fixed musician spawn point lacking

* tweaked submarine: fixed evac screens, added material reclaimer in disposals

* submarine update:
-resorted chemistry
-drippy closets up
-THE CRYO IS REAAAAAAL
-beacons, they're here
-stuff

* fixed shuttel, now it's hammurabi's because it's sick and I can't be bothered to build a whole ass evac shuttle meself

* oopsy woopsie wrong file directory uwu

* emergency fixes, weewoo now it's good

* last changes, on god:
-adjusted maints
-new 3R#0!/ beacon somewhere
-AME has enough cores to power station properly roundstart

* fix cryopod, FULLY READY NOW.

* Final commit, changes the shuttle, added perma cryopod, all clean and good to go.

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-01 13:30:23 -06:00
Pieter-Jan Briers 1c54b75da5
Dependency update / fixes / skrungle bungle (#23745)
* Give .props files 2-space indents.

* Move to Central Package Management.

Allows us to store NuGet package versions all in one place. Yay!

* Update NuGet packages and fix code for changes.

Notable:

Changes to ILVerify.
Npgsql doesn't need hacks for inet anymore, now we need hacks to make the old code work with this new reality.
NUnit's analyzers are already complaining and I didn't even update it to 4.x yet.
TerraFX changed to GetLastSystemError so error handling had to be changed.
Buncha APIs have more NRT annotations.

* Remove dotnet-eng NuGet package source.

I genuinely don't know what this was for, and Central Package Management starts throwing warnings about it, so YEET.

* Remove Robust.Physics project.

Never used.

* Remove erroneous NVorbis reference.

Should be VorbisPizza and otherwise wasn't used.

* Sandbox fixes

* Remove unused unit test package references.

Castle.Core and NUnit.ConsoleRunner.

* Update NUnit to 4.0.1

This requires replacing all the old assertion methods because they removed them 🥲

* Oh so that's what dotnet-eng was used for. Yeah ok that makes sense.

* Add Robust.Analyzers.Test

* Update submodule

* commit to re-run CI

(cherry picked from commit a6c9c36b688a1ba78ff4c12502e81661cf607b6c)
2024-01-26 22:33:46 +01:00
Velcroboy 81a4890686
Hammurabi Rebase (#686)
Co-authored-by: IamVelcroboy<>
2024-01-16 21:53:35 -06:00
Adrian16199 bf341228c3
Shoukou from Nyanotrasen. (#310)
* Shoukou from Nyanotrasen.

Adds Shoko to the rebase.

TO-DO: Ensure that everything is actualy in order in the uh... (reads paper) 79.... thousand lines of yml.
Make it work.

* Updating it to the "acceptable state"

Incase i need to go back if i frick it up.

* Updated the map a bit.

* Changed Shoko further.

* Final changes to departments.

* Final changes to Shoukou, ready to be reviewed.

* Whoops, Now its done~

* Changed the requested things.

* Gave logistics working telecoms.

* Update shoukou.yml

* .

* Added finer details.

* Adjusted alot.

Adjusted pipes in new department places.
Adjusted fire alarms.
Adjusted mistakes of mine.
Fixed the the ingame map.

* Added shutters to lawyers office for private talks.

* Updates

* Adjustments (check desc)

Adjusted cables in salvage's room so they are not under the damn wall while also chaging normal wall for reinforced one.
Added tiles under cargo's substation, LO's office, CE's office.
Got rid of tiny fan in salvage's airlock and atmo's TEG burn chamber.
Added airlocks to cargo.
Made more room in cargo's loading bay.
Expanded doors and added blast doors for cargo shuttle's entrance.
Exchanged some windows in LO's office to reinforced walls and added shutters.
Changed switche's location of detective's office shutters
Added MV cables in security so prisoners have actual power.
Fire alarm has been moved 2 tiles to right and reconnected in command's meeting room.
Moved some engineering hardsuits to the back
The atmos fax should have been named.... hopefully.
Did the obligatory tilewindows, tilewalls, fixrotations,fixgridatmos commands

* Adjustments part 2

Added light at the end of extension of shuttle.
Repaired conveyor belts in cargo.
Exchanged corpsman locker filled to corpsman filled with hardsuit.
Added tiny fan and reversed airlocks in cargo to actualy be able to dock.
Changed the entire area which used to be a side kitchen with eating area and flipping it. Added a window where now resides eating area that looks upon cargo's shuttle.
Changed food in command to be more consistent
Adjusted arrival docks to be more closer aka 5 tiles between eachother instead of 7 so that shuttle can dock properly incase the evac gets destroyed.

* Added mystagogue hardsuit locker.

A quick fix.

* Adjustments to adjustments.

Shady cigs instead of vendomat in the new eating area.
Removed a light on a window.
Added a glass firelock in the new side kitchen and linked it.
Readjusted docking in cargo for cargo's shuttle.
Changed location of the salvage shuttle CONSOLE to be nearby of the magnet.
Got rid of the conveyor belt since there really is no point for it to be there anymore, replaced the airtight with an another door and firelock that was linked.
Adjusted LV cable so it doesnt go thro a wall and reaches the autolathe and airlock doors that have been placed for cargo shuttle
Changed location of the magnet.
(God im tired and depressed, not specificly from this. Hope you are having a fantastic day whoever is reading this)

* Updated SMES's and Substations names.

Updated name of substations near service, in engineering, nearby of epistemics., in command, both security substations, Camera's one, medicals, logistics, upper solars.
Updated SMES's name in engineering of AME, in TEG, on both solars.
Removed 6 MV cables in security because they were causin 2 substations to be connected to eachother

* Anchored the station

Any bump will be meaningless as the station holds still as the big station it is.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-14 19:00:27 -06:00
Velcroboy ef89695780
Hive five (#435)
* The Hive Rebase

* Remove un-merged maps from files

---------

Co-authored-by: Jeff <>
2023-11-11 10:37:11 -06:00
Colin-Tel 19dd012857
Adds Asterisk Station (#374)
* Adds Asterisk Station

The map renderer is a bitch ass motherfucker.

* Update default.yml

added Asterisk to pool, and alphabetized the list.

* Update PostMapInitTest.cs

forgot I had to do this shit

* Update asterisk.yml

I forgot the cool role

* Update asterisk.yml

Added station maps

* Update asterisk.yml

Added JobSpawns for salvage and made some other adjustments

* Update asterisk.yml

Changes made after Velcro's review
2023-11-01 11:32:48 -05:00
Velcroboy 49c711b869
Fixes Tortuga evac being unpowered AND ADDS ARENA STATION! (#311)
* Fixes Tortuga evac being unpowered

* Adds Arena Station

---------

Co-authored-by: Jeff <>
2023-10-25 20:16:52 +00:00
Velcroboy 06458944c8
Wd 1984 (#307)
* Removes WD maps

* Sneaky bugggers

* swap pebble in for bagel map test

---------

Co-authored-by: Jeff <>
2023-10-25 18:07:25 +02:00
Velcroboy 9e281cb5f8
Adds Tortuga Station (#214)
* Adds Tortuga Station

* Add evac shuttle

* Update proto file :)

* ...

* remove med borg

* NTES Seal light/airlock fix

* Add chem spawn

---------

Co-authored-by: Jeff <>
2023-10-22 01:24:03 +02:00
DrSmugleaf 9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
Carolyn3114 db7842a570
Pebble Rebased (#124)
* Pebble rebased

* Update PostMapInitTest.cs

* Update PostMapInitTest.cs

* Update PostMapInitTest.cs

Signed-off-by: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>

* Update pebble.yml

* Update pebble.yml

* add salv shuttle console

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* map pool

* Update pebble.yml

* Update pebble.yml

* Update edge.yml

Made Pebble the small-pop map

---------

Signed-off-by: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-10-12 15:48:30 +00:00
Colin-Tel 8ff4853877
Adds Edge (#121)
* Adds Edge

Also modifies the map pool file.

* Added Salvage arm

also corrected job prototypes in the map yaml.

* I accidentally the atmos

:trollface:

* adjusts test

also obligatory post-"I'm done mapping" map edits

* Update PostMapInitTest.cs

mfw I missed a comma 😱

* Update edge.yml

Say it with me: "It's never done"

* Update edge.yml

added roboisseur
2023-10-07 05:12:57 +00:00
Ubaser 9ecef1b313 Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02:00
metalgearsloth 82d9fa69a4 Fix planet docking (#20104) 2023-09-27 21:59:12 +02:00