From 50d7706cd2846f3d11f821cf40e21435da61a21d Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Thu, 5 Apr 2018 20:21:15 +0800 Subject: [PATCH] Fixes Pathing --- code/modules/projectiles/guns/energy/nuclear_vr.dm | 8 ++++++++ .../icons/obj/eguns.dmi => icons/obj/eguns_vr.dmi | Bin .../code/modules/projectiles/guns/energy/nuclear.dm | 8 -------- vorestation.dme | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 code/modules/projectiles/guns/energy/nuclear_vr.dm rename modular_virgo/icons/obj/eguns.dmi => icons/obj/eguns_vr.dmi (100%) delete mode 100644 modular_virgo/code/modules/projectiles/guns/energy/nuclear.dm diff --git a/code/modules/projectiles/guns/energy/nuclear_vr.dm b/code/modules/projectiles/guns/energy/nuclear_vr.dm new file mode 100644 index 0000000000..97a6aa064e --- /dev/null +++ b/code/modules/projectiles/guns/energy/nuclear_vr.dm @@ -0,0 +1,8 @@ +/* +// Virgo's very own file for overriding Polaris' eguns! Should include: Regular egun, Advanced egun, burst egun, mounted egun +// +// NOTICE: All the egun sprites have to be mirrored in /icons/obj/eguns_vr.dmi because someone made them all child objects of the base thing +*/ + +/obj/item/weapon/gun/energy/gun + icon = 'icons/obj/eguns_vr.dmi' //makes the egun look for icons here instead. ALL of the eguns. \ No newline at end of file diff --git a/modular_virgo/icons/obj/eguns.dmi b/icons/obj/eguns_vr.dmi similarity index 100% rename from modular_virgo/icons/obj/eguns.dmi rename to icons/obj/eguns_vr.dmi diff --git a/modular_virgo/code/modules/projectiles/guns/energy/nuclear.dm b/modular_virgo/code/modules/projectiles/guns/energy/nuclear.dm deleted file mode 100644 index aa8a3a5543..0000000000 --- a/modular_virgo/code/modules/projectiles/guns/energy/nuclear.dm +++ /dev/null @@ -1,8 +0,0 @@ -/* -// Virgo's very own file for overriding Polaris' eguns! Should include: Regular egun, Advanced egun, burst egun, mounted egun -// -// NOTICE: All the egun sprites have to be mirrored in modular_virgo/icons/obj/eguns.dmi because someone made them all child objects of the base thing -*/ - -/obj/item/weapon/gun/energy/gun - icon = 'modular_virgo/icons/obj/eguns.dmi' //makes the egun look for icons here instead. ALL of the eguns. \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 0aeeb3b455..338de97823 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2402,6 +2402,7 @@ #include "code\modules\projectiles\guns\energy\laser.dm" #include "code\modules\projectiles\guns\energy\netgun_vr.dm" #include "code\modules\projectiles\guns\energy\nuclear.dm" +#include "code\modules\projectiles\guns\energy\nuclear_vr.dm" #include "code\modules\projectiles\guns\energy\particle.dm" #include "code\modules\projectiles\guns\energy\pulse.dm" #include "code\modules\projectiles\guns\energy\special.dm" @@ -2857,5 +2858,4 @@ #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" #include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" -#include "modular_virgo\code\modules\projectiles\guns\energy\nuclear.dm" // END_INCLUDE