From 0b43f2f06c83b379c43fd7885a6af000e85bc40a Mon Sep 17 00:00:00 2001
From: The-Cicada <66720987+The-Cicada@users.noreply.github.com>
Date: Tue, 5 Jan 2021 07:25:36 +0100
Subject: [PATCH 1/3] Giving Xeno archeology 18 unque eguns

Giving Xeno archeology 18 unque eguns
---
 .../xenoarcheaology/finds/eguns_vr_ch.dm        |  12 ++++++++++++
 .../xenoarcheaology/finds/find_spawning.dm      |   4 ++--
 icons/obj/xenoegun/xenoe-guns_ch.dmi            | Bin 0 -> 10707 bytes
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
 create mode 100644 icons/obj/xenoegun/xenoe-guns_ch.dmi

diff --git a/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
new file mode 100644
index 0000000000..3c021ec32f
--- /dev/null
+++ b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
@@ -0,0 +1,12 @@
+//The chomp override of the VR override VR:CH
+/obj/item/weapon/gun/energy/laser/xenoarch
+	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+
+/obj/item/weapon/gun/energy/laser/practice/xenoarch
+	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+
+/obj/item/weapon/gun/energy/xray/xenoarch
+	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+
+/obj/item/weapon/gun/energy/captain/xenoarch
+	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm
index b121724219..2e6dc4de31 100644
--- a/code/modules/xenoarcheaology/finds/find_spawning.dm
+++ b/code/modules/xenoarcheaology/finds/find_spawning.dm
@@ -295,7 +295,7 @@
 			if(spawn_type)
 				var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
 				new_item = new_gun
-				new_item.icon_state = "egun[rand(1,12)]"
+				new_item.icon_state = "egun[rand(1,18)]" //CHOMPStation Edit: We now reference our own DMI which has 18 unique guns.
 				new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not."
 
 				//5% chance to explode when first fired
@@ -551,7 +551,7 @@
 			var/obj/item/weapon/reagent_containers/syringe/S = new_item
 
 			S.volume = 30
-			//If S hasn't initialized yet, S.reagents will be null.  
+			//If S hasn't initialized yet, S.reagents will be null.
 			//However, in that case Initialize will set the maximum volume to the volume for us, so we don't need to do anything.
 			S.reagents?.maximum_volume = 30
 
diff --git a/icons/obj/xenoegun/xenoe-guns_ch.dmi b/icons/obj/xenoegun/xenoe-guns_ch.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..79b1c89bf83d090ece3d40fbdf6cdab68b077dd9
GIT binary patch
literal 10707
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
UoOiiGyEFmP;__luqF??04V%m)Z~y=R

literal 0
HcmV?d00001


From c671f2e3e614daf4b9a14041f2be54ffa618a3ff Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Jan 2021 07:39:25 +0100
Subject: [PATCH 2/3] Giving Xenoarch 18 Unique Eguns

Gives Xenoarch the 12 Original egun variants and on top of that adds the 6 ones added by Vore Station. Also Moves xenoarch eguns into their own dmi file found at 'icons/obj/xenoegun/xeno-guns_ch.dmi'
---
 code/modules/xenoarcheaology/finds/eguns_vr_ch.dm | 8 ++++----
 vorestation.dme                                   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
index 3c021ec32f..cce2a07e74 100644
--- a/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
+++ b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
@@ -1,12 +1,12 @@
 //The chomp override of the VR override VR:CH
 /obj/item/weapon/gun/energy/laser/xenoarch
-	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
 
 /obj/item/weapon/gun/energy/laser/practice/xenoarch
-	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
 
 /obj/item/weapon/gun/energy/xray/xenoarch
-	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
 
 /obj/item/weapon/gun/energy/captain/xenoarch
-	icon = 'icons/obj/xengun/xenoe-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
diff --git a/vorestation.dme b/vorestation.dme
index b5550e20e1..aa85867bd4 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4010,6 +4010,7 @@
 #include "code\modules\xenoarcheaology\effects\teleport.dm"
 #include "code\modules\xenoarcheaology\effects\vampire.dm"
 #include "code\modules\xenoarcheaology\finds\eguns.dm"
+#include "code\modules\xenoarcheaology\finds\eguns_vr_ch.dm"
 #include "code\modules\xenoarcheaology\finds\find_spawning.dm"
 #include "code\modules\xenoarcheaology\finds\finds.dm"
 #include "code\modules\xenoarcheaology\finds\finds_defines.dm"

From adbfa82993558c810758528cfed8840f55de1eb7 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Jan 2021 08:01:17 +0100
Subject: [PATCH 3/3] Typo fix

Typo fix
---
 code/modules/xenoarcheaology/finds/eguns_vr_ch.dm   |   8 ++++----
 .../{xenoe-guns_ch.dmi => xeno-eguns_ch.dmi}        | Bin
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename icons/obj/xenoegun/{xenoe-guns_ch.dmi => xeno-eguns_ch.dmi} (100%)

diff --git a/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
index cce2a07e74..600de59ad7 100644
--- a/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
+++ b/code/modules/xenoarcheaology/finds/eguns_vr_ch.dm
@@ -1,12 +1,12 @@
 //The chomp override of the VR override VR:CH
 /obj/item/weapon/gun/energy/laser/xenoarch
-	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-eguns_ch.dmi'
 
 /obj/item/weapon/gun/energy/laser/practice/xenoarch
-	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-eguns_ch.dmi'
 
 /obj/item/weapon/gun/energy/xray/xenoarch
-	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-eguns_ch.dmi'
 
 /obj/item/weapon/gun/energy/captain/xenoarch
-	icon = 'icons/obj/xenoegun/xeno-guns_ch.dmi'
+	icon = 'icons/obj/xenoegun/xeno-eguns_ch.dmi'
diff --git a/icons/obj/xenoegun/xenoe-guns_ch.dmi b/icons/obj/xenoegun/xeno-eguns_ch.dmi
similarity index 100%
rename from icons/obj/xenoegun/xenoe-guns_ch.dmi
rename to icons/obj/xenoegun/xeno-eguns_ch.dmi