From d1839edb7ad3643443cb87a50b2ea4e220a35e39 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:58:27 +1000 Subject: [PATCH 01/37] Add AI warp points (#31559) --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index e843fbfc239f63..8174f52a347322 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -199,6 +199,7 @@ - AiHolder suffix: Empty components: + - type: WarpPoint - type: ContainerComp proto: AiHeld container: station_ai_mind_slot @@ -298,6 +299,8 @@ noSpawn: true suffix: DO NOT MAP components: + - type: WarpPoint + follow: true - type: Eye pvsScale: 1.5 - type: Visibility From 1f4c9b55e2ff882a96bfd24ca6c0296d2d21d811 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 05:59:34 +0000 Subject: [PATCH 02/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 65f093d437047c..c0f0c788f03406 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Moomoobeef - changes: - - message: Fax machines can now be purchased at cargo, for when you need more paper - pushing on your station! - type: Add - id: 6729 - time: '2024-06-14T06:24:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28968 - author: Zonespace27 changes: - message: Non-uplink PDAs can no longer have telecrystals inserted into them. @@ -3865,3 +3857,10 @@ id: 7228 time: '2024-08-27T16:54:48.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31519 +- author: metalgearsloth + changes: + - message: Added warp points for AI. + type: Add + id: 7229 + time: '2024-08-28T05:58:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31559 From 9149a449b1b79b3c5339ea18b7b14ff66cbb97bb Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:09:05 +1000 Subject: [PATCH 03/37] Fix AI being ejectable (#31561) --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 8174f52a347322..e1348c7b389f32 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -116,6 +116,7 @@ - type: StationAiHolder slot: name: station-ai-mind-slot + locked: true whitelist: tags: - StationAi From 8321031a08110da12583a9eb0b02492375c06f51 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:10:11 +0000 Subject: [PATCH 04/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c0f0c788f03406..2c1617d254ad8f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Zonespace27 - changes: - - message: Non-uplink PDAs can no longer have telecrystals inserted into them. - type: Fix - id: 6730 - time: '2024-06-14T15:24:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28985 - author: Aquif changes: - message: '"Space Drugs" have been renamed to "Space Mirage"' @@ -3864,3 +3857,10 @@ id: 7229 time: '2024-08-28T05:58:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31559 +- author: metalgearsloth + changes: + - message: Fix AI being ejectable. + type: Fix + id: 7230 + time: '2024-08-28T07:09:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31561 From 678320f8762e5c8237a97e55bc736bdfb4dfa943 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:11:25 +1000 Subject: [PATCH 05/37] Fix whitelist (#31563) --- Content.Server/Connection/ConnectionManager.Whitelist.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs index 212c87e17a684f..c8a4cc37ca405a 100644 --- a/Content.Server/Connection/ConnectionManager.Whitelist.cs +++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs @@ -121,7 +121,7 @@ private bool IsValid(PlayerConnectionWhitelistPrototype whitelist, int playerCou private async Task CheckConditionManualWhitelist(NetUserData data) { - return !(await _db.GetWhitelistStatusAsync(data.UserId)); + return await _db.GetWhitelistStatusAsync(data.UserId); } private async Task CheckConditionManualBlacklist(NetUserData data) From d93fc73f3c3098fe5f3f053c7798b9d3921e102c Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:12:32 +0000 Subject: [PATCH 06/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2c1617d254ad8f..ee840debe87fc1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Aquif - changes: - - message: '"Space Drugs" have been renamed to "Space Mirage"' - type: Tweak - - message: '"Stimulants" have been renamed to "Hyperzine"' - type: Tweak - id: 6731 - time: '2024-06-14T16:53:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28989 - author: PJB3005 changes: - message: Added pride month. @@ -3864,3 +3855,10 @@ id: 7230 time: '2024-08-28T07:09:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31561 +- author: metalgearsloth + changes: + - message: Fix whitelist + type: Fix + id: 7231 + time: '2024-08-28T07:11:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31563 From ed6649b7f3b5ab56176089d719dc7f81c0ef2f8a Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:23:28 -0600 Subject: [PATCH 07/37] bagel update (#31562) * bagel update * ore processor cargo --- Resources/Maps/bagel.yml | 212 ++++++++++++++++++++++------ Resources/Prototypes/Maps/bagel.yml | 8 +- 2 files changed, 171 insertions(+), 49 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 092af8278aacaf..edd5216f2daf24 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -14104,6 +14104,12 @@ entities: - type: Transform pos: -24.5,62.5 parent: 60 + - uid: 21249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -69.5,16.5 + parent: 60 - uid: 21604 components: - type: MetaData @@ -30507,21 +30513,6 @@ entities: - type: Transform pos: -58.5,16.5 parent: 60 - - uid: 21249 - components: - - type: Transform - pos: -58.5,17.5 - parent: 60 - - uid: 21250 - components: - - type: Transform - pos: -59.5,17.5 - parent: 60 - - uid: 21251 - components: - - type: Transform - pos: -60.5,17.5 - parent: 60 - uid: 21252 components: - type: Transform @@ -43102,6 +43093,11 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 7536 + - uid: 8152 + components: + - type: Transform + pos: -91.5,17.5 + parent: 60 - uid: 8173 components: - type: Transform @@ -46217,6 +46213,11 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 60 + - uid: 18495 + components: + - type: Transform + pos: -93.5,17.5 + parent: 60 - uid: 18521 components: - type: Transform @@ -46912,6 +46913,11 @@ entities: - type: Transform pos: -9.5,1.5 parent: 60 + - uid: 21251 + components: + - type: Transform + pos: -90.5,17.5 + parent: 60 - uid: 21430 components: - type: Transform @@ -47237,6 +47243,26 @@ entities: - type: Transform pos: -94.5,15.5 parent: 60 + - uid: 23092 + components: + - type: Transform + pos: -89.5,17.5 + parent: 60 + - uid: 23093 + components: + - type: Transform + pos: -88.5,17.5 + parent: 60 + - uid: 23094 + components: + - type: Transform + pos: -92.5,17.5 + parent: 60 + - uid: 23095 + components: + - type: Transform + pos: -87.5,17.5 + parent: 60 - uid: 23169 components: - type: Transform @@ -47907,6 +47933,101 @@ entities: - type: Transform pos: -111.5,22.5 parent: 60 + - uid: 24793 + components: + - type: Transform + pos: -86.5,17.5 + parent: 60 + - uid: 24794 + components: + - type: Transform + pos: -85.5,17.5 + parent: 60 + - uid: 24795 + components: + - type: Transform + pos: -84.5,17.5 + parent: 60 + - uid: 24796 + components: + - type: Transform + pos: -83.5,17.5 + parent: 60 + - uid: 24797 + components: + - type: Transform + pos: -82.5,17.5 + parent: 60 + - uid: 24798 + components: + - type: Transform + pos: -81.5,17.5 + parent: 60 + - uid: 24799 + components: + - type: Transform + pos: -80.5,17.5 + parent: 60 + - uid: 24800 + components: + - type: Transform + pos: -79.5,17.5 + parent: 60 + - uid: 24801 + components: + - type: Transform + pos: -77.5,17.5 + parent: 60 + - uid: 24802 + components: + - type: Transform + pos: -78.5,17.5 + parent: 60 + - uid: 24803 + components: + - type: Transform + pos: -76.5,17.5 + parent: 60 + - uid: 24804 + components: + - type: Transform + pos: -75.5,17.5 + parent: 60 + - uid: 24805 + components: + - type: Transform + pos: -74.5,17.5 + parent: 60 + - uid: 24806 + components: + - type: Transform + pos: -73.5,17.5 + parent: 60 + - uid: 24807 + components: + - type: Transform + pos: -72.5,17.5 + parent: 60 + - uid: 24808 + components: + - type: Transform + pos: -71.5,17.5 + parent: 60 + - uid: 24809 + components: + - type: Transform + pos: -70.5,17.5 + parent: 60 + - uid: 24810 + components: + - type: Transform + pos: -70.5,16.5 + parent: 60 + - uid: 24811 + components: + - type: Transform + pos: -69.5,16.5 + parent: 60 - proto: CableMVStack entities: - uid: 6601 @@ -62231,6 +62352,13 @@ entities: - type: Transform pos: 51.475224,-22.209888 parent: 60 +- proto: CurtainsWhiteOpen + entities: + - uid: 21250 + components: + - type: Transform + pos: -2.5,-11.5 + parent: 60 - proto: CyberPen entities: - uid: 10827 @@ -106800,11 +106928,6 @@ entities: - type: Transform pos: 20.5,14.5 parent: 60 - - uid: 18495 - components: - - type: Transform - pos: -2.5,-11.5 - parent: 60 - proto: HydroponicsToolMiniHoe entities: - uid: 6157 @@ -109706,6 +109829,13 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-1.5 parent: 60 +- proto: OreProcessor + entities: + - uid: 19027 + components: + - type: Transform + pos: 43.5,3.5 + parent: 60 - proto: OxygenCanister entities: - uid: 2757 @@ -128360,6 +128490,16 @@ entities: - type: Transform pos: -31.5,13.5 parent: 60 + - uid: 24812 + components: + - type: Transform + pos: -114.5,30.5 + parent: 60 + - uid: 24813 + components: + - type: Transform + pos: -108.5,30.5 + parent: 60 - proto: SpawnPointBotanist entities: - uid: 2779 @@ -151448,26 +151588,6 @@ entities: - type: Transform pos: -108.5,15.5 parent: 60 - - uid: 23092 - components: - - type: Transform - pos: -107.5,21.5 - parent: 60 - - uid: 23093 - components: - - type: Transform - pos: -115.5,21.5 - parent: 60 - - uid: 23094 - components: - - type: Transform - pos: -115.5,30.5 - parent: 60 - - uid: 23095 - components: - - type: Transform - pos: -107.5,30.5 - parent: 60 - uid: 23160 components: - type: Transform @@ -151896,6 +152016,12 @@ entities: rot: 3.141592653589793 rad pos: 54.5,5.5 parent: 60 + - uid: 24814 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,3.5 + parent: 60 - proto: WindoorSecureChapelLocked entities: - uid: 14513 @@ -153388,12 +153514,6 @@ entities: rot: 1.5707963267948966 rad pos: 56.5,6.5 parent: 60 - - uid: 19027 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 43.5,3.5 - parent: 60 - uid: 19907 components: - type: Transform diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 3e9f75ca81976e..2f54c89b218e64 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -17,9 +17,9 @@ emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml - type: StationJobs availableJobs: - #service + #command Captain: [ 1, 1 ] - StationAi: [ 1, 1 ] + #service HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] @@ -43,7 +43,6 @@ ResearchDirector: [ 1, 1 ] Scientist: [ 5, 5 ] ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] @@ -61,3 +60,6 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] + #silicon + StationAi: [ 1, 1 ] + Borg: [ 4, 4 ] From 783621bc6c2f86c16bd37978aec3f907ed341665 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:39:36 +1000 Subject: [PATCH 08/37] Add some more stuff to AI whitelist (#31564) * Add some more stuff to AI whitelist * by the nine --- .../Prototypes/Entities/Structures/Doors/Shutter/shutters.yml | 1 + .../Structures/Doors/Windoors/base_structurewindoors.yml | 3 +++ .../Entities/Structures/Wallmounts/surveillance_camera.yml | 2 -- Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index dc2acb79273f43..955b9ba640df23 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -7,6 +7,7 @@ placement: mode: SnapgridCenter components: + - type: StationAiWhitelist - type: Sprite sprite: Structures/Doors/Shutters/shutters.rsi drawdepth: BlastDoors diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 341d1c6761a36b..b7d0cf8cbb0e87 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -11,6 +11,7 @@ Brute: collection: GlassSmash - type: InteractionOutline + - type: StationAiWhitelist - type: Physics - type: Fixtures fixtures: @@ -130,6 +131,8 @@ layoutId: Airlock - type: UserInterface interfaces: + enum.AiUi.Key: + type: StationAiBoundUserInterface enum.WiresUiKey.Key: type: WiresBoundUserInterface - type: Appearance diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index 3530fe196c09be..e25c7df8d7296d 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -65,8 +65,6 @@ InUse: camera_in_use - type: UserInterface interfaces: - enum.AiUi.Key: - type: StationAiBoundUserInterface enum.SurveillanceCameraSetupUiKey.Camera: type: SurveillanceCameraSetupBoundUi enum.WiresUiKey.Key: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 01e3757a2c7c58..19233ba69a50b5 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -7,6 +7,7 @@ snap: - Wallmount components: + - type: StationAiWhitelist - type: WallMount arc: 360 - type: Clickable @@ -49,6 +50,7 @@ snap: - Wallmount components: + - type: StationAiWhitelist - type: WallMount arc: 360 - type: Clickable @@ -146,6 +148,7 @@ placement: mode: SnapgridCenter components: + - type: StationAiWhitelist - type: Clickable - type: InteractionOutline - type: Sprite From a270afa362a730d8bdf47936226048c132138b49 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:40:42 +0000 Subject: [PATCH 09/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ee840debe87fc1..ab4a6c920f5c6c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: PJB3005 - changes: - - message: Added pride month. - type: Add - - message: Made the nuke gay. - type: Add - id: 6732 - time: '2024-06-14T17:22:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28992 - author: Aeshus changes: - message: Loadouts now display all requirements. @@ -3862,3 +3853,10 @@ id: 7231 time: '2024-08-28T07:11:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31563 +- author: metalgearsloth + changes: + - message: Add shutters, windoors, etc to AI interaction whitelist. + type: Tweak + id: 7232 + time: '2024-08-28T07:39:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31564 From c4b1e18cbd57e5b17d57f93d06836b8316a4e981 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 08:49:40 +0100 Subject: [PATCH 10/37] Meta - Med disposals and chem room extra pipe fix (#31467) Delete extra pipe & fix disposals junction --- Resources/Maps/meta.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 6434c6ef7746ed..f4cebe8b7e2f92 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -10826,7 +10826,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -3920.309 + secondsUntilStateChange: -4222.55 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -64754,11 +64754,6 @@ entities: - type: Transform pos: 34.5,21.5 parent: 5350 - - uid: 14242 - components: - - type: Transform - pos: -20.5,-29.5 - parent: 5350 - uid: 14366 components: - type: Transform @@ -69987,6 +69982,12 @@ entities: rot: 3.141592653589793 rad pos: -21.5,22.5 parent: 5350 + - uid: 14242 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-29.5 + parent: 5350 - uid: 14788 components: - type: Transform @@ -92423,17 +92424,6 @@ entities: parent: 5350 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 14671 - components: - - type: Transform - anchored: False - pos: -21.5,-28.5 - parent: 5350 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 14672 components: - type: Transform From 1a85de56a4b31cd9ff7bada09c8c6f4140699fad Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 02:18:30 -0600 Subject: [PATCH 11/37] bagel hotfix (#31566) bagel update --- Resources/Maps/bagel.yml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index edd5216f2daf24..b8666fdb3cdf37 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -31738,6 +31738,11 @@ entities: - type: Transform pos: -113.5,36.5 parent: 60 + - uid: 23088 + components: + - type: Transform + pos: -69.5,16.5 + parent: 60 - uid: 23403 components: - type: Transform @@ -151568,26 +151573,6 @@ entities: - type: Transform pos: -1.5,-2.5 parent: 7536 - - uid: 23088 - components: - - type: Transform - pos: -114.5,15.5 - parent: 60 - - uid: 23089 - components: - - type: Transform - pos: -114.5,19.5 - parent: 60 - - uid: 23090 - components: - - type: Transform - pos: -108.5,19.5 - parent: 60 - - uid: 23091 - components: - - type: Transform - pos: -108.5,15.5 - parent: 60 - uid: 23160 components: - type: Transform From a02bdd09e42ce212a82ce4e43a64732ef6f6b8e2 Mon Sep 17 00:00:00 2001 From: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:18:51 -0700 Subject: [PATCH 12/37] update AI job icon to 8x8 (#31565) icon and meta.json --- .../Interface/Misc/job_icons.rsi/StationAi.png | Bin 204 -> 170 bytes .../Interface/Misc/job_icons.rsi/meta.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png b/Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png index aba35c034b9f1508e953a030300987dcf1265f1e..86a208915ba94826c85758577d25d945e67f4021 100644 GIT binary patch delta 128 zcmV-`0Du3?0jdFzF?nQ3L_t&-m4%P74S+BZ125>O$Tlz5h^Sd26-%U{iC80I4wfNQ zc|{QjSC;*@^$tK|uDsyf7AG2W_1>F!tTO=nbpuox4S?^fd)<& z1@ERCeSLiiW*i5685nbxHTce`{wzO(d9fo`V#5Oc12S9(bk;O9GBSL~wmJEl;lM$l OZ492SelF{r5}E+Ktvd7o diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 7b09250bd986b6..1f76743a9d5feb 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets", "size": { "x": 8, From 2a28a055508189c72e93493cfa85db898e7d967d Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 08:19:59 +0000 Subject: [PATCH 13/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ab4a6c920f5c6c..00ff359de18a3a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Aeshus - changes: - - message: Loadouts now display all requirements. - type: Fix - id: 6733 - time: '2024-06-14T20:32:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28994 - author: Vermidia changes: - message: allies callable by radio in the uplink now have unique icons @@ -3860,3 +3853,10 @@ id: 7232 time: '2024-08-28T07:39:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31564 +- author: lunarcomets + changes: + - message: updated AI job icon + type: Tweak + id: 7233 + time: '2024-08-28T08:18:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31565 From 4d4a10dae60c869657217056ad6262b43735460c Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:28:24 +0200 Subject: [PATCH 14/37] Update ClothingSpeedModifierSystem.cs (#29994) * TryGetContainerContainer * Math * Changed AddMarkup to AddMarkupOrThrow * Better math * engine version * engine version --- .../Clothing/ClothingSpeedModifierSystem.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 21afd4e591dc34..56758654ed88a6 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -1,10 +1,8 @@ -using Content.Shared.Clothing.Components; using Content.Shared.Examine; using Content.Shared.Inventory; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Movement.Systems; -using Content.Shared.PowerCell; using Content.Shared.Verbs; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -73,22 +71,22 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent var msg = new FormattedMessage(); - if (walkModifierPercentage == sprintModifierPercentage) + if (MathHelper.CloseTo(walkModifierPercentage, sprintModifierPercentage, 0.5f)) { if (walkModifierPercentage < 0.0f) - msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); else - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage))); } else { if (sprintModifierPercentage < 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); } else if (sprintModifierPercentage > 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage))); } if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f) { @@ -96,11 +94,11 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent } if (walkModifierPercentage < 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)))); } else if (walkModifierPercentage > 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage))); } } From 512d27ca6b452ede774e3921d1baf09f59cc1a2d Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:43:30 +0200 Subject: [PATCH 15/37] Add black suspenders (#29055) * Black suspenders * fix * fix linter --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Catalog/Fills/Crates/service.yml | 3 +- .../Entities/Clothing/Belt/belts.yml | 18 +++++++++--- .../Markers/Spawners/Random/maintenance.yml | 3 +- .../Loadouts/Jobs/Civilian/mime.yml | 11 ++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 +++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Graphs/clothing/mime_hardsuit.yml | 2 +- .../Recipes/Crafting/Graphs/bots/mimebot.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 1 - .../suspenders_black.rsi/equipped-BELT.png | Bin 0 -> 345 bytes .../Belt/suspenders_black.rsi/icon.png | Bin 0 -> 557 bytes .../Belt/suspenders_black.rsi/inhand-left.png | Bin 0 -> 425 bytes .../suspenders_black.rsi/inhand-right.png | Bin 0 -> 437 bytes .../Belt/suspenders_black.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-BELT.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 Resources/migration.yml | 3 ++ 21 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index b7e8616da23b8a..92c3bb9d61ec23 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -80,6 +80,7 @@ loadout-group-mime-mask = Mime mask loadout-group-mime-jumpsuit = Mime jumpsuit loadout-group-mime-backpack = Mime backpack loadout-group-mime-outerclothing = Mime outer clothing +loadout-group-mime-belt = Mime belt loadout-group-musician-jumpsuit = Musician jumpsuit loadout-group-musician-outerclothing = Musician outer clothing diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index d922056a8bf933..6a109fbf8e4e62 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -91,7 +91,8 @@ - id: ClothingUniformJumpskirtOldDress - id: BikeHorn - id: ClownRecorder - - id: ClothingBeltSuspenders + - id: ClothingBeltSuspendersRed + - id: ClothingBeltSuspendersBlack - type: entity id: CrateServiceCustomSmokable diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 0613ec972697e6..41e89eef612a58 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -672,20 +672,30 @@ - type: entity parent: ClothingBeltBase - id: ClothingBeltSuspenders - name: suspenders + id: ClothingBeltSuspendersRed + name: red suspenders description: For holding your pants up. components: - type: Tag tags: - MimeBelt - type: Sprite - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon - type: Clothing - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi quickEquip: true +- type: entity + parent: ClothingBeltSuspendersRed + id: ClothingBeltSuspendersBlack + name: black suspenders + components: + - type: Sprite + sprite: Clothing/Belt/suspenders_black.rsi + - type: Clothing + sprite: Clothing/Belt/suspenders_black.rsi + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltWand diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 58586f32168246..8bd9d8ca30d190 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -39,7 +39,8 @@ - id: ClothingMaskRaven - id: ClothingMaskJackal - id: ClothingMaskBat - - id: ClothingBeltSuspenders + - id: ClothingBeltSuspendersRed + - id: ClothingBeltSuspendersBlack - id: ClothingEyesEyepatch - id: ClothingEyesGlasses - id: ClothingHandsGlovesLatex diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml index 0d137b488b8203..f5c78f3c174000 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml @@ -62,3 +62,14 @@ id: MimeWintercoat equipment: outerClothing: ClothingOuterWinterMime + +# Belt +- type: loadout + id: MimeSuspendersRed + equipment: + belt: ClothingBeltSuspendersRed + +- type: loadout + id: MimeSuspendersBlack + equipment: + belt: ClothingBeltSuspendersBlack diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index aab58d0ef4baed..b2e9ca81ccac5a 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -482,6 +482,13 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: MimeBelt + name: loadout-group-mime-belt + loadouts: + - MimeSuspendersRed + - MimeSuspendersBlack + - type: loadoutGroup id: SurvivalMime name: loadout-group-survival-mime diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index b50e49fede7808..21ee9aa311ffa3 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -173,6 +173,7 @@ - MimeJumpsuit - MimeBackpack - MimeOuterClothing + - MimeBelt - Glasses - SurvivalMime - Trinkets diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml index 6d3826f701ac18..73d65b0394ae66 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml @@ -36,7 +36,7 @@ - tag: MimeBelt name: suspenders icon: - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon doAfter: 1 - node: mimeHardsuit diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml index 4fc851a3476e89..27391898c7bfc1 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml @@ -13,7 +13,7 @@ name: mime edition happy honk meal - tag: MimeBelt icon: - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon name: suspenders doAfter: 2 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index bfdf92b5dd56ae..de8a900f8e908b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -21,7 +21,6 @@ - type: startingGear id: MimeGear equipment: - belt: ClothingBeltSuspenders gloves: ClothingHandsGlovesColorWhite shoes: ClothingShoesColorWhite pocket1: CrayonMime diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ab9dc222a8cbd6378df172a3e173c684915627 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlM zPZ!6KinzD8F7h@jh_oiYy<1I`=hRc_{hnO)t!RZed%oAzrm`1s%(FD%+oxQWH*L%8 zVn37RDY}b4t8O(CV`LFZL|J;L!|k-$h%kHe|jAJm!4lYgZ)SGh?%OCY_V)T6?3H~@ zUJ583C>fE(j&BMS443`M207*__g0{~uyr1t+tC+=Nk*raOOGIu7Ku%%;f4sjr zouF&THI+^#=UzjQgBYVysW`{w)pfEC;v(b_lIuXVTHOk!1GeqcnY>-g{K5htgkwA& zCm0~&PV4o$w_GlhnE8BO=&@y zI-RD-SrWa*x=4tS*Y@?XYvjt5;OO`yUJnoT2@nh?T;xi*b@{%Zc{L@u v{u*Wk6u!Va3e0WAJL0jzlmbcz_U^zRLjeE=$0)9<00000NkvXXu0mjfSqAT{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c9e814f9e041f764145b3a73d1cde54883724c82 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7x zPZ!6KinzD8Y>Qe9c-j)xMQuw8*x%Ljykn64QZoA|*V&wjDQRCHpFID%D@pY&;N@L}(mu~&N?{?+9cb3aCt9TAyI98Z*d)v;>HQSGU=VH)} zQ{MFBdBy4Qz--Qjdwbff6oa-Ljo#<6ZhewB!TBY*y+=85yVJDUDyG04t;{i&r*!RGkKmkeP6{dyNZ?z}7WQSR_k zW|#LYE)Q&qmorsF8EkscbHjvTx5U$2*YinLdFKALPYr*4xVitp=g->0?dvw|F$%nz n&%5B0R&40oC$10JIcgXxjY=9H`*D8-hCPF)tDnm{r-UW|H22BR01_s7- zPZ!6KinzD8Hs&=Oh_oiE3tQ)W;M?;*`2*jEgXi2zwRU!`dUh*(hS=);%RLOw?UdhU zd_(bqfCB>~3ntN6ukv9-*4th0GG?i5$(3G~Y4rQv$sC#E$+x#{cwZfH{py*&Tbhoy zn@0HRKJyh_Kg)-~bJb*(>@36lGx@3JjE_t%8Le2Uxn7_sZ5^k<`Ok~r|DKig|J15G zr{;6zGrf428X1&)=hN>ychn9T@XY_uWcrTr)Y?BQw@;2?(%QEzb-|ufb2qaDIn?ws zFmWg}U?=L8Clp_J=sV3uYBSp&r3u>`HvhfLU{%!D`udT}Il(VCCxqL*XA787@nlJ~ zvZeclrCb6PFQ2jfINP*ey!vSVZbq;DjPEO!PQR1cpuOy=wTQ0m*``Yz>!vT@HOOmP zKR>ql&WhqsTqpe_ADeEu&im2LRFIXC Date: Wed, 28 Aug 2024 09:44:37 +0000 Subject: [PATCH 16/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 00ff359de18a3a..50905610d4844b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: allies callable by radio in the uplink now have unique icons - type: Tweak - id: 6734 - time: '2024-06-14T21:44:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28954 - author: K-Dynamic changes: - message: Added witch robes and witch hat to the AutoDrobe. @@ -3860,3 +3853,10 @@ id: 7233 time: '2024-08-28T08:18:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31565 +- author: lzk228 + changes: + - message: Added black suspenders for mime. + type: Add + id: 7234 + time: '2024-08-28T09:43:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29055 From d8dbfa92d7f32b05151e0dfefdcc17a07fb7a5b7 Mon Sep 17 00:00:00 2001 From: saintmuntzer <47153094+saintmuntzer@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:27:08 -0500 Subject: [PATCH 17/37] recolor riot helmet (#31530) * recolor riot helmet resolves #31256 match riot helmet to default security helmet * further color tweaks for consistency; update meta.json Tweaked equipped sprites to more closely match the security helmet. --- .../light_riot.rsi/equipped-HELMET-vox.png | Bin 1033 -> 922 bytes .../Helmets/light_riot.rsi/equipped-HELMET.png | Bin 861 -> 778 bytes .../Head/Helmets/light_riot.rsi/icon.png | Bin 370 -> 374 bytes .../Helmets/light_riot.rsi/inhand-left.png | Bin 570 -> 510 bytes .../Helmets/light_riot.rsi/inhand-right.png | Bin 566 -> 488 bytes .../Head/Helmets/light_riot.rsi/meta.json | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png index 1f6b8adcebab1802edc5ea9f3fef09437b0131f7..4d192145eb5fb8dbd9cb8f81e6ec64d7b2194951 100644 GIT binary patch delta 879 zcmV-#1CacQ2$~0wBo78+OGiWiF#s_DF%fm8)R8_Ie>zD-K~#9!?V8U|(_k3Kzuo4> zva$k_2uzZ#p2l4hyhw5vsp-zgx#GzTTQS--%(5BQrENDtRY^l z-VW^0choxdF5eh{BuP*d1?hAeilRW0B=p|8Q`XL|sSf~>BpD`@-kZ^Powgz0?1Qu~ zLzX0rzjzs~TuKYGbI*$H?4YO*0G_6%vZMh(f6e8fC~D36r=9^mU)6#84)+muLOaV8 z$Ia_H)Lag-EE|`a%OS7pru0v3Kzj36wd4Wd8USz(4vL~yYgZRa$Ia_H4z#>+6_YcpKO6-}_oDUznZi`!W9k?6~F zFExSwOcMk_5ClOG1VIo4K@bE%{6kneL@aZl`S~kT%bEkTRyL2EBU;yCpc)%S_s3$Y8%L1Q_ z3`Y}*+5!|skv*MxQ#Q_2WF%T}RXGn;Eqof6N~O3n-21uCbF2AKiZ(sp4zM}(UN{VB)#}j z4^dLRM(;tPP|#mdVm;N1FQqS0;)=B)f=Ee->#xLQ5y?zbl7DT#r#9$C6iT$UhnUeZP{v_w+XHPw{b?)-de0zXz(s2uq;Vm+RV z0#sLT<9{TD|83Cf0OwT|6{0E-5CsJVWXsFTWE0V-n3$Tf7QrO}Z28v|AxoCFFsiN` z!xYBfGeIW&+kX~7O}+A?$Hd3sVKFv3Du#!Ks6_q1@z9_9*`NvcC`~9+YgIFv^ z?*e~uvFPpF{TU>q08W@l$7O(hR>{cBB5tgqG8RdK565|%-aY!->>-}tWU zrO3_A&FFuDeI=#wJ-$Lp+W59dTh&D*v`Y@XCx1%qhV$<;JEJPVl zLqmhe$;lB#MMYv^VL|>V#QXk!DhCD!U6G(R7=I+mPuA5@9Vnk`YilAL4m%dyQGnQl zz(Ixb%1RQz$dcTro12}bP0MseK=RlPE-5Xgy4UNaQUL*`Cnp^pjsR&1fS{BBg98Ip zZpIA(rkb+xy>dGt6f0nXmN6~ESW!!+)P z?tiYfp3Y9X4uwK#37~aEW;00sNX=ogm7i;9G6jIZk$|jfW0iaY4}2-V>H#>#kpOt% zKylzL+)Ebeeue6mWSxqTB6$#pFXb1|)3@4|w}Dp|xRYlJ}uUOgx>yy;H!CV~h52k*JBpe?P&E>lsEzN6~d1*L7*P+W;z#A`CkINZ8=BbJqa;puy{}nwrwoS;>OZlx^K%UOkbV^z;)f8?0MN9d=pOY(s2>?9L>q*}8 zJf_p>3$M-~lb=qf{bT{UlV@^jg3P?3BE19P=X$)Z>v*2W(cxjNWA^LuaZmf|%uLXy ze)PRMT>Y{Oz`aKgxp{xt^pC$RzA(4Tf8|J$zp`?R$IDNGSfAe&&G)Zf1HlfFcnWZ^ zUkd^{ZP%Yn74g!Xwj1>0V84bxJR_R}cK52<>4^=1uIuQ!PAQ+KJNdobhsZKM_uHzJ z&jR+@U!7vPE7>4>+;s_yx5JCtcgb+dqA^uH20IG&Sk(z`N QSO5S307*qoM6N<$g2C--761SM delta 838 zcmV-M1G)T)2HggbB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pH@<~KNRCr$Pn$K$!K@`Vldq`+hFoz)ZP$V8o>Mckk!9b8A8ocyU zy?7A+3Qy+dUm+g6*j^%7(?g0$iA1Bdhav_8O+zoS2NC)3eHLJFaZeOQQt)pX3TOT>?<#XVF3N`^M)c2{Dt{>ULV#+ zKm5EQfm8wzWPkMf4feiV=C+;BTlJ;XE$&x|7{6Yt@lpgY+HUlvw#?;dR9}c+Wy`l$ z(`J`I+ge+H___3&?R?n%b4-tp0Q6CYLLuI^(`+_*xwAV$e+*JPzySy<-TH##cAFc5 z-9I?63~k|)#ft<0O`Gv(na6Pa_1mB{0oeM-efnJvE9WHIB%Ga z?O)n>!Tl=va@5ceB!V`(I6MhPKm2Cb#K=8hz6N`}p4ssWzu*5)UV~mEod8$-#|iN2 zH{irF^$8#df*=TjAP9mW2!bF8V!CkkhxPFNyg>F|&Mo4O(2m=01f(B8@QFl%`FuVW z3nJ)ZgOv`*{f3gKxLn{ML5V>Uagl zh6c0*B6#5D8v$4M0zwcaRvq?nZ_m1-RtYqqC3Nj`af8%$5j)`A+#D;H%e*hSvci^b zrmXJ;o@Sq(>*bA4>xsBYyw}VoOIv05JeD05K7DrPKfb010qNS#tmYE+YT{E+YYWr9XB6 z009(vGT@bWsU^NcYZ)rofdt&xeIsez+9 zwbs2}Z7_@n7{-IzNaI&rAo?+N-hk-GbWmR?iUMU>)_Hvg03c1%iypm&W(-ro?=k0` z=8NTYzF1B<=T#)7B+fZC<7Qp={xtco8`$l)o^HJ6{O#j&W-^G$)c${(Z$aZ=JCDgb3FS0E2;BYt`kHQ%ceR30hg=*XBDk0X4owN->n140Q%j13X=gk`{NfI=vt46CE00UqE z3;=-kZ<2^emhDGTWYrEpM3RVN}bVi!1n_Awtt0f+ep(C0PueJ z$WOjrZP31M9p!XxZgUrWFOVunN*yTD7Ly;JC*gRp3<03m?}Bp<&N+JhE&yP>SmyEB zd}{e#AkP&C6j8SzOU~Bc<5`iPq|*n=YpB~qe^uj?@Uj4&9!BARd{dP6AOZl_b+x8k q9LL)IQwg9BT~-em00UqE>d+TcKzU0Wbc#1pWh%Bo78+OGiWiF#s_DF%fm8)R8_If1XK1K~#9!?b^R;!cY_j@Gl}H zc?GA|?Pj#ALP5-EDJ5H9q4p6>AEAz&yXac!(T5fKp)5fKp)QErC^RqZLIrD}bDFICs*@Qp@8|2D{9YMD@y8s2s7 zt>3w>f1T+NcGW8E0l2P>JOVO52VDlOYGmJVIHrv0BRq08A%iBX6#(;I=OT>b7k}nn%d;+hYH>SF2xl-aMIrJWm3tJOUBXzx58mAitk=@2pG&q+i3l4-hvpBLSD=`iRCKF?fE1QcWi#~!F zeF1#|7Z(|kIJrqMM8k@Ngcl%=hOkiin_C1-o1XU6#Q1-SX@7f3PS0(RUCuE?L_|bH zL_|bH(G>~>XS-N*>}4#7WlvpNaT9}ttJUg{Bv&^QhF`2Cr0p>lB)p!@+N)()mpp`^ zSV>TM07!V}@W{M&I!mRB^Wy%2`+HbHvFxd;ls(3R+a@SC4b*VDiz>C!l_w`nM}s6M5h@mh*||~mC9zXQn|28^LO`jU$03kz%SNG zx#X>>QK^8>@z}JR57_Ma>=FrYU>%!(d2G7BhZPhHM{R2VQ}}vMCKG%04JF*`^+fma zi!~e$)$%1GA|fIpA|fIpBBH+q{ez^Mrm;xc;Zflp8h`T$s?AZ4bS6LwvHe=^(tE2u z0F)#Ca=DynCO|4^hCn)xpxSFYK0R}j`RKo!(P$L9BP@lDYRx04Re-no-=r}^p!SAt zpIc~WyXse$wWKRRYaT)K8{qcwvHAXBAesq~TAU$hH5z#Ek>?TA-cUZDpTC7DGXYZg j(re8l5E>EvQ^tG&pm*WaI>phK00000NkvXXu0mjf_%!#g diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index cd3dc7f55754487223ef403c19298ff7e27bb44c..42af25fec6ac880b5439f1508d913c6ab2b67034 100644 GIT binary patch delta 442 zcmV;r0Y(0{1n2{hBo78+OGiWiF#s_DF%fm8)R8_Ie~3v$K~#9!?b<<3!ax`W;5SW^ zp;vIF?8=g@HZd_}r^c8bL$81yLC)X?*dcL+JEONi4}b|xFq3W^SCWct!$4))>5P+`H#$UH)x9G!@D7r~q3IKQ-4!c!;aMPMIcYsm}ULVJp^anqa?E%n} z{-FCZet=R*WgB2xvncu-6dCQ&U%=b@R8+MAf6eCKU;C=pOhiOPL_|bHL_|bX2X)B| zl*VRe;J?;zObW1-87NwNXAQ8K8Sp#_*=V5U`+7A3vn|);X4{#8cGv*`D3$24-t{?~ z4z!sWI6ONo?Z~;N18imn(re%M?rwLw1F|v$&!bUy7nuR262x(g-u2aT?Xu=JI!87$ kAOovwPp5p}Pein}Zx=7P(D_|1<^TWy07*qoM6N<$f+z6KZ~y=R delta 541 zcmV+&0^pG%Sl8*RCr$P+P_c2Koke?gM|=B!{W$-tkpOe+>{vOjEjpS3;qL| zYV`kb7B(af{+MVmL}f)n(*MGc4qADat5Q7RY71@S_mdFrT7RzZara=kV*mgE00000 z00469nr7$od0TWNi}Dmr?$0^P2A0d^SWLpGSve=gy9*6iN~cB7jjqRS5~k%Wod6o3 z6?a|bMD6Exn{Djv^ZQZdHRptQccFo~%>qj#-M16N?&pWidM$&!bUM0kqt$?ehp^GM&nX|M4-UkEr zblYGL*Hvc%R)#No*wHzfD#Dn%m6(* zlgaRSqw#~FykACv!#XoSv1tO9bE~}ndVd$#UY~LWj0^M3z}ikRu%DdrEIJhs#+d=9 z0!k;R-?5Lj3g@Efi*g0X&I}m!y1s}r1N7`(zt5_d7o&Usf$+3qRCZyV85oakn&w>N f0Ra31j23+XunODMV*@>N00000NkvXXu0mjfe9iWv diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index 292dc9c99396b1..3352f48a8a71d9 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14; colors tweaked by saintmuntzer", "size": { "x": 32, "y": 32 From 460e58734564b280b706ae3ad97022b9f775d0da Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 11:28:15 +0000 Subject: [PATCH 18/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 50905610d4844b..0c5e75c5bf966f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: Added witch robes and witch hat to the AutoDrobe. - type: Add - id: 6735 - time: '2024-06-15T02:19:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28965 - author: Plykiya changes: - message: You can no longer insert duplicates of the same module into a cyborg. @@ -3860,3 +3853,10 @@ id: 7234 time: '2024-08-28T09:43:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29055 +- author: saintmuntzer + changes: + - message: Riot helmet now matches security helmet colors. + type: Fix + id: 7235 + time: '2024-08-28T11:27:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31530 From 91eb0c2e29f8f592f7de51b8ce4b3b5361602e62 Mon Sep 17 00:00:00 2001 From: coolboy911 <85909253+coolboy911@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:36:31 +0300 Subject: [PATCH 19/37] added wide-spectrum anomaly locator to anomaly cyborg module (#31427) added wide-spectrum anomaly locator to anomaly borg module --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index a49f08e28f1198..062e261dc57cc8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -411,6 +411,7 @@ items: - AnomalyScanner - AnomalyLocatorUnpowered + - AnomalyLocatorWideUnpowered - RemoteSignaller - Multitool From 24e9dc688cddf6ac02aaac990f22fe59f6c34284 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 12:37:39 +0000 Subject: [PATCH 20/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0c5e75c5bf966f..41f74afac5406b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can no longer insert duplicates of the same module into a cyborg. - type: Tweak - id: 6736 - time: '2024-06-15T02:58:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28943 - author: Vermidia changes: - message: Nukie planet now has an improved Donk co. microwave, which cooks twice @@ -3860,3 +3853,10 @@ id: 7235 time: '2024-08-28T11:27:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31530 +- author: coolboy911 + changes: + - message: wide-spectrum anomaly locator is now included in cyborg's anomaly module + type: Add + id: 7236 + time: '2024-08-28T12:36:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31427 From 8d388974ad703ee0d864ca2f4589ae386a606af7 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:08:35 +0300 Subject: [PATCH 21/37] Add Robust.Xaml.csproj to the solution (#31573) --- SpaceStation14.sln | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SpaceStation14.sln b/SpaceStation14.sln index bcd013b5981fb9..0e00fe5b12ff9f 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -133,6 +133,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -444,6 +446,14 @@ Global {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -476,6 +486,7 @@ Global {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A} From 6808558df61f28930c31adfba028214e69fdaa7d Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:08:55 +0000 Subject: [PATCH 22/37] add construction for carp statue (#31261) * separate eyes and teeth * make it buildable and make fixture less abusable * norot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Entities/Structures/Specific/xeno.yml | 48 +++++++++++++- .../Graphs/structures/decoration.yml | 59 ++++++++++++++++++ .../Recipes/Construction/structures.yml | 17 +++++ .../Specific/carp_statue.rsi/eyes.png | Bin 0 -> 200 bytes .../carp_statue.rsi/eyes_unshaded.png | Bin 0 -> 201 bytes .../Specific/carp_statue.rsi/icon.png | Bin 0 -> 819 bytes .../Specific/carp_statue.rsi/meta.json | 11 +++- .../Specific/carp_statue.rsi/statue.png | Bin 1204 -> 792 bytes .../carp_statue.rsi/teeth_unshaded.png | Bin 0 -> 178 bytes .../Specific/carp_statue.rsi/unshaded.png | Bin 633 -> 0 bytes 10 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png delete mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 2f58e5caea9157..17920565ef3108 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -57,8 +57,54 @@ description: A statue of one of the brave carp that got us where we are today. Made with real teeth! components: - type: Sprite + noRot: true sprite: Structures/Specific/carp_statue.rsi layers: - state: statue - - state: unshaded + - state: eyes + - state: eyes_unshaded shader: unshaded + - state: teeth_unshaded + shader: unshaded + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - type: Construction + graph: CarpStatue + node: statue + +- type: entity + parent: CarpStatue + id: CarpStatueEmpty + suffix: Empty + description: A lump of precious metals, soon to be a brilliant carp statue. + components: + - type: Sprite + layers: + - state: statue + - type: Construction + node: empty + +- type: entity + parent: CarpStatue + id: CarpStatueEyes + suffix: Eyes + description: A statue of one of the brave carp that got us where we are today. This one needs a dentist... + components: + - type: Sprite + layers: + - state: statue + - state: eyes + - state: eyes_unshaded + shader: unshaded + - type: Construction + node: eyes diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml index 5c67d3936e4ba0..4810a34e042080 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml @@ -27,3 +27,62 @@ doAfter: 5 - tool: Welding doAfter: 5 + +- type: constructionGraph + id: CarpStatue + start: start + graph: + - node: start + edges: + - to: empty + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Silver + amount: 15 + doAfter: 7 + - node: empty + entity: CarpStatueEmpty + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: IngotSilver1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 + - to: eyes + steps: + - material: Diamond + amount: 2 + doAfter: 2 + - node: eyes + entity: CarpStatueEyes + edges: + - to: empty + completed: + - !type:SpawnPrototype + prototype: MaterialDiamond1 + amount: 2 + steps: + - tool: Prying + doAfter: 2 + - to: statue + steps: + - material: SpaceCarpTooth + amount: 5 + doAfter: 3 + - node: statue + entity: CarpStatue + edges: + - to: eyes + completed: + - !type:SpawnPrototype + prototype: MaterialToothSpaceCarp1 + amount: 5 + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index a273f6674057ba..5278c1b45e0522 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1644,6 +1644,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: carp statue + id: CarpStatue + graph: CarpStatue + startNode: start + targetNode: statue + category: construction-category-structures + placementMode: SnapgridCenter + description: A statue of one of the brave carp that got us where we are today. Made with real teeth! + objectType: Structure + canBuildInImpassable: false + icon: + sprite: Structures/Specific/carp_statue.rsi + state: icon + conditions: + - !type:TileNotBlocked + - type: construction name: bananium clown statue id: BananiumClownStatue diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc6ffccf144b6814a40d96082a47ebb3293d77a GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6s+=e zaSVw#oSY!Rx;R0j@$_d&Nx!*PU-w&Gd}qJOqJv+EeWSCJlZVmd&Jg#UIdM(lHD_m; zZuw|yHh(d5ga668@cop-#z17DPl9QXmc|GKo q_obbc zy7fbD_Ibma!$(}ESZ#7*n123bsJk#j*MCl7wF_#z4LoY5je%Dg-{0GtykX=5Z`3N+wyW7K3|P_NcpCM8mdKI;Vst0OwvmPyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c5d6bd20e5a0b4075e8f81328c62c3fa2276cf38 GIT binary patch literal 819 zcmV-31I+x1P)7d(Z)duI>ioRz$L9X*r7v4gE&;T zMyKGW-AX}mwe2L?YB%jzH@m5WkSd4-YQZ=tR49_Prp^82?mpk|i#aR^Cb2h&eZ%GD zeZRYV-sidZ`vH#Z$o@5}R4Qz?IKe6}o`;u+DL=^j)P5gWEzbyFt9|@!KC%KhLk^P3 z6=0eMrlw0+DbHc5^gxVfvSai=!wRK`7#|;(dVR0lFY_+=t*aMB%sr1`H3m|m=Sr6z z%`*-TYfHpyYir?HKA#uf5(TDlsT%?hG18wrbF|&*~^8#XF*>DY}Pge zLte=GdKLApdIy+dp8vG*7VuipOvCN3UyvL*0lVG8hmH3bJ$s%S&cvuWBH|#RzVjXI z+io-pNRo`eZ6OxZplAkk!^ChR3D5VS=_Xp%K6G7!B+C)5go=i}<}Tt$!gXxAT5xO& zzH5O6K+EyS2hk{?>N+vi1w)CeO+cz{hcLUD~j+jEp~vpEO+vX8lz?mqE&#KV>=;Z?mbe3GpBV3acay+3W&!Ou&oyS zb{lOl@*V6uMwF0xnyf|#8 z(kY}fV`1L42$+^;RU5*|Gv|;xl@a+@s|#Y2;%A42r!S>L`2@wn7)z%{U=Ewm;;Bvn xzwSBhy2!ix1iWWqtKPul)%C%e;>i9x`vJu_XG113jP?Kk002ovPDHLkV1jg6g1rC$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json index 5c8d12c6c62aa4..fb1ed6a3ef3d8a 100644 --- a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json +++ b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json @@ -11,7 +11,16 @@ "name": "statue" }, { - "name": "unshaded" + "name": "icon" + }, + { + "name": "eyes" + }, + { + "name": "eyes_unshaded" + }, + { + "name": "teeth_unshaded" } ] } diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png index 203006754073fdbdcfecc65052a1e8b932839d2c..4dbbc1b6dbb7ec237f0e67d81bb2ffbd2c2c95d9 100644 GIT binary patch delta 751 zcmVo; zJz3+Ky}S43?d;wFC*x%N(NmVTdE_5t7b;eTRCfQ=*ZW@|yM z0*9G10oQ>LArles*k=M_R9XqWOy&cBeG2}fx5ja4r7yv|-8HCP0x7%LqRflY>-CB- zDIv)vkH3S9&p8#6)&tt&O%{$XMF&ywxfa1RYx)gz9FF~u-2Et(h$Y2CF98G<> zGzbswQ$c`9w3k?kf`7;e9`O)DurD)jUF(#tfl>rE2OFHBB+~Eu7;YT^lP}{RHr@b9 zpr!`4KYv1f?hL|7fcG2kFn{qf$?jsFww?5|jCNicVLy!3D4=ONvN%AcV!^N+*p7?Y zS{+H6z_MKgVjs3`LDO}G+t9GEH{L}Rb;MCfzW`Avkj4Ue27d%mLN-&QfN9&5sm&Q` zQf&emv-W@;6XBMPHw#?mIFh|HYMAyla_l@O>_YY0VvbTYvNIoSl6Ww8&k_0t|HW3d{_ zc7aX%URJ%X%YVlbj!9sLj^RAlU>H;%siLo;-1ic|an92&$QdxBOP7}}flD_-$8SjP zu5|J%?KT1BeB#M9mjn)pNNbwrbl!4jaO?KHW4-&A3-_`=EFZ$;Qq>WZe+#0hKEM;d*2re0;Z$cv}SPj z!XJy%H h`@dHdC*!{x-vHn!S>V|-Poe+-002ovPDHLkV1gw$Wy1gf delta 1167 zcmV;A1aSM92DAx~BYy#KX+uL$X=7sm04R}lk-ba9P!z>azo=-XgMuOs8LBw6APOQ* zT8A!0O08hkC3#I+AxXnaiWFDD#i8IJy7)EtALuH$DhPrih`71?wMdEgHH8*wUwFAc z&U@!_a{~C&Iy3CxJYbj(&!&>nYJN=$zaxYp1R-HgX12AE$$zBLb^ScTC+b5&^y+@E z+G9s_?A#6 z52Lq*DmXccD1VVRPHKg^s#G=7ReE$(MehIew6*CeuX`j3gkD|ua|{UY1NEBg{+_yS z{R{}a0M};AU#6U9ze%sPwAe8a-2pCdTAFeIT^g_D3l$U#O6Y!@abQ7%oRF!>;uQ(Z0# zCNMHGB6Yj2+$-|^;5RN`;J(npPNxTdo7atWo$12dW1l58eyHuD6f|ut@G`=@4j08A| z>=;#l74x&xWYzJkJWH&YYzyR>(R|Oxu%`sp)>j#!NMvQDirPl46PRq_|G4@FaGT*A z!_6` zZrg>Xe;a6;yU=wFk}QXK6Dk^Z8rz5=0mrteHDOyO+Kvg|1Ddu=+6#vPRo4lr&Il#J zHU(1kDBFGUW32bbLt#K5b8MS++wCCTsefhUf{o6&1()W8Qv-xdRut9|E%FO;S?>51 zHA2Pch0A~t+p+`1Lc7F>Ku-4%VpN!+BoK?me_@$Tv|BB-;FEUYX&T!goj9H(W;A9a zv{RtdxffM0%i=YceIjtwh{E?JC<@g_JER{HaqdNcX!JCl0-pnV^vL3oMPLaBk*?ml zUCjIEvsnt{^NlC=TqLlch|sF42IHF1N1x<7U9J7c4O^Id2c*n#>t&S&) hD+eozBl+*-JAip=Z~LZf8~^|S07*qo1w^hwV1gnBDtl}UpHU7zd0W4^?}W%Tv+ksb#A-0U-VA=)Lh59`f9yv-`WGuYEo~A3J3}cUVN{2 Xuit!ag_uPK&^`uFS3j3^P6azo=-XgMuOs8LBw6APOQ*T8A!0O08hkC3#I+AxXnaiWFDD#i8IJ zy7)EtALuH$DhPrih`71?wMdEgHH8*wUwFAc&U@!_a{~C&Iy3CxJYbj(&!&>nYJN=$ zzaxYp1R-HgX12AE$)wSB{XD`a>O(^G>VB`|>MN)=1AINiGtA-+F-?Q?mSYLtBOYWW zxj=kE9OpD3@vYDmkKY6rJ^m8RbJ<0}FM3MFHdfl0mAFAXK^!ym3Tw_Iz9gcWE6Y?z zXph217AYht3k4NyLWhF{Rg*I7?3--(mQW@Sqql`BI5~+n(O|ax^Ddp2)qE-X3JluoMyjCueG$;F%aDWE^k_z zasXWI0>jUi%;km@pzYT*;Nt@5&jSPZK<~PjRr4I@Pe5*)e$gFpcm#~o{piLYJI!b% z$6=v_00009a7bBm001r{001r{0eGc9b^rhXuSrBfR9M69kiiYZAPhwf>Jr(7F%ajh zkpZGy*?>E9aN^n_a$^Ks{j{j`7Nn+9B|ixne=NRjB0=~k?m8)bIdj3ri_vj3Jo73>we#Grr96jygdQ1VIo4K^Wly33XH! TQE4wl00000NkvXXu0mjf;&Bs} From 386733e99c714a73c7935bd41b451f1d5eca93e0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 13:10:02 +0000 Subject: [PATCH 23/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 41f74afac5406b..1f4e0c412afd03 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Nukie planet now has an improved Donk co. microwave, which cooks twice - as fast but is more likely to explode. It can't handle id cards without exploding. - type: Add - - message: Made microwave explosions destroy the machine board and spit out the - machine parts. - type: Tweak - id: 6737 - time: '2024-06-15T03:00:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28951 - author: robertGN changes: - message: Using a welder on vending machines now correctly repairs the vending @@ -3860,3 +3849,10 @@ id: 7236 time: '2024-08-28T12:36:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31427 +- author: deltanedas + changes: + - message: You can now build carp statues with luxury materials. + type: Add + id: 7237 + time: '2024-08-28T13:08:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31261 From f5a8be8ad3da20b2d7b88a898ed139dfdf677963 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:10:18 +0200 Subject: [PATCH 24/37] fix spelling error silicon jobs (#31581) Update department.ftl --- Resources/Locale/en-US/job/department.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 2295a9ba9d30c5..51a0345bc69ea5 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -5,5 +5,5 @@ department-Engineering = Engineering department-Medical = Medical department-Security = Security department-Science = Science -department-Silicon = Silicons +department-Silicon = Silicon department-Specific = Station specific From c2ccf2bc0f2e53b2d6edf3f2b8131a2b1a051b84 Mon Sep 17 00:00:00 2001 From: PopGamer46 Date: Wed, 28 Aug 2024 15:22:21 +0200 Subject: [PATCH 25/37] Fixes shuttles not being able to FTL onto/near station (#31569) fixes FTL --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index e6704457450007..8da7aaa641e55a 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -118,7 +118,7 @@ private void OnStationPostInit(ref StationPostInitEvent ev) continue; } - TryAddFTLDestination(gridXform.MapID, true, out _); + TryAddFTLDestination(gridXform.MapID, true, false, false, out _); } } From d088c8a015cedfef03f76910c6c8b9fa952fbc9a Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 13:23:28 +0000 Subject: [PATCH 26/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1f4e0c412afd03..85e38de7ed77aa 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: robertGN - changes: - - message: Using a welder on vending machines now correctly repairs the vending - machine. - type: Fix - id: 6738 - time: '2024-06-15T03:13:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28920 - author: Brandon-Huu changes: - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant @@ -3856,3 +3848,10 @@ id: 7237 time: '2024-08-28T13:08:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31261 +- author: PopGamer46 + changes: + - message: Fixed shuttles not being able to FTL onto the station + type: Fix + id: 7238 + time: '2024-08-28T13:22:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31569 From 0f2c42f7642636364039527b5933f08e8caf0d53 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:31:47 -0400 Subject: [PATCH 27/37] Fix defibs draining battery when turned off (#31593) --- Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 2d06ed0f1dc715..7b5ba23fe33103 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -47,6 +47,7 @@ - type: GuideHelp guides: - Medical Doctor + - type: ToggleCellDraw - type: entity id: Defibrillator From daba76d4fe7403a8872c42d725c7e2cc541da9a0 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:31:56 +0100 Subject: [PATCH 28/37] Bagel - LV cable wasn't connected (#31591) fixes a missing wire --- Resources/Maps/bagel.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index b8666fdb3cdf37..ea24bc48ee5899 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -32183,6 +32183,11 @@ entities: - type: Transform pos: -54.5,16.5 parent: 60 + - uid: 24815 + components: + - type: Transform + pos: 0.5,-53.5 + parent: 60 - proto: CableApcStack entities: - uid: 9517 From f7f255a25907b91d67398b6548a02d46a7c95c55 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:32:15 +0100 Subject: [PATCH 29/37] Marathon - Names a singular camera (#31590) Fixes unnamed camera --- Resources/Maps/marathon.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 80f9ba58b92275..974e6e00ba214c 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -11015,7 +11015,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -25025.113 + secondsUntilStateChange: -25052.139 state: Opening - type: DeviceLinkSource lastSignals: @@ -118879,6 +118879,11 @@ entities: rot: 3.141592653589793 rad pos: -17.5,-0.5 parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Sec Med Office - uid: 21283 components: - type: Transform From 693fc755395997146d8f9d4ad8e6eb065a211766 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 17:32:55 +0000 Subject: [PATCH 30/37] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 85e38de7ed77aa..c7899518ef2dfa 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Brandon-Huu - changes: - - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant - box. - type: Remove - id: 6739 - time: '2024-06-15T03:23:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28999 - author: EmoGarbage404 changes: - message: Revamped meteors. Meteors now crash through several walls before exploding. @@ -3855,3 +3847,10 @@ id: 7238 time: '2024-08-28T13:22:21.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31569 +- author: themias + changes: + - message: Defibs batteries no longer drain when switched off + type: Fix + id: 7239 + time: '2024-08-28T17:31:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31593 From b2edae89d2c3e52abdd1479240ddd340b622a7df Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:35:57 +0100 Subject: [PATCH 31/37] Reach - Scientist added to map's prototype (#31567) Added scientist to map prototype --- Resources/Prototypes/Maps/reach.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index a0d6752c1fb8bf..0824e317758419 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -30,5 +30,6 @@ Musician: [ 1, 1 ] AtmosphericTechnician: [ 1, 1 ] StationEngineer: [ 1, 2 ] + Scientist: [ 1, 1 ] Passenger: [ -1, -1 ] From 98680ce0f262e83a488481ba664d23d72e9fefdd Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:12:09 +0200 Subject: [PATCH 32/37] Change my copyright (#31599) --- Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json | 2 +- .../Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json | 2 +- Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json | 2 +- .../Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json | 2 +- .../Clothing/Head/Welding/flame_welding_mask.rsi/meta.json | 2 +- .../Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json | 2 +- .../Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json | 2 +- .../Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json | 2 +- .../Objects/Specific/Library/Equipment/books_bag.rsi/meta.json | 2 +- .../Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json index 9171e1f8822d3f..48b2471e0cc4bb 100644 --- a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by лазік#7305", + "copyright": "Made by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json index 36eed5db120beb..2b8717faa2fe19 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json index 5539c0fb7af239..bd9fd6d24af3c2 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by lzk228(discord 455630609641897984). equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json index e5a67c14e41c73..e9b30b54371cf9 100644 --- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json index 07d399a7b1ef2f..b486fbbc86c73a 100644 --- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json index 0f5f121242a803..2a9b8dfba708f8 100644 --- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json index 3ff460a2c7a054..8936db03da706a 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305", + "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json index 9b7af45aa711be..519a0332d06794 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhand sprites by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json index e56c72ad43b1bd..017d14881f39c5 100644 --- a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by лазік#7305", + "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json index 8d6202dde40ba8..39303046bb70b1 100644 --- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Homegrown by @ninruB#7795, inhand sprites by лазік#7305", + "copyright": "Homegrown by @ninruB#7795, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 From 6398f5bd49b34dfc569ffa17d6c573d6322316af Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:26:34 +0200 Subject: [PATCH 33/37] Remove random cyrillic letters (#31600) --- .../CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml | 2 +- Content.Server/Anomaly/AnomalySynchronizerSystem.cs | 4 ++-- Resources/Locale/en-US/paper/story-generation.ftl | 2 +- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml index bd5879408ef536..fd5a7bb1617b20 100644 --- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml +++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml @@ -26,7 +26,7 @@ Text="{Loc 'news-read-ui-next-text'}" ToolTip="{Loc 'news-read-ui-next-tooltip'}"/> - +