Commit graph

9126 commits

Author SHA1 Message Date
Vigers Ray
4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/smites.ftl
#	Resources/Locale/en-US/_strings/reagents/frostoil.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/migration.yml
2025-02-04 04:18:31 +03:00
Vigers Ray
8de23c502f камбек бедных предателей 2025-02-04 04:13:54 +03:00
banumbas
a956751091
Дарвиний (#1210)
* Был добавлен дарвиний

* мелкие фиксы

* ааа наконец та

* Исправил ошибки, добавил вульп и фелинидов.

* багфикс ошибки в консоли

* фикс перевода и линтера

* заебало чё то

* фелиниды ликвидированы.

* Update cargo_medical.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-04 04:02:55 +03:00
ScarKy0
8d1a300b57
[Admin] Omni Accent Smite (#34824)
gods forgive me
2025-02-02 21:00:27 +01:00
Plykiya
75e469738c
Fixes debug assertion crash when inserting cash (#34812) 2025-02-02 20:39:23 +01:00
Plykiya
28709fdc72
Fixes debug assertion thrown when chopping logs (#34814) 2025-02-02 20:39:02 +01:00
Jessey van Hoeijen
c8c0821a23
Fix stunbaton component namespace (#34790)
* Fixed incorrect namespace

* .Components was weird so I removed it
2025-01-31 15:43:07 +01:00
keronshb
6565ba52b2
Void's Applause (#34591)
* Adds single clap emote

* Adds missing single clap loc

* Adds void blink effects, sound, and sprite

* Adds VoidApplauseEvent and implements it into the Magic System and Grimoire

* Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future.

* Makes spells Mono

* Changes to swap positions.

* Makes Void Applause target body only

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Update Content.Client/Magic/MagicSystem.cs

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

* Update Resources/Audio/Effects/Emotes/attributions.yml

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

* Update Resources/Prototypes/SoundCollections/emotes.yml

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

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Removes duplicate effect spawning from server

* Puts Void Applause effect on server, lets lizards hear clap

* Adds single clap to diona

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-31 01:10:35 +01:00
beck-thompson
dd252e6277
Fixed: Ore now correctly drops the right amount of ore (#34557)
Fixed bug
2025-01-30 18:48:11 +01:00
BarryNorfolk
18592148f7
Add history tab to bounty console (#33932)
* Add struct for holding historical data on cargo bounties

* Add localisation strings for bounty history

* Add new XAML entry for display bounty history

* Expand cargo bounty menu to include tabs

* Ensure station databases hold historical bounty data

* Add to the bounty history when removing one from active

* Feed bounty history into cargo's bounty system

* Move tab title setting to constructor

* Remove redundant access specifications

* Remove un-needed override

* Fixup BountyHistoryEntry backing code

* Fix formatting in CargoBountyMenu

* Reformat BountyHistoryData

* Rework TryRemoveBounty to use new Entity type

* Add Enum for showing bounty results

* Rework look and feel of History tab

* Add visible text when no bounties have been completed yet

* Remove control

* Swap default to null

* Reverse ordering of bounties so last entry comes first

* Remove redundant Visible

* Move enum docs into the enum
2025-01-30 09:27:36 -08:00
Milon
5be5ee9832
fix BankClientComponent never updating (#33123)
* fix

* oh right
2025-01-30 17:49:03 +01:00
Vigers Ray
8a6ea6ac33 Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-30 15:38:24 +03:00
beck-thompson
bc1d6420af
After getting banned, you now have to re-read the rules! (#33270)
* first commit

* opps

* Reset cooldown instead

* Added ccvar

* Not replicated!
2025-01-30 13:09:31 +01:00
Velken
c360a97e3b
Juice that makes you go boom (#34730)
* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)
2025-01-30 12:34:32 +01:00
Vigers Ray
72ad978261 Фикс числа антагов 2025-01-30 13:40:28 +03:00
Vigers Ray
69443a73d3 фикс говна лигуба 2025-01-30 11:40:01 +03:00
Vigers Ray
f14b367cce Удалил старую реализацию зума снайперок и заменил на оффовскую 2025-01-30 11:37:58 +03:00
Vigers Ray
cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/UserInterface/Controls/RadialContainer.cs
#	Content.Server/Lathe/LatheSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
#	Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/migration.yml
2025-01-30 11:33:49 +03:00
ScarKy0
253a9fbdf1
Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-01-29 23:05:47 -05:00
Preston Smith
84328eee6b
Syndicate and CentComm Radio Implanters (#33533)
* Add Syndicate Radio Implant

* Fix description grammar

* remove unused var

* Update - Small fixes

* Un mess with imports

* Remove unused tag

* Correction

* Clear lists instead of remove

* Update 0 check

* Add Centcomm implant

* Correct centcom channel

* Correct params

* No more crying

* Update Content.Shared/Implants/Components/RadioImplantComponent.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-30 01:14:00 +01:00
lzk
467b68690b
fix stop bleeding popup (#34729)
* fix stop bleeding popup

* add identity
2025-01-29 14:13:50 +01:00
James Simonson
b9424386c7
Criminal Records Computer Better UX + Filtering (#32352)
* First pass at new Criminal Records Computer

need buttons to highlight.

* Filter status tabs/buttons now activate correctly via UpdateState

* Removed unneeded Directives

* Fix typo + undo VSCode changes

* Implement Emo Feedback

Loc NA and use inject deps
Cannot use inject deps on sprite system.

* try to undo vscode launch.json change

* Added requests + Filter dropdown list + jobs

Fixed maintainer fix requests,
Added Job to announcement channel output
Removed toggle buttons in-place of a dropdown list

* Fixed missed merge conflict

+ fixed an bug with filterstatus not showing on re-open ui

* Update criminal-records.ftl

Fixed lint error. whoops.

* Update Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs

typo

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* impliment chromiumboy feedback

hopefully this will do it....

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2025-01-29 13:34:49 +03:00
godisdeadLOL
aea4e3cdbd
Sentient medibot now can inject (#32110)
medibot player injection

Co-authored-by: YourUsername <you@example.com>
2025-01-29 13:34:01 +03:00
Southbridge
55bffa864a
Nuke Timer MinimumTime (#34734)
* Implemented the thing

* Made requested changes
2025-01-29 10:04:45 +01:00
Zachary Higgs
c5045883ac
Fake mindshield componentry and Implanter (#34079)
* Fake Mindshield (With some bad sprites)

- Add FakeMindshield System and Component

- Add FakeMindsheildImplantSystem and Component

- modify ShowMindShieldIconsSystem to check for FakeMindshields

- add all supporting yaml for the Implants, action and uplink

- add loc file stuff

- add unfinished sprites

* Cleanup, add to thief toolbox, remove metagame

- Move Implant sameness check to AFTER the implant DoAfter
to prevent instant identification of Deception Implants

- cleanup the systems and components

- add the fake mindshield to the Thief toolbox

* part 1 of fixing the folder problem

* Make the fakemindshield sprite folder lowercase

* CR - Move ImplantCheck into shared, cleanup

- Moved ImplantCheck and eventsubscription into Shared

- Remove Client/Server extensions of FakeMindshieldImplantSystem and
FakeMindShieldSystem and make shared Sealed

- make OnToggleMindshield Private, use the event!

* CR - Cleanup extra lines, fix some Prototype

- cleaned up extra liens in ImplanterSystem and
SharedFakeMindshieldSystem from when i was developing

- Uplink catalog no longer lists the implant in 2 spots,
only implants now, also uses the On state action icon

- added a comment about why it's reraising the action event
rather than directly interacting with the FakeMindshield Component

* Fake Mindshield CR:

- Added a comment about IsEnabled

- moved OnFakeMindShieldToggle to Entity<> from Uid, Comp

- fixed some formatting in uplink_catalog

* CR - Add a bit more comment
2025-01-27 18:37:46 -08:00
SlamBamActionman
5c782d3028
Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626) 2025-01-28 00:20:45 +01:00
ThereDrD
ced03313b5
Фикс чата и дамаг попапов (#1207)
* refactor: damage overlay refactor + fix double selfdamage popup

* fix: real chat icons fix

* fix: missing spaces in radio-tag job names
2025-01-28 01:36:58 +03:00
ArtisticRoomba
98c606d760
Engineering guidebook megaupdate v2 (#33062)
Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information.

Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read.
2025-01-27 11:42:27 -08:00
Coolsurf6
012c835559
Added Pain Numbness Trait (#34538)
* added pain-numbness component and system

* added numb as a trait that pulls the pain numbness component

* removed new event as mob threshold event as already being fired

* checked for MobThresholdsComponent first before running VerifyThresholds

* refacted force say to using LocalizedDatasetPrototype and added numb messages

* added severity check alert

* added comment for BeforeForceSayEvent

* removed space formatting

* changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb

* changed prefix damage-force-say-numb to 5 (whoops)
2025-01-27 11:34:20 +01:00
Southbridge
bbad147973
fixrotations - Modified Targetted Entities (#34638) 2025-01-27 18:48:16 +11:00
Ignaz "Ian" Kraft
371b1f8012
replace all instances of "department-{id}" with department.name (#34607)
replace all instances of "department-{id}" with department.name"
2025-01-23 19:46:32 -08:00
ThereDrD
4f835ea1b9
Новые звуки в случайные места (#1181)
* add: new health scanner sound

* refactor: boots footstep moved to its folder

* add: carpets footstep sound

* add: better crit cough sounds

* oops
2025-01-23 05:23:40 +03:00
Vigers Ray
3c2672efe9 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Locale/en-US/_strings/administration/multi-server-kick.ftl
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
2025-01-22 05:27:53 +03:00
slarticodefast
20acef16ee
Merge stable into master (#34564) 2025-01-22 00:53:05 +01:00
Pieter-Jan Briers
71c9dfc9ea
Add system to kick people if they connect to multiple servers at once. (#34563) 2025-01-22 00:23:47 +01:00
Errant
ae213066b1
HOTFIX Admin playerlist character update fix (#34560)
fix IdentityChangedEvent subscription
2025-01-21 23:48:07 +01:00
ThereDrD
e194bc1fe3
Иконки в чате (#1168)
* init

* refactor: move scale to tag argument

* fix: chatbox rebuild fix

* tweak: add icons for non-humanoid roles like ai and borgs

* add: switch option for radio icons

* blyat commit

* fix
2025-01-22 00:57:20 +03:00
slarticodefast
b0c9c79297
Merge stable into master (#34547) 2025-01-21 00:12:49 +01:00
Errant
671ab10be2
[HOTFIX] Admin Menu player jobs (#34545)
update job info on spawn
2025-01-20 23:30:00 +01:00
Vigers Ray
28ba3e857b Фикс выпадение предметов с импланта хранилища в апстриме 2025-01-20 06:07:01 +03:00
Vigers Ray
5a40924eec Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/PowerSink/PowerSinkSystem.cs
#	Resources/Maps/centcomm.yml
#	Resources/manifest.yml
2025-01-20 05:46:59 +03:00
Winkarst
b09cd1ca8c
Make storage implant drop items on gibbing (#33493)
* Make storage implant drop items on gib/removal

* Better way

* Fix error

* Forgotten trash

* Cleanup

* Unused var

* Update Content.Server/Implants/ImplantedSystem.cs

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

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>
2025-01-19 11:48:58 -08:00
War Pigeon
b471c1094d
CentComm Map Updates (#34475)
* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype
2025-01-18 22:32:33 -07:00
Mono
c78717e4e2
Various Locale Typo Fixes (and spaces) (#34483)
Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)
2025-01-17 23:37:37 -08:00
Vigers Ray
5ed863e68f Сделал голосование тише 2025-01-18 06:52:52 +03:00
Vigers Ray
31a3dfbacf Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-18 06:20:57 +03:00
Vigers Ray
933c7a19bf фикс поднятия фелинидов 2025-01-18 05:01:09 +03:00
Partmedia
970b4a687d
Improve canister admin logs (#34495) 2025-01-17 17:37:40 -08:00
Leon Friedrich
9d4e60068b
Optimize & clean up RadiationSystem (#34459)
* Optimize & clean up RadiationSystem

* comments

* Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2025-01-18 12:07:20 +11:00
Vigers Ray
fed7696e69 фикс ToggleableGhostRoleComponent 2025-01-18 03:03:53 +03:00