cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 23:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v into april-fools-2024

Browse Source
This commit is contained in:
NullWanderer
2024-04-01 00:52:41 +02:00
parent b4fb5ddc2b 6d701a77af
commit 28a6d4baeb
28 changed files with 6846 additions and 4421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
+9 -1
View File
@@ -1,4 +1,6 @@
namespace Content.Server.Cargo.Components;
using Content.Server.Station.Systems;
namespace Content.Server.Cargo.Components;
/// <summary>
/// This is used for marking containers as
@@ -17,4 +19,10 @@ public sealed partial class CargoBountyLabelComponent : Component
/// Used to prevent recursion in calculating the price.
/// </summary>
public bool Calculating;
/// <summary>
/// The Station System to check and remove bounties from
/// </summary>
[DataField]
public EntityUid? AssociatedStationId;
}
Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+16 -10
View File
@@ -4,6 +4,7 @@ using Content.Server.Cargo.Components;
using Content.Server.Labels;
using Content.Server.NameIdentifier;
using Content.Server.Paper;
using Content.Server.Station.Systems;
using Content.Shared.Cargo;
using Content.Shared.Cargo.Components;
using Content.Shared.Cargo.Prototypes;
@@ -65,16 +66,17 @@ public sealed partial class CargoSystem
var label = Spawn(component.BountyLabelId, Transform(uid).Coordinates);
component.NextPrintTime = _timing.CurTime + component.PrintDelay;
SetupBountyLabel(label, bounty.Value);
SetupBountyLabel(label, station, bounty.Value);
_audio.PlayPvs(component.PrintSound, uid);
}
public void SetupBountyLabel(EntityUid uid, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
{
if (!Resolve(uid, ref paper, ref label) || !_protoMan.TryIndex<CargoBountyPrototype>(bounty.Bounty, out var prototype))
return;
label.Id = bounty.Id;
label.AssociatedStationId = stationId;
var msg = new FormattedMessage();
msg.AddText(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
msg.PushNewline();
@@ -103,7 +105,7 @@ public sealed partial class CargoSystem
if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName)
return;
if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
return;
if (database.CheckedBounties.Contains(component.Id))
@@ -131,14 +133,18 @@ public sealed partial class CargoSystem
if (!TryGetBountyLabel(sold, out _, out var component))
continue;
if (!TryGetBountyFromId(args.Station, component.Id, out var bounty))
if (component.AssociatedStationId is not { } station || !TryGetBountyFromId(station, component.Id, out var bounty))
{
continue;
}
if (!IsBountyComplete(sold, bounty.Value))
{
continue;
}
TryRemoveBounty(args.Station, bounty.Value);
FillBountyDatabase(args.Station);
TryRemoveBounty(station, bounty.Value);
FillBountyDatabase(station);
_adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Value.Bounty}\" (id:{bounty.Value.Id}) was fulfilled");
}
}
@@ -196,7 +202,7 @@ public sealed partial class CargoSystem
FillBountyDatabase(entity);
}
public bool IsBountyComplete(EntityUid container, EntityUid? station, out HashSet<EntityUid> bountyEntities)
public bool IsBountyComplete(EntityUid container, out HashSet<EntityUid> bountyEntities)
{
if (!TryGetBountyLabel(container, out _, out var component))
{
@@ -204,7 +210,7 @@ public sealed partial class CargoSystem
return false;
}
station ??= _station.GetOwningStation(container);
var station = component.AssociatedStationId;
if (station == null)
{
bountyEntities = new();
@@ -225,7 +231,7 @@ public sealed partial class CargoSystem
return IsBountyComplete(container, data, out _);
}
public bool IsBountyComplete(EntityUid container, CargoBountyData data, out HashSet<EntityUid> bountyEntities)
public bool IsBountyComplete(EntityUid container, CargoBountyData data, out HashSet<EntityUid> bountyEntities)
{
if (!_protoMan.TryIndex(data.Bounty, out var proto))
{
@@ -314,7 +320,7 @@ public sealed partial class CargoSystem
var children = GetBountyEntities(ent);
foreach (var child in children)
{
entities.Add(child);
entities.Add(child);
}
}
}
Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+7 -10
View File
@@ -254,9 +254,8 @@ public sealed partial class CargoSystem
#region Station
private bool SellPallets(EntityUid gridUid, EntityUid? station, out double amount)
private bool SellPallets(EntityUid gridUid, out double amount)
{
station ??= _station.GetOwningStation(gridUid);
GetPalletGoods(gridUid, out var toSell, out amount);
Log.Debug($"Cargo sold {toSell.Count} entities for {amount}");
@@ -264,11 +263,9 @@ public sealed partial class CargoSystem
if (toSell.Count == 0)
return false;
if (station != null)
{
var ev = new EntitySoldEvent(station.Value, toSell);
RaiseLocalEvent(ref ev);
}
var ev = new EntitySoldEvent(toSell);
RaiseLocalEvent(ref ev);
foreach (var ent in toSell)
{
@@ -323,7 +320,7 @@ public sealed partial class CargoSystem
return false;
}
var complete = IsBountyComplete(uid, (EntityUid?) null, out var bountyEntities);
var complete = IsBountyComplete(uid, out var bountyEntities);
// Recursively check for mobs at any point.
var children = xform.ChildEnumerator;
@@ -356,7 +353,7 @@ public sealed partial class CargoSystem
return;
}
if (!SellPallets(gridUid, null, out var price))
if (!SellPallets(gridUid, out var price))
return;
var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType);
@@ -448,4 +445,4 @@ public sealed partial class CargoSystem
/// deleted but after the price has been calculated.
/// </summary>
[ByRefEvent]
public readonly record struct EntitySoldEvent(EntityUid Station, HashSet<EntityUid> Sold);
public readonly record struct EntitySoldEvent(HashSet<EntityUid> Sold);
Content.Server/Cargo/Systems/PriceGunSystem.cs
+1 -1
View File
@@ -57,7 +57,7 @@ public sealed class PriceGunSystem : EntitySystem
return;
// Check if we're scanning a bounty crate
if (_bountySystem.IsBountyComplete(args.Target.Value, (EntityUid?) null, out _))
if (_bountySystem.IsBountyComplete(args.Target.Value, out _))
{
_popupSystem.PopupEntity(Loc.GetString("price-gun-bounty-complete"), args.User, args.User);
}
Content.Server/Whitelist/WhitelistCommands.cs
+1 -1
View File
@@ -71,7 +71,7 @@ public sealed class AddWhitelistCommand : LocalizedCommands
}
}
[AdminCommand(AdminFlags.Ban | AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist. Hopefully this is an or, not an and
[AdminCommand(AdminFlags.Ban), AdminCommand(AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist.
public sealed class RemoveWhitelistCommand : LocalizedCommands
{
public override string Command => "whitelistremove";
Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+5
View File
@@ -1,6 +1,7 @@
using Content.Shared.Mind;
using Content.Shared.Objectives;
using Content.Shared.Objectives.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
namespace Content.Shared.Objectives.Systems;
@@ -11,6 +12,7 @@ namespace Content.Shared.Objectives.Systems;
public abstract class SharedObjectivesSystem : EntitySystem
{
[Dependency] private readonly SharedMindSystem _mind = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
private EntityQuery<MetaDataComponent> _metaQuery;
@@ -55,6 +57,9 @@ public abstract class SharedObjectivesSystem : EntitySystem
/// </summary>
public EntityUid? TryCreateObjective(EntityUid mindId, MindComponent mind, string proto)
{
if (!_protoMan.HasIndex<EntityPrototype>(proto))
return null;
var uid = Spawn(proto);
if (!TryComp<ObjectiveComponent>(uid, out var comp))
{
Resources/Changelog/DeltaVAdmin.yml
+7
View File
@@ -13,5 +13,12 @@ Entries:
id: 2
time: '2024-03-11T22:00:00.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/958
- author: NullWanderer
changes:
- message: whitelistremove now requires either ban or whitelist, not both.
type: Fix
id: 3
time: '2024-03-27T23:53:10.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/994
Name: Admin
Order: 1
Resources/Changelog/DeltaVChangelog.yml
+22
View File
@@ -1945,3 +1945,25 @@
id: 296
time: '2024-03-27T16:57:09.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/988
- author: NullWanderer
changes:
- message: Merged master, please report any bugs
type: Add
id: 297
time: '2024-03-27T18:23:58.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/1000
- 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
Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
+8 -8
View File
@@ -2,31 +2,31 @@ station-beacon-epistemics = Epistemics
station-beacon-mystagogue = Mystagogue
station-beacon-logistics = Logistics
station-beacon-logistics-reception = Logistics Reception
station-beacon-logistics-reception = Logistics
station-beacon-lo = LO
station-beacon-conference-room = Conference Room
station-beacon-virology = Virology
station-beacon-metempsychosis = Metempsychosis
station-beacon-exam = Exam Room
station-beacon-exam = Exam
station-beacon-med-outpost = Med Outpost
station-beacon-psych = Psychologist
station-beacon-psych = Psych
station-beacon-glimmer-prober = Glimmer Prober
station-beacon-forensic-mantis = Forensic Mantis
station-beacon-glimmer-prober = Prober
station-beacon-forensic-mantis = Mantis
station-beacon-mailroom = Mail
station-beacon-engi-outpost = Engi Outpost
station-beacon-janitor-office = Jani Office
station-beacon-janitor-closet = Jani closet
station-beacon-janitor-closet = Jani Closet
station-beacon-reporter = Reporter
station-beacon-camera-servers = Camera Servers
station-beacon-camera-servers = Cameras
station-beacon-boxing-ring = Boxing Ring
station-beacon-boxing-ring = Boxing
station-beacon-park = Park
station-beacon-corpsman = Corpsman
Resources/Maps/hammurabi.yml
+3105 -1311
View File
File diff suppressed because it is too large Load Diff
Resources/Maps/hive.yml
+1400 -794
View File
File diff suppressed because it is too large Load Diff
Resources/Maps/shoukou.yml
+233 -36
View File
@@ -3479,7 +3479,6 @@ entities:
- 1828
- 719
- 180
- 1121
- 11251
- 10311
- 10312
@@ -3878,7 +3877,6 @@ entities:
- type: DeviceList
devices:
- 180
- 1121
- 11251
- 10315
- 10316
@@ -31705,6 +31703,13 @@ entities:
- type: Transform
pos: 9.5,16.5
parent: 34
- proto: DefaultStationBeaconAtmospherics
entities:
- uid: 13780
components:
- type: Transform
pos: -46.5,-40.5
parent: 34
- proto: DefaultStationBeaconBar
entities:
- uid: 11712
@@ -31719,6 +31724,13 @@ entities:
- type: Transform
pos: -16.5,-6.5
parent: 34
- proto: DefaultStationBeaconBridge
entities:
- uid: 1121
components:
- type: Transform
pos: 45.5,-32.5
parent: 34
- proto: DefaultStationBeaconBrig
entities:
- uid: 13552
@@ -31761,12 +31773,19 @@ entities:
- type: Transform
pos: 14.5,-33.5
parent: 34
- proto: DefaultStationBeaconCommand
- proto: DefaultStationBeaconConferenceRoom
entities:
- uid: 13680
- uid: 13785
components:
- type: Transform
pos: 45.5,-35.5
pos: 52.5,-35.5
parent: 34
- proto: DefaultStationBeaconCourtroom
entities:
- uid: 13783
components:
- type: Transform
pos: 28.5,-30.5
parent: 34
- proto: DefaultStationBeaconCryosleep
entities:
@@ -31789,6 +31808,13 @@ entities:
- type: Transform
pos: -41.5,8.5
parent: 34
- proto: DefaultStationBeaconDorms
entities:
- uid: 13779
components:
- type: Transform
pos: -48.5,-5.5
parent: 34
- proto: DefaultStationBeaconEngineering
entities:
- uid: 11713
@@ -31796,6 +31822,13 @@ entities:
- type: Transform
pos: -32.5,-32.5
parent: 34
- proto: DefaultStationBeaconEngiOutpost
entities:
- uid: 13786
components:
- type: Transform
pos: -24.5,4.5
parent: 34
- proto: DefaultStationBeaconEscapePod
entities:
- uid: 13682
@@ -31864,6 +31897,13 @@ entities:
- type: Transform
pos: 8.5,7.5
parent: 34
- proto: DefaultStationBeaconMantis
entities:
- uid: 13787
components:
- type: Transform
pos: -31.5,1.5
parent: 34
- proto: DefaultStationBeaconMedical
entities:
- uid: 13155
@@ -31885,6 +31925,13 @@ entities:
- type: Transform
pos: 45.5,1.5
parent: 34
- proto: DefaultStationBeaconPsychologist
entities:
- uid: 13782
components:
- type: Transform
pos: 18.5,-29.5
parent: 34
- proto: DefaultStationBeaconRDRoom
entities:
- uid: 13153
@@ -31892,6 +31939,13 @@ entities:
- type: Transform
pos: -34.5,-4.5
parent: 34
- proto: DefaultStationBeaconReporter
entities:
- uid: 13784
components:
- type: Transform
pos: 28.5,-37.5
parent: 34
- proto: DefaultStationBeaconSalvage
entities:
- uid: 13688
@@ -31920,6 +31974,13 @@ entities:
- type: Transform
pos: 32.5,-44.5
parent: 34
- proto: DefaultStationBeaconSurgery
entities:
- uid: 13781
components:
- type: Transform
pos: 10.5,-27.5
parent: 34
- proto: DefaultStationBeaconTEG
entities:
- uid: 13694
@@ -36859,14 +36920,6 @@ entities:
- 2410
- 7684
- 6707
- uid: 1121
components:
- type: Transform
pos: -36.5,-22.5
parent: 34
- type: Door
secondsUntilStateChange: -67176.98
state: Closing
- uid: 1274
components:
- type: Transform
@@ -37650,6 +37703,11 @@ entities:
- 13672
- 2410
- 6707
- uid: 13680
components:
- type: Transform
pos: -36.5,-22.5
parent: 34
- proto: Fireplace
entities:
- uid: 2186
@@ -86342,35 +86400,38 @@ entities:
- type: Transform
pos: -39.5,-46.5
parent: 34
- proto: WarpPoint
- proto: WarpPointArrivals
entities:
- uid: 13758
components:
- type: Transform
pos: 9.5,17.5
parent: 34
- proto: WarpPointAtmos
entities:
- uid: 11316
components:
- type: Transform
pos: -44.5,-41.5
parent: 34
- type: WarpPoint
location: atmospherics
- proto: WarpPointBeacon
- proto: WarpPointBar
entities:
- uid: 13156
- uid: 13760
components:
- type: Transform
pos: -47.5,-5.5
pos: 1.5,-8.5
parent: 34
- type: NavMapBeacon
text: Dorms
- type: WarpPoint
location: Dorms
- proto: WarpPointBeacon
entities:
- uid: 13158
components:
- type: Transform
pos: 1.5,5.5
parent: 34
- type: NavMapBeacon
text: Dojo
- type: WarpPoint
location: Dojo
missingComponents:
- NavMapBeacon
- proto: WarpPointBombing
entities:
- uid: 93
@@ -86380,16 +86441,14 @@ entities:
parent: 34
- type: WarpPoint
location: Court
- type: NavMapBeacon
text: Court
- uid: 3791
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-28.5
parent: 34
- type: WarpPoint
location: Surgery
missingComponents:
- WarpPoint
- uid: 7494
components:
- type: Transform
@@ -86403,23 +86462,161 @@ entities:
pos: -8.5,-16.5
parent: 34
- type: WarpPoint
location: central square
location: Central Square
- uid: 11315
components:
- type: Transform
pos: -43.5,-5.5
parent: 34
- type: WarpPoint
location: dorms
missingComponents:
- WarpPoint
- uid: 12918
components:
- type: Transform
pos: -24.5,4.5
parent: 34
- type: WarpPoint
location: engineering checkpoint
- type: NavMapBeacon
text: North Solars
missingComponents:
- WarpPoint
- proto: WarpPointBotany
entities:
- uid: 13761
components:
- type: Transform
pos: -18.5,-6.5
parent: 34
- proto: WarpPointBridge
entities:
- uid: 13778
components:
- type: Transform
pos: 48.5,-34.5
parent: 34
- proto: WarpPointChapel
entities:
- uid: 13762
components:
- type: Transform
pos: -27.5,-16.5
parent: 34
- proto: WarpPointCryo
entities:
- uid: 13759
components:
- type: Transform
pos: 17.5,15.5
parent: 34
- proto: WarpPointDetective
entities:
- uid: 13763
components:
- type: Transform
pos: -9.5,4.5
parent: 34
- proto: WarpPointDisposals
entities:
- uid: 13764
components:
- type: Transform
pos: -41.5,9.5
parent: 34
- proto: WarpPointDorms
entities:
- uid: 13156
components:
- type: Transform
pos: -47.5,-5.5
parent: 34
- proto: WarpPointEngineering
entities:
- uid: 13765
components:
- type: Transform
pos: -38.5,-26.5
parent: 34
- proto: WarpPointEpistemics
entities:
- uid: 13766
components:
- type: Transform
pos: -30.5,-10.5
parent: 34
- proto: WarpPointEvac
entities:
- uid: 13767
components:
- type: Transform
pos: 1.5,-49.5
parent: 34
- proto: WarpPointHOP
entities:
- uid: 13768
components:
- type: Transform
pos: -18.5,-17.5
parent: 34
- proto: WarpPointJanitor
entities:
- uid: 13769
components:
- type: Transform
pos: 5.5,-18.5
parent: 34
- proto: WarpPointKitchen
entities:
- uid: 13770
components:
- type: Transform
pos: -9.5,-6.5
parent: 34
- proto: WarpPointLogistics
entities:
- uid: 13771
components:
- type: Transform
pos: -10.5,-34.5
parent: 34
- proto: WarpPointMedical
entities:
- uid: 13772
components:
- type: Transform
pos: 4.5,-36.5
parent: 34
- proto: WarpPointPerma
entities:
- uid: 13773
components:
- type: Transform
pos: 44.5,-1.5
parent: 34
- proto: WarpPointReporter
entities:
- uid: 13774
components:
- type: Transform
pos: 28.5,-38.5
parent: 34
- proto: WarpPointSalvage
entities:
- uid: 13775
components:
- type: Transform
pos: -31.5,-61.5
parent: 34
- proto: WarpPointSecurity
entities:
- uid: 13776
components:
- type: Transform
pos: 27.5,-2.5
parent: 34
- proto: WarpPointVault
entities:
- uid: 13777
components:
- type: Transform
pos: 38.5,-34.5
parent: 34
- proto: WashingMachineBroken
entities:
- uid: 6038
Resources/Maps/submarine.yml
+1672 -1940
View File
File diff suppressed because it is too large Load Diff
Resources/Maps/tortuga.yml
+216 -278
View File
File diff suppressed because it is too large Load Diff
Resources/Migrations/deltaMigrations.yml
+4
View File
@@ -99,3 +99,7 @@ SpaceTickSpawnerNPC: SpaceTickSpawner
# 2024-03-07
LockableButtonBrig: LockableButtonSecurity
SignDirectionalICU: SignDirectionalIcu
# 2024-03-29
#Remove whenever holoparasite isn't broken I suppose
MagicalLamp: Lamp
Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
+4 -4
View File
@@ -27,7 +27,7 @@
- type: entity
parent: DefaultStationBeaconMedical
id: DefaultStationBeaconExam
suffix: Exam Room
suffix: Exam
components:
- type: NavMapBeacon
text: station-beacon-exam
@@ -43,7 +43,7 @@
- type: entity
parent: DefaultStationBeaconMedical
id: DefaultStationBeaconPsychologist
suffix: Psychologist
suffix: Psych
components:
- type: NavMapBeacon
text: station-beacon-psych
@@ -52,7 +52,7 @@
- type: entity
parent: DefaultStationBeaconScience
id: DefaultStationBeaconProber
suffix: Glimmer Prober
suffix: Prober
components:
- type: NavMapBeacon
text: station-beacon-glimmer-prober
@@ -60,7 +60,7 @@
- type: entity
parent: DefaultStationBeaconScience
id: DefaultStationBeaconMantis
suffix: Forensic Mantis
suffix: Mantis
components:
- type: NavMapBeacon
text: station-beacon-forensic-mantis
Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+24 -4
View File
@@ -58,6 +58,10 @@
collection: VulpkaninWhines
Howl:
collection: VulpkaninHowls
Honk:
collection: BikeHorn
Weh:
collection: Weh
- type: emoteSounds
id: MaleVulpkanin
@@ -72,12 +76,20 @@
collection: MaleSneezes
Cough:
collection: MaleCoughs
Yawn:
collection: MaleYawn
Snore:
collection: Snores
Honk:
collection: BikeHorn
Sigh:
collection: MaleSigh
Crying:
collection: MaleCry
Whistle:
collection: Whistles
Sigh:
collection: MaleSigh
Weh:
collection: Weh
Growl:
collection: VulpkaninGrowls
Snarl:
@@ -102,12 +114,20 @@
collection: FemaleSneezes
Cough:
collection: FemaleCoughs
Yawn:
collection: FemaleYawn
Snore:
collection: Snores
Honk:
collection: CluwneHorn
Sigh:
collection: FemaleSigh
Crying:
collection: FemaleCry
Whistle:
collection: Whistles
Sigh:
collection: FemaleSigh
Weh:
collection: Weh
Growl:
collection: VulpkaninGrowls
Snarl:
Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+1 -1
View File
@@ -24,7 +24,7 @@
- type: NavMapBeacon
text: station-beacon-general
color: "#D4D4D496"
- type: WarpPoint
#- type: WarpPoint # Delta V - Removes in favor of Warp Point Markers
- type: ActivatableUI
key: enum.NavMapBeaconUiKey.Key
singleUser: true
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+1
View File
@@ -45,6 +45,7 @@
- BookMap
- BookJourney
- BookInspiration
- BookJanitorTale
# Guidebook Books
- BookSpaceEncyclopedia
- BookTheBookOfControl
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
+8
View File
@@ -36,6 +36,7 @@
- BoxCandle
- BoxCandleSmall
- BoxDarts
- BoxCartridgeBB
chance: 0.7
rarePrototypes:
- BoxHugHealing
@@ -49,6 +50,7 @@
- PresentRandom
- BoxHolyWater
- MysteryFigureBox
- BoxCleanerGrenades
rareChance: 0.05
@@ -100,6 +102,8 @@
- BoxMagazineCaselessRifleRubber
- BoxMagazineUniversalMagnumPractice
- BoxMagazineUniversalMagnumRubber
- MagazineBoxSpecialRubber
- MagazineBoxSpecialPractice
chance: 0.15
rarePrototypes:
- BoxMagazinePistolCaselessRifle
@@ -121,4 +125,8 @@
- BoxShellSoulbreaker
- BoxMagazineUniversalMagnum
- BoxSpeedLoaderLightRifle
- MagazineBoxSpecial
- MagazineBoxSpecialIncendiary
- MagazineBoxSpecialUranium
- MagazineBoxSpecialMindbreaker
rareChance: 0.015
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+34 -2
View File
@@ -1,7 +1,7 @@
- type: entity
parent: MarkerBase
id: RandomBoards
name: random machine board spawner
name: random device & board spawner
components:
- type: Sprite
layers:
@@ -71,11 +71,21 @@
- HotplateMachineCircuitboard
- ElectricGrillMachineCircuitboard
- FatExtractorMachineCircuitboard
- SpaceHeaterMachineCircuitBoard
- StationMapCircuitboard
- Igniter
- IntercomElectronics
- DoorRemoteFirefight
- RadiationCollectorFlatpack
- ContainmentFieldGeneratorFlatpack
- SolarAssemblyFlatpack
- StationBeaconPart
- HandheldStationMap
chance: 0.8
rarePrototypes:
- TraversalDistorterMachineCircuitboard
- CloningPodMachineCircuitboard
# - MetempsychoticMachineCircuitboard
- MetempsychoticMachineCircuitboard
- ReverseEngineeringMachineCircuitboard
- MedicalScannerMachineCircuitboard
- DawInstrumentMachineCircuitboard
@@ -107,4 +117,26 @@
- ShockCollar
- GlimmerMonitorCartridge
- PotatoAIChip
- CargoTelepadMachineCircuitboard
- FlatpackerMachineCircuitboard
- OreProcessorIndustrialMachineCircuitboard
- TurboItemRechargerCircuitboard
- PowerCageRechargerCircuitboard
- HellfireHeaterMachineCircuitBoard
- HellfireFreezerMachineCircuitBoard
- BiofabricatorMachineCircuitboard
- SalvageExpeditionsComputerCircuitboard
- RadarConsoleCircuitboard
- RipleyCentralElectronics
- RipleyPeripheralsElectronics
- HamtrCentralElectronics
- HamtrPeripheralsElectronics
- HonkerCentralElectronics
- HonkerPeripheralsElectronics
- HonkerTargetingElectronics
- RemoteSignallerAdvanced
- SignalTimerElectronics
- LogProbeCartridge
- HoloprojectorField
- DeviceQuantumSpinInverter
rareChance: 0.25
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+20
View File
@@ -42,6 +42,18 @@
- ClothingHeadCage
- ClothingHeadHelmetKendoMen
- ClothingHeadBandMerc
- ClothingHeadHatCowboyWhite
- ClothingHeadHatCowboyGrey
- ClothingHeadHatCowboyBrown
- ClothingHeadHatBrownFlatcap
- ClothingHeadHatGreyFlatcap
- ClothingHeadHatPartyRed
- ClothingHeadHatPartyYellow
- ClothingHeadHatPartyGreen
- ClothingHeadHatPartyBlue
- ClothingHeadHatWatermelon
- WaterDropletHat
- ClothingHeadHatRedRacoon
rareChance: 0.03
prototypes:
- ClothingHeadHatAnimalCat
@@ -98,5 +110,13 @@
- ClothingHeadHatFlatBrown
- ClothingHeadTinfoil
- ClothingHeadHatStrawHat
- ClothingHeadHatCowboyBountyHunter
- ClothingHeadHatCowboyRed
- ClothingHeadHatCowboyBlack
- ClothingHeadHatGladiator
- ClothingHeadHatMagician
- ClothingHeadHatHetmanHat
- ClothingHeadHatTacticalMaidHeadband
- ClothingHeadHatPirateTricord
chance: 0.5
offset: 0.2
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+1 -1
View File
@@ -36,5 +36,5 @@
- MatterBinStockPart
- CrateMaterialSteel
- CrateMaterialGlass
chance: 0.45
chance: 0.50
offset: 0.0
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+3
View File
@@ -48,6 +48,7 @@
- PeaSeeds
- PumpkinSeeds
- CottonSeeds
- LilySeeds
chance: 0.95
offset: 0.0
rarePrototypes:
@@ -64,4 +65,6 @@
- LemoonSeeds
- SteelcapSeeds
- KoibeanSeeds
- SpacemansTrumpetSeeds
- LaughinPeaSeeds
rareChance: 0.05
Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+16
View File
@@ -65,3 +65,19 @@
- type: ReverseEngineering
recipes:
- DeepFryerMachineCircuitboard
- type: entity
id: MailTeleporterMachineCircuitboard
parent: BaseMachineCircuitboard
name: mail teleporter machine board
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: MailTeleporter
requirements:
Capacitor: 1
MatterBin: 1
materialRequirements:
Steel: 4
Cable: 4
Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+8 -6
View File
@@ -1,6 +1,6 @@
- type: entity
id: MailTeleporter
parent: BaseStructureDynamic
parent: [ BaseMachinePowered, ConstructibleMachine ]
name: mail teleporter
description: Teleports mail addressed to the crew of this station.
components:
@@ -37,11 +37,11 @@
!type:DamageTrigger
damage: 75
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
- !type:PlaySoundBehavior
sound:
collection: MetalGlassBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- !type:DoActsBehavior
acts: ["Destruction"]
- type: ApcPowerReceiver
@@ -56,3 +56,5 @@
True: {visible: true}
False: {visible: false}
- type: PowerSwitch
- type: Machine
board: MailTeleporterMachineCircuitboard
Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
+20 -12
View File
@@ -12,10 +12,20 @@
collection: MaleSneezes
Cough:
collection: MaleCoughs
Yawn:
collection: MaleYawn
Snore:
collection: Snores
Honk:
collection: BikeHorn
Sigh:
collection: MaleSigh
Crying:
collection: MaleCry
Whistle:
collection: Whistles
Weh:
collection: Weh
Hiss:
collection: FelinidHisses
Meow:
@@ -26,8 +36,6 @@
collection: FelinidGrowls
Purr:
collection: FelinidPurrs
Sigh:
collection: MaleSigh
- type: emoteSounds
id: FemaleFelinid
@@ -42,10 +50,20 @@
collection: FemaleSneezes
Cough:
collection: FemaleCoughs
Yawn:
collection: FemaleYawn
Snore:
collection: Snores
Honk:
collection: CluwneHorn
Sigh:
collection: FemaleSigh
Crying:
collection: FemaleCry
Whistle:
collection: Whistles
Weh:
collection: Weh
Hiss:
collection: FelinidHisses
Meow:
@@ -56,13 +74,3 @@
collection: FelinidGrowls
Purr:
collection: FelinidPurrs
Sigh:
collection: FemaleSigh
# mobs
- type: emoteSounds
id: Mothroach
sound:
path: /Audio/Voice/Moth/moth_squeak.ogg
params:
variation: 0.125
Resources/Prototypes/Objectives/objectiveGroups.yml
-1
View File
@@ -80,7 +80,6 @@
TechnologyDiskStealCollectionObjective: 1 #rnd
FigurineStealCollectionObjective: 0.3 #service
IDCardsStealCollectionObjective: 1
CannabisStealCollectionObjective: 1
LAMPStealCollectionObjective: 2 #only for moth
- type: weightedRandom