From dbe6fe04d7c2edac7c1490db94b2ab500e597ddd Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 18 Oct 2020 01:58:44 +0200 Subject: [PATCH 1/5] Adds mob variable to handle hiding/showing wings --- code/modules/mob/living/carbon/human/human_defines_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index 9316b90e889..3a52565d084 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -9,6 +9,7 @@ var/impersonate_bodytype //For impersonating a bodytype var/ability_flags = 0 //Shadekin abilities/potentially other species-based? var/sensorpref = 5 //Suit sensor loadout pref + var/wings_hidden = FALSE /mob/living/carbon/human/proc/shadekin_get_energy() var/datum/species/shadekin/SK = species @@ -48,4 +49,4 @@ if(!istype(SK)) return 0 - SK.set_energy(src, SK.get_energy(src) + amount) \ No newline at end of file + SK.set_energy(src, SK.get_energy(src) + amount) From 2df5a8d6c5d31f0bcdb6ed9427cb1a00bdd2eaa2 Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 18 Oct 2020 02:06:59 +0200 Subject: [PATCH 2/5] Adds verb to show/hide wings --- code/modules/mob/living/carbon/human/emote_vr.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 2be90ec8dce..64a05ee2757 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -247,3 +247,10 @@ set desc = "Switch tail layer on top." tail_alt = !tail_alt update_tail_showing() + +/mob/living/carbon/human/verb/hide_wings_vr() + set name = "Show/Hide wings" + set category = "IC" + set desc = "Hide your wings, or show them if you already hid them." + wings_hidden = !wings_hidden + update_wing_showing() From 93682a47439532946d0589cb807fa64976e0268e Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 18 Oct 2020 02:08:30 +0200 Subject: [PATCH 3/5] Adds functionality to hide_wings_vr verb --- code/modules/mob/living/carbon/human/update_icons_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons_vr.dm b/code/modules/mob/living/carbon/human/update_icons_vr.dm index 45a5690ae64..df2c5b0d11c 100644 --- a/code/modules/mob/living/carbon/human/update_icons_vr.dm +++ b/code/modules/mob/living/carbon/human/update_icons_vr.dm @@ -3,13 +3,13 @@ return //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) + if((synthetic && synthetic.includes_wing && !wing_style) && !wings_hidden) var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(wing_s) //If you have custom wings selected - if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) + if((wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) && wings_hidden) var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) From 68ed68ddfc4f0a5ab4edfff2e963d02438e45e0a Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 18 Oct 2020 02:25:21 +0200 Subject: [PATCH 4/5] Fixes wings_hidden having wrong logic Caused wings not to show on character setup, making hidden wings default. Made it so non-hidden wings (aka, current wings) are default. --- code/modules/mob/living/carbon/human/update_icons_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/update_icons_vr.dm b/code/modules/mob/living/carbon/human/update_icons_vr.dm index df2c5b0d11c..d05f8afa222 100644 --- a/code/modules/mob/living/carbon/human/update_icons_vr.dm +++ b/code/modules/mob/living/carbon/human/update_icons_vr.dm @@ -9,7 +9,7 @@ return image(wing_s) //If you have custom wings selected - if((wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) && wings_hidden) + if((wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) && !wings_hidden) var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) From ab8c120ff2ae2bf4f90c448779e54a98ff4eb12c Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 18 Oct 2020 02:48:42 +0200 Subject: [PATCH 5/5] Makes hiding/showing wings visible in chat. --- code/modules/mob/living/carbon/human/emote_vr.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 64a05ee2757..6a3e65b880e 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -254,3 +254,10 @@ set desc = "Hide your wings, or show them if you already hid them." wings_hidden = !wings_hidden update_wing_showing() + var/message = "" + if(!wings_hidden) + message = "reveals their wings!" + else + message = "hides their wings." + visible_message("[src] [message]") +