From a8b0a12e8bab5e0a7b0ffc5e8d52be8e9b50c6d6 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Thu, 31 Oct 2024 13:58:12 +0000
Subject: [PATCH] add an icon

---
 .../Objects/Specific/Robotics/borg_modules.yml    |   2 ++
 .../Entities/Structures/Machines/lathe.yml        |   9 +++------
 .../Actions/actions_borg.rsi/fauna-module.png     | Bin 0 -> 456 bytes
 .../Interface/Actions/actions_borg.rsi/meta.json  |   5 ++++-
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 69f9426d0fc..47d06e88afb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -256,6 +256,8 @@
     items:
     - WeaponProtoKineticAcceleratorOneHanded
     - WeaponCrusherDagger
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: fauna-module }
 
 # engineering modules
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fdb4315f003..9c821edd0b9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -415,7 +415,9 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
-<<<<<<< HEAD
+      - WeaponCrusher
+      - WeaponCrusherDagger
+      - WeaponCrusherGlaive
       # Begin DeltaV additions
       - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
       - WeaponEnergyGun       # Energy Gun
@@ -438,11 +440,6 @@
       - MagazineBoxSpecialHoly
       - MagazineBoxSpecialMindbreaker
       # End DeltaV additions
-=======
-      - WeaponCrusher
-      - WeaponCrusherDagger
-      - WeaponCrusherGlaive
->>>>>>> 56e6e9b031 (remove shovel from mining module, add recipes to emagged lathes)
 
 - type: entity
   id: ProtolatheHyperConvection
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..888ddb464e67de02f8a203988866ef04c4b597bd
GIT binary patch
literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLdPzh<R9M4fU>NCu5t(CbZ2X@dmYzL(mJ!1NFw23GG_@RP4~ipL
z&|JpAz$Zy--@_e&;Q%n;5ut7Pe|nC>#dN@zH*`&e!!HC}H8~k}U;hs0U!5Arpq;&*
zJ|W<${EtC|pN*kJhMmDqn}^}Xqpz4|(kcW%J{RF+Wsqk72e$ms)h`TUyo?0Rq)G_D
zd@jxY18zCpLI9i3K{T;uQWOHXd=3I2-+MbdFld(_rd<f^zR18(;wpgKay+S@Dj`r}
z`G<I)Q#%AG^*Kc$0P;BuAg6Y`KBra)fP5~`|Ciz6M`kczS=AJXA#$YnoU9N4`5a{V
zg{S`*1bLXjKKGk*n6&gmZV1494zhgi@vmS$HR=wcLIBz4b1!oO)c`TWAM#30QbPdU
z=L`%G--F8evUTri+a3V<9AptF!OgwQ4)!@rtZWxEc{L|#At1o;>hphwp4}hdp+PO5
y6BPnI$5F-5`J-(@s)qomy-u%=$)M?)jRF93<<|v5Z(mmc0000<MNUMnLSTaEX2O&J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index dc8a6fcf9c6..15870765512 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9. fauna-module.png created by deltanedas (github) for SS14.",
     "size": {
         "x": 32,
         "y": 32
@@ -102,6 +102,9 @@
         },
         {
             "name":"syndicate-martyr-module"
+        },
+        {
+            "name": "fauna-module"
         }
     ]
 }