new-frontiers-14 · whatston3 · Oct 9, 2024 · Oct 5, 2024 · Oct 6, 2024 · Oct 6, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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: ContractorCrayonMagic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 30000
+  inhand:
+    - CrayonMagic
diff --git 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
+  - 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
@@ -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
@@ -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
@@ -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.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png
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
diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png
diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json 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/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
@@ -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
@@ -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