Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private void AddLanguageEntry(ProtoId<LanguagePrototype> language)
HorizontalExpand = true
};

var button = new Button { Text = "Choose" };
var button = new Button { Text = Loc.GetString("language-menu-choose-button") }; // LuaM: "Choose" > Loc.GetString("language-menu-choose-button")
button.OnPressed += _ => OnLanguageChosen(language);
state.Button = button;

Expand Down
16 changes: 14 additions & 2 deletions Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,16 @@ namespace Content.Shared._Shitmed.Medical.Surgery;

public abstract partial class SharedSurgerySystem
{

private EntityQuery<SurgeryIgnoreClothingComponent> _ignoreQuery; // LuaM-port-Shitmed-content.

private static readonly string[] BruteDamageTypes = { "Slash", "Blunt", "Piercing" };
private static readonly string[] BurnDamageTypes = { "Heat", "Shock", "Cold", "Caustic" };
private void InitializeSteps()
{

_ignoreQuery = GetEntityQuery<SurgeryIgnoreClothingComponent>(); // LuaM-port-Shitmed-content.

SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepEvent>(OnToolStep);
SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepCompleteCheckEvent>(OnToolCheck);
SubscribeLocalEvent<SurgeryStepComponent, SurgeryCanPerformStepEvent>(OnToolCanPerform);
Expand Down Expand Up @@ -278,8 +284,14 @@ private void OnToolCanPerform(Entity<SurgeryStepComponent> ent, ref SurgeryCanPe
return;
}
}

if (_inventory.TryGetContainerSlotEnumerator(args.Body, out var containerSlotEnumerator, args.TargetSlots))
// LuaM-start:
bool ignoreClothing = _ignoreQuery.HasComp(args.User)
|| args.Tools.Any(tool => _ignoreQuery.HasComp(tool));

if (!ignoreClothing
&& _inventory.TryGetContainerSlotEnumerator(args.Body, out var containerSlotEnumerator, args.TargetSlots))
// LuaM-end
// if (_inventory.TryGetContainerSlotEnumerator(args.Body, out var containerSlotEnumerator, args.TargetSlots)) // Commented by LuaM
{
while (containerSlotEnumerator.MoveNext(out var containerSlot))
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
// SPDX-FileCopyrightText: 2025 Piras314 <p1r4s@proton.me>
// SPDX-FileCopyrightText: 2025 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
//
// SPDX-License-Identifier: AGPL-3.0-or-later

using Robust.Shared.GameStates;

namespace Content.Shared._Shitmed.Medical.Surgery;

/// <summary>
/// Allows the entity to do surgery without having to remove clothing.
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed partial class SurgeryIgnoreClothingComponent : Component { }
14 changes: 0 additions & 14 deletions Resources/Audio/_LuaM/AdminSound/attributions.yml

This file was deleted.

17 changes: 16 additions & 1 deletion Resources/Audio/_LuaM/Music/attributions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
- files: ["running_in.ogg"]
license: "Custom"
copyright: "Creative Commons. Created by Q/\ntum"
source: "https://www.youtube.com/watch?v=AisGME8DRk0"
source: "https://www.youtube.com/watch?v=AisGME8DRk0"

- files: ["Scattle2.ogg"]
license: "CC-BY-SA-4.0"
copyright: "Created by Maciej EllisTinker (Discord) for Space Station 14 server Frontier Colososs"
source: "https://github.com/Lua-Frontier/Monolith-DS"

- files: ["Hotline_Run.ogg"]
license: "CC-BY-SA-4.0"
copyright: "Created by Maciej EllisTinker (Discord) for Space Station 14 server Frontier Colososs"
source: "https://github.com/Lua-Frontier/Monolith-DS"

- files: ["Hotlin_Hookers.ogg"]
license: "CC-BY-SA-4.0"
copyright: "Created by Maciej EllisTinker (Discord) for Space Station 14 server Frontier Colososs"
source: "https://github.com/Lua-Frontier/Monolith-DS"
Binary file modified Resources/Audio/_LuaM/Music/running_in.ogg
Binary file not shown.
7 changes: 6 additions & 1 deletion Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,9 @@
- files: ["scalpel2.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from cmss13"
source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"

- files: ["bone_setter.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Darkrell"
source: "https://github.com/ss14Starlight/space-station-14"
Binary file not shown.
25 changes: 25 additions & 0 deletions Resources/Locale/en-US/_LuaM/catalog/selectable_sets.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
selectable-set-an-medic-doctor-kit-name = Physician
selectable-set-an-medic-doctor-kit-desc =
An ageless classic. For those who like to work fast!
The kit includes: MOD "Rag", void jetpack,
two combat medkits, an Interdyne defibrillator,
two anti-radiation and anti-toxin auto-injectors each,
as well as 3 mechanical and 3 physical damage auto-injectors,
and 3 combat medipens.

selectable-set-an-medic-surgeon-kit-name = Surgeon
selectable-set-an-medic-surgeon-kit-desc =
Perfect work requires surgical precision...
The kit includes: MOD "Rag", surgeon's attire,
Syndicate surgical multitool, operation equipment,
two toxin flush kits, and an advanced
surgical kit (energy tools and BS gloves).

selectable-set-an-medic-chemistry-kit-name = Chemist
selectable-set-an-medic-chemistry-kit-desc =
Patience and chemistry are the keys to success!
The kit includes: MOD "Rag", Syndicate hypospray,
bluespace beaker, chemical pouch, omnizine jug,
two chemical synthesis kits, chemical
bluespace glassware blueprints, and everything needed
to set up a field chemical laboratory.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
metabolizer-type-cybernetic = Cybernetic
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_EE/language/language-menu.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ language-menu-window-title = Языки
language-menu-current-language = Текущий: {$language}
language-menu-description-header = Описание
ui-options-function-open-language-menu = Открыть меню языков
language-menu-choose-button = Выбрать
Loading
Loading