From e650491e0ba5c81fb4a83f891c99341daeb29688 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 9 Dec 2024 01:41:56 -0500 Subject: [PATCH 01/14] ART --- BuildChecker/BuildChecker.csproj | 4 +- Content.Client/Crayon/CrayonSystem.cs | 11 +++++ Content.Server/Crayon/CrayonSystem.cs | 11 +++-- .../Locale/en-US/crayon/crayon-component.ftl | 1 + .../Catalog/Fills/Items/toolboxes.yml | 2 + .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 + .../DeltaV/Loadouts/Jobs/Civilian/clown.yml | 13 +++++ .../DeltaV/Loadouts/Jobs/Civilian/mime.yml | 13 +++++ .../_NF/Entities/Objects/Fun/magic_crayon.yml | 28 +++++++++++ .../Fun/magic_crayon.rsi/icon-inhand-left.png | Bin 0 -> 204 bytes .../magic_crayon.rsi/icon-inhand-right.png | Bin 0 -> 203 bytes .../_NF/Objects/Fun/magic_crayon.rsi/icon.png | Bin 0 -> 282 bytes .../Objects/Fun/magic_crayon.rsi/meta.json | 46 ++++++++++++++++++ SpaceStation14.sln | 8 +-- 14 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj index 63d16fa9708..e2b4c27d9b1 100644 --- a/BuildChecker/BuildChecker.csproj +++ b/BuildChecker/BuildChecker.csproj @@ -19,6 +19,8 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild {C899FCA4-7037-4E49-ABC2-44DE72487110} .NETFramework, Version=v4.7.2 false + v4.8 + Library @@ -49,4 +51,4 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild - + \ No newline at end of file diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index dc039794813..84749cf1f1b 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -57,6 +57,17 @@ protected override void FrameUpdate(FrameEventArgs args) } _parent.UIUpdateNeeded = false; + + // Frontier: unlimited crayon, Delta V Port + if (_parent.Capacity == int.MaxValue) + { + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label-unlimited", + ("color", _parent.Color), + ("state", _parent.SelectedState))); + return; + } + // End Frontier, Delta V Port + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label", ("color",_parent.Color), ("state",_parent.SelectedState), diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index 07a13d8a34a..d0a64951cf6 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -73,9 +73,14 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft if (component.UseSound != null) _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f)); - // Decrease "Ammo" - component.Charges--; - Dirty(uid, component); + // Frontier: check if crayon is infinite, Delta V Port + if (component.Charges != int.MaxValue) + { + // Decrease "Ammo" + component.Charges--; + Dirty(uid, component); + } + // End Frontier, Delta V Port _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}"); args.Handled = true; diff --git a/Resources/Locale/en-US/crayon/crayon-component.ftl b/Resources/Locale/en-US/crayon/crayon-component.ftl index 444ffa4c45e..e75e37a683a 100644 --- a/Resources/Locale/en-US/crayon/crayon-component.ftl +++ b/Resources/Locale/en-US/crayon/crayon-component.ftl @@ -5,6 +5,7 @@ crayon-drawing-label = Drawing: [color={$color}]{$state}[/color] ({$charges}/{$c crayon-interact-not-enough-left-text = Not enough left. crayon-interact-used-up-text = The {$owner} got used up. crayon-interact-invalid-location = Can't reach there! +crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] ## UI crayon-window-title = Crayon diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index c484fee13f1..dd89f8a7729 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -85,6 +85,8 @@ amount: 2 - id: CrayonMime - id: CrayonRainbow + - id: CrayonMagic # Delta V - I don't feel liek making a construction graph :blunt: + prob: .33 - type: entity id: ToolboxMechanicalFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 4c0a9826de7..00a9e25fc6e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -134,6 +134,8 @@ children: - id: StrangePill prob: 0.20 + - id: CrayonMagic # Delta V - Just another way to get it + prob: .01 # Tools - !type:NestedSelector tableId: MaintToolsTable diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml index 168b9884ca0..98facb72da2 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml @@ -13,3 +13,16 @@ id: FoolPDA equipment: id: FoolPDA + +# Trinket +- type: loadout + id: CrayonMagic + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 300 + storage: + back: + - CrayonMagic diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml index 43740a3097a..5f9e24d256a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml @@ -3,3 +3,16 @@ id: FoamSabre equipment: belt: ClothingBeltFoamSheathFilled + +# Trinket +- type: loadout + id: CrayonMagic + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobMime + time: 300 + storage: + back: + - CrayonMagic diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml new file mode 100644 index 00000000000..8a88ea8b06d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -0,0 +1,28 @@ +- type: entity + parent: CrayonRainbow + id: CrayonMagic + name: magic crayon + description: Specially blended with bluespace crystals and certified non-toxic. + components: + - type: Sprite + sprite: _NF/Objects/Fun/magic_crayon.rsi + state: icon + - type: Item + sprite: _NF/Objects/Fun/magic_crayon.rsi + heldPrefix: icon + - type: Tag # Removing trash & recyclable + tags: + - Write + - Crayon + - type: Crayon + capacity: 2147483647 # int.MaxValue, infinite charges + - type: FlavorProfile + flavors: + - chewy + - magical + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nothing + Quantity: 40 \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a88404f0b202b9e258fa00a6f96b8050115f52a9 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QbGYfA+A9B7Q=srh5t(aG5jm$ z|IfsKP?W7C$S;`TzYY*S=}ia)iX?lwIEG|2zP-7T_kaNhi$l-bzv1VYChqUJ zq*AWCX(3CkD8q;B#pl27J@-}eUikUX{MtSjGMl2TeFg6IUjXX2TXk6PPsMe%Bv3hnr>mdKI;Vst08%nbKmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c337641453062383276b3656a5dc5c51dfa0db23 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QbGYfA+A80Vd1}94FCTX^OyW% z_|L?|Z5)vY6l5z2@(X6r`LFZ;zxCrhIiN_Ar;B4qM&sLCJ9!Tn@Gv|4yj}k^rE!Mq z1hswHyp3AE4xtPOJfrUK?-zZRK4ZS_ll}?&=da&7fBl4bMR^8>zH9dX`tSEDnKW&1 y^p@W9-ejRMBg29BFIlS?85pKWE1SE0c*8V3k>Tn5BWJ}xuJUyCb6Mw<&;$U=o=Ecm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c520ae932500b2757cd8b4ced4aeb6d3e4ef40ac GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3-pya`gKGDct~{5LX~Q)A$U7@tK(n{}~ov zVqo~+wq2BA`}<=(Y%8A0Uayq-|A}E0P;@fGEe3`M@8_8UHSm`N`2{olM*&ZJ=Pd(D z^?JHEhGaCpy>$8$@nJHL#E$=kopU0tg)~^Lo?dq8lHa9hRnJT789y<9lKmw5 zsqmFFPx$=@7QfkkFV8pFf6UDPd-T2H*~@>gy?yD~%epUiFYEl@KhNCX^j-5s_=WWg z=Bs#4QmMUI)leGz_gB)(zwVEI^Dp_X>G^;EgfIWOft127`Ca)h)IBfNn;!~i;g#0a R1iGAo!PC{xWt~$(69CTof<6EM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json new file mode 100644 index 00000000000..8d3d97e9f19 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser and whatston3 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "icon-inhand-left", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "icon-inhand-right", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + } + ] +} + diff --git a/SpaceStation14.sln b/SpaceStation14.sln index 0e00fe5b12f..e7d52278377 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -471,21 +471,21 @@ Global {41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880} {AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880} {440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880} + {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution From 6a4e14ca21d2c9e569193fbc555c4e3adfeaa51f Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 9 Dec 2024 16:37:22 -0500 Subject: [PATCH 02/14] Update clown.yml --- Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml index 98facb72da2..01390ef4b7e 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml @@ -14,7 +14,7 @@ equipment: id: FoolPDA -# Trinket +# Trinkets - type: loadout id: CrayonMagic effects: From fc39e831fb584cb8649ec4e0e611bf939a5f2ef5 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 9 Dec 2024 19:55:34 -0500 Subject: [PATCH 03/14] Loadout fixes, time req --- .../Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml | 2 +- Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml | 6 +++--- Resources/Prototypes/Loadouts/loadout_groups.yml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml index 01390ef4b7e..b865455dcfb 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml @@ -22,7 +22,7 @@ requirement: !type:RoleTimeRequirement role: JobClown - time: 300 + time: 36000 storage: back: - CrayonMagic diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml index 5f9e24d256a..6a5884ee19f 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml @@ -4,15 +4,15 @@ equipment: belt: ClothingBeltFoamSheathFilled -# Trinket +# Trinkets - type: loadout id: CrayonMagic effects: - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobMime - time: 300 + role: JobClown + time: 36000 storage: back: - CrayonMagic diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index d801a9fce93..5aeeebf8f73 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -51,6 +51,7 @@ - Cane # DeltaV - WhiteCane #DeltaV - CDDogtags # _CD + - CrayonMagic # Delta V, _NF Port - type: loadoutGroup id: Glasses From 439027ca7fc4b29b747decdf37a3fb7e1159fdff Mon Sep 17 00:00:00 2001 From: Avalon Date: Wed, 11 Dec 2024 15:44:56 -0500 Subject: [PATCH 04/14] loadout bgone --- .../Prototypes/Catalog/Fills/Items/toolboxes.yml | 4 ++-- .../DeltaV/Loadouts/Jobs/Civilian/clown.yml | 13 ------------- .../DeltaV/Loadouts/Jobs/Civilian/mime.yml | 13 ------------- Resources/Prototypes/Loadouts/loadout_groups.yml | 1 - 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index dd89f8a7729..710ef1ddc9f 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -85,8 +85,8 @@ amount: 2 - id: CrayonMime - id: CrayonRainbow - - id: CrayonMagic # Delta V - I don't feel liek making a construction graph :blunt: - prob: .33 + - id: CrayonMagic # Delta V - I don't feel like making a construction graph :blunt: + prob: .10 - type: entity id: ToolboxMechanicalFilled diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml index b865455dcfb..168b9884ca0 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml @@ -13,16 +13,3 @@ id: FoolPDA equipment: id: FoolPDA - -# Trinkets -- type: loadout - id: CrayonMagic - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobClown - time: 36000 - storage: - back: - - CrayonMagic diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml index 6a5884ee19f..43740a3097a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml @@ -3,16 +3,3 @@ id: FoamSabre equipment: belt: ClothingBeltFoamSheathFilled - -# Trinkets -- type: loadout - id: CrayonMagic - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobClown - time: 36000 - storage: - back: - - CrayonMagic diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 5aeeebf8f73..d801a9fce93 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -51,7 +51,6 @@ - Cane # DeltaV - WhiteCane #DeltaV - CDDogtags # _CD - - CrayonMagic # Delta V, _NF Port - type: loadoutGroup id: Glasses From 5b3106f6a38868781030f61ef380de81f04ef211 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 12 Dec 2024 19:03:08 -0500 Subject: [PATCH 05/14] Fixes, moved things --- .../en-US/_NF/crayon/crayon-component.ftl | 7 +++++ .../Locale/en-US/crayon/crayon-component.ftl | 1 - .../_NF/Entities/Objects/Fun/magic_crayon.yml | 2 +- .../Recipes/Crafting/Graphs/magic_crayon.yml | 28 +++++++++++++++++++ .../_NF/Recipes/Crafting/magic_crayon.yml | 10 +++++++ 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/crayon/crayon-component.ftl create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml diff --git a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl new file mode 100644 index 00000000000..8c86c307999 --- /dev/null +++ b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl @@ -0,0 +1,7 @@ + +## Entity + +crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] + +## UI +crayon-window-title = Crayon diff --git a/Resources/Locale/en-US/crayon/crayon-component.ftl b/Resources/Locale/en-US/crayon/crayon-component.ftl index e75e37a683a..444ffa4c45e 100644 --- a/Resources/Locale/en-US/crayon/crayon-component.ftl +++ b/Resources/Locale/en-US/crayon/crayon-component.ftl @@ -5,7 +5,6 @@ crayon-drawing-label = Drawing: [color={$color}]{$state}[/color] ({$charges}/{$c crayon-interact-not-enough-left-text = Not enough left. crayon-interact-used-up-text = The {$owner} got used up. crayon-interact-invalid-location = Can't reach there! -crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] ## UI crayon-window-title = Crayon diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index 8a88ea8b06d..ae22ae5fd9a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -25,4 +25,4 @@ food: reagents: - ReagentId: Nothing - Quantity: 40 \ No newline at end of file + Quantity: 100 diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml new file mode 100644 index 00000000000..975f4f26687 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: CrayonMagic + start: start + graph: + - node: start + edges: + - to: magicCrayon + steps: + - material: MaterialBluespace1 + amount: 1 + - tag: CrayonRed + name: red crayon + icon: + sprite: Objects/Fun/crayons.rsi + state: red + - tag: CrayonGreen + name: green crayon + icon: + sprite: Objects/Fun/crayons.rsi + state: green + - tag: CrayonBlue + name: blue crayon + icon: + sprite: Objects/Fun/crayons.rsi + state: blue + doAfter: 5 + - node: magicCrayon + entity: CrayonMagic diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml b/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml new file mode 100644 index 00000000000..dbbeacf41fc --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml @@ -0,0 +1,10 @@ +- type: construction + name: Magic Crayon + id: CrayonMagic + graph: magic_crayon + startNode: start + targetNode: magicCrayon + category: construction-category-misc + description: A crayon that lasts forever! Pretty too + icon: { sprite: _NF\Objects\Fun\magic_crayon.rsi, state: icon } + objectType: Item From bb07c7be722811ca6901fd5e733c8eafe2024505 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 12 Dec 2024 19:20:17 -0500 Subject: [PATCH 06/14] fixoneoops --- Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index ae22ae5fd9a..0b5f0635079 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -26,3 +26,6 @@ reagents: - ReagentId: Nothing Quantity: 100 + - type: Construction + graph: CrayonMagic + node: magicCrayon From 5afff79a9e2ef5aea3dd3c916219207e806a3ccd Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 12 Dec 2024 20:39:39 -0500 Subject: [PATCH 07/14] More fixes --- Resources/Locale/en-US/_NF/crayon/crayon-component.ftl | 2 -- Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml | 2 +- .../Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl index 8c86c307999..146559f00a5 100644 --- a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl +++ b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl @@ -3,5 +3,3 @@ crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] -## UI -crayon-window-title = Crayon diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index 0b5f0635079..35ac44cdcf5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -27,5 +27,5 @@ - ReagentId: Nothing Quantity: 100 - type: Construction - graph: CrayonMagic + graph: magic_crayon node: magicCrayon diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml index 975f4f26687..233cf6ca4b7 100644 --- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml @@ -6,7 +6,7 @@ edges: - to: magicCrayon steps: - - material: MaterialBluespace1 + - material: Bluespace amount: 1 - tag: CrayonRed name: red crayon From c578da774391e1716d275ba8cad65d979c746599 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 12 Dec 2024 21:30:59 -0500 Subject: [PATCH 08/14] CRAFTING WORKS! --- .../Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml index 233cf6ca4b7..5d5c4836781 100644 --- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml @@ -1,5 +1,5 @@ - type: constructionGraph - id: CrayonMagic + id: magic_crayon start: start graph: - node: start From 4a809ed91492f8b2210d0be906c60349f38416bc Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 12 Dec 2024 22:29:18 -0500 Subject: [PATCH 09/14] Flipped slashes --- Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml b/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml index dbbeacf41fc..cb26164f471 100644 --- a/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml @@ -6,5 +6,5 @@ targetNode: magicCrayon category: construction-category-misc description: A crayon that lasts forever! Pretty too - icon: { sprite: _NF\Objects\Fun\magic_crayon.rsi, state: icon } + icon: { sprite: _NF/Objects/Fun/magic_crayon.rsi, state: icon } objectType: Item From faa7bbd04bbbc2b14046dfee0ed628e2e1202f80 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 17 Dec 2024 13:30:53 -0500 Subject: [PATCH 10/14] UNTOUCHED! AT LAST --- BuildChecker/BuildChecker.csproj | 4 +--- SpaceStation14.sln | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj index e2b4c27d9b1..63d16fa9708 100644 --- a/BuildChecker/BuildChecker.csproj +++ b/BuildChecker/BuildChecker.csproj @@ -19,8 +19,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild {C899FCA4-7037-4E49-ABC2-44DE72487110} .NETFramework, Version=v4.7.2 false - v4.8 - Library @@ -51,4 +49,4 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild - \ No newline at end of file + diff --git a/SpaceStation14.sln b/SpaceStation14.sln index e7d52278377..0e00fe5b12f 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -471,21 +471,21 @@ Global {41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880} {AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880} {440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880} - {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {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} - {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution From fd88a56aaaa94a91aa74f1f9c10e26a44985b0bd Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 17 Dec 2024 14:11:25 -0500 Subject: [PATCH 11/14] Fix comment --- Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 710ef1ddc9f..ba2b91df007 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -85,7 +85,7 @@ amount: 2 - id: CrayonMime - id: CrayonRainbow - - id: CrayonMagic # Delta V - I don't feel like making a construction graph :blunt: + - id: CrayonMagic # Delta V - A construction graph was made, but still can find in the wild prob: .10 - type: entity From a9da62f88e9ea676a19ecf8d814e7da655e54349 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 20 Dec 2024 21:15:15 -0500 Subject: [PATCH 12/14] Mailladd --- .../Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml | 2 ++ .../DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 09b3a8ae88f..6ea56a91842 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -1555,6 +1555,8 @@ - type: Mail contents: - id: CrayonBox + - id: CrayonMagic + - prob: .10 - type: entity parent: BaseMail diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml index ffc5801fc3b..5c0248f02fd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -178,6 +178,8 @@ - id: CrayonBox - id: Paper maxAmount: 3 + - id: CrayonMagic + - prob: .2 - type: entity parent: BaseMail From c53f47ec2a0e73e569688557d118f76b6ec0f3de Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 27 Dec 2024 08:49:15 -0500 Subject: [PATCH 13/14] Webedit ops Signed-off-by: Avalon --- Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json index 8d3d97e9f19..01cdda8ed59 100644 --- a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -6,7 +6,7 @@ "x": 32, "y": 32 }, - "states": [ + "states": [ { "name": "icon", "delays": [ From 461eb0b082e9cd755a61c14c2f4850e7062ebc8e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:52:47 +0000 Subject: [PATCH 14/14] untroll indent Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../Objects/Fun/magic_crayon.rsi/meta.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json index 01cdda8ed59..21fc89b91f5 100644 --- a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -6,20 +6,20 @@ "x": 32, "y": 32 }, - "states": [ + "states": [ { - "name": "icon", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] ] - ] }, { "name": "icon-inhand-left",