diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index d691f9acef3..64fc975b98c 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -1,7 +1,9 @@ using System.Linq; using Content.Client.Message; +using Content.Shared.DeltaV.Salvage.Systems; // DeltaV using Content.Shared.Salvage; using Content.Shared.Salvage.Magnet; +using Robust.Client.Player; // DeltaV using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -10,12 +12,16 @@ namespace Content.Client.Salvage.UI; public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface { [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IPlayerManager _player = default!; // DeltaV + + private readonly MiningPointsSystem _points; // DeltaV private OfferingWindow? _window; public SalvageMagnetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); + _points = _entManager.System(); // DeltaV } protected override void Open() @@ -61,6 +67,21 @@ protected override void UpdateState(BoundUserInterfaceState state) }); }; + // Begin DeltaV Additions: Mining points cost for wrecks + if (offer.Cost > 0) + { + if (_player.LocalSession?.AttachedEntity is not {} user || !_points.UserHasPoints(user, offer.Cost)) + option.Disabled = true; + + var label = new Label + { + Text = Loc.GetString("salvage-magnet-mining-points-cost", ("points", offer.Cost)), + HorizontalAlignment = Control.HAlignment.Center + }; + option.AddContent(label); + } + // End DeltaV Additions + switch (offer) { case AsteroidOffering asteroid: diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 81db78fb201..4ae1a06d176 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -45,7 +45,7 @@ private void OnMagnetClaim(EntityUid uid, SalvageMagnetComponent component, ref return; } - TakeMagnetOffer((station.Value, dataComp), args.Index, (uid, component)); + TakeMagnetOffer((station.Value, dataComp), args.Index, (uid, component), args.Actor); // DeltaV: pass the user entity } private void OnMagnetStartup(EntityUid uid, SalvageMagnetComponent component, ComponentStartup args) @@ -250,11 +250,15 @@ private void UpdateMagnetUIs(Entity data) } } - private async Task TakeMagnetOffer(Entity data, int index, Entity magnet) + private async Task TakeMagnetOffer(Entity data, int index, Entity magnet, EntityUid user) // DeltaV: add user param { var seed = data.Comp.Offered[index]; var offering = GetSalvageOffering(seed); + // Begin DeltaV Addition: make wrecks cost mining points to pull + if (offering.Cost > 0 && !(_points.TryFindIdCard(user) is {} idCard && _points.RemovePoints(idCard, offering.Cost))) + return; + // End DeltaV Addition var salvMap = _mapSystem.CreateMap(); var salvMapXform = Transform(salvMap); diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs index eb5719c892f..7610b05d7da 100644 --- a/Content.Server/Salvage/SalvageSystem.cs +++ b/Content.Server/Salvage/SalvageSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Construction; using Content.Server.GameTicking; using Content.Server.Radio.EntitySystems; +using Content.Shared.DeltaV.Salvage.Systems; // DeltaV using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Popups; @@ -52,6 +53,7 @@ public sealed partial class SalvageSystem : SharedSalvageSystem [Dependency] private readonly LabelSystem _labelSystem = default!; [Dependency] private readonly MapLoaderSystem _map = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly MiningPointsSystem _points = default!; // DeltaV [Dependency] private readonly RadioSystem _radioSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; diff --git a/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs b/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs index 33dca3ee019..e3e5c0655ec 100644 --- a/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs +++ b/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs @@ -61,6 +61,17 @@ private void OnClaimMiningPoints(Entity ent, ref Lat return (idCard, comp); } + /// + /// Returns true if the user has at least some number of points on their ID card. + /// + public bool UserHasPoints(EntityUid user, uint points) + { + if (TryFindIdCard(user)?.Comp is not {} comp) + return false; + + return comp.Points >= points; + } + /// /// Removes points from a holder, returning true if it succeeded. /// diff --git a/Content.Shared/Salvage/Magnet/AsteroidOffering.cs b/Content.Shared/Salvage/Magnet/AsteroidOffering.cs index 38da94afee2..42592d8a015 100644 --- a/Content.Shared/Salvage/Magnet/AsteroidOffering.cs +++ b/Content.Shared/Salvage/Magnet/AsteroidOffering.cs @@ -15,4 +15,6 @@ public record struct AsteroidOffering : ISalvageMagnetOffering /// Calculated marker layers for the asteroid. /// public Dictionary MarkerLayers; + + uint ISalvageMagnetOffering.Cost => 0; // DeltaV } diff --git a/Content.Shared/Salvage/Magnet/DebrisOffering.cs b/Content.Shared/Salvage/Magnet/DebrisOffering.cs index 953b9dcad9f..7f88c085977 100644 --- a/Content.Shared/Salvage/Magnet/DebrisOffering.cs +++ b/Content.Shared/Salvage/Magnet/DebrisOffering.cs @@ -6,4 +6,6 @@ namespace Content.Shared.Salvage.Magnet; public record struct DebrisOffering : ISalvageMagnetOffering { public string Id; + + uint ISalvageMagnetOffering.Cost => 0; // DeltaV: Debris is a very good source of materials for the station, so no cost } diff --git a/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs b/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs index 7d002fe679e..8aae2981fdb 100644 --- a/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs +++ b/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs @@ -2,5 +2,8 @@ namespace Content.Shared.Salvage.Magnet; public interface ISalvageMagnetOffering { - -} \ No newline at end of file + /// + /// DeltaV: How many mining points this offering costs to accept. + /// + public uint Cost { get; } +} diff --git a/Content.Shared/Salvage/Magnet/SalvageOffering.cs b/Content.Shared/Salvage/Magnet/SalvageOffering.cs index c49f1ff4022..a30328a6fa6 100644 --- a/Content.Shared/Salvage/Magnet/SalvageOffering.cs +++ b/Content.Shared/Salvage/Magnet/SalvageOffering.cs @@ -6,4 +6,6 @@ namespace Content.Shared.Salvage.Magnet; public record struct SalvageOffering : ISalvageMagnetOffering { public SalvageMapPrototype SalvageMap; + + uint ISalvageMagnetOffering.Cost => 1000; // DeltaV: Station gets next to no benefit from you pulling wrecks, force you to mine first. } diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 0d4851667ab..f392b7a3a1e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,58 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Reworked Submarine's atmos, notably the TEG is now good, easy to set - up and has a guide next to it. - type: Tweak - id: 298 - time: '2024-03-28T15:27:57.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1022 -- author: FluffiestFloof - changes: - - message: Felinids, Harpies and Vulpkanin should now Weh accordingly. - type: Fix - id: 299 - time: '2024-03-28T18:27:42.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/992 -- author: deltanedas - changes: - - message: Reworked Shoukou's atmospherics setup. The Gas Recycler is now usable - among other things. - type: Tweak - id: 300 - time: '2024-04-03T02:10:51.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1049 -- author: rosieposieeee - changes: - - message: Submarine has, once again, had some minor issues quashed, and small improvements - made. Go check out the park! - type: Tweak - id: 301 - time: '2024-04-03T19:44:14.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1053 -- author: NullWanderer - changes: - - message: Merged master, please report bugs or regressions - type: Add - - message: Mail containing books has been temporarily removed - type: Remove - id: 302 - time: '2024-04-09T07:49:38.080075+00:00' - url: null -- author: deltanedas - changes: - - message: Lighthouse is BACK! - type: Add - id: 303 - time: '2024-04-09T07:49:38.080495+00:00' - url: null -- author: Adrian16199 - changes: - - message: Added new horn designs for onis. - type: Add - id: 304 - time: '2024-04-09T07:49:38.080864+00:00' - url: null - author: FluffiestFloof changes: - message: Fixed our custom drinks not having different fill levels. @@ -3821,3 +3767,61 @@ id: 797 time: '2024-12-19T04:55:03.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2304 +- author: deltanedas + changes: + - message: Pulling wrecks on the salvage magnet now costs mining points. GO MINE!!! + type: Tweak + id: 798 + time: '2024-12-20T05:28:43.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2457 +- author: makyo + changes: + - message: round restart time + type: Tweak + id: 799 + time: '2024-12-20T05:31:37.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2229 +- author: deltanedas + changes: + - message: Removed vent fauna (spiders, slimes, snakes) events pending rework. + type: Remove + id: 800 + time: '2024-12-20T05:34:54.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2474 +- author: deltanedas + changes: + - message: Changed Salvage Weapons to be a tier 2 tech, Experimental Salvage Weaponry. + type: Tweak + - message: Crusher weapons are researchable again, PKA is roundstart. + type: Tweak + - message: Added the Fauna Protection Module for borgs, it has a PKA and crusher + dagger. + type: Add + id: 801 + time: '2024-12-20T05:38:08.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2077 +- author: Stop-Signs + changes: + - message: sleepers will no longer receive nukies as kill targets + type: Fix + id: 802 + time: '2024-12-20T17:22:58.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2483 +- author: alterae + changes: + - message: Added coats, hats, scarves, and shoes to the Psychologist's loadout options. + type: Add + - message: Added three new Psychologist job titles. + type: Add + - message: Psychologist now spawns with a folder. + type: Tweak + id: 803 + time: '2024-12-20T18:49:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2459 +- author: Lyndomen + changes: + - message: Vent critters are back, thanks for your feedback! + type: Tweak + id: 804 + time: '2024-12-21T06:29:07.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2491 diff --git a/Resources/ConfigPresets/DeltaV/horizon.toml b/Resources/ConfigPresets/DeltaV/horizon.toml index 96fc9aeb5b8..5ba5501c2e0 100644 --- a/Resources/ConfigPresets/DeltaV/horizon.toml +++ b/Resources/ConfigPresets/DeltaV/horizon.toml @@ -1,6 +1,7 @@ [game] -hostname = "[EN][MRP] Delta-v (Ψ) | Horizon [US East 3]" -soft_max_players = 80 +hostname = "[EN][MRP] Delta-v (Ψ) | Horizon [US East 3]" +soft_max_players = 80 +round_restart_time = 300 [vote] preset_enabled = true diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml index 77ea036dc76..172ba3cc63f 100644 --- a/Resources/ConfigPresets/DeltaV/periapsis.toml +++ b/Resources/ConfigPresets/DeltaV/periapsis.toml @@ -1,6 +1,7 @@ [game] -hostname = "[EN][MRP] Delta-v (Ψ) | Periapsis [US East 2]" -soft_max_players = 50 +hostname = "[EN][MRP] Delta-v (Ψ) | Periapsis [US East 2]" +soft_max_players = 50 +round_restart_time = 300 [server] rules_file = "DeltaVRuleset" diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl index 51b345aa339..c324675f688 100644 --- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl @@ -31,6 +31,53 @@ flavor-complex-candy-bubblegum = like bubble gum flavor-complex-double-ice-cream = like ice cream, twice flavor-complex-drgibbbloodred = like severe malpractice +## Delta-V additional drink flavors +flavor-complex-absinthe = like green death +flavor-complex-blue-curacao = like fermented oranges +flavor-complex-deadrum = like a botched murder +flavor-complex-n-t-cahors = five hundred dollars too expensive +flavor-complex-poison-wine = like a dark velvet +flavor-complex-acidspit = like stomach acid +flavor-complex-allies-cocktail = like wartime camaraderie +flavor-complex-amasec = like a smoking gun +flavor-complex-andalusia = like summer +flavor-complex-b52 = like a nuclear arms race +flavor-complex-bahama-mama = like a tropical vacation +flavor-complex-barefoot = like berry-picking, but without the shoes +flavor-complex-booger = like no one is watching +flavor-complex-brave-bull = like you're seeing red +flavor-complex-demons-blood = like brimstone +flavor-complex-devils-kiss = like temptation +flavor-complex-doctors-delight = like a medical miracle +flavor-complex-driest-martini = like a dry sense of humor +flavor-complex-erika-surprise = like a green dream, perfect for a warm day +flavor-complex-gin-fizz = like a fizzy lemon +flavor-complex-gildlager = like a spicy secret told over spring break +flavor-complex-grog = like a day on the high seas +flavor-complex-hippies-delight = like, totally trippy, man +flavor-complex-hooch = like homemade firewater +flavor-complex-irish-cream = like whiskey and cream +flavor-complex-kira-special = kawaii +flavor-complex-manhattan = dark and mysterious +flavor-complex-manhattan-project = like two minutes to midnight +flavor-complex-margarita = like a paradise in space +flavor-complex-martini = like a sense of humor +flavor-complex-mojito = minty fresh, and a little sweet +flavor-complex-neurotoxin = like a trip to the ER +flavor-complex-patron = like luxury +flavor-complex-red-mead = like fermented honey with a splash of blood +flavor-complex-rewriter = like an all-nighter +flavor-complex-sbiten = like you'll need a glass of milk +flavor-complex-silencer = like a broken vow +flavor-complex-snow-white = like a mistake +flavor-complex-sui-dream = like a fruit salad, perfect for the working lady +flavor-complex-syndicate-bomb = like it will blow your mind +flavor-complex-toxins-special = like a plasma fire +flavor-complex-vodka-martini = shaken, not stirred +flavor-complex-vodka-tonic = like depression in denial +flavor-complex-kvass = like bread tossed into a blender +flavor-complex-mothamphetamine = like there are buzzing wings in your mouth + candy-flavor-profile = This one is supposed to taste {$flavor}. candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}. candy-flavor-profile-unknown = You have no idea what this one is supposed to taste like. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index e08645c5ea6..90307cc2d61 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -55,6 +55,10 @@ job-alt-title-fool = Fool job-alt-title-hygiene-technician = Hygiene Technician +job-alt-title-psychiatrist = Psychiatrist +job-alt-title-social-worker = Social Worker +job-alt-title-therapist = Therapist + # Role timers JobMedicalBorg = Medical Cyborg JobCourier = Courier diff --git a/Resources/Locale/en-US/deltav/markings/moth.ftl b/Resources/Locale/en-US/deltav/markings/moth.ftl new file mode 100644 index 00000000000..59ecbdae659 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/moth.ftl @@ -0,0 +1,6 @@ +marking-MothWingsClassicSelene = Wings (Selene, Classic) + +marking-MothWingsSelene-selene_primary = Primary +marking-MothWingsSelene-selene_secondary = Secondary +marking-MothWingsSelene-selene_tertiary = Tertiary +marking-MothWingsSelene = Wings (Selene) diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 9d0b06d8804..f761cd45830 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -62,6 +62,11 @@ loadout-group-medical-doctor-neck = Medical Doctor neck loadout-group-medical-intern-id-delta = Medical Intern PDA +loadout-group-psychologist-head = Psychologist head +loadout-group-psychologist-outerclothing = Psychologist outer clothing +loadout-group-psychologist-shoes = Psychologist shoes +loadout-group-psychologist-id-delta = Psychologist PDA + # Miscellaneous loadout-group-scarfs = Scarf diff --git a/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl index d2d7ad97289..ed67706ee08 100644 --- a/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl +++ b/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl @@ -1 +1,3 @@ salvage-map-wreck-size-unknown = [color=purple]Unidentified[/color] + +salvage-magnet-mining-points-cost = Cost: {$points} Mining Points diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 0b0970ec08f..91a803da6ea 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -22,7 +22,6 @@ research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning research-technology-excavation = Mass Excavation -research-technology-salvage-weapons = Salvage Weapons research-technology-draconic-munitions = Draconic Munitions research-technology-uranium-munitions = Uranium Munitions research-technology-explosive-technology = Explosive Technology @@ -32,6 +31,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition research-technology-practice-ammunition = Practice Ammunition research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry research-technology-wave-particle-harnessing = Wave Particle Harnessing +research-technology-experimental-salvage-weaponry = Experimental Salvage Weaponry research-technology-advanced-riot-control = Advanced Riot Control research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry research-technology-experimental-battery-ammo = Experimental Battery Ammo diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml new file mode 100644 index 00000000000..7097be16ffa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml @@ -0,0 +1,27 @@ +- type: marking + id: MothWingsClassicSelene + bodyPart: Tail + markingCategory: Tail + forcedColoring: true + speciesRestriction: [Moth] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi + state: selene + +- type: marking + id: MothWingsSelene + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Moth] + sprites: + - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi + state: selene_primary + - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi + state: selene_secondary + - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi + state: selene_tertiary diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 8b4478d804c..a9ddeb881da 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -310,6 +310,38 @@ id: ClinicianIDCard state: pda-phys # - aPDA Sprite Rework +# Psychologist + +- type: entity + parent: PsychologistPDA + id: PsychiatristPDA + name: psychiatrist PDA + description: Sterile-smelling and neutrally colored. + components: + - type: Pda + id: PsychiatristIDCard + state: pda-psychiatrist + +- type: entity + parent: PsychologistPDA + id: TherapistPDA + name: therapist PDA + description: Covered in a rubberized case in a reassuring shade of brown. + components: + - type: Pda + id: TherapistIDCard + state: pda-therapist + +- type: entity + parent: PsychologistPDA + id: SocialWorkerPDA + name: social worker PDA + description: Dented and scratched. It's been well-used. + components: + - type: Pda + id: SocialWorkerIDCard + state: pda-socialworker + # Atmospherics Technician - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 8c93b96d4e6..47449201b6a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -150,6 +150,32 @@ - type: IdCard jobTitle: job-alt-title-clinician +# Psychologist + +- type: entity + parent: PsychologistIDCard + id: PsychiatristIDCard + name: psychiatrist ID card + components: + - type: IdCard + jobTitle: job-alt-title-psychiatrist + +- type: entity + parent: PsychologistIDCard + id: TherapistIDCard + name: therapist ID card + components: + - type: IdCard + jobTitle: job-alt-title-therapist + +- type: entity + parent: PsychologistIDCard + id: SocialWorkerIDCard + name: social worker ID card + components: + - type: IdCard + jobTitle: job-alt-title-social-worker + # Atmospheric Technician - type: entity diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index 9ed9b3003f4..3dc68673b0d 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml @@ -121,6 +121,232 @@ flavorType: Complex description: flavor-complex-blellow +#Delta-V additional drink flavors +- type: flavor + id: absinthe + flavorType: Complex + description: flavor-complex-absinthe + +- type: flavor + id: blue-curacao + flavorType: Complex + description: flavor-complex-blue-curacao + +- type: flavor + id: deadrum + flavorType: Complex + description: flavor-complex-deadrum + +- type: flavor + id: n-t-cahors + flavorType: Complex + description: flavor-complex-n-t-cahors + +- type: flavor + id: poison-wine + flavorType: Complex + description: flavor-complex-poison-wine + +- type: flavor + id: acidspit + flavorType: Complex + description: flavor-complex-acidspit + +- type: flavor + id: allies-cocktail + flavorType: Complex + description: flavor-complex-allies-cocktail + +- type: flavor + id: amasec + flavorType: Complex + description: flavor-complex-amasec + +- type: flavor + id: andalusia + flavorType: Complex + description: flavor-complex-andalusia + +- type: flavor + id: b52 + flavorType: Complex + description: flavor-complex-b52 + +- type: flavor + id: bahama-mama + flavorType: Complex + description: flavor-complex-bahama-mama + +- type: flavor + id: barefoot + flavorType: Complex + description: flavor-complex-barefoot + +- type: flavor + id: booger + flavorType: Complex + description: flavor-complex-booger + +- type: flavor + id: brave-bull + flavorType: Complex + description: flavor-complex-brave-bull + +- type: flavor + id: demons-blood + flavorType: Complex + description: flavor-complex-demons-blood + +- type: flavor + id: devils-kiss + flavorType: Complex + description: flavor-complex-devils-kiss + +- type: flavor + id: doctors-delight + flavorType: Complex + description: flavor-complex-doctors-delight + +- type: flavor + id: driest-martini + flavorType: Complex + description: flavor-complex-driest-martini + +- type: flavor + id: erika-surprise + flavorType: Complex + description: flavor-complex-erika-surprise + +- type: flavor + id: gin-fizz + flavorType: Complex + description: flavor-complex-gin-fizz + +- type: flavor + id: gildlager + flavorType: Complex + description: flavor-complex-gildlager + +- type: flavor + id: grog + flavorType: Complex + description: flavor-complex-grog + +- type: flavor + id: hippies-delight + flavorType: Complex + description: flavor-complex-hippies-delight + +- type: flavor + id: hooch + flavorType: Complex + description: flavor-complex-hooch + +- type: flavor + id: irish-cream + flavorType: Complex + description: flavor-complex-irish-cream + +- type: flavor + id: kira-special + flavorType: Complex + description: flavor-complex-kira-special + +- type: flavor + id: manhattan + flavorType: Complex + description: flavor-complex-manhattan + +- type: flavor + id: manhattan-project + flavorType: Complex + description: flavor-complex-manhattan-project + +- type: flavor + id: margarita + flavorType: Complex + description: flavor-complex-margarita + +- type: flavor + id: martini + flavorType: Complex + description: flavor-complex-martini + +- type: flavor + id: mojito + flavorType: Complex + description: flavor-complex-mojito + +- type: flavor + id: neurotoxin + flavorType: Complex + description: flavor-complex-neurotoxin + +- type: flavor + id: patron + flavorType: Complex + description: flavor-complex-patron + +- type: flavor + id: red-mead + flavorType: Complex + description: flavor-complex-red-mead + +- type: flavor + id: rewriter + flavorType: Complex + description: flavor-complex-rewriter + +- type: flavor + id: sbiten + flavorType: Complex + description: flavor-complex-sbiten + +- type: flavor + id: silencer + flavorType: Complex + description: flavor-complex-silencer + +- type: flavor + id: snow-white + flavorType: Complex + description: flavor-complex-snow-white + +- type: flavor + id: sui-dream + flavorType: Complex + description: flavor-complex-sui-dream + +- type: flavor + id: syndicate-bomb + flavorType: Complex + description: flavor-complex-syndicate-bomb + +- type: flavor + id: toxins-special + flavorType: Complex + description: flavor-complex-toxins-special + +- type: flavor + id: vodka-martini + flavorType: Complex + description: flavor-complex-vodka-martini + +- type: flavor + id: vodka-tonic + flavorType: Complex + description: flavor-complex-vodka-tonic + +- type: flavor + id: kvass + flavorType: Complex + description: flavor-complex-kvass + +- type: flavor + id: mothamphetamine + flavorType: Complex + description: flavor-complex-mothamphetamine + - type: flavor id: drgibbbloodred flavorType: Complex diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml new file mode 100644 index 00000000000..c7e252151ca --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml @@ -0,0 +1,74 @@ +# PDA +- type: loadout + id: PsychologistPDA + equipment: + id: PsychologistPDA + +- type: loadout + id: PsychiatristPDA + equipment: + id: PsychiatristPDA + +- type: loadout + id: TherapistPDA + equipment: + id: TherapistPDA + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobPsychologist + time: 14400 # 4 hours psychologist + +- type: loadout + id: SocialWorkerPDA + equipment: + id: SocialWorkerPDA + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Civilian + time: 14400 # 4 hours service + +# Head +- type: loadout + id: PsychologistFrenchBeret + equipment: + head: ClothingHeadHatBeretFrench + +- type: loadout + id: PsychologistGreyFlatcap + equipment: + head: ClothingHeadHatGreyFlatcap + +- type: loadout + id: PsychologistBrownFlatcap + equipment: + head: ClothingHeadHatBrownFlatcap + +# OuterClothing +- type: loadout + id: PsychologistMedicalWinterCoat + equipment: + outerClothing: ClothingOuterWinterMed + +- type: loadout + id: PsychologistWinterCoat + equipment: + outerClothing: ClothingOuterWinterCoat + +- type: loadout + id: PsychologistWinterCoatPlaid + equipment: + outerClothing: ClothingOuterWinterCoatPlaid + +- type: loadout + id: PsychologistCoatBomber + equipment: + outerClothing: ClothingOuterCoatBomber + +- type: loadout + id: PsychologistSweater + equipment: + outerClothing: ClothingOuterCoatHyenhSweater diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 8b5b827e09a..2bf3ae86d50 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -211,6 +211,38 @@ - SecurityFirearmSpeedLoaderSpecialRubber - SecurityFirearmSpeedLoaderSpecial +# Medical +## Psychologist +- type: loadoutGroup + id: PsychologistHead + name: loadout-group-psychologist-head + minLimit: 0 + loadouts: + - MedicalBeret + - PsychologistFrenchBeret + - PsychologistGreyFlatcap + - PsychologistBrownFlatcap + +- type: loadoutGroup + id: PsychologistOuterClothing + name: loadout-group-psychologist-outerclothing + minLimit: 0 + loadouts: + - PsychologistMedicalWinterCoat + - PsychologistWinterCoat + - PsychologistWinterCoatPlaid + - PsychologistCoatBomber + - PsychologistSweater + +- type: loadoutGroup + id: PsychologistShoes + name: loadout-group-psychologist-shoes + loadouts: + - LeatherShoes + - LaceupShoes + - MedicalWinterBoots + - WinterBoots + # Justice ## Chief Justice - type: loadoutGroup @@ -446,6 +478,15 @@ - JanitorPDA - HygieneTechnicianPDA +- type: loadoutGroup + id: PsychologistPDADelta + name: loadout-group-psychologist-id-delta + loadouts: + - PsychologistPDA + - PsychiatristPDA + - TherapistPDA + - SocialWorkerPDA + # Misc - type: loadoutGroup id: Scarfs diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml index d2e297f926a..ff847f2ac8b 100644 --- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml @@ -171,7 +171,7 @@ parent: BaseDrink desc: reagent-desc-kvass physicalDesc: reagent-physical-desc-bubbly - flavor: bread + flavor: kvass #Delta-V Flavor additions color: "#381600" metamorphicSprite: sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi @@ -186,7 +186,7 @@ parent: BaseDrink desc: reagent-desc-mothamphetamine physicalDesc: reagent-physical-desc-fuzzy - flavor: cotton + flavor: mothamphetamine #Delta-V Flavor additions color: "#2fa1ef" metamorphicSprite: sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index c37189f4148..b179c7aa042 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -220,7 +220,6 @@ - type: ItemBorgModule items: - MiningDrill - - Shovel - MineralScannerUnpowered - OreBag - Crowbar @@ -244,6 +243,23 @@ - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module } +- type: entity + parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ] + id: BorgModuleFauna + name: fauna protection module + description: A borg module for protection from deadly space fauna. + components: + - type: Sprite + layers: + - state: cargo + - state: icon-carp + - type: ItemBorgModule + items: + - WeaponProtoKineticAcceleratorOneHanded + - WeaponCrusherDagger + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: fauna-module } + # engineering modules - type: entity id: BorgModuleAdvancedTool diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 409f622f89c..9bbc8129a4b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -13,3 +13,19 @@ map: [ "empty-icon" ] # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi + +- type: entity + parent: WeaponProtoKineticAccelerator + id: WeaponProtoKineticAcceleratorOneHanded + suffix: One-Handed, DO NOT MAP + description: Fires low-damage kinetic bolts at a short range. This kind has a gyroscope to keep a cyborg's aim steady. + components: + - type: GunWieldBonus + wieldBonusExamineMessage: null + minAngle: 0 + maxAngle: 0 + - type: Gun + minAngle: 1 + maxAngle: 2 + - type: UseDelay + delay: 0 # You can't dual wield this as a borg so no need for a delay diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d58d5f4f75a..0806d6e99c4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -232,6 +232,7 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - WeaponProtoKineticAccelerator # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe - SpeedLoaderSpecial - SpeedLoaderSpecialEmpty @@ -350,7 +351,6 @@ - SyringeBluespace #- WeaponForceGun # DeltaV - WeaponLaserSvalinn - - WeaponProtoKineticAccelerator - WeaponGrapplingGun #- WeaponTetherGun # DeltaV - ClothingBackpackHolding @@ -377,6 +377,7 @@ # End DeltaV additions - type: EmagLatheRecipes emagDynamicRecipes: + - BorgModuleFauna - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium @@ -416,6 +417,9 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive # Begin DeltaV additions - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - WeaponEnergyGun # Energy Gun @@ -807,6 +811,7 @@ - WeaponDisablerPractice - WeaponFlareGunSecurity - WeaponLaserCarbinePractice + - WeaponProtoKineticAccelerator - Zipties # Begin DeltaV additions - ClothingNeckShockCollar # Nyanotrasen - Shock Collar recipe @@ -821,6 +826,7 @@ # End DeltaV additions dynamicRecipes: - EncryptionKeySyndie # Nyano + - BorgModuleFauna - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium @@ -871,6 +877,9 @@ - WeaponLaserCarbine - WeaponXrayCannon - ClothingBackpackElectropack + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive # Begin DeltaV additions - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index dac93f951f5..7982c1e2b78 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -107,6 +107,7 @@ - RoleSurvivalNukie components: - type: NukeOperative + - type: TargetObjectiveImmune # DeltaV - Makes sleepers unable to get nukie kill objectives - type: RandomMetadata nameSegments: - nukeops-role-commander @@ -124,6 +125,7 @@ - RoleSurvivalNukie components: - type: NukeOperative + - type: TargetObjectiveImmune # DeltaV - Makes sleepers unable to get nukie kill objectives - type: RandomMetadata nameSegments: - nukeops-role-agent @@ -143,6 +145,7 @@ - RoleSurvivalNukie components: - type: NukeOperative + - type: TargetObjectiveImmune # DeltaV - Makes sleepers unable to get nukie kill objectives - type: RandomMetadata nameSegments: - nukeops-role-operator diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index eb569b70225..c16fd986b07 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -547,6 +547,11 @@ - MedicalBackpack - Glasses - SurvivalMedical # DeltaV, replaces Survival + - PsychologistPDADelta # DeltaV + - PsychologistHead # DeltaV + - Scarfs # DeltaV + - PsychologistOuterClothing # DeltaV + - PsychologistShoes # DeltaV - Trinkets - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index 9dbf90693ae..d286e879772 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -53,7 +53,7 @@ Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] Boxer: [ 2, 2 ] - Chef: [ 2, 3 ] + Chef: [ 1, 2 ] Clown: [ 1, 2 ] HeadOfPersonnel: [ 1, 1 ] Janitor: [ 2, 3 ] diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 6617791a633..47e1371a41f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -7,7 +7,7 @@ parent: BaseAlcohol desc: reagent-desc-absinthe physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: absinthe #Delta-V Flavor additions color: "#33EE00" metamorphicSprite: sprite: Objects/Consumable/Drinks/absintheglass.rsi @@ -64,7 +64,7 @@ parent: BaseAlcohol desc: reagent-desc-blue-curacao physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: blue-curacao #Delta-V Flavor additions color: "#0099FF" metamorphicSprite: sprite: Objects/Consumable/Drinks/thin_glass.rsi @@ -131,7 +131,7 @@ parent: BaseAlcohol desc: reagent-desc-dead-rum physicalDesc: reagent-physical-desc-strong-smelling - flavor: rum + flavor: deadrum #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/rumglass.rsi @@ -264,7 +264,7 @@ parent: BaseAlcohol desc: reagent-desc-n-t-cahors physicalDesc: reagent-physical-desc-strong-smelling - flavor: bitter + flavor: n-t-cahors #Delta-V Flavor additions color: "#7E4043" metamorphicSprite: sprite: Objects/Consumable/Drinks/wineglass.rsi @@ -279,7 +279,7 @@ parent: BaseAlcohol desc: reagent-desc-poison-wine physicalDesc: reagent-physical-desc-strong-smelling - flavor: bitter + flavor: poison-wine #Delta-V Flavor additions color: "#990066" metamorphicSprite: sprite: Objects/Consumable/Drinks/pwineglass.rsi @@ -471,7 +471,7 @@ parent: BaseAlcohol desc: reagent-desc-acid-spit physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: acidspit #Delta-V Flavor additions color: "#365000" metamorphicSprite: sprite: Objects/Consumable/Drinks/acidspitglass.rsi @@ -486,7 +486,7 @@ parent: BaseAlcohol desc: reagent-desc-allies-cocktail physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: allies-cocktail #Delta-V Flavor additions color: "#00664d" metamorphicSprite: sprite: Objects/Consumable/Drinks/alliescocktail.rsi @@ -516,7 +516,7 @@ parent: BaseAlcohol desc: reagent-desc-amasec physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: amasec #Delta-V Flavor additions color: "#124da7" metamorphicSprite: sprite: Objects/Consumable/Drinks/amasecglass.rsi @@ -531,7 +531,7 @@ parent: BaseAlcohol desc: reagent-desc-andalusia physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: andalusia #Delta-V Flavor additions color: "#665700" metamorphicSprite: sprite: Objects/Consumable/Drinks/andalusia.rsi @@ -595,7 +595,7 @@ parent: BaseAlcohol desc: reagent-desc-b52 physicalDesc: reagent-physical-desc-bubbly - flavor: alcohol + flavor: b52 #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/b52glass.rsi @@ -618,7 +618,7 @@ parent: BaseAlcohol desc: reagent-desc-bahama-mama physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: bahama-mama #Delta-V Flavor additions color: "#FF7F3B" metamorphicSprite: sprite: Objects/Consumable/Drinks/bahama_mama.rsi @@ -648,7 +648,7 @@ parent: BaseAlcohol desc: reagent-desc-barefoot physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: barefoot #Delta-V Flavor additions color: "#ff66cc" metamorphicSprite: sprite: Objects/Consumable/Drinks/b&p.rsi @@ -725,7 +725,7 @@ parent: BaseAlcohol desc: reagent-desc-booger physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: booger #Delta-V Flavor additions color: "#99ff00" metamorphicSprite: sprite: Objects/Consumable/Drinks/booger.rsi @@ -740,7 +740,7 @@ parent: BaseAlcohol desc: reagent-desc-brave-bull physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: brave-bull #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/bravebullglass.rsi @@ -827,7 +827,7 @@ parent: BaseAlcohol desc: reagent-desc-demons-blood physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: demons-blood #Delta-V Flavor additions color: "#a70000" metamorphicSprite: sprite: Objects/Consumable/Drinks/demonsblood.rsi @@ -843,7 +843,7 @@ parent: BaseAlcohol desc: reagent-desc-devils-kiss physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: devils-kiss #Delta-V Flavor additions color: "#ff0033" metamorphicSprite: sprite: Objects/Consumable/Drinks/devilskiss.rsi @@ -858,7 +858,7 @@ parent: BaseDrink desc: reagent-desc-doctors-delight physicalDesc: reagent-physical-desc-strong-smelling - flavor: medicine + flavor: doctors-delight #Delta-V Flavor additions color: "#FF8CFF" metamorphicSprite: sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi @@ -890,7 +890,7 @@ parent: BaseAlcohol desc: reagent-desc-driest-martini physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: driest-martini #Delta-V Flavor additions color: "#2E6671" metamorphicSprite: sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi @@ -913,7 +913,7 @@ parent: BaseAlcohol desc: reagent-desc-erika-surprise physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: erika-surprise #Delta-V Flavor additions color: "#67bc50" metamorphicSprite: sprite: Objects/Consumable/Drinks/beerstein.rsi @@ -952,7 +952,7 @@ parent: BaseAlcohol desc: reagent-desc-gin-fizz physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: gin-fizz #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/ginfizzglass.rsi @@ -1000,7 +1000,7 @@ parent: BaseAlcohol desc: reagent-desc-gildlager physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: gildlager #Delta-V Flavor additions color: "#FFFF91" metamorphicSprite: sprite: Objects/Consumable/Drinks/gildlagerglass.rsi @@ -1023,7 +1023,7 @@ parent: BaseAlcohol desc: reagent-desc-grog physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: grog #Delta-V Flavor additions color: "#e3e77b" metamorphicSprite: sprite: Objects/Consumable/Drinks/beerstein.rsi @@ -1038,7 +1038,7 @@ parent: BaseAlcohol desc: reagent-desc-hippies-delight physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: hippies-delight #Delta-V Flavor additions color: "#6eaa0c" metamorphicSprite: sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi @@ -1053,7 +1053,7 @@ parent: BaseAlcohol desc: reagent-desc-hooch physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: hooch #Delta-V Flavor additions color: "#664e00" - type: reagent @@ -1101,7 +1101,7 @@ parent: BaseAlcohol desc: reagent-desc-irish-cream physicalDesc: reagent-physical-desc-creamy - flavor: creamy + flavor: irish-cream #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/irishcreamglass.rsi @@ -1170,7 +1170,7 @@ parent: BaseAlcohol desc: reagent-desc-manhattan physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: manhattan #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/manhattanglass.rsi @@ -1185,7 +1185,7 @@ parent: BaseAlcohol desc: reagent-desc-manhattan-project physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: manhattan-project #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi @@ -1216,7 +1216,7 @@ parent: BaseAlcohol desc: reagent-desc-margarita physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: margarita #Delta-V Flavor additions color: "#8CFF8C" metamorphicSprite: sprite: Objects/Consumable/Drinks/margaritaglass.rsi @@ -1231,7 +1231,7 @@ parent: BaseAlcohol desc: reagent-desc-martini physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: martini #Delta-V Flavor additions color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/martiniglass.rsi @@ -1270,7 +1270,7 @@ parent: BaseAlcohol desc: reagent-desc-mojito physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: mojito #Delta-V Flavor additions color: "#3ea99888" metamorphicSprite: sprite: Objects/Consumable/Drinks/mojito.rsi @@ -1309,7 +1309,7 @@ parent: BaseAlcohol desc: reagent-desc-neurotoxin physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: neurotoxin #Delta-V Flavor additions color: "#2E2E61" metamorphicSprite: sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi @@ -1358,7 +1358,7 @@ parent: BaseAlcohol desc: reagent-desc-patron physicalDesc: reagent-physical-desc-metallic - flavor: alcohol + flavor: patron #Delta-V Flavor additions color: "#585840" metamorphicSprite: sprite: Objects/Consumable/Drinks/patronglass.rsi @@ -1381,7 +1381,7 @@ parent: BaseAlcohol desc: reagent-desc-red-mead physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: red-mead #Delta-V Flavor additions color: "#bc5550" metamorphicSprite: sprite: Objects/Consumable/Drinks/beerstein.rsi @@ -1409,7 +1409,7 @@ parent: BaseAlcohol desc: reagent-desc-sbiten physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: sbiten #Delta-V Flavor additions color: "#004166" metamorphicSprite: sprite: Objects/Consumable/Drinks/sbitenglass.rsi @@ -1473,7 +1473,7 @@ parent: BaseAlcohol desc: reagent-desc-silencer physicalDesc: reagent-physical-desc-strong-smelling - flavor: nothing + flavor: silencer #Delta-V Flavor additions color: "#878787" metamorphicSprite: sprite: Objects/Consumable/Drinks/silencerglass.rsi @@ -1511,7 +1511,7 @@ parent: BaseAlcohol desc: reagent-desc-snow-white physicalDesc: reagent-physical-desc-bubbly - flavor: alcohol + flavor: snow-white #Delta-V Flavor additions color: "#FFFFFF" metamorphicSprite: sprite: Objects/Consumable/Drinks/snowwhite.rsi @@ -1527,7 +1527,7 @@ parent: BaseAlcohol desc: reagent-desc-sui-dream physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: sui-dream #Delta-V Flavor additions color: "#00A86B" metamorphicSprite: sprite: Objects/Consumable/Drinks/sdreamglass.rsi @@ -1543,7 +1543,7 @@ parent: BaseAlcohol desc: reagent-desc-syndicate-bomb physicalDesc: reagent-physical-desc-opaque - flavor: syndiebomb + flavor: syndicate-bomb #Delta-V Flavor additions color: "#e3e77b" metamorphicSprite: sprite: Objects/Consumable/Drinks/syndicatebomb.rsi @@ -1624,7 +1624,7 @@ parent: BaseAlcohol desc: reagent-desc-toxins-special physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: toxins-special #Delta-V Flavor additions color: "#665c00" metamorphicSprite: sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi @@ -1639,7 +1639,7 @@ parent: BaseAlcohol desc: reagent-desc-vodka-martini physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: vodka-martini #Delta-V Flavor additions color: "#004666" metamorphicSprite: sprite: Objects/Consumable/Drinks/martiniglass.rsi @@ -1662,7 +1662,7 @@ parent: BaseAlcohol desc: reagent-desc-vodka-tonic physicalDesc: reagent-physical-desc-strong-smelling - flavor: alcohol + flavor: vodka-tonic #Delta-V Flavor additions color: "#0064C8" metamorphicSprite: sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 3f9fb7b53d2..ad680a5fbcc 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -562,7 +562,7 @@ parent: BaseDrink desc: reagent-desc-rewriter physicalDesc: reagent-physical-desc-strong-smelling - flavor: sweet + flavor: rewriter #Delta-V Flavor additions color: "#485000" metamorphicSprite: sprite: Objects/Consumable/Drinks/beerstein.rsi diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 88ea4459dc9..368ddf7bacc 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -175,16 +175,6 @@ Glass: 100 Uranium: 100 -- type: latheRecipe - id: WeaponProtoKineticAccelerator - result: WeaponProtoKineticAccelerator - category: Weapons - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Silver: 100 - #- type: latheRecipe #DeltaV - LRP # id: WeaponTetherGun # result: WeaponTetherGun diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index a4413e01ebe..36ceff065b3 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -146,6 +146,13 @@ id: BorgModuleTool result: BorgModuleTool +# Mining Modules + +- type: latheRecipe + parent: BaseGoldBorgModuleRecipe + id: BorgModuleFauna + result: BorgModuleFauna + # Engineering Modules - type: latheRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index f6f303e5e3b..ac695f314a0 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -106,6 +106,44 @@ Plastic: 250 Gold: 100 +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponProtoKineticAccelerator + result: WeaponProtoKineticAccelerator + materials: + Steel: 1000 + Glass: 500 + Gold: 100 + +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponCrusher + result: WeaponCrusher + materials: + Steel: 1500 + Glass: 500 + Plastic: 250 + Gold: 100 + +- type: latheRecipe + parent: BaseWeaponRecipe + id: WeaponCrusherDagger + result: WeaponCrusherDagger + materials: + Steel: 750 + Glass: 300 + Gold: 200 + +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponCrusherGlaive + result: WeaponCrusherGlaive + materials: + Steel: 2000 + Glass: 500 + Silver: 250 + Gold: 250 + - type: latheRecipe id: ClothingBackpackElectropack result: ClothingBackpackElectropack diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index c7409565dd4..a768ac45639 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,19 +1,5 @@ # Tier 1 -- type: technology - id: SalvageWeapons - name: research-technology-salvage-weapons - icon: - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi - state: icon - discipline: Arsenal - tier: 1 - cost: 5000 - recipeUnlocks: - - WeaponProtoKineticAccelerator - - ShuttleGunKineticCircuitboard - # These are roundstart but not replenishable for salvage - - type: technology id: DraconicMunitions name: research-technology-draconic-munitions @@ -174,6 +160,22 @@ # recipeUnlocks: # - WeaponXrayCannon +- type: technology + id: ExperimentalSalvageWeaponry + name: research-technology-experimental-salvage-weaponry + icon: + sprite: Objects/Weapons/Melee/crusher_glaive.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 10000 + recipeUnlocks: + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive + - BorgModuleFauna + - ShuttleGunKineticCircuitboard + - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament @@ -193,8 +195,7 @@ - ShuttleGunSvalinnMachineGunCircuitboard - ShuttleGunPerforatorCircuitboard - ShuttleGunFriendshipCircuitboard - technologyPrerequisites: - - SalvageWeapons + technologyPrerequisites: # DeltaV: added prerequesite - ExplosiveTechnology # Tier 3 diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 4e69c4a3c87..00e991a2094 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -22,9 +22,10 @@ - type: startingGear id: PsychologistGear equipment: - shoes: ClothingShoesLeather - id: PsychologistPDA + #shoes: ClothingShoesLeather # DeltaV: Multiple shoe options in loadout. + #id: PsychologistPDA # DeltaV: Multiple PDA options in loadout. ears: ClothingHeadsetMedical storage: back: - RubberStampPsychologist + - BoxFolderBlue # DeltaV diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/meta.json new file mode 100644 index 00000000000..cab0153f68d --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Selene wings by @bogus_0451 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "selene", + "directions": 4 + }, + { + "name": "selene_primary", + "directions": 4 + }, + { + "name": "selene_secondary", + "directions": 4 + }, + { + "name": "selene_tertiary", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene.png b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene.png new file mode 100644 index 00000000000..ba9a5c4e262 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_primary.png b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_primary.png new file mode 100644 index 00000000000..034e3ebbc1e Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_primary.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_secondary.png b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_secondary.png new file mode 100644 index 00000000000..30b451639f3 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_secondary.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_tertiary.png b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_tertiary.png new file mode 100644 index 00000000000..71cf6555e6d Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi/selene_tertiary.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index d0ac0bee150..51105a4c6de 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae ", "size": { "x": 32, "y": 32 @@ -104,6 +104,9 @@ { "name": "pda-paramedic" }, + { + "name": "pda-psychiatrist" + }, { "name": "pda-mime" }, @@ -128,6 +131,9 @@ { "name": "pda-security" }, + { + "name": "pda-socialworker" + }, { "name": "pda-brigmedic" }, @@ -137,6 +143,9 @@ { "name": "pda-syndi-agent" }, + { + "name": "pda-therapist" + }, { "name": "pda-centcom" }, diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png new file mode 100644 index 00000000000..fae856a2e10 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png new file mode 100644 index 00000000000..0aac9742b61 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png new file mode 100644 index 00000000000..9de90f1914a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png differ diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png new file mode 100644 index 00000000000..888ddb464e6 Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png differ diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json index 2ebb6eddcf5..7fb1027c9e9 100644 --- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json +++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9. fauna-module.png created by deltanedas (github) for SS14.", "size": { "x": 32, "y": 32 @@ -103,6 +103,9 @@ { "name":"syndicate-martyr-module" }, + { + "name": "fauna-module" + }, { "name": "select-type" } diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png new file mode 100644 index 00000000000..abe4ade024f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 74c9893cae3..25837047418 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png and icon-carp.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).", "size": { "x": 32, "y": 32 @@ -28,6 +28,9 @@ { "name": "icon-cables" }, + { + "name": "icon-carp" + }, { "name": "icon-chemist" },