From 0eed2c2fa66496d0f0f4600dd049510543ea8929 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Wed, 19 Nov 2014 22:42:58 -0500 Subject: [PATCH] Fixes the xenoarch eguns. This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm --- baystation12.dme | 1 + .../research/xenoarchaeology/finds/finds.dm | 8 +++--- .../xenoarchaeology/finds/finds_eguns.dm | 25 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 code/modules/research/xenoarchaeology/finds/finds_eguns.dm diff --git a/baystation12.dme b/baystation12.dme index 38e54e0b4ea..c5d55626a1b 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1287,6 +1287,7 @@ #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_teleport.dm" #include "code\modules\research\xenoarchaeology\finds\finds.dm" #include "code\modules\research\xenoarchaeology\finds\finds_defines.dm" +#include "code\modules\research\xenoarchaeology\finds\finds_eguns.dm" #include "code\modules\research\xenoarchaeology\finds\finds_fossils.dm" #include "code\modules\research\xenoarchaeology\finds\finds_misc.dm" #include "code\modules\research\xenoarchaeology\finds\finds_special.dm" diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 64927f06141..3c2a3dd8e24 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -342,10 +342,10 @@ if(26) //energy gun var/spawn_type = pick(\ - /obj/item/weapon/gun/energy/laser/practice,\ - /obj/item/weapon/gun/energy/laser,\ - /obj/item/weapon/gun/energy/xray,\ - /obj/item/weapon/gun/energy/laser/captain) + /obj/item/weapon/gun/energy/laser/practice/xenoarch,\ + /obj/item/weapon/gun/energy/laser/xenoarch,\ + /obj/item/weapon/gun/energy/xray/xenoarch,\ + /obj/item/weapon/gun/energy/laser/captain/xenoarch) if(spawn_type) var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc) new_item = new_gun diff --git a/code/modules/research/xenoarchaeology/finds/finds_eguns.dm b/code/modules/research/xenoarchaeology/finds/finds_eguns.dm new file mode 100644 index 00000000000..95755e4d9c6 --- /dev/null +++ b/code/modules/research/xenoarchaeology/finds/finds_eguns.dm @@ -0,0 +1,25 @@ +//snowflake guns for xenoarch because you can't override the update_icon() proc inside the giant mess that is find creation +/obj/item/weapon/gun/energy/laser/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/practice/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/practice/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/xray/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/captain/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return \ No newline at end of file