From 4d1e0e4a51c5ff7d692a0369893fc81fa206c9c3 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 11 Apr 2022 18:21:02 -0400 Subject: [PATCH 1/4] Initial --- code/__defines/span_vr.dm | 115 +++++++++++++++++++++++ code/modules/xenobio/items/weapons_vr.dm | 2 +- vorestation.dme | 3 +- 3 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 code/__defines/span_vr.dm diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm new file mode 100644 index 0000000000..4ea56d4b5d --- /dev/null +++ b/code/__defines/span_vr.dm @@ -0,0 +1,115 @@ +// Sorted alphabetically +// Shamelessly yoinked from TGCode, luv u folks +#define span_abductor(str) ("" + str + "") +#define span_admin(str) ("" + str + "") +#define span_adminhelp(str) ("" + str + "") +#define span_adminnotice(str) ("" + str + "") +#define span_adminobserverooc(str) ("" + str + "") +#define span_adminooc(str) ("" + str + "") +#define span_adminsay(str) ("" + str + "") +#define span_aiprivradio(str) ("" + str + "") +#define span_alert(str) ("" + str + "") +#define span_alertalien(str) ("" + str + "") +#define span_alertsyndie(str) ("" + str + "") +#define span_alertwarning(str) ("" + str + "") +#define span_alien(str) ("" + str + "") +#define span_announce(str) ("" + str + "") +#define span_big(str) ("" + str + "") +#define span_bigicon(str) ("" + str + "") +#define span_binarysay(str) ("" + str + "") +#define span_blue(str) ("" + str + "") +#define span_blueteamradio(str) ("" + str + "") +#define span_bold(str) ("" + str + "") +#define span_boldannounce(str) ("" + str + "") +#define span_boldnotice(str) ("" + str + "") +#define span_boldwarning(str) ("" + str + "") +#define span_centcomradio(str) ("" + str + "") +#define span_changeling(str) ("" + str + "") +#define span_clown(str) ("" + str + "") +#define span_colossus(str) ("" + str + "") +#define span_command_headset(str) ("" + str + "") +#define span_comradio(str) ("" + str + "") +#define span_cult(str) ("" + str + "") +#define span_cultbold(str) ("" + str + "") +#define span_cultboldtalic(str) ("" + str + "") +#define span_cultitalic(str) ("" + str + "") +#define span_cultlarge(str) ("" + str + "") +#define span_danger(str) ("" + str + "") +#define span_deadsay(str) ("" + str + "") +#define span_deconversion_message(str) ("" + str + "") +#define span_drone(str) ("" + str + "") +#define span_engradio(str) ("" + str + "") +#define span_extremelybig(str) ("" + str + "") +#define span_ghostalert(str) ("" + str + "") +#define span_green(str) ("" + str + "") +#define span_greenannounce(str) ("" + str + "") +#define span_greenteamradio(str) ("" + str + "") +#define span_greentext(str) ("" + str + "") +#define span_hear(str) ("" + str + "") +#define span_hidden(str) ("") +#define span_hierophant(str) ("" + str + "") +#define span_hierophant_warning(str) ("" + str + "") +#define span_highlight(str) ("" + str + "") +#define span_his_grace(str) ("" + str + "") +#define span_holoparasite(str) ("" + str + "") +#define span_hypnophrase(str) ("" + str + "") +#define span_icon(str) ("" + str + "") +#define span_info(str) ("" + str + "") +#define span_interface(str) ("" + str + "") +#define span_looc(str) ("" + str + "") +#define span_medal(str) ("" + str + "") +#define span_medradio(str) ("" + str + "") +#define span_memo(str) ("" + str + "") +#define span_memoedit(str) ("" + str + "") +#define span_mind_control(str) ("" + str + "") +#define span_minorannounce(str) ("" + str + "") +#define span_monkey(str) ("" + str + "") +#define span_monkeyhive(str) ("" + str + "") +#define span_monkeylead(str) ("" + str + "") +#define span_name(str) ("" + str + "") +#define span_narsie(str) ("" + str + "") +#define span_narsiesmall(str) ("" + str + "") +#define span_nicegreen(str) ("" + str + "") +#define span_notice(str) ("" + str + "") +#define span_noticealien(str) ("" + str + "") +#define span_ooc(str) ("" + str + "") +#define span_papyrus(str) ("" + str + "") +#define span_phobia(str) ("" + str + "") +#define span_prefix(str) ("" + str + "") +#define span_purple(str) ("" + str + "") +#define span_radio(str) ("" + str + "") +#define span_reallybig(str) ("" + str + "") +#define span_red(str) ("" + str + "") +#define span_redteamradio(str) ("" + str + "") +#define span_redtext(str) ("" + str + "") +#define span_resonate(str) ("" + str + "") +#define span_revenbignotice(str) ("" + str + "") +#define span_revenboldnotice(str) ("" + str + "") +#define span_revendanger(str) ("" + str + "") +#define span_revenminor(str) ("" + str + "") +#define span_revennotice(str) ("" + str + "") +#define span_revenwarning(str) ("" + str + "") +#define span_robot(str) ("" + str + "") +#define span_rose(str) ("" + str + "") +#define span_sans(str) ("" + str + "") +#define span_sciradio(str) ("" + str + "") +#define span_secradio(str) ("" + str + "") +#define span_servradio(str) ("" + str + "") +#define span_singing(str) ("" + str + "") +#define span_slime(str) ("" + str + "") +#define span_small(str) ("" + str + "") +#define span_smallnotice(str) ("" + str + "") +#define span_smallnoticeital(str) ("" + str + "") +#define span_spider(str) ("" + str + "") +#define span_suicide(str) ("" + str + "") +#define span_suppradio(str) ("" + str + "") +#define span_swarmer(str) ("" + str + "") +#define span_syndradio(str) ("" + str + "") +#define span_tape_recorder(str) ("" + str + "") +#define span_tinynotice(str) ("" + str + "") +#define span_tinynoticeital(str) ("" + str + "") +#define span_unconscious(str) ("" + str + "") +#define span_userdanger(str) ("" + str + "") +#define span_warning(str) ("" + str + "") +#define span_yell(str) ("" + str + "") +#define span_yellowteamradio(str) ("" + str + "") \ No newline at end of file diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 24a91715a4..9dd1e0015f 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -39,7 +39,7 @@ /obj/item/weapon/xenobio/attack_self(mob/living/user as mob) if(loaded_item) user.put_in_hands(loaded_item) - user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") + user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src].")) loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) diff --git a/vorestation.dme b/vorestation.dme index 0cda4b083a..00a7892186 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -84,6 +84,7 @@ #include "code\__defines\shuttle.dm" #include "code\__defines\sound.dm" #include "code\__defines\spaceman_dmm.dm" +#include "code\__defines\span_vr.dm" #include "code\__defines\species_languages.dm" #include "code\__defines\species_languages_vr.dm" #include "code\__defines\sprite_sheets.dm" @@ -4121,6 +4122,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\tether\tether.dm" +#include "maps\virgo_minitest\virgo_minitest.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE From 0f7d581dcd4ee72f9deb6c5836287c52493f16d5 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 11 Apr 2022 20:12:35 -0400 Subject: [PATCH 2/4] Update span_vr.dm --- code/__defines/span_vr.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 4ea56d4b5d..85e9672dae 100644 --- a/code/__defines/span_vr.dm +++ b/code/__defines/span_vr.dm @@ -112,4 +112,10 @@ #define span_userdanger(str) ("" + str + "") #define span_warning(str) ("" + str + "") #define span_yell(str) ("" + str + "") -#define span_yellowteamradio(str) ("" + str + "") \ No newline at end of file +#define span_yellowteamradio(str) ("" + str + "" + +// VORE Specific stuff after this point +// Sorted by however I felt like it +#define span_game_say(str) ("" + str + "" +#define span_emote_subtle(str) ("" + str + "" +#define span_emote(str) ("" + str + "" \ No newline at end of file From 0ed24be8dd0a82719068515e94f1e7ade7e1ffc4 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 11 Apr 2022 20:17:24 -0400 Subject: [PATCH 3/4] Cleanup testcode --- code/modules/xenobio/items/weapons_vr.dm | 2 +- vorestation.dme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 9dd1e0015f..15a2dbda64 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -39,7 +39,7 @@ /obj/item/weapon/xenobio/attack_self(mob/living/user as mob) if(loaded_item) user.put_in_hands(loaded_item) - user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src].")) + user.visible_message(span_notice("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) diff --git a/vorestation.dme b/vorestation.dme index 00a7892186..7cb5f402df 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4122,6 +4122,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\virgo_minitest\virgo_minitest.dm" +#include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE From bc85d8eac4490ff2d057ecf37fb01dea5c5d0c19 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 11 Apr 2022 20:25:45 -0400 Subject: [PATCH 4/4] Update weapons_vr.dm --- code/modules/xenobio/items/weapons_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 15a2dbda64..24a91715a4 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -39,7 +39,7 @@ /obj/item/weapon/xenobio/attack_self(mob/living/user as mob) if(loaded_item) user.put_in_hands(loaded_item) - user.visible_message(span_notice("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") + user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1)