Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit d3efeec6bc6bd7ac2dff7c0ac4c65b62709f2b6a
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 23:28:20 2024 +0300

    Fix tests fail

commit c43459447c567939a12c57151e4f5721735197f9
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 22:32:24 2024 +0300

    Remove pride holiday

    This reverts commit ba6853d386e392560c528c6fba93bda97a32cd02.

    # Conflicts:
    #	Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
    #	Resources/Prototypes/holidays.yml

commit 6af40016107738c3a8e90b53c86898a677eae24e
Author: metalgearsloth <[email protected]>
Date:   Sat Jun 15 17:18:48 2024 +1000

    Update submodule to 225.0.0 (#29016)

commit d689d0c927b8806ac7e8994f4197ea7a5e1c1124
Merge: 7c33f47264 087ecabd7e
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 22:09:33 2024 +0300

    Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

    # Conflicts:
    #	Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
    #	Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl
    #	Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl
    #	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl
    #	Resources/Maps/Nonstations/nukieplanet.yml
    #	Resources/Maps/bagel.yml
    #	Resources/Maps/saltern.yml
    #	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
    #	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
    #	Resources/Prototypes/GameRules/events.yml
    #	Resources/Prototypes/Research/arsenal.yml
    #	Resources/Prototypes/holidays.yml

commit 087ecabd7e59a80d66ba62c84829e9933713972a
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 00:27:01 2024 +0300

    Meh

commit 09e06bc91ae3afbc4f63417e72b9053ec72fc499
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 00:25:06 2024 +0300

    Update locale

commit 42e364768d7b5b4de34f046eca4a89678c0262ad
Merge: 87e191f0b0 30cdb90ac2
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 00:02:27 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

commit 87e191f0b0920a01ed59f86db1da7a1537cefd42
Author: MilenVolf <[email protected]>
Date:   Sun Jun 16 00:02:05 2024 +0300

    Localization

commit 30cdb90ac217c4e599c53eed10e693af098df1f6
Author: PJBot <[email protected]>
Date:   Sat Jun 15 17:52:01 2024 +0000

    Automatic changelog update

commit 81e41f8e8d000f6d420ce67134dc7eb49b0034ca
Author: BombasterDS <[email protected]>
Date:   Sun Jun 16 03:50:55 2024 +1000

    Mannequin (#29004)

    * Mannequin

    * rsi license fix

    * damage container fix

    * container fix

    hope this works

    * layers fix + appearance comp (mb it help?)

    * maybe fixed?

    * one day it will work...

    * can't even understand why test failing... (maybe fix?)

    * last try?

commit 5dbee6fc413d11544da7e98f6231c28a7f76f56f
Author: PJBot <[email protected]>
Date:   Sat Jun 15 15:46:02 2024 +0000

    Automatic changelog update

commit ca58811bdb68a62c8702a56914d766d0a021fec5
Author: Ian <[email protected]>
Date:   Sat Jun 15 17:44:56 2024 +0200

    make the donk microwave drop the correct board on normal deconstruction (#29037)

    * make the donk microwave drop the correct board on normal deconstruction

    * removed the unnecessary SyndicateMicrowaveMachineBoard tag

commit ba16cd19b201febe36b096ed21ed43b2445f3377
Author: PJBot <[email protected]>
Date:   Sat Jun 15 15:18:22 2024 +0000

    Automatic changelog update

commit 789453adf0cf1b3310f75ef3ac5b1240a09be9b8
Author: ShadowCommander <[email protected]>
Date:   Sat Jun 15 08:17:16 2024 -0700

    Make firelock warning light not require power and add a PointLight (#29024)

    * Add a PointLight to firelocks when warnings are active

    * Remove power requirement for lights

commit 71eb4d91786b1b3eccbcd61dd5e10dff184fe197
Author: TsjipTsjip <[email protected]>
Date:   Sat Jun 15 16:03:20 2024 +0200

    CVarify meteor behavior (#29030)

    * CVarify meteor behavior

    * Cache value to reduce CVar calls, hook into OnValueChanged

    * _cfg is still null at construction time, fixed by just making it set up on Started instead

    * Invoke immediately! Learning more every step of the way.

    * Move cached value initialisation to Initialize call

    * Add explicit supercall

commit 7e4c7607e6d46c2792924c004f7f40117dcdb3e9
Author: PJBot <[email protected]>
Date:   Sat Jun 15 13:20:29 2024 +0000

    Automatic changelog update

commit 31d1d3b6e792d6edc6550211ad71fc78ddbe898c
Author: Nemanja <[email protected]>
Date:   Sat Jun 15 09:19:23 2024 -0400

    fix borgs getting deleted by salvage magnets (#29006)

commit ee4983c875888d45581cc8aa254975aea57e71ef
Author: MilenVolf <[email protected]>
Date:   Sat Jun 15 15:41:36 2024 +0300

    Update russian locale files

commit b10c9a9e2937d157f6da827e4ec2cc70b8c0da1a
Author: MilenVolf <[email protected]>
Date:   Sat Jun 15 15:41:18 2024 +0300

    Update english locale files

commit e16bf41da16fe99d2da228c5871528b0a1a5a1fb
Author: PJBot <[email protected]>
Date:   Sat Jun 15 11:26:48 2024 +0000

    Automatic changelog update

commit 9dc9e22d13e261346ad67328c70819181f085b91
Author: nikthechampiongr <[email protected]>
Date:   Sat Jun 15 11:25:42 2024 +0000

    Bwoink fix (#28899)

    * Fix incorrect usage of loc string

    * Make it so you can no longer ahelp someone who is no longer selected

commit 9bc0b4d65e5de316b97ee28076d43368ad2443e9
Merge: 184e17b404 9b8c544191
Author: MilenVolf <[email protected]>
Date:   Sat Jun 15 13:53:34 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

commit 184e17b404d97a1c7b84a08f704105eaefb2ba5a
Merge: 749a1f706b 7b6e30d688
Author: MilenVolf <[email protected]>
Date:   Sat Jun 15 11:00:15 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

    # Conflicts:
    #	Resources/Prototypes/GameRules/events.yml

commit 9b8c5441919cdb9edfce7b7fbe4ad70aaa125aa8
Author: metalgearsloth <[email protected]>
Date:   Sat Jun 15 17:18:48 2024 +1000

    Update submodule to 225.0.0 (#29016)

commit 7b6e30d68846354be9c3a82fc1fc92952e10a7d5
Author: PJBot <[email protected]>
Date:   Sat Jun 15 06:53:55 2024 +0000

    Automatic changelog update

commit 8f12e90b90a6749d783b1f2c8588241749ceeeb2
Author: metalgearsloth <[email protected]>
Date:   Sat Jun 15 16:53:42 2024 +1000

    Don't use invalid defaults for loadouts (#28740)

    * Don't use invalid defaults for loadouts

    At the time it made more sense but now with species specific stuff it's better to have nothing.

    * Loadout SetDefault only applies valid loadouts

commit f0fbedd6408e4a8f7b4e2614961cc94c3f946d84
Author: metalgearsloth <[email protected]>
Date:   Sat Jun 15 16:52:49 2024 +1000

    Fix RoleLoadout equality (#28737)

    * Fix RoleLoadout equality

    Knew it was janky but thought SequenceEqual was better than it is so we just do it manually.

    * Also implement this

commit a3d9f7291d55ca9bff37162ad35c8f7ec516bf67
Author: Leon Friedrich <[email protected]>
Date:   Sat Jun 15 18:42:25 2024 +1200

    Fix IComponentFactory mock in benchmark (#29015)

commit bb61191b24509cc0a5e65c87226c69634f8137dd
Author: LankLTE <[email protected]>
Date:   Fri Jun 14 23:35:34 2024 -0700

    Set ahelp new player icon to use minutes, not seconds (#29014)

    Replace seconds with minutes

commit 62b9e423c9e1812a3ad801a3719893af005a0f58
Author: PJBot <[email protected]>
Date:   Sat Jun 15 06:04:02 2024 +0000

    Automatic changelog update

commit 7afbe3c98e6c19ede53b16c7dadc2bb24ec9741c
Author: Flareguy <[email protected]>
Date:   Sat Jun 15 01:02:56 2024 -0500

    Adds 2 new space ruins (#28971)

    adds 2 new space ruins

commit 65424e02532744e0694ccbe93c4001952f695b67
Author: deltanedas <[email protected]>
Date:   Sat Jun 15 06:01:13 2024 +0000

    saltern update (#29001)

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

commit 16e7fec5e820041c2edac756662a15c54a2f7a48
Author: PJBot <[email protected]>
Date:   Sat Jun 15 05:21:49 2024 +0000

    Automatic changelog update

commit ba24cc8f5c453d111c59e5b332b10b33e10ae3fb
Author: Nemanja <[email protected]>
Date:   Sat Jun 15 01:20:42 2024 -0400

    Fix drinking from openable containers (#29010)

commit c339773b5f6823630e9fa04bbec2dd1d87e521ff
Author: AJCM-git <[email protected]>
Date:   Sat Jun 15 00:41:25 2024 -0400

    Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)

commit 2953e87f1ca6f7ffe5a542342cc87e648be7f7ff
Author: PJBot <[email protected]>
Date:   Sat Jun 15 04:02:28 2024 +0000

    Automatic changelog update

commit d907e4ef577e6df595a77c7c87e5f864ee38ad0c
Author: Nemanja <[email protected]>
Date:   Sat Jun 15 00:01:22 2024 -0400

    make pulled uncuffing slower & reduce uncuff spam cooldown (#29008)

    * prevent people being pulled from uncuffing themselves

    * block -> modify duration

commit d6b8b34f25f6538d14ab91afe715d2ad7fdc4640
Author: PJBot <[email protected]>
Date:   Sat Jun 15 03:44:29 2024 +0000

    Automatic changelog update

commit 748e5831e834b192852533e5ce166b11a17d8cbb
Author: Nemanja <[email protected]>
Date:   Fri Jun 14 23:43:23 2024 -0400

    Add moon boots (#29009)

commit 06c8238164c3b278245c94f5e91c5195fc836084
Author: PJBot <[email protected]>
Date:   Sat Jun 15 03:39:49 2024 +0000

    Automatic changelog update

commit f136657b388b6d90b63fa338cc7295b1fd39d00c
Author: Nemanja <[email protected]>
Date:   Fri Jun 14 23:38:43 2024 -0400

    Revamped Meteor Swarm (#28974)

    * meteor code and balanced values

    * Meteor Swarms

    * Update meteors.yml

    * Update meteors.yml

    * HOO! (fix overkill bug and buff space dust)

    * undo BloodstreamComponent.cs changes

    * DamageDistribution -> DamageTypes

    * part 2.

commit 1d5840c279a48486c8a4668b10c5af3f40f5fa63
Author: PJBot <[email protected]>
Date:   Sat Jun 15 03:24:48 2024 +0000

    Automatic changelog update

commit 298de1ba39279a3e10ce978802a356987589a07a
Author: Brandon Hu <[email protected]>
Date:   Sat Jun 15 03:23:42 2024 +0000

    fix(uplink): Remove useless gps from death rattle box (#28999)

commit 97695cfa62fe3291fe7abfe8d35668987f2fd79b
Author: PJBot <[email protected]>
Date:   Sat Jun 15 03:14:58 2024 +0000

    Automatic changelog update

commit 48f90322f274cb5524c816a2f88ede8bc779cd64
Author: Robert V <[email protected]>
Date:   Fri Jun 14 20:13:52 2024 -0700

    Allow vending machines to be repaired (#28920)

    Vending machines can be repaired

commit 6132b5e07a4185ce9e2a643906466beac5f0d05e
Author: PJBot <[email protected]>
Date:   Sat Jun 15 03:01:06 2024 +0000

    Automatic changelog update

commit 41a081d5efa0050b44f3200cdaecde16eab2bc78
Author: Verm <[email protected]>
Date:   Fri Jun 14 22:00:00 2024 -0500

    Donk co. microwave + microwave tweaks (#28951)

    * THE syndie microwave

    * Always burn to explode microwave when copying

    * Make it so copying ids stop when the microwave is goign to explode

    * Made explosion destroy the board and spit out the machine parts

    * Move logic is MicrowaveSystem, make metal cooking use the same logic

    * Fix passing the wrong malfunction time

    * Shuttle cannot escape aggressive branding

    * Always make it explode with an id

    * Forgot to invert bool, move it after fry chance

commit 7d0798cea5cfb19665076cb745e2882fcd102c7f
Author: PJBot <[email protected]>
Date:   Sat Jun 15 02:59:36 2024 +0000

    Automatic changelog update

commit 835d1dd15383b62802eb6d89f9b6f12fa8ce9a63
Author: Plykiya <[email protected]>
Date:   Fri Jun 14 19:58:30 2024 -0700

    Prevent borgs from getting duplicate modules (#28943)

    * Prevent borgs from getting duplicate modules

    * outta the loop

    ---------

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

commit 3cd740c32bb1db33f21de5ee34cb54ef7cdd6821
Author: Zonespace <[email protected]>
Date:   Sat Jun 15 04:43:36 2024 +0200

    Replaces reagent-effect-guidebook-missing with more descriptive guidebook entries (#28817)

    removes `reagent-effect-guidebook-missing`

    Co-authored-by: John Doe <[email protected]>

commit 9e4d19118900d31270f2c725da684a95137fb9cb
Author: deltanedas <[email protected]>
Date:   Sat Jun 15 02:42:40 2024 +0000

    make RefillableSolution optional for SolutionTransfer (#28830)

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

commit 8eb85a08b60e6e0c24d8050265119ca2b3752257
Author: PJBot <[email protected]>
Date:   Sat Jun 15 02:20:14 2024 +0000

    Automatic changelog update

commit e803871172f3ad5aca65afb58e2ff373d516aab3
Author: K-Dynamic <[email protected]>
Date:   Sat Jun 15 14:19:08 2024 +1200

    Adds witch robes (#28965)

    * ze

    * autodrobe entry

    * autodrobe crate cost adjust

commit 27ba3440841b683d1380e5b8ff1a7e821a4f1add
Author: PJBot <[email protected]>
Date:   Fri Jun 14 21:45:29 2024 +0000

    Automatic changelog update

commit 68807cb25e167425091035eb0d2be5f3c935758e
Author: Verm <[email protected]>
Date:   Fri Jun 14 16:44:23 2024 -0500

    Changes all the uplink ally icons to be a combination of the mob + radio (#28954)

    * New Icons!

    * Better meta info

commit 749a1f706bfadc70c8fc889ceccc661d9f4a7838
Merge: c68aad1a00 68807cb25e
Author: MilenVolf <[email protected]>
Date:   Sat Jun 15 00:44:16 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

commit a4ade6964055f7949c09f692edd886d9ba164c6c
Author: Verm <[email protected]>
Date:   Fri Jun 14 16:42:58 2024 -0500

    Move secure crate labels to the left (#28952)

    Move secure label to the left

commit e8dd5d4312ef7e1376aafb4e3ef63b549dc71dcc
Author: PJBot <[email protected]>
Date:   Fri Jun 14 20:33:46 2024 +0000

    Automatic changelog update

commit 9ebfb1d64fd5e2d8594897e557bf6c4ff7f33c4e
Author: Thomas <[email protected]>
Date:   Fri Jun 14 15:32:39 2024 -0500

    Fix Loadout Requirements Only Displaying One Requirement (#28994)

    Collect all group effects failed instead of only first one failed

commit c68aad1a00eee257178521efe44fb301f1fccae2
Merge: 061cf5c658 2711ef7f48
Author: MilenVolf <[email protected]>
Date:   Fri Jun 14 21:44:45 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

    # Conflicts:
    #	Resources/ServerInfo/Guidebook/Engineering/Fires.xml

commit 7c33f47264a1302c5e6c1c456a61ea97b41dbb29
Author: Tenteratus <[email protected]>
Date:   Sat Jun 8 17:31:59 2024 +0300

    Driller and Lighthouse fixes (#361)

    * фиксы

    были исправлены мелкие ошибки на картах дриллер и лайтхаус

    * ыыыыы

    * lighthouse bag fix

commit 1679e739535827bac4f9a18f7a7f6dd2a0271cf6
Author: MilenVolf <[email protected]>
Date:   Fri Jun 14 20:52:52 2024 +0300

    CRLF to LF | Fix CRLF test (#368)

    * CRLF to LF | Fix CRLF test

    * Weh

commit 2711ef7f48bb3ecc4232136658b2508062e3beb5
Author: PJBot <[email protected]>
Date:   Fri Jun 14 17:23:07 2024 +0000

    Automatic changelog update

commit ba6853d386e392560c528c6fba93bda97a32cd02
Author: Pieter-Jan Briers <[email protected]>
Date:   Fri Jun 14 19:22:01 2024 +0200

    It is pride month, nukies. You know what that means. (#28992)

    * Make the nuke gay

    * I forgot to commit the gay

    * Add pride month

    * Use holiday visualizer for nuke

    * Fix pride month

    * Trans too

commit 9efa5de340f0a9b518840e4b9ecf99fc628bb0b3
Author: PJBot <[email protected]>
Date:   Fri Jun 14 16:54:55 2024 +0000

    Automatic changelog update

commit 05cc7541ddf547f5ede3af5d17cc3ba486f4ba60
Author: dffdff2423 <[email protected]>
Date:   Fri Jun 14 11:53:48 2024 -0500

    Rename generic drugs (#28989)

    * Rename generic drugs

    Space Drugs and Stimulents cause quite a bit of confusion.

    * Ensure everything is updated to the new names.

commit 795196c9647c2f40df8ec8c9380a049efe600ed9
Author: PJBot <[email protected]>
Date:   Fri Jun 14 15:25:46 2024 +0000

    Automatic changelog update

commit 6d71ec1b140e48effbc4b6964b809e5244da0f8f
Author: Zonespace <[email protected]>
Date:   Fri Jun 14 17:24:40 2024 +0200

    Non-uplink PDAs no longer can have TC inserted into them (#28985)

    * PDAs no longer can have TC inserted into them

    * far better way of doing this

    ---------

    Co-authored-by: John Doe <[email protected]>

commit 24e7653c984da133283457da2089e629161a7ff2
Author: Verm <[email protected]>
Date:   Fri Jun 14 08:45:01 2024 -0500

    Resprite rodent inhands + add hamlet inhands (#28955)

    * Resprite rodent inhands + add hamlet inhands

    * Small ham adjustment

commit 3b3163c4f46d25790a207d2d8772b48b10841fd5
Author: Hannah Giovanna Dawson <[email protected]>
Date:   Fri Jun 14 12:15:42 2024 +0100

    SS-28662 Add cvars to support forcing people to departures and making those at departures invincible (#28765)

    * SS-28662 Add cvar to force spawn everyone at departures

    This cvar means everyone must spawn at departures. This
    could be handy for an admin event? But mostly it's so the
    tutorial departures terminal can be seen by all newbies on
    gateway servers.

    * Small fix to ArrivalsSystem flow

    * Remove incorrect todo

    * Add godmode arrivals cvar

commit e70131e5b4cf0f36352d5f352d75df49181a4718
Author: Ubaser <[email protected]>
Date:   Fri Jun 14 17:55:30 2024 +1000

    Lighten throwing knive's border (#28977)

    add

commit 0d869a317f311a600b9801f35c794a70f1231e85
Author: PJBot <[email protected]>
Date:   Fri Jun 14 06:25:24 2024 +0000

    Automatic changelog update

commit adad6b2b0434416327337b57816dc412b97d4963
Author: Moomoobeef <[email protected]>
Date:   Thu Jun 13 23:24:18 2024 -0700

    cargo can now order fax machines (#28968)

    * cargo can now order fax machines

    * removed fax manual

commit e7a3fd5285ba5d61a7f16f487ec630220fd2d15d
Author: PJBot <[email protected]>
Date:   Fri Jun 14 06:20:53 2024 +0000

    Automatic changelog update

commit 4c182298cc7bbc37ac818fe7c0f7e1e25f6f679c
Author: Killerqu00 <[email protected]>
Date:   Fri Jun 14 08:19:47 2024 +0200

    uncuffCooldown *= 5 (#28095)

commit df2c3ec844da27056e27d0de44aade706b76e204
Author: IProduceWidgets <[email protected]>
Date:   Fri Jun 14 01:26:39 2024 -0400

    Evac shuttle for Oasis (#27998)

    * Add robo control comp, also de-reinforce a lot of walls.

    * Add Accordia Evac shuttle for Oasis.

    * Revert "Add robo control comp, also de-reinforce a lot of walls."

    This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.

commit 39d7afec2b52870e748cdd76f6de429f3ed71319
Author: PJBot <[email protected]>
Date:   Fri Jun 14 02:44:08 2024 +0000

    Automatic changelog update

commit c52073f542a07f2e1b8380556a14995380336b49
Author: Tabitha <[email protected]>
Date:   Fri Jun 14 12:43:02 2024 +1000

    Add chicken speech sound (#28948)

commit bcf85944318b8afd5d9b82176f3316e31cb959b2
Author: PJBot <[email protected]>
Date:   Fri Jun 14 02:41:29 2024 +0000

    Automatic changelog update

commit 80590280158efd3094195c66a66ca52cb223ac65
Author: Boaz1111 <[email protected]>
Date:   Fri Jun 14 04:40:23 2024 +0200

    makes PKA able to mine rocks in one hit (#27476)

    gives it gatheringprojectile

commit 6c343ddae2a57e95b05ceecaaab9121eeddf843a
Author: Tayrtahn <[email protected]>
Date:   Thu Jun 13 22:15:29 2024 -0400

    Move SleepingSystem to Shared & cleanup (#28672)

    * Move SleepingSystem to Shared & cleanup

    * Remove empty OnShutdown handler

commit c79849ae292690809e315b023ab95c33aaebbe56
Author: crasg <[email protected]>
Date:   Thu Jun 13 19:12:24 2024 -0700

    Remove Rat King from MouseMigration and add it to it's own Event (#28872)

commit f40267e68e7ac7891947546e4bbf480ea8ca4ba8
Author: Repo <[email protected]>
Date:   Fri Jun 14 14:10:41 2024 +1200

    Add trailing comments on multiline lists - editorconfig. (#28922)

    Add trailing comments on multiline lists.

commit af11bc3f51f3dfa3b278a813f7b4621c0cab97f2
Author: PJBot <[email protected]>
Date:   Fri Jun 14 02:05:51 2024 +0000

    Automatic changelog update

commit 57858cd6a558399c0ec19ffce932ed5967144eff
Author: Cojoke <[email protected]>
Date:   Thu Jun 13 21:04:45 2024 -0500

    Lasers passover objects like projectiles unless the target is clicked on (#28768)

    * uh...

    * fix

    * alright, there we go

    * Revert "alright, there we go"

    This reverts commit 448180bfa58cc24c42a4d59ef34c017b9941f37b.

    * Make lasers not hit certain objects and lying mobs unless clicked on

    * comment

    * Update Content.Server/Weapons/Ranged/Systems/GunSystem.cs

    * an l vanished?

    ---------

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

commit e481925ea4e5d10e215c2e87faa17dd6cb8a8993
Author: PJBot <[email protected]>
Date:   Fri Jun 14 02:02:39 2024 +0000

    Automatic changelog update

commit ad3f1f77b7ebd940b93f3966e3a49e79188703ae
Author: osjarw <[email protected]>
Date:   Fri Jun 14 05:01:32 2024 +0300

    Nodescanner now works with right click (#26873)

commit 47bf64b883b26252df8873dd300defef2b610854
Author: Ghagliiarghii <[email protected]>
Date:   Thu Jun 13 21:10:17 2024 -0400

    Fix no combat knives in sec techfab (#28086)

commit 222d3b532dddeab68b3b39ebd37af7c53d00b2ed
Author: MjrLandWhale <[email protected]>
Date:   Thu Jun 13 18:25:02 2024 -0500

    Override under-pressure lock-out in air alarm "Fill" mode (#28909)

commit 4e8375e5f99e7ac4616f37bc3b497f9ef5924ee3
Author: Emisse <[email protected]>
Date:   Thu Jun 13 16:03:01 2024 -0600

    bagel update (#28946)

commit ccd402d8d1cbb715f431a6c05dc51f0fa9d68b92
Author: lzk <[email protected]>
Date:   Thu Jun 13 22:21:24 2024 +0200

    Adjust softdrink restock crate name (#28934)

    These contain restocks for multiple vendors, so change the name and description to reflect this.

commit 29fa18418ec56b6f9db9264fc607bf329ee85a67
Author: PJBot <[email protected]>
Date:   Thu Jun 13 18:37:44 2024 +0000

    Automatic changelog update

commit c3720f9fd9922c37c5434ad8e93b67734789db83
Author: lzk <[email protected]>
Date:   Thu Jun 13 20:36:38 2024 +0200

    Add order quantity to cargo invoice label (#28821)

commit 1559b080e4c78b105e84e331f69b6e6781d5cbfc
Author: PJBot <[email protected]>
Date:   Thu Jun 13 18:22:55 2024 +0000

    Automatic changelog update

commit 221cb73d8c24fdfff79ba1ab1d5d1de7e2dc579f
Author: Nemanja <[email protected]>
Date:   Thu Jun 13 14:21:48 2024 -0400

    Fix construction rotation (#28427)

commit 1bffa2aee7d28bf0cea0be69adf5424a424ffb4a
Author: PJBot <[email protected]>
Date:   Thu Jun 13 18:12:03 2024 +0000

    Automatic changelog update

commit 7f5476b5551a44a2138038bd785f43d307bf8fbc
Author: Doomsdrayk <[email protected]>
Date:   Thu Jun 13 12:10:56 2024 -0600

    Fix Drozd and C-20r unwielding on use-in-hand (#28728)

    Make Drozd and C-20r not unwield on use

commit 83ddc1eb382ca70d474d2fbb3e83ee1c20bffc79
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 18:16:11 2024 +0300

    Reapply "Add website link support for guidebooks"

    This reverts commit 061cf5c6580c8375e1f9aa249858d85fa9a264c0.

commit 41aa8e12c90b9a0a3510d45fa12aa14cff06dfe1
Merge: dc0b1269aa 061cf5c658
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 18:15:53 2024 +0300

    Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

commit 061cf5c6580c8375e1f9aa249858d85fa9a264c0
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 18:15:17 2024 +0300

    Revert "Add website link support for guidebooks"

    This reverts commit c1236bf5cd9a3ff1c95f04a8f0acae79bcfea963.

commit dc0b1269aa5fa53c13e9967165aece41da761a82
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:24:53 2024 +0300

    Reapply "Update Starshine rules"

    This reverts commit 5d3218be86d472f06189c5d915de4c08266a8ef5.

commit d27ae3bd6e2b284f72d9179dbc3578ca849a8d32
Merge: e15bea3392 5d3218be86
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:23:17 2024 +0300

    Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

commit 5d3218be86d472f06189c5d915de4c08266a8ef5
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:22:07 2024 +0300

    Revert "Update Starshine rules"

    This reverts commit 8dc84d823293e2487cdf960e516536e9a62a15a5.

    # Conflicts:
    #	Resources/Prototypes/Guidebook/rules.yml
    #	Resources/ServerInfo/Starshine/Guidebook/ServerRules/CoreRules/StarshineRule4NoERP.xml
    #	Resources/ServerInfo/Starshine/Guidebook/ServerRules/CoreRules/StarshineRule6Metacomms.xml
    #	Resources/ServerInfo/Starshine/Guidebook/ServerRules/CoreRules/StarshineRule8ICSituations.xml
    #	Resources/ServerInfo/Starshine/Guidebook/ServerRules/CoreRules/StarshineRule9Behaviour.xml

commit 845586a2a6eecb96edec4c6ae59f5b9a1da24d0f
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:21:16 2024 +0300

    Revert "Add Corporate Law guidebooks"

    This reverts commit f3d31e320b7b67bf45326508447846676a089f67.

    # Conflicts:
    #	Resources/Prototypes/Guidebook/rules.yml
    #	Resources/ServerInfo/Starshine/Guidebook/ServerRules/CorporateLaw/CorporateLaw.xml

commit 55db790586c15ae78317c8ff25588f6634d5b6d9
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:20:08 2024 +0300

    Revert "Fix guidebook rules"

    This reverts commit c7cc5912cc94c016a6870900437131c2d4927e44.

commit e15bea339224dfc7c2008b6ab600d14a5ac2c10f
Merge: 753a0c81b1 5cca493d9a
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:13:35 2024 +0300

    Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

commit 5cca493d9a9e855228b519269d1db0ea7ef5ada6
Author: MilenVolf <[email protected]>
Date:   Thu Jun 13 12:12:01 2024 +0300

    Update rule 8

commit e02ef6825991ea56440074ec576152219de4e7fd
Author: PJBot <[email protected]>
Date:   Thu Jun 13 06:39:49 2024 +0000

    Automatic changelog update

commit 8791f98f0bed4f44ee55651cbaae7e81d6014341
Author: ShadowCommander <[email protected]>
Date:   Wed Jun 12 23:38:43 2024 -0700

    Fix playtime on player tab getting set to Unknown (#28876)

    Update play time on admin panel player tab after db loads

commit 68dc1fb055e2b56c1f7ef0a4506341309d67e79e
Author: Tayrtahn <[email protected]>
Date:   Thu Jun 13 02:37:31 2024 -0400

    Fix ninja Spider Clan charge not getting a target (#28871)

commit 99f2e6ffa8c66ed33a0fb1a77b3cf8a157d9dbbb
Author: PJBot <[email protected]>
Date:   Thu Jun 13 06:31:45 2024 +0000

    Automatic changelog update

commit d38ad122622a21199eec86e58c704b6aa397482f
Author: Leon Friedrich <[email protected]>
Date:   Thu Jun 13 18:31:21 2024 +1200

    Fix `playtime_addrole` command printing the wrong time (#28783)

commit 249e4a9c15c8e3960dd1cd77db4ad4090bf6609d
Author: Doomsdrayk <[email protected]>
Date:   Thu Jun 13 00:30:39 2024 -0600

    Fix guns appearing to cycle bolt when wielded (#28756)

    Adds a check during wielding to see if the code is running clientside, and if so skip the part responsible for creating the virtual items.

    This is necessary because TrySpawnVirtualItem is blocked from running clientside, so trying to spawn the virtual items for wielding causes the client to always believe the wield has failed. This erroneous failure leads to the display of incorrect feedback until the server's successful wield attempt makes it to the client. The added check prevents wielding from failing in this way and therefore allows the client to behave as expected.

commit d865bffff3ea620d0562422c869c6e2a02cf68b1
Author: Cojoke <[email protected]>
Date:   Wed Jun 12 23:45:52 2024 -0500

    Fix .30 ammo listing wrong number of bullets in uplink (#28919)

commit d9bac82402507c78852d2c37292403d5a3136ae3
Author: deltanedas <[email protected]>
Date:   Thu Jun 13 02:24:08 2024 +0000

    localize RoleBriefing (#28824)

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

commit ab8b3ecec2a139069c3ee76d5961f1b5758edae2
Author: geraeumig <[email protected]>
Date:   Thu Jun 13 04:23:15 2024 +0200

    Fix magazine sprites after Auto Eject (#28859)

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

commit 22b1ec9775a3f4618c3faa780507eee0c1e02c7d
Author: Moomoobeef <[email protected]>
Date:   Wed Jun 12 19:20:28 2024 -0700

    added a new sprite for the super synthesizer. (#28884)

commit 020b2919ac1f7009f7e829eb685d02c69979a555
Author: PJBot <[email protected]>
Date:   Thu Jun 13 02:20:16 2024 +0000

    Automatic changelog update

commit 1d4d6c33317f58f05180abb63ddf6419f5296d25
Author: Plykiya <[email protected]>
Date:   Wed Jun 12 19:19:10 2024 -0700

    Fix gauze stopping if it stops bleeding (#28844)

    delete a line

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

commit 7d4586b27bc56a040e0ff76065a55d525b6d7a9f
Author: PJBot <[email protected]>
Date:   Thu Jun 13 02:18:41 2024 +0000

    Automatic changelog update

commit 865810c6e122cb2f4f8eb601c17bf9b84690f890
Author: Cojoke <[email protected]>
Date:   Wed Jun 12 21:17:35 2024 -0500

    New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)

    * New Sprites for Tranq

    * Add consistancy to secfab print

commit d322a82bdf7ff4be344d6c8350ad8867b4c625aa
Author: Stalen <[email protected]>
Date:   Thu Jun 13 05:17:07 2024 +0300

    Pets toggle internals fix (#28904)

commit 0e32d632faf27dd6903369237328dffbaa96dc0a
Author: Verm <[email protected]>
Date:   Wed Jun 12 21:15:43 2024 -0500

    Make automatic gasps not create a chat message (#28907)

    No chat gasp

commit dc0327c3c0c7834823aeaf7e11eef6993e5fdc77
Author: Partmedia <[email protected]>
Date:   Wed Jun 12 18:15:15 2024 -0800

    Update PA admin warnings (#28911)

    With singulo fixed, PA strength 3 and below (level 2) are now safe.
    Update the admin logging to reflect this.

commit 12911d292f307485476f943d3e33adb0b67e76f8
Author: bibbly <[email protected]>
Date:   Wed Jun 12 22:09:10 2024 -0400

    Reach Fixes (#28913)

    various small changes to Reach

commit 1aa5e023d4b30c05b715a92c07a47f26a0b26f70
Author: PJBot <[email protected]>
Date:   Wed Jun 12 22:57:13 2024 +0000

    Automatic changelog update

commit 35e5a96b7ebb73c67b3fade4d6ed731028dfc551
Author: Partmedia <[email protected]>
Date:   Wed Jun 12 14:56:07 2024 -0800

    Fix queued deletion check (singulo loosing at beyond PA 1 but only on live servers) (#28906)

    Fix queued deletion check

commit b091a55d7d1e24962fdc2c924e0ae2ac8e4a14ee
Author: dragonryan06 <[email protected]>
Date:   Wed Jun 12 18:05:56 2024 -0400

    Add new icon for Remove Evidence verb (#28898)

commit ca39135c99e51a2db89a9d9088ed34d666256ecc
Author: PJBot <[email protected]>
Date:   Wed Jun 12 18:12:00 2024 +0000

    Automatic changelog update

commit 8c514b90fde39594a59babd76086008b6c8635c3
Author: deltanedas <[email protected]>
Date:   Wed Jun 12 18:10:53 2024 +0000

    fix pda ui troll (#28896)

    * fix pda ui troll

    * bruh

    ---------

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

commit 9b40bcc1d9cd63938ccd9833628c23761feef456
Author: PJBot <[email protected]>
Date:   Wed Jun 12 13:34:04 2024 +0000

    Automatic changelog update

commit 94bf301a8bbf975763904121d5f5dfa5c15ec7f6
Author: Robert V <[email protected]>
Date:   Wed Jun 12 06:32:57 2024 -0700

    Comms Consoles without CanShuttle can no longer recall (#28803)

    Consoles without CanShuttle can no longer recall

commit a0f709918d9848116dfeafc86b5005c3d5bb65cf
Author: PJBot <[email protected]>
Date:   Wed Jun 12 10:33:18 2024 +0000

    Automatic changelog update

commit 90354fa6d3c5a4e77273fc621f011f7adaae6e73
Author: Deserty0 <[email protected]>
Date:   Wed Jun 12 20:32:11 2024 +1000

    Fix "no materials loaded" messege in lathes (#28885)

    fix

commit 9a32a1949c57d9b22583ff345c64a2c0f622e805
Author: Flareguy <[email protected]>
Date:   Wed Jun 12 01:04:43 2024 -0500

    Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)

    * replace the grass sprites. again

    * Fix dirt

    ---------

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

commit d6399446b6bd1da1cd70c0b140d3c4c3b1c2eba9
Author: PJBot <[email protected]>
Date:   Wed Jun 12 01:08:43 2024 +0000

    Automatic changelog update

commit 3d2589366415d17aa5d2b3091f7936d6938eb1f9
Author: Boaz1111 <[email protected]>
Date:   Wed Jun 12 03:07:37 2024 +0200

    Cluster Update (#28854)

    Changes armoury, cargo job slot

commit c5b30a384f0e1cd2cbf24b880df3dd424780eb13
Author: PJBot <[email protected]>
Date:   Tue Jun 11 22:19:37 2024 +0000

    Automatic changelog update

commit bd42c2b56aa6efc22e0a1ed8aba12d6f0964e24b
Author: Tayrtahn <[email protected]>
Date:   Tue Jun 11 18:18:30 2024 -0400

    Fix nearest beacon messages reporting the opposite direction (#28869)

    * Fix nearest beacon messages reporting the opposite direction

    * Lets document that method, shall we?

commit 753a0c81b16cc81aa41e382ea5662ddb7e6bb397
Author: MilenVolf <[email protected]>
Date:   Wed Jun 12 00:26:17 2024 +0300

    Fix tests fail

commit b6d7a6a8e26570aa1bb12f9a9d277fda57f4112f
Author: PJBot <[email protected]>
Date:   Tue Jun 11 09:34:42 2024 +0000

    Automatic changelog update

commit 41a0ffba38e367f4f0d134e7acfb1493adaf04f6
Author: lzk <[email protected]>
Date:   Tue Jun 11 11:33:36 2024 +0200

    Add reward line in bounty label (#28853)

commit be12a59327e3dd0bf0b2177109ccd684d3557eab
Author: MilenVolf <[email protected]>
Date:   Tue Jun 11 12:15:49 2024 +0300

    Fix infolinks and build fail

commit 2b2883005d0765bc465bdff121d99e624a91578b
Author: lzk <[email protected]>
Date:   Tue Jun 11 07:55:37 2024 +0200

    Fix some wideswing animations (#28819)

    * Fix some wideswing animations

    * 2

commit 3c2b1affeffaa89babb644d0cfa9c227f3cf0553
Author: PJBot <[email protected]>
Date:   Tue Jun 11 02:49:30 2024 +0000

    Automatic changelog update

commit f571e230378e5d5d11bcf61c4f4127b14c43e454
Author: dffdff2423 <[email protected]>
Date:   Mon Jun 10 21:48:23 2024 -0500

    Enable save button on changing job unavailable preference (#28839)

    Enable save button on changing unavailable pref

    Fix an issue where the save button was disabled when just changing your job unavailable preference

commit 3f44076f028db56bd29c278cafc4462565be3cc2
Merge: 598a6755ea cb61e71478
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 23:32:44 2024 +0300

    Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

    # Conflicts:
    #	Content.Client/Info/RulesPopup.xaml
    #	Content.Server/Flash/Components/FlashImmunityComponent.cs
    #	Content.Shared/Flash/FlashableComponent.cs
    #	Content.Shared/Roles/AntagPrototype.cs
    #	Resources/Locale/en-US/connection-messages.ftl
    #	Resources/Locale/en-US/info/rules.ftl
    #	Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl
    #	Resources/Locale/en-US/traits/traits.ftl
    #	Resources/Locale/ru-RU/info/rules.ftl
    #	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/anomalies.ftl
    #	Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/events.ftl
    #	Resources/Locale/ru-RU/traits/traits.ftl
    #	Resources/Maps/cluster.yml
    #	Resources/Maps/core.yml
    #	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
    #	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
    #	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
    #	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
    #	Resources/Prototypes/Catalog/revenant_catalog.yml
    #	Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
    #	Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
    #	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
    #	Resources/Prototypes/GameRules/events.yml
    #	Resources/Prototypes/Loadouts/loadout_groups.yml
    #	Resources/Prototypes/Maps/marathon.yml
    #	Resources/Prototypes/Maps/packed.yml
    #	Resources/Prototypes/Roles/Antags/nukeops.yml
    #	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
    #	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
    #	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
    #	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
    #	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
    #	Resources/Prototypes/Roles/Jobs/Security/warden.yml
    #	Resources/Prototypes/Voice/speech_emote_sounds.yml
    #	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
    #	Resources/ServerInfo/Guidebook/Controls/Controls.xml
    #	Resources/ServerInfo/Guidebook/Controls/Radio.xml
    #	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
    #	Resources/ServerInfo/Guidebook/Science/Science.xml
    #	Resources/ServerInfo/Guidebook/Service/Chef.xml
    #	Resources/ServerInfo/Guidebook/SpaceStation14.xml
    #	Resources/Textures/LobbyScreens/attributions.yml
    #	Resources/migration.yml

commit 598a6755eae9f7eee1750720d096eea35459e59b
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 20:43:43 2024 +0300

    weh

commit ffaeaea2d04d0c40e6469ff70f3441ae175aaa3e
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 20:20:48 2024 +0300

    Revert "Кнопка в правилах (#214)"

    This reverts commit 5ddc3cc0cf27e02ca5998f8328e8e0eabde3cf5d.

    # Conflicts:
    #	Resources/Locale/ru-RU/info/rules.ftl

commit 1207b676f5ce6a3965f6798cc3f158c9b665057f
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 20:04:05 2024 +0300

    Remove whitelist system

    Reverts 419fe7d732e71e9da1b1760615db4df2ad15403d

commit cb61e71478b3a44ce157444c8e290b8d2983084f
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 18:32:17 2024 +0300

    Localization

commit be328c0ac064d77973940265c7db68c9ca714146
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 17:29:26 2024 +0300

    Update russian locale

commit 54ae831acd10e39b7799e34fa6c2bcc4822d63ec
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 17:29:06 2024 +0300

    Update english locale

commit 95af28ee07c31fb749800ad0e91e77437ab5e6a9
Merge: 02ef04704d d3d8a9e59c
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 17:22:07 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

commit 02ef04704da4f27aae1dfc6a6a5c627c85563114
Merge: a4101ebecd 7032c0106a
Author: MilenVolf <[email protected]>
Date:   Mon Jun 10 16:45:25 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

    # Conflicts:
    #	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
    #	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
    #	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
    #	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
    #	Resources/ServerInfo/Guidebook/Controls/Controls.xml
    #	Resources/ServerInfo/Guidebook/Controls/Radio.xml
    #	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
    #	Resources/ServerInfo/Guidebook/Jobs.xml
    #	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
    #	Resources/ServerInfo/Guidebook/Medical/Medical.xml
    #	Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
    #	Resources/ServerInfo/Guidebook/Science/Science.xml
    #	Resources/ServerInfo/Guidebook/Security/Security.xml
    #	Resources/ServerInfo/Guidebook/Service/Bartender.xml
    #	Resources/ServerInfo/Guidebook/Service/Chef.xml
    #	Resources/ServerInfo/Guidebook/SpaceStation14.xml
    #	Resources/ServerInfo/Guidebook/Survival.xml

commit d3d8a9e59c10b920fee3629651b2f03f6fc8ddd4
Author: PJBot <[email protected]>
Date:   Mon Jun 10 13:22:04 2024 +0000

    Automatic changelog update

commit 63ad5e0b838cf2891d89ddc1bb100afb327b4545
Author: Nemanja <[email protected]>
Date:   Mon Jun 10 09:20:58 2024 -0400

    enable search filters on drinks guidebook (#28815)

commit b60c9a8fe83a9e2fcac709428a42ef725369ac8e
Author: PJBot <[email protected]>
Date:   Mon Jun 10 13:20:31 2024 +0000

    Automatic changelog update

commit bc5a6279f508d2f3d1c90b2f948a138c1490063c
Author: Zonespace <[email protected]>
Date:   Mon Jun 10 15:19:24 2024 +0200

    Fixes a typo in the glossary (#28818)

    independance -> independence

    Co-authored-by: John Doe <[email protected]>

commit 7032c0106ab7ffb8459790d7c09e07a0f9a2be4d
Author: Chief-Engineer <[email protected]>
Date:   Sun Jun 9 22:13:26 2024 -0500

    Fix description of temp servers and add region tags (#28811)

    * Fix description of LRP temp servers

    * update regions

commit e95fb9aa7f82115929c5dce6785c914b076c0bc9
Author: nikthechampiongr <[email protected]>
Date:   Sun Jun 9 23:41:04 2024 +0000

    Disable panic bunker for servers (#28812)

    * Disable panic bunker for servers

    * Add disabled stuff back in to be reenabled later

commit 08040204107529d704c559d7cab5788751bfe737
Author: Pieter-Jan Briers <[email protected]>
Date:   Mon Jun 10 00:13:29 2024 +0200

    FUCK (#28808)

commit edd13ad82f063c955a6e20f2c4beafcf9147903e
Author: Leon Friedrich <[email protected]>
Date:   Mon Jun 10 09:48:47 2024 +1200

    Fix wizardsDenCoreOnly.toml (#28807)

    Fix wizardsDenCoreOnly

commit d741968714bbf742f749140b2b93ec0ba435bbf1
Author: Chief-Engineer <[email protected]>
Date:   Sun Jun 9 16:32:10 2024 -0500

    Temporarily update server configs (#28780)

    * update configs

    * Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

    * Update Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml

    * LF

    * Apply suggestions from code review

    Co-authored-by: Julian Giebel <[email protected]>

    * Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

    Co-authored-by: Julian Giebel <[email protected]>

    ---------

    Co-authored-by: Pieter-Jan Briers <[email protected]>
    Co-authored-by: Julian Giebel <[email protected]>

commit 1bb9d9451fcd410f172222666eb2a0514cdd2288
Author: Hannah Giovanna Dawson <[email protected]>
Date:   Sun Jun 9 21:45:47 2024 +0100

    Panic Bunker uses minutes not hours (#28805)

    * Panic Bunker uses minutes not hours

    * Fixing an instance of hours

commit 50d83b936046d44b33cee28019dbe49eb814223e
Author: Nemanja <[email protected]>
Date:   Sun Jun 9 16:01:05 2024 -0400

    Cap scramble tag (#28804)

commit a4101ebecd886426c84aabc79250d2b3fac14326
Author: MilenVolf <[email protected]>
Date:   Sun Jun 9 22:28:43 2024 +0300

    Clean out old locale files

commit de07c291de827bd8a2e843974d4362a13be3bb89
Author: Julian Giebel <[email protected]>
Date:   Sun Jun 9 21:18:54 2024 +0200

    Implement map text (#28705)

commit 3ceb92a0c43d3815d65c8124cd6bea3be5140455
Author: Hannah Giovanna Dawson <[email protected]>
Date:   Sun Jun 9 19:58:10 2024 +0100

    SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)

commit f4e80b0daecaa4c330f49d44ac608a0f0cb52e0c
Author: PJBot <[email protected]>
Date:   Sun Jun 9 18:29:52 2024 +0000

    Automatic changelog update

commit fffa1dfd3fc9e1bd9b74099054018f1a02dc70e9
Author: Thomas <[email protected]>
Date:   Sun Jun 9 13:28:46 2024 -0500

    Update Cargo Guidebook (#28775)

commit b51e787fd7e4b5c9711e152538fd4e366ca5d2ec
Author: Nemanja <[email protected]>
Date:   Sun Jun 9 14:03:47 2024 -0400

    new station and shifts guide (#28799)

commit 1490fc36d3be1bbc49c854e3d79d6399e63a1160
Author: Nemanja <[email protected]>
Date:   Sun Jun 9 14:02:35 2024 -0400

    Redo new player & controls guidebooks (#28794)

commit bcf1069c7b31ddf26ca613897cdbdbeac27dba70
Author: PJBot <[email protected]>
Date:   Sun Jun 9 16:27:56 2024 +0000

    Automatic changelog update

commit 346ac44a28dca541139a87ac367bf9d8f9dbc54c
Author: AJCM-git <[email protected]>
Date:   Sun Jun 9 12:26:48 2024 -0400

    Open the guidebook when people with less than an hour playing join the round (#28774)

    * Open the guidebook when people with less than an hour playing join the round

    * Filter for gameplayState

    * Fix tests

    * tweaks

    * saltern update (#28773)

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

    * Fix admin menu objects list (#28787)

    * Make `MakeAntag()` log errors instead of throwing exceptions (#28771)

    Make `MakeAntag()` log errors instead of throw

    * add default page support for the guidebook (#28772)

    * Probably a better way to handle this

    ---------

    Co-authored-by: deltanedas <[email protected]>
    Co-authored-by: Leon Friedrich <[email protected]>
    Co-authored-by: Nemanja <[email protected]>

commit c549573f7aa6ca2c66f05a3f55f1001bb6791530
Author: Nemanja <[email protected]>
Date:   Sun Jun 9 11:55:21 2024 -0400

    add default page support for the guidebook (#28772)

commit ad9d18771e490019716ca94e0cd1b8f38cc9a91a
Author: Leon Friedrich <[email protected]>
Date:   Mon Jun 10 01:53:03 2024 +1200

    Make `MakeAntag()` log errors instead of throwing exceptions (#28771)

    Make `MakeAntag()` log errors instead of throw

commit 8d52f6b617757eae801c325fb1f75e14f626a393
Author: Leon Friedrich <[email protected]>
Date:   Mon Jun 10 01:51:02 2024 +1200

    Fix admin menu objects list (#28787)

commit b7b7186081013310f9d9547e80f55d066b65fd4f
Author: MilenVolf <[email protected]>
Date:   Sun Jun 9 16:40:59 2024 +0300

    Fix engine locale files

commit fb1ab6469a443b97e202ed5d6d680f6083171be0
Author: deltanedas <[email protected]>
Date:   Sun Jun 9 02:33:40 2024 +0000

    saltern update (#28773)

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

commit 5f91c3f27f2d6d8cb67413d2e85f3fa13a38d89a
Author: Tayrtahn <[email protected]>
Date:   Sat Jun 8 19:57:07 2024 -0400

    Strip markdown from silicon laws before saying them (#28596)

commit 468728c995f6e760058242d2a20318cfd4727f7d
Author: PJBot <[email protected]>
Date:   Sat Jun 8 23:30:57 2024 +0000

    Automatic changelog update

commit 182fe2993fe069db69b9bc976e5e64327405a1a8
Author: Psychpsyo <[email protected]>
Date:   Sun Jun 9 01:29:51 2024 +0200

    Add Jani lobby background (#28724)

    * Add jani lobby background

    * Actually make new lobby screen functional

    * Fix license

commit c061d9c2481c37bc04f9cc4a8be7775b6637c8a4
Author: TsjipTsjip <[email protected]>
Date:   Sun Jun 9 01:26:12 2024 +0200

    Add suffixes to excap survival boxes (#28755)

    Update emergency.yml

commit 6a8892f930c476e715b2a5567e6a60bb915fb4b5
Author: PJBot <[email protected]>
Date:   Sat Jun 8 23:01:50 2024 +0000

    Automatic changelog update

commit c6ff1e44fb5cc6771be6781d2946587934cc6a0d
Author: UBlueberry <[email protected]>
Date:   Sat Jun 8 19:00:43 2024 -0400

    Guidebook Updates for the Amateur Spessman (#28603)

    * Created NewPlayer.xml

    * Created NewPlayer.yml and added it to guides.ftl

    * shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later

    * switched some stuff between the New? entry and the Space Station 14 entry

    * Made everything so nice!!!!!!!!!!!!!!

    * fixed formatting inconsistencies

    * added a How to use this guidebook section

    * build correction and guidebook clarification for other servers

    * wrote character creation ig probs fo shizzle

    * added new terms to the glossary and alphabetized it

    * meh this seems important enough to add

    * okay no more shitsec bad idea

    * I HATED Roleplaying.xml ANYWAY!!!

    * I REALLY REALLY HATED IT ACTUALLYLLL

    * Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete

    * Separated the character creation bits that are just cosmetic from the ones that matter

    * also put all the related new player xml files in their own folder

    * expanded Radio.xml, kinda fixed survival.xml

    * removed the line that mighta maybe sorta possibly could encourage self antag

    * thought about this randomly but ICK OCK

    * talking is no longer a key part of this game

    * moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around

    * ah probably should make sure this works first also me when i lie on the internet

    * don't be such a grammar nukie

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

    * okay nevermind that's justified

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

    * prepare. it is coming. the great reorganization...

    * yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.

    * rename that real quick

    * step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.

    * update shiftandcrew.yml to only have departments as children also fuck it alphabetization

    * consolidated salvage into cargo

    * made a new entry for command

    * gave salvage a home and service an existence

    * made some XML files to be filled out later

    * quick rename...

    * took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml

    * The Great Writing about Departments (25XX, black and white)

    * added a bunch of links everywhere

    * biochemical is no longer a thing

    * service formatinaaaaaaa

    * shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,

    * let's get that fixed

    * second time i made a typo there as well

    * we hate fun around here

    * grammar?!???/

    * various fixes and more linkings

    * oops

    * wewlad lol!!

    ---------

    Co-authored-by: Tayrtahn <[email protected]>
    Co-authored-by: AJCM <[email protected]>

commit 0700f7035be247b1416ba44405196aebd3556a53
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 23:05:13 2024 +0300

    Update locale

commit c7cc5912cc94c016a6870900437131c2d4927e44
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 22:32:24 2024 +0300

    Fix guidebook rules

commit 934d2869e8b0b56498978e91e82880ceb76835a3
Merge: 029551ed16 7f686a6ae5
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 22:06:40 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

commit 7f686a6ae58e2fc73d9f6649527259d6fee7f2cd
Author: Tayrtahn <[email protected]>
Date:   Sat Jun 8 14:50:20 2024 -0400

    Fix null ref exception in PrayerSystem (#28712)

    * Fix null ref exception in PrayerSystem

    * Also check that prayable ent/comp still exist

commit cce50da1707153599d89292a8118ffb05f1b3956
Author: PJBot <[email protected]>
Date:   Sat Jun 8 18:49:15 2024 +0000

    Automatic changelog update

commit e3c37f6e9b14a901d2ec0b04194d24ddea660717
Author: metalgearsloth <[email protected]>
Date:   Sun Jun 9 04:48:09 2024 +1000

    Maybe fix invalid loadout prototypes (#28734)

    * Maybe fix invalid loadout prototypes

    So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

    Need someone affected to send me their loadout to confirm it's fixed.

    * Better fix

commit 1fdbf9403a6d28ffefc867aeb21db3db017a6404
Author: metalgearsloth <[email protected]>
Date:   Sun Jun 9 04:43:21 2024 +1000

    Don't use invalid defaults for loadouts (#28729)

    At the time it made more sense but now with species specific stuff it's better to have nothing.

commit 029551ed1641faa5658ef4d1ee39c6ac3f472c41
Merge: c1236bf5cd c79384c5fd
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 20:12:37 2024 +0300

    Merge branch 'master' of https://github.com/space-wizards/space-station-14 into master-ru

    # Conflicts:
    #	Content.Shared/Preferences/HumanoidCharacterProfile.cs

commit c1236bf5cd9a3ff1c95f04a8f0acae79bcfea963
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 20:08:50 2024 +0300

    Add website link support for guidebooks

commit f3d31e320b7b67bf45326508447846676a089f67
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 20:08:00 2024 +0300

    Add Corporate Law guidebooks

commit c79384c5fd0156cea5db6db9576674fab28e534c
Author: PJBot <[email protected]>
Date:   Sat Jun 8 14:37:53 2024 +0000

    Automatic changelog update

commit 4089d6a664948e3a90f67f964fbd69f33594c7a9
Author: Nemanja <[email protected]>
Date:   Sat Jun 8 10:36:47 2024 -0400

    fix singulo decay (#28743)

commit 33e68dc51f4502142fd03e40999bc3040a0727ad
Author: PJBot <[email protected]>
Date:   Sat Jun 8 10:41:39 2024 +0000

    Automatic changelog update

commit 8cf903727313e7e6ce2fe4c172146f6cae8659a2
Author: nikthechampiongr <[email protected]>
Date:   Sat Jun 8 10:40:33 2024 +0000

    Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664)

commit 511336beb8a47fd12c2e5e42522f670308ed5bf9
Author: PJBot <[email protected]>
Date:   Sat Jun 8 10:39:01 2024 +0000

    Automatic changelog update

commit 123dfee3a37da657633381990c50d8fb81d21b79
Author: Whisper <[email protected]>
Date:   Sat Jun 8 06:37:55 2024 -0400

    allow ' in character names (#28652)

commit db6548bc99d66cc5cd7f67ed6bd194601b1c241a
Author: Vasilis <[email protected]>
Date:   Sat Jun 8 13:33:51 2024 +0300

    Ensure packager creates a release folder (#28426)

    I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.

commit c4966e51776eca4582b7391be1d4f7dd2f6071bd
Author: PJBot <[email protected]>
Date:   Sat Jun 8 10:28:27 2024 +0000

    Automatic changelog update

commit 7ef7fe6761dcbf541785210ff361d79bf4080dcc
Author: Leon Friedrich <[email protected]>
Date:   Sat Jun 8 22:27:21 2024 +1200

    Try fix RGBee (#28741)

commit 8dc84d823293e2487cdf960e516536e9a62a15a5
Author: MilenVolf <[email protected]>
Date:   Sat Jun 8 13:17:43 2024 +0300

    Update Starshine rules

commit 74ed68b2d5f3aad6be270b8a7fd316abefe25b7a
Author: PJBot <[email protected]>
Date:   Sat Jun 8 10:05:00 2024 +0000

    Automatic changelog update

commit 45015188cd5d6c0df9da9b63c7d54de48ec2009c
Author: metalgearsloth <[email protected]>
Date:   Sat Jun 8 20:03:54 2024 +1000

    Add loadout group check for role proto (#28731)

    MFW same bug twice at 2 layers because I'm stupid.

commit b50faffcc310dbd4bd49b591d107c2619bbffbb1
Author: MerrytheManokit <[email protected]>
Date:   Sat Jun 8 04:48:49 2024 -0400

    rn, atp (#28674)

    * Update speech-chatsan.ftl

    * Update word_replacements.yml

    * Atm-at the moment

    * Atm

    * Update Resources/Locale/en-US/speech/speech-chatsan.ftl

    * Update Resources/Prototypes/Accents/word_replacements.yml

    ---------

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

commit 2c7598fd5b1197674c98a56c1b7bb167c33b1cca
Author: Leon Friedrich <[email protected]>
Date:   Sat Jun 8 20:48:23 2024 +1200

    Fix flatpacker (#28736)

    * Fix flatpacker

    * a

commit c2bbc72cf40c12710c88f815a70251e0872fed5a
Author: Ubaser <[email protected]>
Date:   Sat Jun 8 18:35:58 2024 +1000

    Update Core (#28735)

    add

commit a7c7cd74ec52a00d6471cf590341d6208bb217a5
Author: DrSmugleaf <[email protected]>
Date:   Fri Jun 7 22:53:54 2024 -0700

    Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690)

commit 49496b40e5e7f21cf938cf6b96b4095e43dd791d
Author: Tayrtahn <[email protected]>
Date:   Sat Jun 8 01:53:17 2024 -0400

    Improve grammar of various petting messages (#28715)

    Improve grammar of various petting message

commit 4d10f3523b99bf6a4f96f078109c5fd81386da47
Author: PJBot <[email protected]>
Date:   Sat Jun 8 05:50:48 2024 +0000

    Automatic changelog update

commit 1584a50a1d99b132ac1e6d3c6e010524d7af0397
Author: Lyndomen <[email protected]>
Date:   Sat Jun 8 01:49:42 2024 -0400

    Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

    * Update DevourSystem.cs

    * Update DevourSystem.cs

    * Update Content.Server/Devour/DevourSystem.cs

    ---------

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

commit 7f1933169eca9309953ffa0fb424763efd850e7a
Author: DrSmugleaf <[email protected]>
Date:   Fri Jun 7 22:36:29 2024 -0700

    Add DoPopup data field to OnUseTimerTrigger (#28691)

commit 0762f9da175966700ed961200ab3329dc556c12d
Author: DrSmugleaf <[email protected]>
Date:   Fri Jun 7 22:34:48 2024 -0700

    Fix action icons when dragging an active action to another slot (#28692)

commit f37060fc1be72e809730ad39f3ed849796168327
Author: Flareguy <[email protected]>
Date:   Fri Jun 7 21:15:13 2024 -0500

    Ports the singularity's values from vgstation (#28720)

    * ports the singularity values from vgstation

    * guidebook fix

    * 5000 energy level 6 singulo

commit b714210e38e3a9bbf6228853aab0a82f67572df9
Author: PJBot <[email protected]>
Date:   Sat Jun 8 00:58:14 2024 +0000

    Automatic changelog update

commit d19b430a92611823bb4cc69bf40bef4df9db2071
Author: Plykiya <[email protected]>
Date:   Fri Jun 7 17:57:07 2024 -0700

    Swap some InRangeUnobstructed for InRangeUnoccluded (#28706)

    Swap InRangeUnobstructed to InRangeUnoccluded

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

commit 567d6a08882304670d6639b80b64e70de8f6f2ea
Author: lzk <[email protected]>
Date:   Sat Jun 8 02:56:25 2024 +0200

    Add locale support for booze and soda jugs labels (#28708)

commit 63e0ee08cb50dbd937e11ab1e965b5f79aae134d
Author: AJCM-git <[email protected]>
Date:   Fri Jun 7 15:53:20 2024 -0400

    Fixes client having authority over rules popup cvars (#28655)

    * Fixes client having authority over rules popup cvars

    * Delete duplicate migration

    * Pre-update

    * Post-update

commit a1a3a0d131e5c89ba26df74092b3307fb291e899
Author: Ubaser <[email protected]>
Date:   Sat Jun 8 04:39:22 2024 +1000

    Tweak chapel salvage wreck (#28703)

    add

commit b2f5021b4e8058dffe7e68af42185d24d978a928
Author: MilenVolf <[email protected]>
Date:   Fri Jun 7 19:55:50 2024 +0300

    Localization

commit b632a653854b04c77d10548078d5d4d33762d162
Author: Leon Friedrich <[email protected]>
Date:   Sat Jun 8 04:43:02 2024 +1200

    Add JobRequirementOverride prototypes (#28607)

    * Add JobRequirementOverride prototypes

    * a

    * invert if

    * Add override that takes in prototypes directly

commit b3debf449ab8b25d0d196ee0b6db693950d10f99
Author: Chief-Engineer <[email protected]>
Date:   Fri Jun 7 09:03:22 2024 -0500

    rule fixes first pass (#28701)

    update

commit 24055021776c814bd14d3abac5256aaa6fbd66cc
Author: PJBot <[email protected]>
Date:   Fri Jun 7 11:30:02 2024 +0000

    Automatic changelog update

commit accf8adf972ec28da489c4dfc5cfa89453d88f03
Author: AJCM-git <[email protected]>
Date:   Fri Jun 7 07:28:55 2024 -0400

    Fixed the guidebook listing every single rule (#28680)

    * Well i tried this way

    * New approach (start)

    * Did it

    * makes spacelaw available, put it under sec

commit 7ba26f4592e9bc6cc281ab861a27c3a9526e7fe7
Author: Ubaser <[email protected]>
Date:   Fri Jun 7 15:00:02 2024 +1000

    Update Core (#28689)

    add

commit 6bae088d7a5fb19ade7a943a5c088e77d0b2f1dd
Author: PJBot <[email protected]>
Date:   Fri Jun 7 01:25:13 2024 +0000

    Automatic changelog update

commit f2792e98b7e6a30dbaab9eb9ac3d9b8eec993aa6
Author: blueDev2 <[email protected]>
Date:   Thu Jun 6 21:24:07 2024 -0400

    Return medicine recipe solid material costs to 1 (#28679)

    Set material costs of medicine recipes to 1

commit b317fa4ccf92ec7a8158fc4bf2e7eb5438f85868
Author: Nemanja <[email protected]>
Date:   Thu Jun 6 20:55:35 2024 -0400

    Flatpacker fixes (#28417)

commit 08d2918fe7de1aab704a9a634e618626cca20148
Author: Verm <[email protected]>
Date:   Thu Jun 6 19:37:41 2024 -0500

    Fix typo in slime naming conventions (#28682)

commit 997e34de9f9da60f5ca300b5e14f02ac2f0419cb
Author: PJBot <[email protected]>
Date:   Thu Jun 6 22:27:19 2024 +0000

    Automatic changelog update

commit 3dc4f82833846a0db1728bb9814616ad447c0a41
Author: Mr. 27 <[email protected]>
Date:   Thu Jun 6 18:26:13 2024 -0400

    fix janitor not spawning with a survival box (#28669)

    hi

commit 6e98965e6aba43c319d45de4903e215335e1aefc
Author: Moomoobeef <[email protected]>
Date:   Thu Jun 6 12:47:41 2024 -0700

    fixed "silicones" typo in new rules (#28671)

    fixed all appearances of silicone where it should have been silicon

commit 5773970a2a0b3ae58fd8319c09775b122988e35a
Author: PJBot <[email protected]>
Date:   Thu Jun 6 19:25:20 2024 +0000

    Automatic changelog update

commit e72ac31d5d5f5ff3ff7d26ec56d9c2dbf13e0225
Author: Thomas <[email protected]>
Date:   Thu Jun 6 14:24:13 2024 -0500

    Fix typo in Space Law's restricted gear (#28668)

    This typo was included in the wiki as well.

    Reported-by: Bobberson in the Discord

commit b0d5b60d60a18b0e83384dd830198731f0aad18d
Author: MilenVolf <[email protected]>
Date:   Thu Jun 6 15:50:20 2024 +0300

    Update russian locale files

commit 252d81b72fa0951a8defcad28a2d23f336c9a154…
  • Loading branch information
@Elst28
Elst28 committed Jun 17, 2024
1 parent d2df1e7 commit 5ce9e51
Show file tree
Hide file tree
Showing 1,534 changed files with 1,095,323 additions and 1,058,031 deletions.
14 changes: 8 additions & 6 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
root = true

[*]

charset = utf-8
Expand Down Expand Up @@ -278,7 +279,7 @@ dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case

dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.constants_symbols.applicable_kinds = field
dotnet_naming_symbols.constants_symbols.required_modifiers = const

Expand Down Expand Up @@ -317,20 +318,20 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static

dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly

dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
dotnet_naming_symbols.property_symbols.applicable_kinds = property

dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field

dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly

dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate

dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
Expand All @@ -342,6 +343,7 @@ resharper_csharp_wrap_parameters_style = chop_if_long
resharper_keep_existing_attribute_arrangement = true
resharper_wrap_chained_binary_patterns = chop_if_long
resharper_wrap_chained_method_calls = chop_if_long
resharper_csharp_trailing_comma_in_multiline_lists = true

[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
indent_size = 2
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
/Resources/ServerInfo/Guidebook/ServerRules/ @Chief-Engineer
/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer

Expand All @@ -23,6 +24,7 @@
/Resources/Prototypes/Body/ @DrSmugleaf # suffering
/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
/Resources/Prototypes/Guidebook/rules.yml @Chief-Engineer
/Content.*/Body/ @DrSmugleaf
/Content.YAMLLinter @DrSmugleaf
/Content.Shared/Damage/ @DrSmugleaf
Expand Down
1 change: 1 addition & 0 deletions Content.Benchmarks/EntityManagerGetAllComponents.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void Setup()

var componentFactory = new Mock<IComponentFactory>();
componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());
componentFactory.Setup(m => m.GetIndex(typeof(DummyComponent))).Returns(CompIdx.Index<DummyComponent>());
componentFactory.Setup(p => p.GetRegistration(It.IsAny<DummyComponent>())).Returns(dummyReg);
componentFactory.Setup(p => p.GetAllRegistrations()).Returns(new[] { dummyReg });
componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index<DummyComponent>() });
Expand Down
41 changes: 15 additions & 26 deletions Content.Benchmarks/PvsBenchmark.cs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using Content.IntegrationTests;
using Content.IntegrationTests.Pair;
using Content.Server.Mind;
using Content.Server.Warps;
using Robust.Server.GameObjects;
using Robust.Shared;
using Robust.Shared.Analyzers;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Random;

Expand Down Expand Up @@ -58,15 +56,20 @@ public void Setup()
_pair.Server.CfgMan.SetCVar(CVars.NetPvsAsync, false);
_sys = _entMan.System<SharedTransformSystem>();

SetupAsync().Wait();
}

private async Task SetupAsync()
{
// Spawn the map
_pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
_pair.Server.WaitPost(() =>
await _pair.Server.WaitPost(() =>
{
var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
if (!success)
throw new Exception("Map load failed");
_pair.Server.MapMan.DoMapInitialize(_mapId);
}).Wait();
});

// Get list of ghost warp positions
_spawns = _entMan.AllComponentsList<WarpPointComponent>()
Expand All @@ -76,17 +79,19 @@ public void Setup()

Array.Resize(ref _players, PlayerCount);

// Spawn "Players".
_pair.Server.WaitPost(() =>
// Spawn "Players"
_players = await _pair.Server.AddDummySessions(PlayerCount);
await _pair.Server.WaitPost(() =>
{
var mind = _pair.Server.System<MindSystem>();
for (var i = 0; i < PlayerCount; i++)
{
var pos = _spawns[i % _spawns.Length];
var uid =_entMan.SpawnEntity("MobHuman", pos);
_pair.Server.ConsoleHost.ExecuteCommand($"setoutfit {_entMan.GetNetEntity(uid)} CaptainGear");
_players[i] = new DummySession{AttachedEntity = uid};
mind.ControlMob(_players[i].UserId, uid);
}
}).Wait();
});

// Repeatedly move players around so that they "explore" the map and see lots of entities.
// This will populate their PVS data with out-of-view entities.
Expand Down Expand Up @@ -168,20 +173,4 @@ public void CycleTick()
}).Wait();
_pair.Server.PvsTick(_players);
}

private sealed class DummySession : ICommonSession
{
public SessionStatus Status => SessionStatus.InGame;
public EntityUid? AttachedEntity {get; set; }
public NetUserId UserId => default;
public string Name => string.Empty;
public short Ping => default;
public INetChannel Channel { get; set; } = default!;
public LoginType AuthType => default;
public HashSet<EntityUid> ViewSubscriptions { get; } = new();
public DateTime ConnectedTime { get; set; }
public SessionState State => default!;
public SessionData Data => default!;
public bool ClientSide { get; set; }
}
}
4 changes: 3 additions & 1 deletion Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Content.Shared.Access.Systems;
using Content.Shared.StatusIcon;
using Robust.Client.GameObjects;
using Robust.Shared.Prototypes;

namespace Content.Client.Access.UI
{
Expand Down Expand Up @@ -40,7 +42,7 @@ private void OnJobChanged(string newJob)
SendMessage(new AgentIDCardJobChangedMessage(newJob));
}

public void OnJobIconChanged(string newJobIconId)
public void OnJobIconChanged(ProtoId<StatusIconPrototype> newJobIconId)
{
SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
}
Expand Down
8 changes: 3 additions & 5 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,16 @@ public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
}

public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
{
IconGrid.DisposeAllChildren();

var jobIconGroup = new ButtonGroup();
var i = 0;
foreach (var jobIconId in icons)
{
if (!_prototypeManager.TryIndex<StatusIconPrototype>(jobIconId, out var jobIcon))
{
if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
continue;
}

String styleBase = StyleBase.ButtonOpenBoth;
var modulo = i % JobIconColumnCount;
Expand Down Expand Up @@ -77,7 +75,7 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
};

jobIconButton.AddChild(jobIconTexture);
jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIcon.ID);
jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId);
IconGrid.AddChild(jobIconButton);

if (jobIconId.Equals(currentJobIconId))
Expand Down
12 changes: 9 additions & 3 deletions Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
private string? _lastJobTitle;
private string? _lastJobProto;

// The job that will be picked if the ID doesn't have a job on the station.
private static ProtoId<JobPrototype> _defaultJob = "Passenger";

public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
List<ProtoId<AccessLevelPrototype>> accessLevels)
{
Expand Down Expand Up @@ -65,7 +68,6 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
}

JobPresetOptionButton.OnItemSelected += SelectJobPreset;

_accessButtons.Populate(accessLevels, prototypeManager);
AccessLevelControlContainer.AddChild(_accessButtons);

Expand Down Expand Up @@ -172,11 +174,15 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
new List<ProtoId<AccessLevelPrototype>>());

var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
if (jobIndex >= 0)
// If the job index is < 0 that means they don't have a job registered in the station records.
// For example, a new ID from a box would have no job index.
if (jobIndex < 0)
{
JobPresetOptionButton.SelectId(jobIndex);
jobIndex = _jobPrototypeIds.IndexOf(_defaultJob);
}

JobPresetOptionButton.SelectId(jobIndex);

_lastFullName = state.TargetIdFullName;
_lastJobTitle = state.TargetIdJobTitle;
_lastJobProto = state.TargetIdJobPrototype;
Expand Down
4 changes: 3 additions & 1 deletion Content.Client/Administration/UI/AdminMenuWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs"
xmlns:playerTab="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
xmlns:objectsTab="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab">
xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
xmlns:baby="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab">
<TabContainer Name="MasterTabContainer">
<adminTab:AdminTab />
<adminbusTab:AdminbusTab />
<atmosTab:AtmosTab />
<tabs:RoundTab />
<tabs:ServerTab />
<panic:PanicBunkerTab Name="PanicBunkerControl" Access="Public" />
<baby:BabyJailTab Name="BabyJailControl" Access="Public" />
<playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
<objectsTab:ObjectsTab Name="ObjectsTabControl" Access="Public" />
</TabContainer>
Expand Down
8 changes: 6 additions & 2 deletions Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ public AdminMenuWindow()
MasterTabContainer.SetTabTitle(3, Loc.GetString("admin-menu-round-tab"));
MasterTabContainer.SetTabTitle(4, Loc.GetString("admin-menu-server-tab"));
MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-panic-bunker-tab"));
MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-players-tab"));
MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-objects-tab"));
/*
* TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
*/
MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-baby-jail-tab"));
MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-players-tab"));
MasterTabContainer.SetTabTitle(8, Loc.GetString("admin-menu-objects-tab"));
}

protected override void Dispose(bool disposing)
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public BanPanel()
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
{
CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
CreateRoleGroup(proto.ID, proto.Roles.Select(p => p.Id), proto.Color);
}

CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);
Expand Down
6 changes: 3 additions & 3 deletions Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public BwoinkControl()
if (info.Antag && info.ActiveThisRound)
sb.Append(new Rune(0x1F5E1)); // 🗡
if (info.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
if (info.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
sb.Append(new Rune(0x23F2)); // ⏲
sb.AppendFormat("\"{0}\"", text);
Expand Down Expand Up @@ -243,7 +243,7 @@ private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
if (pl.Antag)
sb.Append(new Rune(0x1F5E1)); // 🗡

if (pl.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
if (pl.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
sb.Append(new Rune(0x23F2)); // ⏲

sb.AppendFormat("\"{0}\"", pl.CharacterName);
Expand All @@ -260,9 +260,9 @@ private void SwitchToChannel(NetUserId? ch)
{
UpdateButtons();

AHelpHelper.HideAllPanels();
if (ch != null)
{
AHelpHelper.HideAllPanels();
var panel = AHelpHelper.EnsurePanel(ch.Value);
panel.Visible = true;
}
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public BwoinkWindow()
{
if (sel is null)
{
Title = Loc.GetString("bwoink-none-selected");
Title = Loc.GetString("bwoink-title-none-selected");
return;
}
Expand Down
16 changes: 9 additions & 7 deletions Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public sealed class ExplosionDebugOverlay : Overlay

public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;

public Matrix3 SpaceMatrix;
public Matrix3x2 SpaceMatrix;
public MapId Map;

private readonly Font _font;
Expand Down Expand Up @@ -78,15 +78,16 @@ private void DrawScreen(OverlayDrawArgs args)
if (SpaceTiles == null)
return;

gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds);
Matrix3x2.Invert(SpaceMatrix, out var invSpace);
gridBounds = invSpace.TransformBox(args.WorldBounds);

DrawText(handle, gridBounds, SpaceMatrix, SpaceTiles, SpaceTileSize);
}

private void DrawText(
DrawingHandleScreen handle,
Box2 gridBounds,
Matrix3 transform,
Matrix3x2 transform,
Dictionary<int, List<Vector2i>> tileSets,
ushort tileSize)
{
Expand All @@ -103,7 +104,7 @@ private void DrawText(
if (!gridBounds.Contains(centre))
continue;

var worldCenter = transform.Transform(centre);
var worldCenter = Vector2.Transform(centre, transform);

var screenCenter = _eyeManager.WorldToScreen(worldCenter);

Expand All @@ -119,7 +120,7 @@ private void DrawText(
if (tileSets.TryGetValue(0, out var set))
{
var epicenter = set.First();
var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
var worldCenter = Vector2.Transform((epicenter + Vector2Helpers.Half) * tileSize, transform);
var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
handle.DrawString(_font, screenCenter, text);
Expand Down Expand Up @@ -148,11 +149,12 @@ private void DrawWorld(in OverlayDrawArgs args)
if (SpaceTiles == null)
return;

gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds).Enlarged(2);
Matrix3x2.Invert(SpaceMatrix, out var invSpace);
gridBounds = invSpace.TransformBox(args.WorldBounds).Enlarged(2);
handle.SetTransform(SpaceMatrix);

DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize);
handle.SetTransform(Matrix3.Identity);
handle.SetTransform(Matrix3x2.Identity);
}

private void DrawTiles(
Expand Down
6 changes: 6 additions & 0 deletions Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<controls:BabyJailStatusWindow
xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
Title="{Loc admin-ui-baby-jail-window-title}">
<RichTextLabel Name="MessageLabel" Access="Public" />
</controls:BabyJailStatusWindow>
Loading

0 comments on commit 5ce9e51

Please sign in to comment.