Commit Graph

8534 Commits

Author SHA1 Message Date
metalgearsloth
af70b9a3c7 Selectively revert PullController (#28126)
I am leaving the issues open and have updated #26547 with more info on what we should do long-term. This is just to bandaid the short-term complaining.
2024-05-26 20:11:17 -04:00
Nemanja
cba23487d3 fix borg ui mispredict opening (#28305)
move borg ui junk to shared
2024-05-26 13:07:16 -07:00
deltanedas
492ccc93d0 fix antag selection being evil (#28197)
* fix antag selection being evil

* fix test

* untroll the other tests

* remove role timer troll

* Allow tests to modify antag preferences

* Fix antag selection

* Misc test fixes

* Add AntagPreferenceTest

* Fix lazy mistakes

* Test cleanup

* Try stop players in lobbies from being assigned mid-round antags

* ranting

* I am going insane

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-05-26 01:14:29 -04:00
Nemanja
d747fa98f8 actually fix magic mirrors (#28282) 2024-05-25 21:46:41 -07:00
Leon Friedrich
b177fb8179 Make NetworkConfigurator use BoundUserInterfaceCheckRangeEvent (#28293) 2024-05-26 13:20:29 +10:00
Leon Friedrich
a38e6475cb Fix stripping not marking interactions as handled (#28292) 2024-05-26 13:18:27 +10:00
Ady4ik
f84e87a010 Move PendingZombieComponent to Shared (#28143)
* Move PendingZombieComponent to Shared

* network me boy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-05-25 17:07:18 -04:00
eoineoineoin
229f6d697c Objects ordered through cargo system shouldn't start anchored (#28115)
* Order normal space heater instead of anchored variant

* Make sure ordered objects don't spawn anchored

* Order space heater flatpack instead of a regular space heater

* Remove obsolete TODO

* Remove unnecessary name

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-05-25 16:26:48 -04:00
Ed
afb1acab10 Fix candles (firestack fading) (#28139)
Update FlammableSystem.cs
2024-05-25 16:22:34 -04:00
MilenVolf
de8b663124 Add direction relative to station for emergency shuttle's docking & nearby announcement (#28164)
* Use nav beacon location for emergency shuttle's docking announcement

Location of the shuttle relative to the nearest nav beacon in docking announcement message of the emergency shuttle

* Add directions relative to station
2024-05-25 16:20:43 -04:00
Repo
90d3699c1d Fix gamerule display issues (#28178)
* A comprehensive rule list for joining admins and mid round command to get rule list added

* Fix up for when a rule is added vs started and some logging

* fix command help localization, fix admin flags and spam anouncement.

* Send admin message only to the joining player not all admins.

* Bit better formatting in chat box
2024-05-25 16:18:05 -04:00
deltanedas
739c81c230 move nukie profile loading into its own rule (#28208)
* move profile loading out of nukeops rule

* make BaseNukeopsRule and use AntagLoadProfileRule

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-25 16:15:56 -04:00
deltanedas
a06ea58249 antag objective issuing refactor (#28216)
* add AntagObjectives from GenericAntag

* add AntagRandomObjectives that traitor and thief can use

* make ObjectivesSystem use initial character name which AntagSelection passes

* make thief and traitor use AntagRandomObjectives

* remove now unused locale

* make sleeper agents rule use baseTraitorRule

* restore dragon rule oop

* bandaid for genericantag

* real

* typo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-25 16:14:48 -04:00
deltanedas
37ad81c59c fix id card console not updating records (#28237)
* fix id card console not updating records

* test

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-25 16:08:15 -04:00
Ed
e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream
# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-05-25 18:49:49 +03:00
Ed
af114a93f6 Chromium slime (#174)
* added chromium slime

* inverse poison damage
2024-05-25 17:41:29 +03:00
nikthechampiongr
b2ca9b6a9c Fix firelock prediction issues with periodic pulses of closing lights (#28227)
* Fix firelock prediction issues with periodic pulses of closing lights

For some reason this function was setting a time for the next state
which was triggering the door system to try to close the firelock.
This does not happen serverside because the function only fires from an
event called clientside apparently.
It appears to be an attempt to stop firelocks from closing instantly
that did not function properly, and I cannot discern any other purpose.
As such I have removed it.

* Remove redundant serverside check

This became redundant with commit 439a87f2
2024-05-24 16:44:42 +02:00
Leon Friedrich
76e13eed35 Improve InteractionSystem range & BUI checks (#27999)
* Improve InteractionSystem range & BUI checks

* Ghost fixes

* AAA

* Fix test

* fix nullable

* revert to broadcast event

* Fixes for eengine PR

* Ah buckle code

* )
2024-05-24 15:03:03 +10:00
Nemanja
8a95cb186c Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
nikthechampiongr
df8b9a659e Firelock improvements part 1 (#26582)
* Change prying system and pryunpoweredcomp to allow for custom time modifiers

This will be useful if I go the route of making firelocks pryable when
unpowered instead of just being able to open and close instantly when
unpowered.

* Make firelocks properly predicted

Shared system made. Since atmos checks can only be done on the server we
just have it set relevant bools on the component and then dirty it.
Ditched atmos checks on trying to open, they now only happen whenever
firelocks are updated.

* Make firelocks pryable without a crowbar

While this usually would only allow you to do this when a door is
unpowered, firelocks do not have the airlock component which actually
does that check. As such firelocks will always allow you to pry them
open/closed by hand.

* Clean up System. Change update interval to be based on ticks. Move as much as possible to shared

* Make firelocks unable to emergency close for 2 seconds after being pried open

* Clean up

* More cleanup

* Reorganize SharedFirelockSystem methods to match Initialize order

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-05-22 04:16:20 -07:00
Ed
6d51ea95a1 Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream 2024-05-22 13:29:42 +03:00
DrSmugleaf
dbb7dcd16d Add defib event, add fields to be able to disable crit defib and do after movement (#28174)
* Add defib event, add fields to be able to disable crit defib and do after movement

* Fix check
2024-05-21 14:11:49 +02:00
Leon Friedrich
0f6e1196d8 Use non-generic TryComp() for metadata & transform (#28133) 2024-05-20 22:40:35 -07:00
Tayrtahn
8995810ade Fix non-ghosts and admins counting toward most followed (#28120)
* Fixed non-ghosts and admins counting toward most followed

* Redone to better leverage EntityQueryEnumerator

* Remember to test your code before you commit it, kids

* Review revisions

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

* Clean up

---------

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-05-20 07:12:05 -07:00
Tayrtahn
fa06783986 Prevent ghosts from spawning on terminating maps/grids (#28099)
* Extra checks to prevent ghosts spawning on terminating maps/grids

* Add test for grid deletion
2024-05-20 06:52:49 -07:00
Tayrtahn
68ec204a67 Slightly emphasize popup when someone points at you (#28152)
Slightly emphasize when someone points at you
2024-05-20 15:32:25 +02:00
Flesh
c551cafdae Add plant metabolism effects to chemical guidebook (#28038)
* draft one of plant metabolism guidebook

* loc fix?

* add attributes loc

* fix loc syntax

* improved appearance

* last commit was undercooked, my bad

* last commit was still undercooked, my worse

* last commit was even still undercooked, my worst

* Addressed comments?

* Fix newlines

* Hopefully this works

* Cleanup, I think

* 2xs
2024-05-19 17:01:44 -06:00
Nemanja
a30fb2661f Fix magic mirror (#28084)
* Fix magic mirror

* buff magic mirror
2024-05-19 16:35:55 -06:00
Ed
1dbb4e7e94 Merge branch 'master' into ed-19-05-2024-upstream 2024-05-19 15:57:20 +03:00
Ed
6a639107b3 Merge remote-tracking branch 'space-station-14/master' into ed-19-05-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
2024-05-19 15:43:25 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158)
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
2024-05-19 15:40:28 +03:00
Leon Friedrich
b4a5399ad4 Modify battery assert to avoid floating point errors (#28007) 2024-05-19 11:54:52 +10:00
Tayrtahn
bad3bb4a89 Random book story generator refactor (#28082)
* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar
2024-05-18 12:20:00 -04:00
Ed
225a05ecdb Nuke spaceshroom ore (#28110)
nuke spaceshroom ore
2024-05-18 12:17:46 -04:00
double_b
0525c63332 Resolves Bible summon message being sent to all users (#28104)
* Changed PopupEntity overload used to ensure message is only sent to user

* Updated uid for PopupEntity call

* Updating _popupSystem.PopupEntity call in AttemptSummon
2024-05-18 10:23:16 -04:00
Ed
9690077532 Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)
* added 4 basic reagent effects

* entrance bugfixes

* add bloodgrass world sprites

* preuso cherry pick

* add planet bloodgrass and sickle gathering

* +1 gather sound
2024-05-18 15:16:20 +03:00
lzk
b08f79fb38 Move replacement chance from ReplacementAccentComponent to ReplacementAccentPrototype (#28049)
Move replacement chance to ReplacementAccentPrototype
2024-05-17 19:33:22 +03:00
Ed
811cc8a41d Underworld + Overworld (#151)
* Setup new dungeon system (v2)

* add custom basic generation

* add maps linking

shitcode, boo

* add auto linking sub-world portal

* fix deleted component

* clearing otherside of the tiles manually (im stuck in wall, brother!)

* Upgrade cave biome generation

* add TODO

* add ladder and hole sprites

* add dungeon entrance prototypes

* clean up, add docs

* add many ambient sounds

* Update CP14StationDungeonMapSystem.cs

* remove bugs
2024-05-17 17:07:29 +03:00
Ed
918ba35ccb Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream 2024-05-17 12:57:04 +03:00
DrSmugleaf
de7e1b33dd Add data field for id card microwave behaviour (#28087) 2024-05-17 10:48:22 +02:00
deltanedas
b453b94148 fix ninja hacking not affecting sechud (#28021)
minor refactor and fix

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-16 16:51:06 -04:00
DrSmugleaf
e53f225a39 Move most rotting code to shared (#28050)
* Move most rotting code to shared

* Remove unused dependency
2024-05-15 17:45:50 -04:00
deltanedas
e37f95c24c biome flexibility changes (#28017)
make biome apply template on mapinit, add api for setting Enabled

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-14 23:27:25 -04:00
deltanedas
bad5367479 fire troll fix (#28034)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-14 16:47:00 -07:00
beck-thompson
550a3afc52 Fix incorrect message displaying when trying to remove stuck item from someones hand. (#28024)
* Fix

* Fixed the other spot!
2024-05-14 15:01:12 -04:00
deltanedas
4b2193a8a0 fix fire spread round removal (#27986)
* fix a resolve debug assert

* rewrite fire spread

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-13 17:49:44 -04:00
Brandon Li
bfed85aff2 Reagent dispenser UI (Again) (#27958)
* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`

* delete unused classes

* disable reagent button when container is empty

* Make things a bit bigger

* remove obsolete text color override
2024-05-13 17:46:16 -04:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
2024-05-13 18:32:59 +03:00
Leon Friedrich
1f03111ff8 Change some EntityQueryEnumerator to AllEntityQuery (#27969) 2024-05-13 15:11:49 +10:00
metalgearsloth
ce0a175c73 Implement Equals for ApcBoundInterfaceState (#27965)
* Implement Equals for ApcBoundInterfaceState

Saves a lot on bandwidth. Also made it round to the nearest 5.

* Also this
2024-05-13 14:05:37 +10:00