Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upd 1 #10

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
79e504d
Merge pull request #11 from Tropica1Owl/Pogmed
Eagle-0 Aug 25, 2024
682722e
Merge pull request #12 from Tropica1Owl/Pogmed
Eagle-0 Aug 26, 2024
c5e01da
Merge pull request #15 from Tropica1Owl/Pogmed
Eagle-0 Sep 1, 2024
35395ac
Merge pull request #16 from Tropica1Owl/Pogmed
Eagle-0 Sep 2, 2024
1c1745f
Merge pull request #17 from Tropica1Owl/Pogmed
Eagle-0 Sep 4, 2024
50d8755
cirurgia
Tropica1Owl Sep 5, 2024
a59275a
Cirurgia (#1)
Dreammyrr Sep 6, 2024
5fa5cae
Update security.yml
Dreammyrr Sep 6, 2024
60337b6
Update DefaultRules.xml
Dreammyrr Sep 6, 2024
e19ad46
Update RoleTypes.xml
Dreammyrr Sep 6, 2024
06edf32
Update CriminalRecords.xml
Dreammyrr Sep 6, 2024
c1c3905
Update Defusal.xml
Dreammyrr Sep 6, 2024
b753d05
Update Forensics.xml
Dreammyrr Sep 6, 2024
707854d
Update Security.xml
Dreammyrr Sep 6, 2024
09a28d8
Musicas para a Jukebox
Dreammyrr Sep 6, 2024
793fdbb
Update attributions.yml
Dreammyrr Sep 6, 2024
db0c680
Update Standard.yml
Dreammyrr Sep 6, 2024
75c9019
Update runserver.bat
Dreammyrr Sep 6, 2024
faf1a81
Tradução (#2)
Dreammyrr Sep 6, 2024
fcb0c2d
Merge branch 'DeltaV-Station:master' into master
Dreammyrr Sep 11, 2024
ca79548
musica - 001
Dreammyrr Sep 11, 2024
e662767
Add files via upload
Dreammyrr Sep 11, 2024
acd2a0e
musica - 002
Dreammyrr Sep 11, 2024
f9865b7
Update Standard.yml
Dreammyrr Sep 11, 2024
295e098
Guidebook da Sec atualizado, adição da spacelaw
Dreammyrr Sep 11, 2024
d1f7844
Update guides.ftl
Dreammyrr Sep 11, 2024
a0f9d4f
Dreammyrr music 1 1 (#8)
Dreammyrr Sep 11, 2024
930e114
Guidebook da Sec atualizado, adição da spacelaw integrado no guideboo…
Dreammyrr Sep 11, 2024
10144a8
musica - 002 (#4)
Dreammyrr Sep 11, 2024
bca99c0
Update Standard.yml (#6)
Dreammyrr Sep 11, 2024
28d71a8
musica - 002 (#5)
Dreammyrr Sep 11, 2024
e8abe7d
musica - 002 (#4) (#9)
Dreammyrr Sep 11, 2024
4e6a60c
Merge branch 'DeltaV-Station:master' into master
Dreammyrr Sep 16, 2024
5ec6373
Merge branch 'master' into upd-1
Dreammyrr Sep 23, 2024
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
Binary file added Burguesinha+4180+5.ogg
Binary file not shown.
Binary file added Chitaozinho_Xororo_Evidencias.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Content.Server.Palmtree.Surgery
{
[RegisterComponent]
public partial class MindExchangerComponent : Component
{
[DataField("Mind")]
[ViewVariables(VVAccess.ReadWrite)]
public EntityUid mind = default!;

[DataField("ContainsMind")]
[ViewVariables(VVAccess.ReadWrite)]
public bool occupied = false;
}
}
12 changes: 12 additions & 0 deletions Content.Server/Palmtree/Surgery/Components/TendWoundComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using Content.Shared.Damage;

namespace Content.Server.Palmtree.Surgery
{
[RegisterComponent]
public partial class PTendWoundsComponent : Component
{
[DataField("healThisMuch", required: true)] // Sorry I can't stop making silly names
[ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier healThisMuch = default!;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Collections.Generic;

namespace Content.Server.Palmtree.Surgery
{
[RegisterComponent]
public partial class PPatientComponent : Component //"PPatient" because wizden might add surgery down the line, so I'm doing this to avoid conflicts.
{
public List<string> procedures = new List<string>();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using Content.Shared.Damage;
using Robust.Shared.Audio;

namespace Content.Server.Palmtree.Surgery
{
[RegisterComponent]
public partial class PSurgeryToolComponent : Component
{
[DataField("kind")]
[ViewVariables(VVAccess.ReadWrite)]
public string kind = "scalpel";

[DataField("subKind")]
[ViewVariables(VVAccess.ReadWrite)]
public string subKind = "none"; // Used for implants

[DataField("useDelay")]
[ViewVariables(VVAccess.ReadWrite)]
public float useDelay = 3.0f;

[DataField("bleedAmountOnUse")]
[ViewVariables(VVAccess.ReadWrite)]
public float bleedAmountOnUse = 0.0f; // Cutting tools usually are the ones that cause bleed

[DataField("damageOnUse", required: true)] // Tools damage the patient on use except in special cases.
[ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier damageOnUse = default!;

[DataField("audioStart")]
[ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier? audioStart = null;

[DataField("audioEnd")]
[ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier? audioEnd = null;

[DataField("consumedOnUse")] // Used for implants
[ViewVariables(VVAccess.ReadWrite)]
public bool consumedOnUse = false;
}
}
319 changes: 319 additions & 0 deletions Content.Server/Palmtree/Surgery/SurgerySystem.cs

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Content.Shared/Atmos/Rotting/RottingComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ public sealed partial class RottingComponent : Component
/// The damage dealt by rotting.
/// </summary>
[DataField]
public DamageSpecifier Damage = new()
public DamageSpecifier Damage = new() // SYNDIE STATION CHANGE START
{
DamageDict = new()
{
{ "Blunt", 0.06 },
{ "Cellular", 0.06 }
{ "Poison", 0.15 },
{ "Asphyxiation", 0.15 },
{ "Radiation", -10 }
}
};
}; // SYNDIE STATION CHANGE END
}
11 changes: 11 additions & 0 deletions Content.Shared/Palmtree/Surgery/SharedSurgery.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;

namespace Content.Shared.Palmtree.Surgery
{
public abstract partial class SharedSurgerySystem : EntitySystem
{
[Serializable, NetSerializable]
protected sealed partial class SurgeryDoAfterEvent : SimpleDoAfterEvent {}
}
}
Binary file added Crucified+3350+5.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Jukebox/Crucified+3350+5.ogg
Binary file not shown.
Binary file added Resources/Audio/Jukebox/Furrymon+3310+5.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Jukebox/Shadow 4EVER+3250+5.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Jukebox/aloneedge.ogg
Binary file not shown.
22 changes: 21 additions & 1 deletion Resources/Audio/Jukebox/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,24 @@
- files: ["sunset.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Sunset by PigeonBeans. Exported in Mono OGG."
source: "https://soundcloud.com/pigeonbeans/sunset"
source: "https://soundcloud.com/pigeonbeans/sunset"

- files: ["aloneedge.ogg"]
license: "CC-BY-4.0"
copyright: "Dream Sweet in Sea Major - Miracle Musical."
source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"

- files: ["The_Missile_Knows_Where_It_Is.ogg"]
license: "CC-BY-4.0"
copyright: "Dream Sweet in Sea Major - Miracle Musical."
source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"

- files: ["Chitaozinho_Xororo_Evidencias.ogg"]
license: "CC-BY-4.0"
copyright: "Chitaozinho e Xororo - Evidencias"
source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"

- files: ["Luiz_Gonzaga_Asa_Branca.ogg"]
license: "CC-BY-4.0"
copyright: "Luiz Gonzaga - Asa Branca"
source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"
Binary file added Resources/Audio/Jukebox/fenda da sunga+3020+5.ogg
Binary file not shown.
Binary file added Resources/Audio/Jukebox/garcom+3210+5.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Jukebox/moskau+4270+5.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Jukebox/thats life+3070+5.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Palmtree/Items/Medical/organ1.ogg
Binary file not shown.
Binary file added Resources/Audio/Palmtree/Items/Medical/organ2.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Palmtree/Items/Medical/saw.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 10 additions & 5 deletions Resources/Locale/en-US/guidebook/guides.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@ guide-entry-xenoarchaeology = Xenoarchaeology
guide-entry-artifact-reports = Artifact Reports
guide-entry-traversal-distorter = Traversal Distorter
guide-entry-machine-upgrading = Machine Upgrading
guide-entry-robotics = Robotics
guide-entry-robotics = Roboticas
guide-entry-cyborgs = Cyborgs
guide-entry-security = Security
guide-entry-forensics = Forensics
guide-entry-defusal = Large Bomb Defusal
guide-entry-criminal-records = Criminal Records
guide-entry-security = Segurança
guide-entry-forensics = Perícia
guide-entry-defusal = Desativação de Bomba Grande
guide-entry-criminal-records = antecedentes criminais
guide-entry-sb = Substancias
guide-entry-sl = SpaceLaw
guide-entry-cl = ListaCrimes
guide-entry-item = Items
guide-entry-gear = Equipamentos
guide-entry-command = Command
guide-entry-service = Service

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- id: Cautery
- id: Retractor
- id: Scalpel
- id: PhantomLinkCard # Syndie change

- type: entity
parent: ClothingBackpackDuffelSyndicateMedicalBundle
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
- id: Saw
- id: Hemostat
- id: ClothingMaskSterile
- id: PhantomLinkCard # Syndie change

- type: entity
id: CrateMedicalScrubs
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
- id: MedicalTechFabCircuitboard
- id: MedkitFilled
- id: RubberStampCMO
- id: MedicalBiofabMachineBoard # Mudança daqui, em caso de merge conflict manter essa linha onde está

# Hardsuit table, used for suit storage as well
- type: entityTable
Expand Down
139 changes: 139 additions & 0 deletions Resources/Prototypes/Catalog/Jukebox/Standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,142 @@
name: PigeonBeans - Sunset
path:
path: /Audio/Jukebox/sunset.ogg

- type: jukebox
id: aloneedge
name: Alone At The Edge - Miracle Musical
path:
path: /Audio/Jukebox/aloneedge.ogg

- type: jukebox
id: The_Missile_Knows_Where_It_Is
name: The Missile Knows Where It Is
path:
path: /Audio/Jukebox/The_Missile_Knows_Where_It_Is.ogg

- type: jukebox
id: Chitaozinho_Xororo_Evidencias
name: Chitaozinho e Xororo - Evidencias
path:
path: /Audio/Jukebox/Chitaozinho_Xororo_Evidencias.ogg

- type: jukebox
id: Luiz_Gonzaga_Asa_Branca
name: Luiz Gonzaga - Asa Branca
path:
path: /Audio/Jukebox/Luiz_Gonzaga_Asa_Branca.ogg

- type: jukebox
id: a_morte_do_vaqueiro
name: A Morte do vaqueiro
path:
path: /Audio/Jukebox/a_morte_do_vaqueiro.ogg

- type: jukebox
id: aster_dark_x_sweater
name: after dark x sweater weather
path:
path: /Audio/Jukebox/after_dark_x_sweater.ogg

- type: jukebox
id: american_boy
name: American Boy
path:
path: /Audio/Jukebox/american boy+3590+5.ogg

- type: jukebox
id: Burguesinha
name: Burguesinha
path:
path: /Audio/Jukebox/Burguesinha+4180+5.ogg

- type: jukebox
id: Crucified
name: Crucified - ArmyOfLoversVEVO
path:
path: /Audio/Jukebox/Crucified+3350+5.ogg

- type: jukebox
id: Furrymon
name: Furrymon
path:
path: /Audio/Jukebox/Furrymon+3310+5.ogg

- type: jukebox
id: garcom
name: garçom
path:
path: /Audio/Jukebox/garcom+3210+5.ogg

- type: jukebox
id: house_of_the_rising_sun
name: house of the rising sun
path:
path: /Audio/Jukebox/house of the rising sun+4200+5.ogg

- type: jukebox
id: I_m_Still_Standing
name: I'm Still Standing
path:
path: /Audio/Jukebox/I'm Still Standing+3010+5.ogg

- type: jukebox
id: moskau
name: Moskou
path:
path: /Audio/Jukebox/moskau+4270+5.ogg

- type: jukebox
id: Não_Creio_em_Mais_Nada
name: Não Creio em Mais Nada
path:
path: /Audio/Jukebox/Não Creio em Mais Nada+2190+5.ogg

- type: jukebox
id: Numa_Sala_de_Reboco
name: Numa Sala de Reboco
path:
path: /Audio/Jukebox/Numa Sala de Reboco+2180+5.ogg

- type: jukebox
id: pelados_em_santos
name: pelados em santos
path:
path: /Audio/Jukebox/pelados em santos+3230+5.ogg

- type: jukebox
id: rap_do_minecraft
name: rap do minecraft
path:
path: /Audio/Jukebox/rap do minecraft+3090+5.ogg

- type: jukebox
id: Stronger_-_Kanye_West
name: Stronger - Kanye West
path:
path: /Audio/Jukebox/Stronger - Kanye West+5120+5.ogg

- type: jukebox
id: thats_life
name: thats life
path:
path: /Audio/Jukebox/thats life+3070+5.ogg

- type: jukebox
id: The_Ecstasy_of_Gold
name: The Ecstasy of Gold
path:
path: /Audio/Jukebox/The Ecstasy of Gold+3200+5.ogg

- type: jukebox
id: trepada_em_cuiaba
name: trepada em cuiaba
path:
path: /Audio/Jukebox/trepada em cuiaba+2420+5.ogg

#- type: jukebox
# id:
# name:
# path:
# path: /Audio/Jukebox/Path

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1212,6 +1212,7 @@
description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
abstract: true
components:
- type: PPatient
- type: CombatMode
- type: Inventory
templateId: monkey
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
id: BaseMobSpecies
abstract: true
components:
- type: PPatient
- type: Sprite
layers:
- map: [ "enum.HumanoidVisualLayers.Chest" ]
Expand Down
Loading
Loading