Commit graph

8080 commits

Author SHA1 Message Date
VigersRay
08ab1bd3cd Фикс крио телепорта 2024-07-12 06:36:48 +03:00
VigersRay
ed452581ce Целью на убийство для антагониста может быть только экипаж основной станции 2024-07-12 06:16:42 +03:00
VigersRay
898730ee53 фикс счетчика сбежавших заключенных 2024-07-12 06:04:56 +03:00
VigersRay
9a928552f1 правки беглеца 2024-07-12 05:52:56 +03:00
VigersRay
bceb675012 Смена дня и ночи на транзит 2024-07-12 05:18:01 +03:00
VigersRay
9b78c5e9d9 SponsorLoadoutSystem 2024-07-12 04:53:31 +03:00
VigersRay
293e88ac94 фиксы линтера 2024-07-12 04:53:20 +03:00
pacable
0277e6e460
Реворк оружейки гамма кода (#177)
* Реворк оружейки гамма кода

* Добавил объявление

* фикс гравы

* оформление

* фикс линтера

* фикс дельты и гравы

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-12 04:30:44 +03:00
pacable
6308c92c2d
Телепортация в криокапсулы ссд игроков. (#180)
* Добавил автокрио

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

* release fix

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

* Update StationCryoTeleportComponent.cs

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-12 04:28:11 +03:00
Babaev
15c9545d31
Update SuitSensorComponent.cs (#183) 2024-07-12 04:23:02 +03:00
Vigers Ray
ffd3e3de14
Планетарная тюрьма (#187)
* Тюрьма (#150)

* Prison Init

* Новая карта для планетарных тюрем

* Готовая планетарная тюрьма

* Незначительное изменение тайлов

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>

* Космическая тюрьма и всё остальное говно

* фиксы

* фикс PrisonlDoctor

* фикс PrisonDoctor

* день длится 20 минут

---------

Co-authored-by: SplikZerys <136282037+SplikZerys@users.noreply.github.com>
2024-07-12 04:21:12 +03:00
VigersRay
094596a16a Вернул телепортацию зевак на станцию 2024-07-12 01:00:17 +03:00
VigersRay
30458496b6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
2024-07-12 00:55:20 +03:00
chavonadelal
9a17154d83
Аnnouncement sender localization (#29907) 2024-07-12 00:02:53 +10:00
VigersRay
3f5042a3e6 Фиксы апстрима 2024-07-11 15:24:57 +03:00
VigersRay
bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
2024-07-11 14:05:37 +03:00
metalgearsloth
03f0257ae9
Revert "Picking a ghostrole as an admin will now deadmin you. (#29790)" (#29901)
This reverts commit 1a50760e67.
2024-07-11 17:04:10 +10:00
Tayrtahn
e6f55fafb4
Fix AtmosDeviceSystem debug assert Heisenbug (#29752)
Fix AtmosDeviceSystem debug assertion Heisenbug
2024-07-11 16:14:34 +10:00
deltanedas
02636386b5
item toggling giga rework + full ninja refactor (#28039)
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-11 15:55:56 +10:00
MFMessage
1a50760e67
Picking a ghostrole as an admin will now deadmin you. (#29790)
* @forcibly deadmins you

* Added checks for AdminDeadminOnJoin
2024-07-11 15:53:14 +10:00
Cojoke
19a06b6cc0
Fix the ability to shoot out of crates (#28961)
* Fix the ability to shoot out of crates

* Makes it check what inventory the player is in

* use IsEntityOrParentInContainer

* Fix Issues Github had

* gaahhh... Prevents lasers from being shot out of crates

* gaahhh... Prevents lasers from being shot out of crates

* Fix laser?

* hmmm... this is better looking I think?

* Uncook indentation

* Rerun tests?
2024-07-11 15:14:49 +10:00
Chief-Engineer
6371a04621
Fix baby jail (#29896)
* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747.

* the fix
2024-07-11 15:14:01 +10:00
Vasilis
24a2866747
Revert Baby Jail (#29891)
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a0c4.

* Revert configs

* Oops
2024-07-11 10:33:47 +10:00
Tayrtahn
2df65f10f5
Replace ProtoId<EntityPrototype> uses with EntProtoId (#29892) 2024-07-11 02:01:30 +02:00
dffdff2423
e8b3042a38
Add an option to the admin fax menu to lock papers such that they can't be edited by cybersun pens (#28972)
* Add option to adminfax for locking papers.

* Replace dummy control with margin
2024-07-10 15:28:36 +10:00
Moomoobeef
3f2793c179
fixed missing characters in OwO accent (#29047)
replaced two characters with ones that actually show up ingame
2024-07-10 15:25:24 +10:00
Ed
eef6f92012
Steal Objective Condition now support stacks (#29843)
* Update StealConditionSystem.cs

* Update StealConditionSystem.cs
2024-07-10 15:24:25 +10:00
lzk
93197b6cce
Fix colornetwork desc and help (#29856)
* Fix colornetwork description

* suggested changes

* forgor

* done

* ok now it IS done
2024-07-10 09:24:38 +10:00
Plykiya
2349fb485e
Stop eating food if you drop it (#29854)
* Stop eating food if you drop it

* woops, unused param

* comments

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-10 09:12:40 +10:00
Errant
49128ba9d3
Aghosts can now /ghost (#29360)
I will not be subjected to criminal abuse
2024-07-09 18:55:47 +02:00
chavonadelal
b511d8e180
Nozzle Direction Localization (#29849) 2024-07-09 18:11:07 +02:00
chavonadelal
c9be1ef96b
Localization of the threat level in an emergency lamp (#29847) 2024-07-09 16:57:36 +02:00
lzk
061ec432ff
Add popup for health analyzer target (#29803)
* Add popup for health analyzer target

* addition

* fix showing popup to all
2024-07-09 04:42:35 -04:00
lzk
74d9ac7241
Add popup for healing target (#29804)
* Add popup for healing target

* hop

* huh

* fix one

* fix showing popup to all
2024-07-09 04:41:47 -04:00
slarticodefast
92e2980534
Improve throwing precision (#29726)
* improve throwing precision

* remove debugging logs

* minor fixes

* f

* Update Content.Shared/Throwing/LandAtCursorComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-08 19:03:53 +10:00
Tayrtahn
8c3e72c8c8
Silence ringtones on admin PDAs (#29801)
* Silence ringtones on invisible PDAs

* Revert "Silence ringtones on invisible PDAs"

This reverts commit afc1041f31eebe82e83630a856a8856b877a9826.

* Literally just this

* Add an admin announcement for news article publishing
2024-07-08 13:33:17 +10:00
Nemanja
ed7f00692e
The real AME nerf (#29587)
* The real AME nerf

* oh the real change

* Update AmeNodeGroup.cs
2024-07-08 00:27:52 +10:00
Nemanja
21d0f85cc2
metal foam grenades (#29428)
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
2024-07-08 00:26:58 +10:00
Verm
13b84870ec
Bartending+: Shaking and Stirring (#29243)
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
2024-07-08 00:21:53 +10:00
Nemanja
0e9ed36b85
Intercom buffs and fixes (#29580)
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
2024-07-08 00:19:10 +10:00
beck-thompson
18df27d8e7
Spilling reagents on mutliple entities at once fix (#29763)
* Fixed!

* That could have been bad this is why I'm glad I check the diff xD
2024-07-07 13:52:18 +10:00
themias
7b99d1f851
Don't allow toggling internals while asleep (#29753) 2024-07-06 13:55:58 +10:00
VigersRay
1a9950886a Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 20:02:52 +03:00
lzk
b0ae7d5725
Add summary comments for ElectrifiedComponent fields (#29733)
add summaries for ElectrifiedComponent
2024-07-05 09:01:39 -04:00
VigersRay
72434b718d Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 13:45:25 +03:00
Jezithyr
8adcb37964
Re-enabling nukie species(except vox), added antag species blacklisting
* Revert "Make all Nukies humans (#29693)"

This reverts commit 3e3e050aaf.

* Implemented species blacklist

* Re-enabled all species as Nukies except for Vox because loadouts don't support breathing alternative gases yet.
2024-07-05 00:59:16 -07:00
VigersRay
326d0f067b Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 10:26:05 +03:00
VigersRay
8420fd6ad2 Редизайн лобби 2 2024-07-05 10:22:18 +03:00
nikthechampiongr
8e05e1cfed
Move checking code for BlacklistedRange to the right place in sqlite (#29389) 2024-07-04 21:02:53 +02:00
Vigers Ray
ff592a6963
Обнова лобби (#171)
* Обнова лобби

* Небольшой фикс

* Убрал YouTubeWindow
2024-07-04 09:44:28 +03:00