Vigers Ray
cdb190bf50
фелиниды дубинки
2025-02-10 13:11:59 +03:00
Vigers Ray
7b1782f4c7
Лимит безопастного давления для вентиляций (Чтобы не делали 4500кПа в вентиляции)
2025-02-10 10:35:23 +03:00
Vigers Ray
084c955371
фикс движения в вентиляции
2025-02-10 10:07:46 +03:00
Vigers Ray
4b97863bf4
Merge remote-tracking branch 'space-wizards/master'
2025-02-10 08:39:27 +03:00
Vigers Ray
08ff9c2d9e
Фикс движения в вентиляции и комбез уплотнения для атмоса
2025-02-10 08:36:47 +03:00
metalgearsloth
a269850a73
Gravity well improvements ( #35027 )
...
* Gravity well improvements
- Fixed persistence
- Removed dummy fields
- Performance
* Update Content.Server/Singularity/Components/GravityWellComponent.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-10 06:18:24 +01:00
Vigers Ray
d6b6d5ee46
фикс апстрима
2025-02-10 08:04:00 +03:00
Vigers Ray
652852e1ca
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
2025-02-10 07:47:04 +03:00
Zachary Higgs
1c8e7443ae
Move DnaComponent to shared ( #35012 )
...
* Move DnaComponent to shared
- Add Using statements to AdminSystem and StationRecordsSystem to point
to Content.Shared.Forensics
* Proper namespacing
* Revert an un-intended change
* Add Networking to DNA Component
* CR - Remove ("dna")
* CR - add back ("dna") tag
2025-02-10 04:36:01 +01:00
Zachary Higgs
8b46538e3f
Move CloneAppearance to Shared ( #35017 )
...
* Move CloneAppearance
- Move CloneAppearance from HumanoidAppearanceSystem
to SharedHumanoidAppearanceSystem
* CR - Fix the sins of the past
2025-02-10 04:13:27 +01:00
Babaev
67316d6138
Фикс голосования о выборе карт ( #1299 )
2025-02-10 05:00:01 +03:00
Vigers Ray
42daef2255
Фикс апстрима
2025-02-10 04:53:54 +03:00
Vigers Ray
4c2742b365
Merge remote-tracking branch 'space-wizards/master'
2025-02-10 04:33:51 +03:00
Vigers Ray
163df9d5a9
Мехи говорят
2025-02-10 04:32:54 +03:00
IProduceWidgets
fe064adaec
Allows pacifists to throw Items with DamageOnLand ( #31060 )
2025-02-09 20:24:10 -05:00
Zachary Higgs
6cb30b3092
Make UnrevivableComponent shared, give the component reason messages and if it shows up on the analyzer ( #35013 )
...
* Make UnrevivableComponent shared
- Move UnrevivableComponent to shared
- add reason messages and if the status shows up in a health analyzer
* Update Content.Shared/Traits/Assorted/UnrevivableComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Make UnrevivableComponent networked
* Update Content.Shared/Traits/Assorted/UnrevivableComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-10 00:16:21 +01:00
Vigers Ray
1e617b9896
Фелинидам не место в мехах для больших дядь
2025-02-10 00:39:59 +03:00
Vigers Ray
62a972a050
админвху для всех
2025-02-09 23:38:39 +03:00
Vigers Ray
7abc8efa2a
фиксы апстрима
2025-02-09 23:35:01 +03:00
Vigers Ray
3355febe9b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
2025-02-09 22:17:22 +03:00
Milon
9963416c1d
improve GetInStation filter ( #33405 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-02-09 20:45:11 +11:00
metalgearsloth
ba1fd6c5f3
Make ReactionResults an array ( #34967 )
...
* Make ReactionResults an array
We're making the dictionaries fixed-size anyway.
Alternatively could use a frozendictionary but not sure on the perf difference. Worst case whoever adds another reactionresult makes a minor adjustment
* apply conventions
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-09 03:13:47 +01:00
Ignaz "Ian" Kraft
36b59c69f4
allow paper labels on seeds ( #34450 )
...
* allow paper labels on seeds
* added the components required by PaperLabel to the SeedBase
* localize insert/eject for PaperLabel
* visualize the paper label on seeds
* new paper layer for seeds
* eject the seed label on use
* different looking paper label
* forgot to turn on a layer
2025-02-08 15:16:06 -08:00
ScarKy0
bf6fd4d581
Wizard Item Recall Spell ( #34411 )
2025-02-08 16:56:08 -05:00
metalgearsloth
d7e978274a
Make Ignite tryget flammablecomp ( #34970 )
...
The flammable effect does it but we don't do it here for reasons. Sometimes this heisentests.
2025-02-08 11:56:44 +01:00
Vigers Ray
94fc2beffa
долбоеб
2025-02-08 02:39:02 +03:00
deltanedas
1f5fab5761
move lathe recipes into packs (easier for forks and maintaining) ( #33095 )
...
* add LatheRecipePackPrototype
* change Lathe and EmagLathe to use packs
* add AddRecipesFromPacks helper to SharedLatheSystem
* update lathe logic to work with packs and clean up some stuff
* migrate individual recipes to recipe packs
* update client
* remove node/artifact scanner from techs
* :trollface:
* fix test and make it include emag recipes
* add test that every dynamic recipe must be researched
* pro
* fix
* fix
* fix all tests, genuinely good test i wonder who made it
* add unused uranium and incendiary drozd mags to tech and lathe
* add recipes
* add incendiary prototype
* undo some changes
* troll
* :trollface:
* true
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
* shitmed real
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
* update funny test
* :trollface:
* :trollface:
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-07 19:22:49 +01:00
TemporalOroboros
f37d5c9f0f
Purge uses of TransformComponent.AttachToGridOrMap ( #34940 )
...
Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap
2025-02-07 12:49:22 +01:00
Vigers Ray
2e9eb2f9d6
ыыыыы
2025-02-06 22:21:58 +03:00
12rabbits
b6ccbef147
DNA scrambler examine fixes ( #34920 )
...
* Remove custom character description after using DNA scrambler
* Mark grammar as dirty when updating identity
* Update Content.Server/Implants/SubdermalImplantSystem.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-06 11:09:59 -08:00
slarticodefast
3940d22076
Merge stable into master ( #34924 )
2025-02-06 16:35:48 +01:00
slarticodefast
11e5d59171
HOTFIX: fix minibomb implant and syndicats not exploding ( #34923 )
...
fix minibomb implant not exploding
2025-02-06 16:17:58 +01:00
Palladinium
001d61c6d5
Add air alarm admin logs ( #33426 )
2025-02-05 21:10:21 -08:00
Vasilis The Pikachu
36e42fb4b2
Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging
2025-02-06 01:11:50 +01:00
Plykiya
0d9f9e9615
Make hacking energy swords predicted ( #34877 )
...
* Make hacking energy swords predicted
* Fix up component, add dirty call
* access
* Dirty Entity<T>
* false
2025-02-05 20:48:28 +01:00
Whatstone
5092681729
HealingSystem: check blood restoration, staunching ( #33526 )
...
* HealingSystem: check blood restoration, staunching
* Milon's suggestions
* beck-thompson's requests
2025-02-05 04:23:30 +01:00
Vigers Ray
2e3945004b
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/migration.yml
2025-02-05 04:48:05 +03:00
Vigers Ray
a901adcab1
ы
2025-02-05 04:44:47 +03:00
Vigers Ray
044f74822f
ы
2025-02-05 03:40:42 +03:00
Vigers Ray
cfbd768f53
ы
2025-02-05 03:40:19 +03:00
Vigers Ray
74761b9309
Попытка не пытка
2025-02-05 01:39:11 +03:00
SlamBamActionman
e58d031300
Hristov & .60 changes - Hristov Rework, Part 2 ( #31662 )
...
* Initial commit
* Updated values to reflect new resistances
* Review fixes
* Review fixes
* LINQ BEGONETH
2025-02-04 22:55:09 +01:00
ActiveMammmoth
6a017ef17b
Mind Swap Fix ( #33553 )
...
* Stores owned by mind instead of body
* Requested changes, traitor uplink fixed
* Store, listings fixed and now use Entity<MindComponent>
* Removed duplicate code
* test change
* test change 2
* back to mind entityuid
* MilonPL requested minor changes
* ScarKy0 requested changes
2025-02-04 17:25:54 +01:00
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
SlamBamActionman
f25720124a
Fix hitting through directional windows (and more!) ( #34793 )
2025-02-02 23:03:31 +01: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
