From b0978c30c81043a81de7acf03211bebdbedb63c3 Mon Sep 17 00:00:00 2001 From: Leander-0 Date: Sat, 5 Oct 2024 17:12:14 -0400 Subject: [PATCH 1/5] add magic crayon --- .../_NF/Entities/Objects/Fun/magic_crayon.yml | 47 ++++++++++++++++++ .../_NF/Loadouts/Jobs/Contractor/fun.yml | 9 ++++ .../Loadouts/contractor_loadout_groups.yml | 1 + .../_NF/Objects/Fun/magic_crayon.rsi/icon.png | Bin 0 -> 8303 bytes .../Fun/magic_crayon.rsi/inhand-left.png | Bin 0 -> 342 bytes .../Fun/magic_crayon.rsi/inhand-right.png | Bin 0 -> 342 bytes .../Objects/Fun/magic_crayon.rsi/meta.json | 42 ++++++++++++++++ 7 files changed, 99 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json 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..dbcd466abc4 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -0,0 +1,47 @@ +- type: entity + parent: BaseItem + id: MagicCrayon + name: magic crayon + description: "The product of blending crayons with bluspace crystals, now with new special not so magical flavors" + components: + - type: Sprite + sprite: _NF/Objects/Fun/magic_crayon.rsi + state: icon + - type: Item + sprite: _NF/Objects/Fun/magic_crayon.rsi + size: Small + - type: Tag + tags: + - Write + - Crayon + - type: UserInterface + interfaces: + enum.CrayonUiKey.Key: + type: CrayonBoundUserInterface + - type: Crayon + color: Red + selectableColor: true + capacity: 999999 + - type: Stamp + stampState: "paper_stamp-nf-signature" + sound: + path: /Audio/Items/Paper/paper_scribble1.ogg + params: + volume: -2 + maxDistance: 5 + - type: UseDelay + delays: + stamp: + length: 1.0 + - type: Food + - type: FlavorProfile + flavors: + - chewy + - sweet + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 40 + diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml index ef9446d3939..db2cd9e33ee 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml @@ -193,3 +193,12 @@ price: 10000 inhand: - PetCarrierNPCEmotionalSupportSafe + +- type: loadout + id: ContractorMagicCrayon + effects: + - !type:GroupLoadoutEffect + proto: ContractorT3 + price: 30000 + inhand: + - MagicCrayon diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index d5826b14f04..7d9a62633ad 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -730,6 +730,7 @@ - ContractorDawInstrumentFlatpack - ContractorHoverbikeFlatpack - ContractorEmotionalPetCarrier + - ContractorMagicCrayon - type: loadoutGroup id: ContractorFace 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..bd55135ba747faccb57c7957210d59310f4d9d49 GIT binary patch literal 8303 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 E1^M9G82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4f191c87d4a42e70e1831a4901b8ced820b132c2 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkad4)Qh`NVGlNe#APuVA8}M=M0%c9&-*(Jt7<}@ZQx!rXlI|)8F%?Ic+~| z`|{bP0l+XkKFzJKn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7eb1adee35d1b35f03595a13f58481082150956e GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkad4EdT2B-$QsKQcGk;^f4h_6rpp${%@RJm>6bE!3ZOWTT5v!h!eIW6L`+hQOt0}lHrjILm^*-1-ru>W`%Q%P+?y7j7RS(Io?hah*+r}yFGVTm-9!7 zUFy;ba;NWB#xHr8Ts7nBt9JXPmU`beX}twQH^l#bUmWpiPm{PK)CZp!?Rp>j3BTGK*8mJC22WQ%mvv4FO#ldHh%5jA 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..c2c9d235de4 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @GentleButter on the frontier discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 106c4ac056b81aae8e04176fa0495609256496ef Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 5 Oct 2024 22:30:42 -0400 Subject: [PATCH 2/5] Infinite crayons, smaller magic crayon, attribs --- Content.Client/Crayon/CrayonSystem.cs | 11 +++++ Content.Server/Crayon/CrayonSystem.cs | 12 +++-- .../en-US/_NF/crayon/crayon-component.ftl | 1 + .../_NF/Entities/Objects/Fun/magic_crayon.yml | 38 ++++----------- .../_NF/Loadouts/Jobs/Contractor/fun.yml | 4 +- .../Loadouts/contractor_loadout_groups.yml | 2 +- .../_NF/Objects/Fun/catplushie.rsi/meta.json | 2 +- .../Objects/Fun/corgiplushie.rsi/meta.json | 2 +- .../_NF/Objects/Fun/foxplushie.rsi/meta.json | 2 +- .../icon-inhand-left.png | Bin 0 -> 204 bytes .../icon-inhand-right.png | Bin 0 -> 203 bytes .../Fun/magic_crayon_small.rsi/icon.png | Bin 0 -> 282 bytes .../Fun/magic_crayon_small.rsi/meta.json | 46 ++++++++++++++++++ .../_NF/Objects/Fun/petrock.rsi/meta.json | 2 +- .../_NF/Objects/Fun/prizeticket.rsi/meta.json | 2 +- .../_NF/Objects/Fun/toys.rsi/meta.json | 2 +- 16 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/crayon/crayon-component.ftl create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index 2ed82b6a711..d489361afba 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -65,6 +65,17 @@ protected override void FrameUpdate(FrameEventArgs args) } _parent.UIUpdateNeeded = false; + + // Frontier: unlimited crayon + 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 + _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 a572ad96c85..771fef8d785 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -14,7 +14,6 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Server.Crayon; @@ -74,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 + if (component.Charges != int.MaxValue) + { + // Decrease "Ammo" + component.Charges--; + Dirty(uid, component); + } + // End Frontier _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/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl new file mode 100644 index 00000000000..cb616f7aaef --- /dev/null +++ b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl @@ -0,0 +1 @@ +crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index dbcd466abc4..2622c2b2dff 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -1,47 +1,29 @@ - type: entity - parent: BaseItem - id: MagicCrayon + parent: CrayonRainbow + id: CrayonMagic name: magic crayon - description: "The product of blending crayons with bluspace crystals, now with new special not so magical flavors" + description: The product of blending crayons with bluspace crystals, now with new special not so magical flavors components: - type: Sprite - sprite: _NF/Objects/Fun/magic_crayon.rsi + sprite: _NF/Objects/Fun/magic_crayon_small.rsi state: icon - type: Item - sprite: _NF/Objects/Fun/magic_crayon.rsi - size: Small - - type: Tag + sprite: _NF/Objects/Fun/magic_crayon_small.rsi + heldPrefix: icon + - type: Tag # Removing trash & recyclable tags: - Write - Crayon - - type: UserInterface - interfaces: - enum.CrayonUiKey.Key: - type: CrayonBoundUserInterface - type: Crayon - color: Red - selectableColor: true - capacity: 999999 - - type: Stamp - stampState: "paper_stamp-nf-signature" - sound: - path: /Audio/Items/Paper/paper_scribble1.ogg - params: - volume: -2 - maxDistance: 5 - - type: UseDelay - delays: - stamp: - length: 1.0 - - type: Food + capacity: 2147483647 # int.MaxValue, infinite charges - type: FlavorProfile flavors: - chewy - - sweet + - magical - type: SolutionContainerManager solutions: food: reagents: - - ReagentId: JuiceThatMakesYouWeh + - ReagentId: Plastic Quantity: 40 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml index db2cd9e33ee..35303378a52 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml @@ -195,10 +195,10 @@ - PetCarrierNPCEmotionalSupportSafe - type: loadout - id: ContractorMagicCrayon + id: ContractorCrayonMagic effects: - !type:GroupLoadoutEffect proto: ContractorT3 price: 30000 inhand: - - MagicCrayon + - CrayonMagic diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 7d9a62633ad..2b7d8008969 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -730,7 +730,7 @@ - ContractorDawInstrumentFlatpack - ContractorHoverbikeFlatpack - ContractorEmotionalPetCarrier - - ContractorMagicCrayon + - ContractorCrayonMagic - type: loadoutGroup id: ContractorFace diff --git a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json index 878f438f4ec..ce57dc29d3f 100644 --- a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json index 06c0cf9ed4a..8c36a89ed2c 100644 --- a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json index 5842b1ad07a..b60d4f5cae8 100644 --- a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.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_small.rsi/icon-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.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_small.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.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_small.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json new file mode 100644 index 00000000000..e0550ba0b0f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "", + "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 ] + ] + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json index d39a58e623d..b00abc40de0 100644 --- a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json index bf0f0d3224d..667aefdc223 100644 --- a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (arcade.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json index 15cfd9eb4c1..f52f9068543 100644 --- a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise Station", + "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 From c6701416754715137a0acd31f605ab56f669c80e Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 5 Oct 2024 22:48:11 -0400 Subject: [PATCH 3/5] Copyright, description --- Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml | 2 +- .../Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index 2622c2b2dff..21667652c55 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -2,7 +2,7 @@ parent: CrayonRainbow id: CrayonMagic name: magic crayon - description: The product of blending crayons with bluspace crystals, now with new special not so magical flavors + description: Specially blended with bluespace crystals and certified non-toxic. components: - type: Sprite sprite: _NF/Objects/Fun/magic_crayon_small.rsi diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json index e0550ba0b0f..643dce035ad 100644 --- a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "", + "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 From b1dcb676eada495c729c1ce7a2b05daeb14700c9 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 5 Oct 2024 22:57:05 -0400 Subject: [PATCH 4/5] Plastic Date: Wed, 9 Oct 2024 17:44:55 -0400 Subject: [PATCH 5/5] magic_crayon_small.rsi->magic_crayon.rsi --- .../_NF/Entities/Objects/Fun/magic_crayon.yml | 4 +- .../icon-inhand-left.png | Bin .../icon-inhand-right.png | Bin .../_NF/Objects/Fun/magic_crayon.rsi/icon.png | Bin 8303 -> 282 bytes .../Fun/magic_crayon.rsi/inhand-left.png | Bin 342 -> 0 bytes .../Fun/magic_crayon.rsi/inhand-right.png | Bin 342 -> 0 bytes .../Objects/Fun/magic_crayon.rsi/meta.json | 80 +++++++++--------- .../Fun/magic_crayon_small.rsi/icon.png | Bin 282 -> 0 bytes .../Fun/magic_crayon_small.rsi/meta.json | 46 ---------- 9 files changed, 44 insertions(+), 86 deletions(-) rename Resources/Textures/_NF/Objects/Fun/{magic_crayon_small.rsi => magic_crayon.rsi}/icon-inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Fun/{magic_crayon_small.rsi => magic_crayon.rsi}/icon-inhand-right.png (100%) delete mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png delete mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png delete mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon.png delete mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml index bee30bc7ad0..eb4079fa67f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -5,10 +5,10 @@ description: Specially blended with bluespace crystals and certified non-toxic. components: - type: Sprite - sprite: _NF/Objects/Fun/magic_crayon_small.rsi + sprite: _NF/Objects/Fun/magic_crayon.rsi state: icon - type: Item - sprite: _NF/Objects/Fun/magic_crayon_small.rsi + sprite: _NF/Objects/Fun/magic_crayon.rsi heldPrefix: icon - type: Tag # Removing trash & recyclable tags: diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-left.png rename to Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon-inhand-right.png rename to Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png index bd55135ba747faccb57c7957210d59310f4d9d49..c520ae932500b2757cd8b4ced4aeb6d3e4ef40ac 100644 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 8303 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 E1^M9G82|tP diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-left.png deleted file mode 100644 index 4f191c87d4a42e70e1831a4901b8ced820b132c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkad4)Qh`NVGlNe#APuVA8}M=M0%c9&-*(Jt7<}@ZQx!rXlI|)8F%?Ic+~| z`|{bP0l+XkKFzJKn diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/inhand-right.png deleted file mode 100644 index 7eb1adee35d1b35f03595a13f58481082150956e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkad4EdT2B-$QsKQcGk;^f4h_6rpp${%@RJm>6bE!3ZOWTT5v!h!eIW6L`+hQOt0}lHrjILm^*-1-ru>W`%Q%P+?y7j7RS(Io?hah*+r}yFGVTm-9!7 zUFy;ba;NWB#xHr8Ts7nBt9JXPmU`beX}twQH^l#bUmWpiPm{PK)CZp!?Rp>j3BTGK*8mJC22WQ%mvv4FO#ldHh%5jA 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 c2c9d235de4..643dce035ad 100644 --- a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -1,42 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by @GentleButter on the frontier discord", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon", - "delays": [ - [ - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10, - 0.10 + "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 ] + ] + } ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] } + \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/icon.png deleted file mode 100644 index c520ae932500b2757cd8b4ced4aeb6d3e4ef40ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json deleted file mode 100644 index 643dce035ad..00000000000 --- a/Resources/Textures/_NF/Objects/Fun/magic_crayon_small.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "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 ] - ] - } - ] -} - \ No newline at end of file