diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs index 9288195d7b28dd..93212013a90576 100644 --- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs +++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs @@ -33,7 +33,7 @@ public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan, RoundId = roundId; var roundEndTabs = new TabContainer(); roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId)); - roundEndTabs.AddChild(MakePlayerManifestoTab(info)); + roundEndTabs.AddChild(MakePlayerManifestTab(info)); Contents.AddChild(roundEndTabs); @@ -90,12 +90,12 @@ private BoxContainer MakeRoundEndSummaryTab(string gamemode, string roundEnd, Ti return roundEndSummaryTab; } - private BoxContainer MakePlayerManifestoTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo) + private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo) { var playerManifestTab = new BoxContainer { Orientation = LayoutOrientation.Vertical, - Name = Loc.GetString("round-end-summary-window-player-manifesto-tab-title") + Name = Loc.GetString("round-end-summary-window-player-manifest-tab-title") }; var playerInfoContainerScrollbox = new ScrollContainer diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index ac57ced2bdc168..8ea40f525c369d 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -395,7 +395,7 @@ public bool CanFit(EntityUid toInsert, EntityUid container, EntityWhitelist? whi var targetIsMob = HasComp(toInsert); var storageIsItem = HasComp(container); - var allowedToEat = whitelist?.IsValid(toInsert) ?? storageIsItem; + var allowedToEat = whitelist?.IsValid(toInsert) ?? HasComp(toInsert); // BEFORE REPLACING THIS WITH, I.E. A PROPERTY: // Make absolutely 100% sure you have worked out how to stop people ending up in backpacks. diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7f4c88429636f9..a608f2d39a5f98 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,27 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - {message: Snow planets now have minerals and rocks on them., type: Add} - id: 4112 - time: '2023-06-28T11:32:02.0000000+00:00' -- author: metalgearsloth - changes: - - {message: Added walls to lava planets., type: Add} - id: 4113 - time: '2023-06-28T12:57:40.0000000+00:00' -- author: crazybrain - changes: - - {message: The lsobjectives command now has autocompletion., type: Tweak} - id: 4114 - time: '2023-06-28T13:47:46.0000000+00:00' -- author: deltanedas - changes: - - {message: 'Hazardous and Extreme expeditions can have more dangerous modifiers, - of which temperature has been added.', type: Tweak} - - {message: Hazardous and Extreme expeditions give 4 and 5 rewards respectively., - type: Tweak} - id: 4115 - time: '2023-06-28T14:01:27.0000000+00:00' - author: Lank changes: - {message: 'Added Lead, a tasteless, incredibly powerful but slow-acting poison @@ -3030,3 +3007,25 @@ Entries: range., type: Fix} id: 4611 time: '2023-08-16T08:03:42.0000000+00:00' +- author: EmoGarbage404 + changes: + - {message: Lockers and crates work again., type: Fix} + id: 4612 + time: '2023-08-16T13:08:53.0000000+00:00' +- author: Ilya246 + changes: + - {message: 'Taxibots, cleanbots, and similar now have binary radio.', type: Add} + id: 4613 + time: '2023-08-16T13:18:57.0000000+00:00' +- author: DogZeroX + changes: + - {message: 'Reworked the loot table from salvage spawners, the stuff you can find + is more varied and valuable overall.', type: Add} + id: 4614 + time: '2023-08-16T19:11:02.0000000+00:00' +- author: DogZeroX + changes: + - {message: Higher rating stock parts are now cheaper to make. Print a bunch of + them and upgrade stuff!, type: Tweak} + id: 4615 + time: '2023-08-16T22:12:09.0000000+00:00' diff --git a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl index 8069838e11ebf3..58d26319b3246a 100644 --- a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl +++ b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl @@ -1,6 +1,6 @@ round-end-summary-window-title = Round End Summary round-end-summary-window-round-end-summary-tab-title = Round Information -round-end-summary-window-player-manifesto-tab-title = Player Manifesto +round-end-summary-window-player-manifest-tab-title = Player Manifest round-end-summary-window-round-id-label = Round [color=white]#{$roundId}[/color] has ended. round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color]. round-end-summary-window-duration-label = It lasted for [color=yellow]{$hours} hours, {$minutes} minutes, and {$seconds} seconds. diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 9e83e1eec0e7b2..cd5daf6f722fd7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -31,11 +31,13 @@ - type: StorageFill contents: # Normal (10%) - - id: ToolboxEmergencyFilled + - id: OxygenTankFilled prob: 0.1 - - id: ClothingMaskBreath + - id: SheetPlasma prob: 0.1 - - id: OxygenTankFilled + - id: IngotGold + prob: 0.1 + - id: IngotSilver prob: 0.1 - id: SheetPlasma prob: 0.1 @@ -43,7 +45,7 @@ prob: 0.1 - id: ResearchDisk prob: 0.1 - - id: ClothingBeltStorageWaistbag + - id: SheetUranium prob: 0.1 # - Service - id: CrayonBox @@ -54,22 +56,15 @@ - id: BoxSyringe prob: 0.1 - id: BoxBeaker - prob: 0.1 - # - Scaf - - id: ClothingHeadHelmetScaf - prob: 0.1 - - id: ClothingOuterArmorScaf prob: 0.1 # - Heh - id: SalvageHumanCorpse prob: 0.1 - - id: LidSalami - prob: 0.1 # Interesting (1%) # - Ammo - id: MagazineBoxMagnum prob: 0.01 - - id: ResearchDisk5000 + - id: ResearchDisk10000 prob: 0.01 # Just no (0.1%) # - Working guns @@ -82,30 +77,8 @@ # - Skub - id: Skub prob: 0.001 - - id: ResearchDisk10000 - prob: 0.001 - id: ClothingHeadHatCatEars prob: 0.01 - # - Pins - - id: ClothingNeckLGBTPin - prob: 0.025 - orGroup: LGBTQIAPlusPins - - id: ClothingNeckAromanticPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckAsexualPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckBisexualPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckIntersexPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckLesbianPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckNonBinaryPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckPansexualPin - orGroup: LGBTQIAPlusPins - - id: ClothingNeckTransPin - orGroup: LGBTQIAPlusPins # TRAITOR EQUIPMENT (0.01%) - id: Telecrystal10 prob: 0.0001 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index d519f238183ae2..32c1cfb506b432 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -117,6 +117,8 @@ prob: 0.2 - id: ClothingHandsGlovesColorYellow prob: 0.05 + - id: ClothingHandsGlovesFingerlessInsulated + prob: 0.07 - id: ClothingBeltUtility prob: 0.10 - id: ClothingHeadHatCone diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 1a220c92c04c69..364fd1758406b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -264,6 +264,20 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesFingerlessInsulated + name: fingerless insulated gloves + description: Insulated gloves resistant to shocks, or at least they used to. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi + - type: Fiber + fiberMaterial: fibers-insulative + fiberColor: fibers-yellow + - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesMercFingerless diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml index e98004bfc81486..a933a7ecbb9710 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml @@ -20,6 +20,19 @@ - CrateSalvageEquipment - CrateMaterialSteel - CrateMaterialGlass + - CrateServiceJanitorialSupplies + - CrateHydroponicsSeedsMedicinal + - CrateEmergencyInternals + - CrateFoodMRE + - CrateMaterialTextiles + - CrateMedicalSupplies + - CrateEngineeringCableBulk + - CrateMaterialCardboard + - CrateServiceBooks + - CrateServiceSmokeables + - CrateTrashCartFilled + - ClosetMaintenanceFilledRandom + - ClosetEmergencyFilledRandom rareChance: 0.4 prototypes: - CrateSalvageAssortedGoodies diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index b920958f1e958d..59b383de121978 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -41,6 +41,14 @@ - type: NpcFactionMember factions: - SimpleNeutral + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - Binary + - type: ActiveRadio + channels: + - Binary + - Common - type: HealthExaminable examinableTypes: - Blunt diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index cfc1917aa8967a..903a849ad8597a 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -52,6 +52,14 @@ showInHands: false - type: Body prototype: Drone + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - Binary + - type: ActiveRadio + channels: + - Binary + - Common - type: DoAfter - type: Pullable - type: Examiner diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 1f736239f2dc0a..8d558ffb181925 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -72,6 +72,14 @@ - type: Speech speechVerb: Robotic speechSounds: Vending + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - Binary + - type: ActiveRadio + channels: + - Binary + - Common - type: DoAfter - type: Electrified enabled: false diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml index c0c496e3963236..99f8273536608e 100644 --- a/Resources/Prototypes/Recipes/Lathes/Parts.yml +++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml @@ -50,34 +50,34 @@ Steel: 150 Plastic: 150 Plasma: 75 - + #Rating 3 - type: latheRecipe id: SuperCapacitorStockPart result: SuperCapacitorStockPart completetime: 3 materials: - Steel: 250 - Plastic: 250 - Plasma: 100 - Gold: 125 + Steel: 150 + Plastic: 150 + Plasma: 75 + Gold: 75 - type: latheRecipe id: SuperMatterBinStockPart result: SuperMatterBinStockPart completetime: 3 materials: - Steel: 250 - Plastic: 250 - Plasma: 100 - Gold: 125 + Steel: 150 + Plastic: 150 + Plasma: 75 + Gold: 75 - type: latheRecipe id: PicoManipulatorStockPart result: PicoManipulatorStockPart completetime: 3 materials: - Steel: 250 - Plastic: 250 - Plasma: 100 - Gold: 125 + Steel: 150 + Plastic: 150 + Plasma: 75 + Gold: 75 diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png new file mode 100644 index 00000000000000..5a85dbeafd5c03 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png new file mode 100644 index 00000000000000..cb3f336c9690fe Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png new file mode 100644 index 00000000000000..8e8542213fa3db Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png new file mode 100644 index 00000000000000..a99658a193627f Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json new file mode 100644 index 00000000000000..16c9e9e5e12523 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}]}