Boaz1111
c9e19445b4
Industrial Reagent Grinder Hotfix ( #26571 )
...
fixed
2024-03-30 16:25:50 -04:00
JabkaGenius
887bf14a45
- add: Что бы в looc не срали
2024-03-30 21:38:29 +03:00
Plykiya
7638252df3
Fix GasMixers/Filters not working ( #26568 )
...
* Fix GasMixers/Filters not working
* OKAY GAS FILTERS TOO
---------
Co-authored-by: Plykiya <plykiya@protonmail.com >
2024-03-30 14:11:44 -04:00
RavMorgan
7ef173bc2b
Cringe ( #257 )
...
Co-authored-by: Mona Hmiza <you@example.com >
2024-03-30 19:58:37 +03:00
lzk
1ffa5c28d8
Make BaseMedicalPDA abstract ( #26567 )
2024-03-30 12:38:38 -04:00
RavMorgan
741eb8bbf5
Fuck C# ( #256 )
...
Co-authored-by: Mona Hmiza <you@example.com >
2024-03-30 19:22:13 +03:00
RavMorgan
608df5a713
Added log error ( #255 )
...
Co-authored-by: Mona Hmiza <you@example.com >
2024-03-30 18:43:50 +03:00
RavmorganButOnCocaine
d49f4918ba
Automatic changelog update
2024-03-30 12:03:15 +00:00
Aviu00
a2a5459a07
Neuro control implant ( #253 )
...
* - add: Neuro control implanter.
* - tweak: Less beanbag stamina damage.
* - tweak: No heat damage.
2024-03-30 15:02:10 +03:00
Aviu00
034a18b1d0
- add: Time beacon. ( #254 )
2024-03-30 15:02:02 +03:00
PJBot
1e51febc67
Automatic changelog update
2024-03-30 06:53:32 +00:00
takemysoult
97b390d35f
up stimulants (no sleep) ( #25886 )
...
* up stimulants (no sleep)
* Update SharedSleepingSystem.cs
2024-03-30 00:52:27 -06:00
Remuchi
490db8a593
я не знаю
2024-03-30 13:03:51 +07:00
Remuchi
cee423f4c8
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/open-inhand-right.png
2024-03-30 11:40:01 +07:00
PJBot
0f6c7c9d51
Automatic changelog update
2024-03-30 04:37:39 +00:00
liltenhead
9ddfe38668
Adjust syndicate hardbomb damage ( #26548 )
...
hardbomb tweaks
2024-03-30 15:36:33 +11:00
Remuchi
297cfd23ad
пара фиксов
2024-03-30 11:33:13 +07:00
Leon Friedrich
888a3bda51
Atmos device performance improvements ( #26493 )
...
* Atmos device performance improvements
* AtmosDirection perf improvements
* Fix errors
* Add GasTileOverlayComponent arguments
* Make excite no longer invalidate a tile
2024-03-30 15:17:53 +11:00
PJBot
aa96baeb5f
Automatic changelog update
2024-03-30 04:01:31 +00:00
PJBot
299625772d
Automatic changelog update
2024-03-30 04:00:26 +00:00
EdenTheLiznerd
431c3ad3b8
Rebalance amatoxin so it is a slower killer ( #25830 )
...
* Balancing? Balancing!!!
* Additional changes
2024-03-30 15:00:21 +11:00
Plykiya
f192d7901f
Hyposprays Draw from Jugs ( #25544 )
...
* Hyposprays Draw from Jugs
* Fix last onlyMobs usage in yml
* Some Suggested Changes
* Remove unnecessary datafield name declarations
* Remove unnecessary dirtying of component
* Same line parentheses
* Added client-side HypospraySystem
* Cache UI values and only updates if values change
* empty line
* Update label
* Label change
* Reimplement ReactionMixerSystem
* Remove DataField from Hypospray Toggle Mode
* Change ToggleMode from enum to Bool OnlyAffectsMobs
* Add DataField required back since it's required for replays...?
* update EligibleEntity and uses of it
* Add user argument back
* Adds newline
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
* Guard for dirty entity
* Adds summary tag
---------
Co-authored-by: Plykiya <plykiya@protonmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-30 14:59:16 +11:00
Remuchi
d4aba17eaa
Revert "Re-resprites labcoats ( #26425 )"
...
This reverts commit bd58954d4e
2024-03-30 10:43:16 +07:00
Remuchi
5aff149c43
Revert "Add stealthmins ( #26263 )"
...
This reverts commit dca0c6694b
2024-03-30 10:41:05 +07:00
PJBot
3fc02edd4e
Automatic changelog update
2024-03-30 03:36:48 +00:00
Remuchi
0b2238b57a
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Bed/Sleep/SleepingSystem.cs
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Body/Components/RespiratorComponent.cs
# Content.Server/Body/Systems/InternalsSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chat/Managers/IChatManager.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
# Content.Server/Electrocution/ElectrocutionSystem.cs
# Content.Server/Holosign/HolosignProjectorComponent.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/box.yml
# Resources/Maps/centcomm.yml
# Resources/Maps/cluster.yml
# Resources/Maps/europa.yml
# Resources/Maps/marathon.yml
# Resources/Maps/meta.yml
# Resources/Maps/omega.yml
# Resources/Maps/origin.yml
# Resources/Maps/packed.yml
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
# Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
2024-03-30 10:36:17 +07:00
Zealith-Gamer
39753892c2
Stop items that are being pulled from spinning ( #26504 )
...
* Fixed pulled items spinning when moved
* edited out others issues
* more reverts
* requested fix
* Removed "Optional:"
2024-03-30 14:35:42 +11:00
PJBot
3af54a286e
Automatic changelog update
2024-03-30 03:32:37 +00:00
metalgearsloth
fc4389f2d7
Fix itemslots swapping ( #25634 )
...
Fix itemslots prediction
2024-03-30 14:31:47 +11:00
SonicHDC
52db14a19d
Zippable coats ( #26494 )
...
* Update base_clothingouter.yml
* Update coats.yml
* Change Flipped to Opened
* labcoat
* coat
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* cmo
* gene
* rd
* robo
* sci
* viro
* Locale zip-unzip
* Missing meta
* Fix wrong sprites
2024-03-30 14:31:32 +11:00
PJBot
ac12982049
Automatic changelog update
2024-03-30 02:47:27 +00:00
Boaz1111
6ef592ddba
Industrial Reagent Grinder ( #25020 )
...
* all work done
* adress whitespace
* millions must factorio
* conflict fix
* i forgot
2024-03-30 13:46:20 +11:00
Leon Friedrich
bb5ca720fc
Split GasTileOverlaySystem update over two ticks ( #26542 )
...
Split GasTileOverlaySystem update over ticks
2024-03-30 13:34:55 +11:00
metalgearsloth
d215419f9a
Revert "Fix scram implant's teleportation out of containers" ( #25030 )
...
* Revert "Fix scram implant's teleportation out of containers (#24827 )"
This reverts commit d4434dbb5e
2024-03-30 13:28:42 +11:00
Pieter-Jan Briers
3b791459c7
Refactor FTL time tracking code to fix a UI bug ( #26538 )
...
The FTL UI on the shuttle console would reset the FTL progress bar every time you open it. This is because the server only sends "time until completion", not a start/end time. The FTL code now uses a separate start/end time so the exact same progress bar can be preserved.
For convenience, I made a StartEndTime record struct that stores the actual tuple. This is now used by the code and has some helpers.
2024-03-30 12:40:55 +11:00
PJBot
72c6a14d59
Automatic changelog update
2024-03-30 01:26:48 +00:00
Alice "Arimah" Heurlin
2e9c8f691c
Fix guardian damage transfer ( #26541 )
2024-03-29 21:25:42 -04:00
PJBot
86a24db72a
Automatic changelog update
2024-03-30 00:02:45 +00:00
Mephisto72
649af483e4
Increase Ion Storm Weights ( #26539 )
...
This increases the probability for the following effects caused by Ion Storms:
Chance to affect a Station Borg: 50% -> 80%
Chance to replace a Law: 10% -> 20%
Chance to remove a Law: 10% -> 20%
Chance to shuffle Laws: 10% -> 20%
2024-03-30 11:01:39 +11:00
Leon Friedrich
985c4b4016
Fix empty atmos deserialization ( #26540 )
...
Fix atmos deserialization
2024-03-30 10:58:12 +11:00
PJBot
3a3652a767
Automatic changelog update
2024-03-29 23:47:13 +00:00
deltanedas
355d00a0f2
combine same-tile explosions in the same tick ( #25664 )
...
* combine same-tile explosions in the same tick
* !
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-30 10:46:05 +11:00
RavmorganButOnCocaine
18ac666686
Automatic changelog update
2024-03-29 20:34:11 +00:00
CaypenNow
6f477f32ae
Модули для оружия ( #222 )
2024-03-30 01:33:08 +05:00
RavMorgan
3b7f90d729
Added global time manager ( #251 )
...
* Added global time manager
* Created IPlayTimeTrackingManager
* adds default api link
---------
Co-authored-by: Mona Hmiza <you@example.com >
Co-authored-by: Valtos <valtos@spaces.ru >
2024-03-29 19:06:07 +00:00
CaYpeN1
24a0a41bc1
add recipes to emagged autolathe
2024-03-29 22:54:01 +05:00
metalgearsloth
28d05feea7
Fix disposals test ( #26535 )
...
The rounding at 0,0 got memed.
2024-03-30 03:03:01 +11:00
JabkaGenius
4b13439750
- add: Prikoli
...
Ебаное говно ебаного говна
2024-03-29 15:39:01 +03:00
RavmorganButOnCocaine
8e45c1c3d6
Automatic changelog update
2024-03-29 12:06:47 +00:00
Aviu00
ae221391bf
Cult stuff ( #249 )
...
* - tweak: Change sounds.
* - tweak: Update stun desc.
* - add: Add hint.
* - tweak: Change juggernaut ability.
* - add: Constructs can't harm allies.
* - add: Name identifier for constructs.
* - add: Pylon now produces oxygen.
* - tweak: Change sledgehammer sound.
* - tweak: Increase conceal presence audio max distance.
2024-03-29 15:05:44 +03:00
