Commit graph

31120 commits

Author SHA1 Message Date
Vigers Ray
d03dbf43fb фикс пвн и визора ниндзи 2024-12-22 01:52:00 +03:00
Vigers Ray
9720362f3e чажелог 2024-12-21 20:14:52 +03:00
Vigers Ray
23b00ae5a2 фикс меты 2024-12-21 20:13:46 +03:00
Vigers Ray
0e0aa04d11 Фикс IsCommandStaff 2024-12-21 20:12:38 +03:00
AverageNotDoingAnythingEnjoyer
d9edd558f1
Real (#897) 2024-12-21 19:51:08 +03:00
Vigers Ray
6bd2ed8d33 фиксы апстрима 2024-12-21 19:38:17 +03:00
Vigers Ray
0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/build-test-debug.yml
#	Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
#	Resources/Locale/en-US/_strings/atmos/gases.ftl
#	Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Research/industrial.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
GayBot
3f2f9653d7 Automatic changelog update 2024-12-21 18:24:36 +03:00
AverageNotDoingAnythingEnjoyer
9503ae48c7
Lawyer moment (#898) 2024-12-21 18:28:18 +03:00
GayBot
d6d90ed901 Automatic changelog update 2024-12-21 18:19:58 +03:00
AverageNotDoingAnythingEnjoyer
80627d1697
Пау (#896)
* Пау

* О, вы из англии
2024-12-21 18:23:40 +03:00
GayBot
a5c55397ed Automatic changelog update 2024-12-21 18:14:27 +03:00
GayBot
3bf7610742 Automatic changelog update 2024-12-21 18:13:20 +03:00
AverageNotDoingAnythingEnjoyer
90dc36f704
бум (#895) 2024-12-21 18:18:04 +03:00
AverageNotDoingAnythingEnjoyer
93e4400126
begone [ ] (#894) 2024-12-21 18:17:02 +03:00
Babaev
28641c657b
Фикс Ночного зрения и ПНВ (#893)
* отсоси

* Update NightVisionDeviceSystem.cs
2024-12-21 18:15:58 +03:00
GayBot
cce7e23dac Automatic changelog update 2024-12-21 18:10:49 +03:00
haiwwkes
be1efa2a81
a (#892) 2024-12-21 18:15:24 +03:00
DragonDidlo
cc21d66904
IdConsole_add_roles (#890) 2024-12-21 18:14:30 +03:00
Babaev
c8926e230e
Update GameTicker.GamePreset.cs (#888) 2024-12-21 18:12:21 +03:00
Babaev
3fc9fcf62a
Update LobbyUIController.cs (#886) 2024-12-21 18:09:56 +03:00
Babaev
05810f9aa6
fix (#885) 2024-12-21 18:09:29 +03:00
GayBot
dbe00fab3c Automatic changelog update 2024-12-21 18:02:52 +03:00
DragonDidlo
9118217bce
Доступы для Мехов и Патрульный Под (#883)
* Mech Access and Sec Pod

* fix shit
2024-12-21 18:06:32 +03:00
KaiserMaus
3b13850036
Роли СССП для Ивентов, и их вещи. (#882)
* USSP

* Fix

* AAAa

* AK514

* Трусы!

* No Doc

* Buff USSP armour & Fix

* Elite suit Tweaks

* Change

* Nerf Chainsaw & nerf Cell ERT\Nuke
2024-12-21 18:06:05 +03:00
GayBot
5ce75fbee5 Automatic changelog update 2024-12-21 18:01:05 +03:00
Focstor
8c05a52fdd
Фикс спрайта телескопички (#877)
* fix-telebaton

* fix
2024-12-21 18:04:47 +03:00
GayBot
197b443231 Automatic changelog update 2024-12-21 17:59:49 +03:00
Focstor
43de5e6abc
Фикс рук фелинидов (#876)
* fix_hand_felinid

* fix_hand_demon

* fix

* fix2
2024-12-21 18:03:28 +03:00
KaiserMaus
42d4193372
Охранно-Диагностический Визор (#872)
* ERT Amber

* Краски в техи и доработка Визора ОБР

* Update

* Debuff mech

* Mech Fix. Chang Fix

* Change
2024-12-21 18:02:38 +03:00
PJBot
1abe9db99c Automatic changelog update 2024-12-21 07:03:11 +00:00
Leon Friedrich
7baa1ae070
Update engine to v238.0.0 (#33980) 2024-12-21 18:02:04 +11:00
PJBot
b3551fb000 Automatic changelog update 2024-12-21 06:46:54 +00:00
Leon Friedrich
06e2bba8ab
Toolshed refactor (#33598)
* Content changes for engine toolshed PR

* add contains command

* more permissive commands
2024-12-21 17:45:48 +11:00
metalgearsloth
b011dbb61e
Update submodule to 237.4.0 (#33976) 2024-12-21 16:08:39 +11:00
metalgearsloth
9f4aa1ebe0
Implement some field-level deltas (#28242)
* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Implement field deltas for guns

* Content done

* Update

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-12-21 15:54:11 +11:00
PJBot
1f859167fd Automatic changelog update 2024-12-21 03:29:53 +00:00
JustinWinningham
12c5c7e91b
Wood walls from barricades (#33902)
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* fixed linter error

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

Reasonable suggestion

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

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

spelling error

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

* removed ability to build wall from 'junk' wood barrier'

* fixed ability to pry overlay barricades and not allow them to extend to full wood walls

* renamed incorrectly named entity

* fixed default entity graph so as to not complain for unit tests

* corrected my incorrect assumptions and fixed destroy cost

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-21 04:28:46 +01:00
PJBot
00f12e092a Automatic changelog update 2024-12-21 02:15:15 +00:00
ScarKy0
03a54e90f5
Increase syndicate uplink discount amount to 6. (#33950)
* Increase uplink discounts from 3 to 7

* nevermind, 6
2024-12-20 20:14:08 -06:00
PJBot
9a4f9561e6 Automatic changelog update 2024-12-20 22:35:50 +00:00
pocl v
3a917bcb56
Diona chirping & Nymph vocals (#32511)
* Adds chirping to adult diona

* Added vocals for diona nymph

* Nymphs now have a speechsound
2024-12-20 23:34:44 +01:00
PJBot
50cc90fb41 Automatic changelog update 2024-12-20 22:16:46 +00:00
lzk
919fdc0798
Add description of tool qualities to entity (#32436)
* Add description of tool qualities to entity

* LMAO I FORGOT FUCKING FTL FILE

* minor cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-20 23:15:40 +01:00
PJBot
bbceffac0e Automatic changelog update 2024-12-20 21:39:33 +00:00
AverageNotDoingAnythingEnjoyer
e4974cba25
Nanotrasen, Syndicate factions are now hostile to Dragons and Carps (#32515)
* Weh

Weh

* Now hostiles too!

Added Dragon to hostile factions for Hostiles

* Nah

Better not do this, I think
2024-12-20 22:38:27 +01:00
PJBot
a89d254425 Automatic changelog update 2024-12-20 21:28:04 +00:00
beck-thompson
a0a405768a
Add clearer defib cooldowns! (#31251)
* First commit

* Fix silly test

* Swiched stuff up

* Update Content.Shared/Medical/DefibrillatorComponent.cs

* remove unneeded visuals

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-20 22:26:56 +01:00
PJBot
0e850ab370 Automatic changelog update 2024-12-20 20:36:01 +00:00
CaptainMaru
5a07413ef8
All hostile turret (#33970)
* All hostile turret

* Other factions are now hostile against "all hostile" too
2024-12-20 23:34:53 +03:00