Commit graph

8633 commits

Author SHA1 Message Date
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
pacable
65165685d6
fix (#506)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-30 10:04:34 +03:00
Vigers Ray
fe9e685a1b Merge remote-tracking branch 'origin/master' 2024-10-21 05:50:17 +03:00
Vigers Ray
6a8317d76e Цвар на отключение планетарнои тюрьмы 2024-10-21 05:49:27 +03:00
haiwwkes
49d1baf0b0
Merge pull request #511
* fix
2024-10-14 22:35:01 +03: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
Rinary
d3094b7cb5
Исправления (#488)
* init

* fix en us

* translate Labels

* last fix
2024-10-11 17:11:41 +03: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
pacable
641ce5c958
Судейский молоточек. (#481)
* судейский молоточек и наковальня

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

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

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-10 20:07:45 +03:00
VigersRay
b69da53ac3 Поддержка телеграм авторизации. 2024-10-10 19:43:55 +03:00
VigersRay
918213bee5 Фиксы апстрима 2024-10-10 19:27:49 +03:00
VigersRay
c8e9b7bbf4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Roles/RoleSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/GameRules/midround.yml
#	RobustToolbox
2024-10-10 19:09:17 +03:00
nikthechampiongr
e7b7e2270d
Fix bounties(and potentially other things) running out of ids (#32700)
* Make NameIdentifier Ids get refreshed after round restarts

Before this commit the existing values would just get shuffled.
This means that eventually the server would run out of ids to give to
new entities for different groups. As a result everything would get id 0

* Comply with what seemingly is the convention for sawmills

* Make it impossible to insert a bounty with a duplicate id

* Reduce duplication

* Remove unused sawmill

* Fix rustbrain and skill issue

* Aaaa

* Apply suggestions from code review

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-10-10 16:35:35 +02:00
Errant
93c7bdc134
Mind Role Entities (#31318)
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
2024-10-10 10:48:56 +02:00
Pieter-Jan Briers
3e078ab3e0
Fix error log when recycling something with small material counts. (#32723)
* Fix error log when recycling something with small material counts.

MaterialStorageSystem.SpawnMultipleFromMaterial now doesn't call StackSystem.SpawnMultiple if it tries to spawn zero. This happens because the recycler calls SpawnMultipleFromMaterial for everything recycled, even if the amount it has stored is < the amount for one sheet.

* Update Content.Server/Materials/MaterialStorageSystem.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-10 03:29:26 +02:00
beck-thompson
327466a6e2
Plushies can now have pAIs stuffed into them (v2)! (#30805)
* First commit

* I forgot silly me

* Actually added comments

* spellin

* fixes

* more blacklists

* Minor fixes

* Speech Verb also changes now

* Simple name stuff

* Other fixes

* remove one line of whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-09 20:01:32 +02:00
chavonadelal
6d99597349
Job title localization (#32338)
* Job title localization

* Correcting fields
2024-10-09 17:05:36 +02:00
SlamBamActionman
ddaa0e83c6
Add admin log for codewords (#32531)
* initial commit

* Delta review
2024-10-09 13:55:48 +02:00
lzk
33042b00d0
Fix cryo locale again (#32654)
* Fix cryo locale again

* yeep
2024-10-08 11:50:54 +02:00
Rinary
fed4d952fd
Фикс боргов (#471)
* init

* comments
2024-10-08 10:32:54 +03:00
VigersRay
8207cfc8dd Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-08 10:32:08 +03:00
VigersRay
2638cd0709 Фиксы тестов 2024-10-08 10:31:46 +03:00
VigersRay
e79763d20f цвары на скрытия голосований 2024-10-08 08:53:40 +03:00
Saphire Lattice
f22f9e39c5
Change minibomb to be explosion resistant and start timer on damage (#32429)
* Make minibomb explosion resistant and trigger timer on damage

* Tune damage behaviour and threshold for minibomb
2024-10-08 00:42:42 +02:00
haiwwkes
b8032baa9d
tweaks. (#465)
* tweaks.

* aaaaaa

* aaaaa

* Revert "aaaaa"

This reverts commit d95c6d6cedeac70d9c882533f115c229a69ee38a.

* yes

* AlwaysPoweredMap, remove biomes.

* forget..

* sky

* Updated map

* Update PlanetPrisonStationSystem.cs

* Update EmergencyShuttleSystem.cs

---------

Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-07 08:45:23 +03:00
pacable
9a37e68869
Мешок с землей (#461)
* Добавил мешок с землей

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

* fix тавтологии

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

* fix stamina

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-07 01:17:24 +03:00
VigersRay
461a4d84a2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/publish.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/migration.yml
2024-10-07 01:09:20 +03:00
Golinth
46a2eb545e
Fully Revert Clown Waddling (#32652)
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
Rinary
08a055a7c2
Обновление энергетических щитов (#425)
* init

* energy dome no more block melee attacks

* return HOS shield

* belt nanotrasen energy shield generator

* fix

* localise

* Revert "return HOS shield"

This reverts commit 3821d1ae51b0a442cc9a551481fe5742e5782bb1.
2024-10-04 21:34:00 +03:00
Saphire Lattice
94c8018ff3
Change the syndicate charge to start a timer on signal (#32423)
* Change the syndicate charge to start a timer on signal

* Actually add the component in question

* Add default link for TimerStart signal
2024-10-04 11:34:48 +02:00
Saphire Lattice
88f060d51a
Make the explosions throw the container/item they originated from (#32428)
Extra fun if it's something that can trigger multiple times
2024-10-04 10:43:45 +02:00
Plykiya
295e63193c
Two additional checks to prevent FTLing stations (#32558)
Add two additional checks to prevent FTLing
2024-10-04 12:55:36 +10:00
VigersRay
5a679bd004 УУУУУУУ СУУУУКААААААА 2024-10-03 17:30:02 +03:00
haiwwkes
5efc51b304
tweaks (#451)
* tweak: add RestrictedRange to prison and transit hub.

* tweak: make laydown better

* ay lmaoo
2024-10-03 17:23:41 +03:00
VigersRay
940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
ArchRBX
dd12ac1f8a
MedTek Cartridge (#32450)
* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-10-01 23:17:57 -07:00
SplikZerys
27ee3abaa8 Revert "Proton (#420)"
This reverts commit 939249a3
2024-10-02 09:05:30 +03:00
VigersRay
d9003082e0 мини фикс апстрима 2024-10-02 06:54:41 +03:00
VigersRay
b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Chat/Managers/IChatManager.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
#	Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
#	Resources/Locale/en-US/_strings/npc/firebot.ftl
#	Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Recipes/Crafting/bots.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
Rinary
e39dfe9e64
Мехи (#415)
* initial commit

* some sprites

* mech weapons

* syndi mechs to nuke ops uplink

* some loadouts to Nanotrasen mechs

* spawn mark filled mechs

* construction graphs

* researchable mechs

* i forgor

* locale changes

* aaa

* minor translate(big, later)

* fix items in hands

* fix

* upd translate

* translate electronics

* translate mech weapons

* translate

* translate const

* fix rsi

* fix

* fix

---------

Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-10-02 06:39:12 +03:00
VigersRay
2a523b73d3 Ну а чо я? Я ничо 2024-10-02 06:33:00 +03:00
Golinth
3b682d4d68
Added Firebots - Real (#32482)
* Add Firebots

Had to add OnActivateInWorld to the spray system to get the bot to work. Checks for the flammable component and if the onFire boolean is true.

* Make SpraySystem actually use useDelay

got rid of that TODO

* Added firebot speech

Fire detected!
2024-09-30 20:13:16 -07:00
Rinary
23dba7f1ad
init (#414) 2024-09-30 16:18:51 +03:00
pacable
939249a38b
Proton (#420)
* Proton-1 finished!

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

* fix

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:15:53 +03:00
pacable
61f4a724f0
фикс (#328)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:12:46 +03:00
drakewill-CRL
7cf04dcb20
Use archived gas mixture in gas exchange comparison (#32088)
The comparison for doing gas exchange used current and not archived
moles. This could lead to update order-dependent gas spreading effects.

To fix this, convert TileAtmosphere's MolesArchived and
TemperatureArchived to a AirArchived, and use that in the comparison
method.

---------

Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2024-09-29 22:14:07 -07:00
slarticodefast
16325007d5
Fix mutation system debug assert (#32530) 2024-09-29 13:37:31 -08:00
SlamBamActionman
d0c4d5a93a
Add webhook for votekicks (#32513)
* Initial commit

* Localization
2024-09-29 15:23:53 +02:00