Commit graph

5167 commits

Author SHA1 Message Date
Vigers Ray
389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
Rinary
3f142392b5
Взрывной ошейник (#567)
* part 1

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* реверт проводки, доработка ошейника, наведение красоты.

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* добавил букет в аплинк отдельно
почистил код

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* review changes

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* review fixes

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2024-10-30 11:18:20 +03:00
Rinary
b6920aec99
Рефактор мехов, правки в системе медицины (#507)
* mech system, fix hands, fix fraction

* fix

* fix fake hypo

* fix triple airlocks big sizing

* fix

* upd clown hulk

* xd fix 2

* bigger exit delay

* mechs reflect changes

* guns changes

* draike up

* mechs in another category

* add equipment

* Revert "upd clown hulk"

This reverts commit b8084967040be5d442b2d4770cf7fdece1daa2a8.

* SPIN MY MECH ASS

* mech no rot

* some resprite

* no injections in hardsuits

* some species can not be injectable

* medipans can ignore armor, admeme hypospray ignore armor

* fix

* fix admeme hypo

* mob fraction fix

* rover + nt gygax add

* fix description

* fix id

* some better dome effects

* если пустая гильза в стволе -> Кнопки "казнь" не будет

* phazon added

* fix server crashes

* full rework mechs on mobstates, coils fix mechs, diagnostic hud show health bar for mechs, mechs fastest repair, add mech analyzer

* some fixes

* configure health of all mechs

* upd

* add rover to uplink

* translate bundle

* change price

* phazon construction

* fix

* fix

* Finish phazon construction

* add phazon research and recipes

* phazon construction translate

* fix

* Mech lights

* fix

* translate light action

* Mech sounds, fix damage

* fix

* fix hello sound

* upd

* fix linter

* change damagePercentage

* fix

* fix hello sound

* temp disable damage sounds

* fix battery needed on construct

* some changes

* add mech painting system as DEBUG(in dev)

* Fix yaml, durand paintings

* mech spray cans textures

* change sprite

* fix

* ripley, clarke new textures

* ripley,clarke paints

* fix

* sec pod texture

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:53:00 +03:00
haiwwkes
8987a12177
ban links. (#548) 2024-10-30 10:44:32 +03:00
haiwwkes
99851de785
ayo (#545) 2024-10-30 10:42:02 +03:00
haiwwkes
66bc5d336f
fix (#536) 2024-10-30 10:40:28 +03:00
haiwwkes
7efd457a51
fix (#534) 2024-10-30 10:39:38 +03:00
haiwwkes
eaf8b9dae2
fix-followed-del (#537) 2024-10-30 10:39:26 +03:00
Rinary
591a3c4a50
Новые предметы, фикс супер материи, правки (#515)
* permission changes

* super matter changes

* NT backpack energy dome

* energy dome is contraband

* fix singularity

* upd

* upd supermatter

* reflector

* upd

* upd

* add meta.json

* fix announcement

* upd

* fix rsi

* fix ids

* return checking for double actions

* fix hydro assembly

* fix x2 hydroponics and chemistry airlock

* upd

* У всех хардсьютов временно забран пнв(переработка хардсьютов под пнв момент)

* peace parts

* clown parts

* upd parts meta

* akms bigger price

* fix

* fix x2

* add clown, peace parts

---------

Co-authored-by: darkrell <rc-alh@outlook.com>
2024-10-30 10:19:36 +03:00
Rinary
612f8ca9aa
Фикс всей локализации (#496)
* cargo product loc

* first cargo product translate

* second cargoproduct translate

* roadmap has optional localization

* upd

* 2024 roadmap translate

* full ru roadmap goals translate moved to russian loc

* translate some roadmap 2025

* roadmap fully translate

* holidays translate

* donation plinks rework

* translate categories

* translate planet prison objective

* translate evil twin objectives

* translate fugitive objectives

* fix planet prisoner dir

* upd

* no more planet prison dir

* partial toys translate

* fully translate toys

* lockbox loc fix

* fix Suntick loc

* fix tape loc

* borg modules translate

* translate borg tools and nanopaste

* upd

* boombox translate

* translate pda's and hand_teleporter

* reinforcement radio translate

* donation plinks translate

* barber items translate

* tape player translate

* ID cards translate

* computers translate

* translate corporate laws

* pepper spray translate

* flippo lighter translate

* magistrat's rubber stamp translate

* translate some ammunition

* clear no need desc

* translate SMGS

* fix

* Finaly guns translating

* translate clocks

* translate misc

* some cloaks translate

* fully cloaks translate

* belts translate

* translate all masks

* translate boots

* all backpacks translate

* glasses translate

* gloves translate

* bras translate

* fix rsi validator

* translate jumpskirt's

* jumpsuits translate

* security pilot's jumpsuit translate

* translate hardsuit helmets

* translate hood

* hats translate

* helmets translate

* men's underpants translate

* translate women's pants

* hardsuits translate

* fix pant desc

* translate armor

* translate coats

* translate captain's overcoat

* socks translate

* big boxes translate

* translate lockers

* power translate

* translate barber pole

* poster translate

* translate chairs

* translate vending_machines

* translate pacificator

* translate computers

* clowns ghost role translate

* translate eviltwin ghost role

* translate predator name

* another player species translate

* translate foliant

* translate borg chassis

* shuttle markers translate

* translate job spawners

* ghost roles spawners translate

* actions translate

* stacks translate

* some fixes

* uplink catalog fully translate

* return hypo on uplink

* sponsor uplink catalog translate start

* new sponsor uplink translation

* fully translate sponsor uplink catalog

* translate lockers

* translate kits

* translate syndicate boombox bundle

* predator organs translate

* body prototypes translate

* humanoid xeno organs translate

* predator body parts translate

* xenomorph body parts translate

* tajaran body parts translate

* translate disease

* species translate

* translate speech emotes

* upd

* translate frontier rules

* translate lust rules

* translate default rules

* crafting translate

* holy shit, last fixes

* no checks if you not changes prototypes

* fix

* fix linter

* fix sponsor uplink catalog

* second fix

* fix socks

* last fix

* xd

* fix

* upd locale, ALL En-US prototypes translated

* upd

* upd locale validator, checks for non lokalized strings in ru-RU

* some translations

* clear

* gaaaaaaaaaay pin

* upd

* upd

* fix

* fix linter

* translate toys

* translate

* upd

* fix

* upd

* fix

* fix linter

* upd

* fix

* better construction graph translation

* start reworking construction menu translation

* some new translations

* fix

* upd translations

* пу-пу-пу

* fix

* upd

* upd, sunrise strings in en-us

* upd

* translate voice-mask

* translate guns

* energy gun translate

* server info translate

* bar signs translate

* translate ui tabs

* translate reagent effect

* translate revenant-catalog

* translate categories

* general translate

* friends translate

* Sponsor uplink fixes|Translate

* some fixes

* translate Security, Hos, QM sponsor uplink
2024-10-30 10:04:15 +03:00
lzk
dc3a2f6d28
add StartDelay bool to actions (#33026)
* add StartDelay bool to actions

* forgot summary
2024-10-28 23:21:14 +01:00
Stalen
24f79c3ecc
Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
Vasilis
7e526da521
Fix Bug With Uppercase Radio Keys (#32997) (master) (#33031)
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2024-10-28 00:35:23 +01:00
Saphire Lattice
a95c8baf28
Add health analyzer unrevivability warning (#32636)
* Add health analyzer unrevivability warning

* Remove errornous comment
2024-10-26 19:22:08 +02:00
Thomas
d4da9923ea
Fix Emote Chat Sanitizer (#32940)
* Fix bug?

* Fix :)

* aaaa

* AAAA!!!

* comment

* Nicer code

* What's a pull requestWhat's a pull request?
2024-10-24 16:10:13 +11:00
chromiumboy
d2216835d8
Visualized regions for NavMapControl (#31910)
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Initial commit

* Tidy up

* Add firelocks to the nav map

* Add nav map regions to atmos alerts computer

* Added support for multiple region overlay sets per grid

* Fixed issue where console values were not updating correctly

* Fixing merge conflict

* Fixing merge conflicts

* Finished all major features

* Removed station map regions (to be re-added in a separate PR)

* Improved clarity

* Adjusted the color saturation of the regions displayed on the atmos alerts computer
2024-10-23 14:49:58 +02:00
ScarKy0
9873efd514
Adding intellicard functionality. (#32347)
* init

* im so confused

* clean

* sprite update

* :|

* further attempts

* be blessed for it works

* Very prestigious pAI

* cleaning up

* Intellicard in RD locker

* PAIn't

* .Clear()n't

* .Clear()n't for real this time

* Cleaning up

* Whoopsie Daisy
2024-10-22 15:49:39 +02:00
ScarKy0
62f5a31c4a
Syringe gun! (#32112)
* Init testing

* copyright

* oops

* Tracking the embed entity uid

* testing stuff for gradual injection

* work

* weh

* god save me

* bleh

* Yippee!

* Again

* Mini syringe ammo

* cleaning up

* mini syringes have a texture for fill amount

* -3 cool points :(

* hitboxes

* init cleanup

* much needed fixes

* Fixes
2024-10-23 00:03:42 +11:00
MendaxxDev
b5687e4c73
prevent typing sound from playing when AI interacts with consoles (#32906)
* prevent typing sound from playing when AI interacts with consoles

* cleanup
2024-10-20 22:50:05 -05:00
Vigers Ray
6a8317d76e Цвар на отключение планетарнои тюрьмы 2024-10-21 05:49:27 +03:00
Pieter-Jan Briers
c221ef06b9
System to automatically restart server after certain uptime. (#32814) 2024-10-20 16:46:22 +02:00
Jajsha
8cf5f93b9f
Fix starting gear multiple storage fills and tests (#32718)
* fix things

* maybe fix everything
2024-10-20 14:43:17 +11:00
Calecute
b7bd7c1d68
Blunt damage will do stamina damage on wide attacks (#32422)
Fix: blunt damage will now do stamina damage on wide attacks.
2024-10-20 14:41:44 +11:00
Pieter-Jan Briers
22938a9a56
Allow strip removing items if you're holding something (#32750)
You were already able to strip more items at once from somebody than you could hold, and they would drop to the floor. This matched the behavior in SS13.

Annoyingly, however, you were not allowed to *start* a stripping action if you're holding something. This just feels like an annoying paper cut, so this is no longer a thing.
2024-10-18 21:20:04 +02:00
Ilya246
fca95ef250
ghost locator maints loot (#32323)
* implement

* react to revenants/AI eye

* rare maints loot

* sprite

* description

* review

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

* do changes

* stats

* networked

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-18 15:42:13 +02:00
Errant
cf1b3b0913
Merge spider clan charges can be armed again (#32866) to Master (#32881)
HOTFIX spider clan charges can be armed again (#32866)

* fix ninja bomb component check

* remove TryGetRole
2024-10-18 15:38:16 +02:00
beck-thompson
15290486dc
Fix: Plushies no longer delete items when recycled (#32838)
fix
2024-10-18 14:58:07 +02:00
Errant
23e4f81b30
Traitor activation fix for missing PDA (#30359)
* Implant the uplink if no PDA is found

* comments

* tidy up loose ends

* Whoops usually I start with the namespace, how did I forget it, shame shame

* Consistent data type for starting TC balance, misc changes

* Implant briefing, guidebook

* Update AutoTraitor, add uplink, codeword and briefing parameters to TraitorRuleComponent,  no pda for reinforcements

* engine 5c0ce43

* pass pda to AddUplink

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

* nicer string handling

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

* case typo 1

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

* case typo 2

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

* case typo 3

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

* minor layout changes

* removed redundant implant check

* minor cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-18 14:55:43 +02:00
beck-thompson
338781c243
Fix: Radio jammer now doesn't show setting changes to other players (#32817)
* fix

* Other fix
2024-10-18 12:04:45 +02:00
Leon Friedrich
adb7aee831
Fix PlantHolder interactions & InteractionSystem assert (#32874) 2024-10-18 16:40:36 +11:00
Vasilis
a739b21b04
Change the window titlebar to show the joined server (#32547)
* Change the window titlebar to show the joined server

Requires https://github.com/space-wizards/RobustToolbox/pull/5475/

* Totally not a webedit

* Can you tell what cvar I copied?

* And this kids is why we don't webedit

* Reviews

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-10-17 13:06:07 +02:00
Callmore
7039f87bd4
Fix saving prefered quick store item locations (#32480)
this was just copypasted without any context wasn't it
2024-10-16 23:00:52 -05:00
Zachary Higgs
79a23d3e0b
Give AI a Sound Cue when an Antimov board is inserted (#32625)
* Subversion Board Insertion Audio Notification

Add Subversion flag and SubversionSound to SiliconLawProviderComponent

Add new Method (OnSubversionInserted)
to SiliconLawSystem to handle a Subversive
SiliconLawProviderComponent and play it's SubversionSound

Add Check for Subversive law provider to OnUpdaterInsert that
calls OnSubversionInserted if the SiliconLawProviderComponent is
Subversive

* Fix subversion Sound

- Change out Weh sound used to test that subversion sounds can be
changed by prototype for a a not yet present Antimov subversion sound

* Make it not just subversive

- Remove OnSubversionInserted and move the MindPlaySound in the
OnUpdaterInsert so long as LawUploadSound exists

- Modify SubversionSound into LawUploadSound

- Remove the Subversion flag

- Just use emagged_borg.ogg until the better one is made

* Remove errant spaces and a errant namespace

* CR Fixes - Add generic Lawboard insert cue

- Combine the If statements per /pull/32625#discussion_r1786926400
inside OnUpdaterInsert

- Remove the ViewVariables(VVAccess.ReadWrite) per
pull/32625#discussion_r1786924433

- Add Cryo_warning.ogg from TGStation, the sound utilized for Law Upload
cue, Attribution.

* CR Add a placeholder Antimov notification sound

- Add a new sound kitbashed from the cryo_sound used for uploading
and the emagged noise

* Add self referential source attribution

- also fix an errant space

* Add more bespoke Sound by ps3moira + attributions
2024-10-16 22:41:06 -05:00
LittleNyanCat
c027919618
Several small SFX tweaks (#28897)
* Several small sfx tweaks

* fix small yml oopsie

* Redo the basin code to use events

* now uses an event for when the transfer is successful, not when there's just an attempt

* forgot to remove this

* Update Content.Server/Botany/Components/PlantHolderComponent.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* adds sound variations to shoes as well

* variations on honkbots and the H.O.N.K mech

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

* fix compile issue

* oops forgot to delete this

* cleanup

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-16 20:38:02 -05:00
deltanedas
cc17acbda8
fix grappling hooks getting bricked (#32738)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-10-17 09:32:32 +11:00
ScarKy0
5be82d2a7f
Cyborg module action icons (#32505)
* Init

* added jani and medical

* + sci and service modules

* + syndi modules

* fixing up

* geiger counter stuff
2024-10-14 18:05:40 +11:00
Джексон Миссиссиппи
9b71757c07
cleanup melee (#32486)
* it removes warns ig

* Quick fix

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-10-14 16:40:59 +11:00
Leon Friedrich
97f6097dad
Add IsQueuedForDeletion checks to interaction system (#32526) 2024-10-14 15:13:35 +11:00
Leon Friedrich
30ada26315
Remove inaccurate admin log when moving a held item (#32525)
Remove inaccurate admin log when switching held item
2024-10-14 15:05:40 +11:00
metalgearsloth
71c9894903
Jobreq format (#32806)
* Format job requirements as hours and minutes

* Use TimeSpan.ToString for playtime instead of custom method

* wehflicts

---------

Co-authored-by: jmcb <joelsgp@protonmail.com>
2024-10-14 14:54:31 +11:00
Leon Friedrich
2d60a4684c
Hide role entities in the spawn menu (#32798) 2024-10-14 14:05:49 +11:00
Leon Friedrich
4e0018697f
Add role prototype validation tests (#32801)
* Add role prototype validation test

* Rejig GetPrototypesWithComponent

* More tests n stuff
2024-10-14 14:05:25 +11:00
SkaldetSkaeg
8093a49943
Block emotes for sleeping (#32779)
* Block emotes

* typing issue

* Update Content.Shared/Bed/Sleep/SleepingSystem.cs

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
2024-10-13 19:22:05 +11:00
slarticodefast
4704309b4e
Fix SpawnAndDeleteAllEntitiesInTheSameSpot heisentest (#32330)
What happened was that the new tech anomaly randomly triggered a signal sink on the portable generator, which is currently broken and throws an error if the that sink is activated.

The resolve needed logMissing = false because it does not expect the ActiveGeneratorRevvingComponent to exist.
2024-10-12 11:54:48 -07:00
VigersRay
06a10c9f99 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-12 17:43:47 +03:00
eoineoineoin
70b7747fdd
Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users

* Check access only on client, when constructing UI

* Do TODO (Thanks, Robust 236.1)

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-12 19:21:43 +11:00
VigersRay
6423086773 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-12 00:26:07 +03:00
Errant
a9ecf805e5
Fix random test fail in DeleteAllThenGhost (#32753)
It's simple. We kill the heisentest
2024-10-11 21:17:01 +02:00
haiwwkes
40568a243c
lay down + scope (#476)
* remove old system

* new scope, new laying
2024-10-11 11:52:39 +03:00
Rinary
42f9ac0dbd
Ребаланс Мехов (#482)
* Initial commit

* mechs has reflect

* all mechs has powercagehigh

* mechs can only powered by power cages

* powercages on protolathes

* magboots on mechs

* fire cost upped x2

* battery on guns has 200 energy by basic, adds ion gun

* mecha x-ray gun add

* mecha vindictor here

* added amlg 90

* added uvm31

* localization

* burst fire on Ultra

* fix vindictor no desc

* mech has prying

* add scale 1.08

* add scale 1.08 to combat mechs

* Mechs has collision

* buff chain sword

* upd

* some fixes

* fix weapon charging

* Fix UVM-31 "Drake" Sound and Proto particle

* Fix Mech collision, mechs can't stop peoples any more(some thing issues creates if collision is on)

* AMLG90 Has bigger damage

* Stunner uses hos stun spread

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-10-10 20:11:43 +03:00