From 5836b2c8cb2f22948671e3b1aa85cc6d417f910f Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 22 May 2016 17:48:58 -0400 Subject: [PATCH 1/5] Create finds_eguns_vr --- .../research/xenoarchaeology/finds/finds_eguns_vr | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 code/modules/research/xenoarchaeology/finds/finds_eguns_vr diff --git a/code/modules/research/xenoarchaeology/finds/finds_eguns_vr b/code/modules/research/xenoarchaeology/finds/finds_eguns_vr new file mode 100644 index 00000000000..ba2f0345c3b --- /dev/null +++ b/code/modules/research/xenoarchaeology/finds/finds_eguns_vr @@ -0,0 +1,14 @@ +/obj/item/weapon/gun/energy/laser/xenoarch + icon = 'icons/obj/xenoarchaeology_vr.dmi' + +/obj/item/weapon/gun/energy/laser/practice/xenoarch + icon = 'icons/obj/xenoarchaeology_vr.dmi' + +/obj/item/weapon/gun/energy/laser/practice/xenoarch //I have zero idea why this is wrote twice. It's how the origonal finds_eguns_vr file was written, so I'm just going to follow its example. + icon = 'icons/obj/xenoarchaeology_vr.dmi' + +/obj/item/weapon/gun/energy/xray/xenoarch + icon = 'icons/obj/xenoarchaeology_vr.dmi' + +/obj/item/weapon/gun/energy/captain/xenoarch + icon = 'icons/obj/xenoarchaeology_vr.dmi' From eb403b3d6dd48bb8b0053ffecf57408094506a00 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 22 May 2016 18:05:48 -0400 Subject: [PATCH 2/5] Rename finds_eguns_vr to finds_eguns_vr.dm --- .../xenoarchaeology/finds/{finds_eguns_vr => finds_eguns_vr.dm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename code/modules/research/xenoarchaeology/finds/{finds_eguns_vr => finds_eguns_vr.dm} (100%) diff --git a/code/modules/research/xenoarchaeology/finds/finds_eguns_vr b/code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm similarity index 100% rename from code/modules/research/xenoarchaeology/finds/finds_eguns_vr rename to code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm From 299605a291e59a3a5a07682a4c0d3999ee61badb Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 22 May 2016 18:36:23 -0400 Subject: [PATCH 3/5] Makes it actually started by default --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 488a131a626..3c82c9420fb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1833,6 +1833,7 @@ #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_eguns_vr.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" From de4130cd0787660343a1352cd99076497560bab6 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 22 May 2016 21:18:41 -0400 Subject: [PATCH 4/5] Actually gives races their pay. Gives races equal pay. --- code/modules/economy/economy_misc_vr.dm | 13 +++++++++++++ vorestation.dme | 1 + 2 files changed, 14 insertions(+) create mode 100644 code/modules/economy/economy_misc_vr.dm diff --git a/code/modules/economy/economy_misc_vr.dm b/code/modules/economy/economy_misc_vr.dm new file mode 100644 index 00000000000..abff973b49a --- /dev/null +++ b/code/modules/economy/economy_misc_vr.dm @@ -0,0 +1,13 @@ +/hook/startup/proc/pay_raise() + economic_species_modifier = list( + /datum/species/human = 10, //Removing racist pay one species at a time. + /datum/species/skrell = 10, + /datum/species/teshari = 10, + /datum/species/tajaran = 10, + /datum/species/unathi = 10, + /datum/species/diona = 10, + /datum/species/hi_zoxxen = 10, + /datum/species/fl_zorren = 10, + /datum/species/sergal = 10, + /datum/species/nevrean = 10 + ) \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 3c82c9420fb..9e2434e8163 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1169,6 +1169,7 @@ #include "code\modules\economy\cash.dm" #include "code\modules\economy\cash_register.dm" #include "code\modules\economy\economy_misc.dm" +#include "code\modules\economy\economy_misc_vr.dm" #include "code\modules\economy\EFTPOS.dm" #include "code\modules\economy\Events.dm" #include "code\modules\economy\Events_Mundane.dm" From f7c7b5eb3a679550bad33805cf7ef8b3e288c2d9 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Mon, 23 May 2016 14:06:06 -0400 Subject: [PATCH 5/5] Removes pay bugfix --- code/modules/economy/economy_misc_vr.dm | 13 ------------- .../xenoarchaeology/finds/finds_eguns_vr.dm | 3 --- vorestation.dme | 1 - 3 files changed, 17 deletions(-) delete mode 100644 code/modules/economy/economy_misc_vr.dm diff --git a/code/modules/economy/economy_misc_vr.dm b/code/modules/economy/economy_misc_vr.dm deleted file mode 100644 index abff973b49a..00000000000 --- a/code/modules/economy/economy_misc_vr.dm +++ /dev/null @@ -1,13 +0,0 @@ -/hook/startup/proc/pay_raise() - economic_species_modifier = list( - /datum/species/human = 10, //Removing racist pay one species at a time. - /datum/species/skrell = 10, - /datum/species/teshari = 10, - /datum/species/tajaran = 10, - /datum/species/unathi = 10, - /datum/species/diona = 10, - /datum/species/hi_zoxxen = 10, - /datum/species/fl_zorren = 10, - /datum/species/sergal = 10, - /datum/species/nevrean = 10 - ) \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm b/code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm index ba2f0345c3b..0936f47bf59 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_eguns_vr.dm @@ -4,9 +4,6 @@ /obj/item/weapon/gun/energy/laser/practice/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/gun/energy/laser/practice/xenoarch //I have zero idea why this is wrote twice. It's how the origonal finds_eguns_vr file was written, so I'm just going to follow its example. - icon = 'icons/obj/xenoarchaeology_vr.dmi' - /obj/item/weapon/gun/energy/xray/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' diff --git a/vorestation.dme b/vorestation.dme index 9e2434e8163..3c82c9420fb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1169,7 +1169,6 @@ #include "code\modules\economy\cash.dm" #include "code\modules\economy\cash_register.dm" #include "code\modules\economy\economy_misc.dm" -#include "code\modules\economy\economy_misc_vr.dm" #include "code\modules\economy\EFTPOS.dm" #include "code\modules\economy\Events.dm" #include "code\modules\economy\Events_Mundane.dm"