diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index d73155d67da..4b08d011d7f 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -61,12 +61,6 @@ private void PreferencesDataLoaded() if (_previewDummy != null) EntityManager.DeleteEntity(_previewDummy); - _previewDummy = - EntityManager.SpawnEntity( - _prototypeManager.Index(HumanoidCharacterProfile.DefaultWithSpecies().Species) - .DollPrototype, MapCoordinates.Nullspace); - _previewPanel?.SetSprite(_previewDummy.Value); - UpdateCharacterUI(); } @@ -104,6 +98,15 @@ public void UpdateCharacterUI() return; } + if (_previewDummy == null) + { + _previewDummy = + EntityManager.SpawnEntity( + _prototypeManager.Index(HumanoidCharacterProfile.DefaultWithSpecies().Species) + .DollPrototype, MapCoordinates.Nullspace); + _previewPanel?.SetSprite(_previewDummy.Value); + } + _previewPanel?.SetLoaded(true); if (_preferencesManager.Preferences?.SelectedCharacter is not HumanoidCharacterProfile selectedCharacter) diff --git a/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs index 892a8b440a6..160f1d72012 100644 --- a/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs +++ b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs @@ -26,7 +26,7 @@ public void SetLoaded(bool value) public void SetSummaryText(string value) { - Summary.Text = string.Empty; + Summary.Text = value; } public void SetSprite(EntityUid uid) diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs index 3d617e3a340..f413befc211 100644 --- a/Content.Server/Advertise/Components/AdvertiseComponent.cs +++ b/Content.Server/Advertise/Components/AdvertiseComponent.cs @@ -1,4 +1,3 @@ -using Content.Server.Advertise.EntitySystems; using Content.Shared.Advertise; using Robust.Shared.Prototypes; @@ -8,21 +7,21 @@ namespace Content.Server.Advertise.Components; /// Makes this entity periodically advertise by speaking a randomly selected /// message from a specified MessagePack into local chat. /// -[RegisterComponent, Access(typeof(AdvertiseSystem))] +[RegisterComponent] public sealed partial class AdvertiseComponent : Component { /// /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1. /// [DataField] - public int MinimumWait { get; private set; } = 8 * 60; + public int MinimumWait { get; set; } = 8 * 60; /// /// Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal /// to /// [DataField] - public int MaximumWait { get; private set; } = 10 * 60; + public int MaximumWait { get; set; } = 10 * 60; /// /// If true, the delay before the first advertisement (at MapInit) will ignore diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs index dd65d36067e..ba09c84bce4 100644 --- a/Content.Server/Antag/MobReplacementRuleSystem.cs +++ b/Content.Server/Antag/MobReplacementRuleSystem.cs @@ -1,4 +1,6 @@ using System.Numerics; +using Content.Server.Advertise.Components; +using Content.Server.Advertise.EntitySystems; using Content.Server.Antag.Mimic; using Content.Server.Chat.Systems; using Content.Server.GameTicking.Rules; @@ -19,7 +21,6 @@ using Content.Server.NPC.HTN; using Content.Server.NPC; using Content.Shared.Weapons.Melee; -using Content.Server.Advertise; using Content.Server.Power.Components; using Content.Shared.CombatMode; @@ -36,7 +37,7 @@ public sealed class MobReplacementRuleSystem : GameRuleSystem(uid, out var aPC)) aPC.NeedsPower = false; diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl index b411cf2eec7..d5a1bf9882d 100644 --- a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl +++ b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl @@ -4,4 +4,4 @@ advertisement-courierdrobe-3 = Wear your brown with pride! advertisement-courierdrobe-4 = These shorts are comfy and easy to wear, get yours now! advertisement-courierdrobe-5 = Outrun every danger with our stylish clothes! thankyou-courierdrobe-1 = Now get out there and deliver that mail! -thankyou-courierdrobe-1 = Those parcels aren't going to deliver themselves! +thankyou-courierdrobe-2 = Those parcels aren't going to deliver themselves! diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl index d8c47a8e412..da4db530b4e 100644 --- a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl +++ b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl @@ -2,4 +2,4 @@ advertisement-pride-1 = Be gay do crime! advertisement-pride-2 = Full of colors! advertisement-pride-3 = You are valid! thankyou-pride-1 = Go, do some crime! -thankyou-pride-1 = Have a colorful day! +thankyou-pride-2 = Have a colorful day! diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index ac06ebba4e9..156fb2de6ec 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -7451,7 +7451,7 @@ entities: - type: Transform pos: -52.5,-20.5 parent: 2 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 7103 components: diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index d63e4cc6271..8a1148c7745 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -14056,14 +14056,6 @@ entities: - type: Transform pos: 11.693138,27.631475 parent: 100 -- proto: BookFishops - entities: - - uid: 5268 - components: - - type: Transform - parent: 5207 - - type: Physics - canCollide: False - proto: BookLeafLoversSecret entities: - uid: 504 @@ -14122,18 +14114,6 @@ entities: - type: Transform pos: 11.5,-4.5 parent: 100 - - type: Storage - storedItems: - 5268: - position: 0,0 - _rotation: South - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 5268 - uid: 11782 components: - type: Transform diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index 1d94f1fb50d..f517f5a5ab5 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -35942,7 +35942,7 @@ entities: - type: Transform pos: -45.5,26.5 parent: 2 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 1410 components: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dd43ec40948..93c60e4caa0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 2400 + cost: 4500 category: cargoproduct-category-name-service group: market @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1200 + cost: 1700 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 1f27eb265c2..dcde538f9cd 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -20,7 +20,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib - type: entity @@ -33,7 +33,7 @@ - id: BoxSurvivalMedical - id: RubberStampPsychologist - + - type: entity noSpawn: true parent: ClothingBackpack diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 0ae8407a2fc..4aa423e0aed 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib - type: entity @@ -20,7 +20,7 @@ - id: BoxSurvivalMedical - id: RubberStampPsychologist - + - type: entity noSpawn: true parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 4eebbcfe917..1ef1441b3b9 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib - type: entity @@ -20,7 +20,7 @@ - id: BoxSurvivalMedical - id: RubberStampPsychologist - + - type: entity noSpawn: true parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml index 37b4a65d98d..38bbd956868 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalSecurity - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib # - id: Flash - id: BruteAutoInjector diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml index 2ab94da0a4b..caf5aa3515b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalSecurity - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib # - id: Flash - id: BruteAutoInjector diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml index d2d081da462..9c27500a1f7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalSecurity - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded + - id: BodyBagFolded - id: Portafib # - id: Flash - id: BruteAutoInjector diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 8f7e6ce6b2d..7de554f5ff5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -6,100 +6,100 @@ components: - type: Mail contents: - # Author Books - - id: BookNarsieLegend - prob: 0.02 - orGroup: bookauthor - - id: BookTruth - prob: 0.02 - orGroup: bookauthor - - id: BookWorld - prob: 0.1 - orGroup: bookauthor - - id: BookIanAntarctica - prob: 0.05 - orGroup: bookauthor - - id: BookSlothClownSSS - prob: 0.04 - orGroup: bookauthor - - id: BookSlothClownPranks - prob: 0.04 - orGroup: bookauthor - - id: BookSlothClownMMD - prob: 0.04 - orGroup: bookauthor - - id: BookStruck - prob: 0.1 - orGroup: bookauthor - - id: BookSun - prob: 0.1 - orGroup: bookauthor - - id: BookPossum - prob: 0.1 - orGroup: bookauthor - - id: BookCafe - prob: 0.1 - orGroup: bookauthor - - id: BookFeather - prob: 0.1 - orGroup: bookauthor - - id: BookIanLostWolfPup - prob: 0.05 - orGroup: bookauthor - - id: BookIanRanch - prob: 0.05 - orGroup: bookauthor - - id: BookIanOcean - prob: 0.05 - orGroup: bookauthor - - id: BookIanMountain - prob: 0.05 - orGroup: bookauthor - - id: BookIanCity - prob: 0.05 - orGroup: bookauthor - - id: BookIanArctic - prob: 0.05 - orGroup: bookauthor - - id: BookIanDesert - prob: 0.05 - orGroup: bookauthor - - id: BookNames - prob: 0.08 - orGroup: bookauthor - - id: BookEarth - prob: 0.08 - orGroup: bookauthor - - id: BookTemple - prob: 0.09 - orGroup: bookauthor - - id: BookAurora - prob: 0.1 - orGroup: bookauthor - - id: BookWatched - prob: 0.04 - orGroup: bookauthor - - id: BookMedicalOfficer - prob: 0.06 - orGroup: bookauthor - - id: BookMorgue - prob: 0.06 - orGroup: bookauthor - - id: BookRufus - prob: 0.1 - orGroup: bookauthor - - id: BookMap - prob: 0.08 - orGroup: bookauthor - - id: BookJourney - prob: 0.1 - orGroup: bookauthor - - id: BookInspiration - prob: 0.09 - orGroup: bookauthor - - id: BookRandom # The "spawn nothing" in the 'orGroup' - prob: 0.3 - orGroup: bookauthor +# # Author Books +# - id: BookNarsieLegend +# prob: 0.02 +# orGroup: bookauthor +# - id: BookTruth +# prob: 0.02 +# orGroup: bookauthor +# - id: BookWorld +# prob: 0.1 +# orGroup: bookauthor +# - id: BookIanAntarctica +# prob: 0.05 +# orGroup: bookauthor +# - id: BookSlothClownSSS +# prob: 0.04 +# orGroup: bookauthor +# - id: BookSlothClownPranks +# prob: 0.04 +# orGroup: bookauthor +# - id: BookSlothClownMMD +# prob: 0.04 +# orGroup: bookauthor +# - id: BookStruck +# prob: 0.1 +# orGroup: bookauthor +# - id: BookSun +# prob: 0.1 +# orGroup: bookauthor +# - id: BookPossum +# prob: 0.1 +# orGroup: bookauthor +# - id: BookCafe +# prob: 0.1 +# orGroup: bookauthor +# - id: BookFeather +# prob: 0.1 +# orGroup: bookauthor +# - id: BookIanLostWolfPup +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanRanch +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanOcean +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanMountain +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanCity +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanArctic +# prob: 0.05 +# orGroup: bookauthor +# - id: BookIanDesert +# prob: 0.05 +# orGroup: bookauthor +# - id: BookNames +# prob: 0.08 +# orGroup: bookauthor +# - id: BookEarth +# prob: 0.08 +# orGroup: bookauthor +# - id: BookTemple +# prob: 0.09 +# orGroup: bookauthor +# - id: BookAurora +# prob: 0.1 +# orGroup: bookauthor +# - id: BookWatched +# prob: 0.04 +# orGroup: bookauthor +# - id: BookMedicalOfficer +# prob: 0.06 +# orGroup: bookauthor +# - id: BookMorgue +# prob: 0.06 +# orGroup: bookauthor +# - id: BookRufus +# prob: 0.1 +# orGroup: bookauthor +# - id: BookMap +# prob: 0.08 +# orGroup: bookauthor +# - id: BookJourney +# prob: 0.1 +# orGroup: bookauthor +# - id: BookInspiration +# prob: 0.09 +# orGroup: bookauthor +# - id: BookRandom # The "spawn nothing" in the 'orGroup' +# prob: 0.3 +# orGroup: bookauthor # id: Guidebook Books - id: BookSpaceEncyclopedia prob: 0.2 @@ -143,28 +143,28 @@ - id: BookRandom # The "spawn nothing" in the 'orGroup' prob: 0.5 orGroup: bookguide - # Other Books - - id: BookEscalation - prob: 0.2 - orGroup: bookother - - id: BookEscalationSecurity - prob: 0.15 - orGroup: bookother - - id: BookAtmosDistro - prob: 0.1 - orGroup: bookother - - id: BookAtmosWaste - prob: 0.1 - orGroup: bookother - - id: BookAtmosAirAlarms - prob: 0.1 - orGroup: bookother - - id: BookAtmosVentsMore - prob: 0.1 - orGroup: bookother - - id: BookRandom # The "spawn nothing" in the 'orGroup' - prob: 0.7 - orGroup: bookother +# # Other Books +# - id: BookEscalation +# prob: 0.2 +# orGroup: bookother +# - id: BookEscalationSecurity +# prob: 0.15 +# orGroup: bookother +# - id: BookAtmosDistro +# prob: 0.1 +# orGroup: bookother +# - id: BookAtmosWaste +# prob: 0.1 +# orGroup: bookother +# - id: BookAtmosAirAlarms +# prob: 0.1 +# orGroup: bookother +# - id: BookAtmosVentsMore +# prob: 0.1 +# orGroup: bookother +# - id: BookRandom # The "spawn nothing" in the 'orGroup' +# prob: 0.7 +# orGroup: bookother - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 9939a61943a..c78a5f9bdb5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -214,7 +214,7 @@ name: chief medical officer's lab coat - type: entity - parent: ClothingOuterStorageFoldableBase + parent: ClothingOuterStorageBase id: ClothingOuterCoatRnd name: epistemics lab coat # DeltaV - Epistemics Department replacing Science description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml index 8b1826857d8..e3944296ea7 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml @@ -239,13 +239,13 @@ - type: AccessReader access: [["Detective"]] -- type: entity - parent: DoorElectronics - id: DoorElectronicsBrig - suffix: Brig, Locked - components: - - type: AccessReader - access: [["Brig"]] +#- type: entity +# parent: DoorElectronics +# id: DoorElectronicsBrig +# suffix: Brig, Locked +# components: +# - type: AccessReader +# access: [["Brig"]] - type: entity parent: DoorElectronics diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 7d0d1e7e1ce..b5b55dbd546 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -135,7 +135,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -262,7 +262,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -298,7 +298,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -419,7 +419,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -662,7 +662,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -698,7 +698,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -820,7 +820,6 @@ - type: Tag tags: - Wall - - RCDDeconstructWhitelist - type: Sprite sprite: Structures/Walls/shuttle.rsi - type: Icon @@ -873,7 +872,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: @@ -1255,7 +1254,7 @@ - type: RCDDeconstructable cost: 6 delay: 8 - fx: EffectRCDDeconstruct8 + fx: EffectRCDDeconstruct8 - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml index 26527dae173..2f790f2ce1c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml @@ -10,7 +10,7 @@ - type: Sprite layers: - sprite: Objects/Misc/books.rsi - state: icon_book + state: book_icon - type: RandomSpawner offset: 0 prototypes: @@ -61,20 +61,20 @@ - BookHowToSurvive - BookChemicalCompendium # Other Books - - BookEscalation - - BookEscalationSecurity + #- BookEscalation + #- BookEscalationSecurity - BookAtmosDistro - BookAtmosWaste - BookAtmosAirAlarms - BookAtmosVentsMore - BookRandom # The empty random book because why not chance: 0.9 - rarePrototypes: - - BookChemistryInsane - - BookBotanicalTextbook - - BookGnominomicon - - BookFishing - - BookFishops # DeltaV - fishops book - - BookDetective - - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book - rareChance: 0.25 + # rarePrototypes: + # - BookChemistryInsane + # - BookBotanicalTextbook + # - BookGnominomicon + # - BookFishing + # - BookFishops # DeltaV - fishops book + # - BookDetective + # - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book + # rareChance: 0.25 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml index f0dd4709034..3ea45bf846c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml @@ -19,7 +19,7 @@ - ClothingHeadHatXmasCrown - ClothingHeadHelmetCosmonaut - ClothingHeadHelmetBasic - - ClothingHeadHelmetScaf + #- ClothingHeadHelmetScaf - ClothingHeadHelmetTemplar - ClothingHeadHelmetThunderdome - ClothingHeadHelmetFire @@ -29,7 +29,7 @@ - ClothingHeadHatHoodRad - ClothingHeadHatCake - ClothingHeadHatChickenhead - - ClothingHeadHatHairflower + #- ClothingHeadHatHairflower - ClothingHeadHatPumpkin - ClothingHeadHatRichard - ClothingHeadHatSkub @@ -94,7 +94,7 @@ - ClothingHeadFishCap - ClothingHeadRastaHat - ClothingHeadSafari - - ClothingHeadHatFlowerCrown + #- ClothingHeadHatFlowerCrown - ClothingHeadHatCone - ClothingHeadHatCasa - ClothingHeadHatBluesoft diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml index 91e40a8e607..9ef2331aa93 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml @@ -72,7 +72,7 @@ - ChemistryEmptyBottle03 - LargeBeaker - Syringe - - BodyBag_Folded + - BodyBagFolded - SprayBottle - SprayBottleWater - SprayBottleSpaceCleaner diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml deleted file mode 100644 index b7721b9c124..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ /dev/null @@ -1,204 +0,0 @@ -- type: entity - parent: BaseItem - id: BaseHyperlinkBook - abstract: true - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - - type: Tag - tags: - - Book - - type: EmitSoundOnPickup - sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg - - type: EmitSoundOnDrop - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - - type: EmitSoundOnLand - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSpaceLaw - name: space law - description: A big book of laws for space courts. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Space_Law - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSupernanny - name: book of unsanctioned space punishments - description: The ravings of a madman. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques - -#- type: entity -# parent: BaseHyperlinkBook -# id: HyperlinkBookGlimmer -# suffix: GuidebookBook -# name: A Layman's Guide to the Mind -# description: A guide on psionics. -# components: -# - type: Sprite -# sprite: SimpleStation14/Objects/Misc/books.rsi -# layers: -# - state: book_psionics -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Glimmer -# - type: GuidebookBook -# guides: -# - Psionics -# - AltarsGolemancy - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookChemistry - name: chemical recipe book - description: A list of chemical recipes. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Chemistry - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBartending - name: bartender's guide - description: A list of drink recipes. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Drinks - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookCooking - name: cookbook - description: A list of food recipes. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Cooking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBotany - name: botanical field guide - description: A guide to plants. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hydroponics - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookShuttle - name: guide to shuttle construction - description: A guide to building shuttles. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAlerts - suffix: GuidebookBook - name: What to do When Things are Blowing Up - description: Procedure for when and why each alert should be put in effect, and what to do. - components: - - type: Sprite - layers: - - state: icon_law - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Alert_Procedure -# - type: GuidebookBook -# guides: -# - CommonAlerts -# - SpecificAlerts -# - CentCommAlerts - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookProcedure - suffix: GuidebookBook - name: standard operating procedure - description: A guide to normal station function. - components: - - type: Sprite - layers: - - state: icon_law - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Standard_Operating_Procedure -# - type: GuidebookBook -# guides: -# - StandardOperatingProcedure - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookPower - name: guide to power - description: A guide to powering the station. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Power - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookMedical - name: guide to medical - description: A guide to the medical department. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Medical - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookHacking - name: guide to hacking - description: For emergency use only. - components: - - type: Sprite - layers: - - state: icon_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hacking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAtmos - suffix: GuidebookBook - name: How to Make Gas Hot - description: A guide on Atmospherics. Make sure to grab the thrilling sequal; What to do When Gas Hot. - components: - - type: Sprite - layers: - - state: icon_law - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science -# - type: GuidebookBook -# guides: -# - Atmospherics diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml index e0761b7d40d..72f0cb741c7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml @@ -80,41 +80,41 @@ contents: - id: BlockGameArcadeComputerCircuitboard -- type: entity - noSpawn: true - parent: BaseMail - id: MailBooks - suffix: books - components: - - type: Mail - contents: - # Don't use BookDemonomiconRandom. - # It uses a RandomSpawner which just spawns the book outside of the mail. - - id: BookDemonomicon1 - orGroup: Demonomicon - - id: BookDemonomicon2 - orGroup: Demonomicon - - id: BookDemonomicon3 - orGroup: Demonomicon - # There's no way to signal "spawn nothing" with an orGroup, - # so have this blank book instead. Write your own demon summoning tome! - - id: BookRandom - prob: 3 - orGroup: Demonomicon - - id: BookChemistryInsane - prob: 0.10 - - id: BookBotanicalTextbook - prob: 0.5 - - id: BookFishing - prob: 0.10 - - id: BookDetective - prob: 0.10 - - id: BookGnominomicon - prob: 0.2 - - id: BookFishops # DeltaV - fishops book - prob: 0.2 - - id: BookSalvageEpistemics1 - prob: 0.025 +#- type: entity +# noSpawn: true +# parent: BaseMail +# id: MailBooks +# suffix: books +# components: +# - type: Mail +# contents: +# # Don't use BookDemonomiconRandom. +# # It uses a RandomSpawner which just spawns the book outside of the mail. +# - id: BookDemonomicon1 +# orGroup: Demonomicon +# - id: BookDemonomicon2 +# orGroup: Demonomicon +# - id: BookDemonomicon3 +# orGroup: Demonomicon +# # There's no way to signal "spawn nothing" with an orGroup, +# # so have this blank book instead. Write your own demon summoning tome! +# - id: BookRandom +# prob: 3 +# orGroup: Demonomicon +# - id: BookChemistryInsane +# prob: 0.10 +# - id: BookBotanicalTextbook +# prob: 0.5 +# - id: BookFishing +# prob: 0.10 +# - id: BookDetective +# prob: 0.10 +# - id: BookGnominomicon +# prob: 0.2 +# - id: BookFishops # DeltaV - fishops book +# prob: 0.2 +# - id: BookSalvageEpistemics1 +# prob: 0.025 - type: entity noSpawn: true @@ -408,19 +408,19 @@ contents: - id: FlashlightLantern -- type: entity - noSpawn: true - parent: BaseMail - id: MailFlowers - suffix: flowers - components: - - type: Mail - contents: - # TODO actual flowers - - id: ClothingHeadHatFlowerCrown - orGroup: Flower - - id: ClothingHeadHatHairflower - orGroup: Flower +#- type: entity +# noSpawn: true +# parent: BaseMail +# id: MailFlowers +# suffix: flowers +# components: +# - type: Mail +# contents: +# # TODO actual flowers +# - id: ClothingHeadHatFlowerCrown +# orGroup: Flower +# - id: ClothingHeadHatHairflower +# orGroup: Flower - type: entity noSpawn: true diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml index 0dc5c678198..12548299910 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml @@ -92,4 +92,3 @@ - type: Tag tags: - Wall - - RCDDeconstructWhitelist diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png new file mode 100644 index 00000000000..3ff890bfe28 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json index 68b29bf695a..beb93d20c72 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon-open" + }, { "name": "equipped-OUTERCLOTHING", "directions": 4