From 0c3fa4743ce940497b835899e96ab816e0ba45bb Mon Sep 17 00:00:00 2001 From: David Winters Date: Sat, 6 Jun 2020 07:34:04 -0400 Subject: [PATCH 1/7] Minor typo fixes Cowled vests aren't from the future anymore W isn't a vowel anymore De-russian'd syntax in webbing/drop-pouches description --- code/modules/clothing/under/accessories/clothing.dm | 2 +- code/modules/clothing/under/accessories/storage.dm | 8 ++++---- code/modules/mob/living/carbon/human/emote_vr.dm | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index bee36652833..1a2b0896ea9 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -383,7 +383,7 @@ /obj/item/clothing/accessory/cowledvest name = "cowled vest" - desc = "A body warmer for the 26th century." + desc = "A body warmer for the 24th century." icon_state = "cowled_vest" /obj/item/clothing/accessory/asymmetric diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index f3fd40fa009..96efdeb5d39 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -57,7 +57,7 @@ /obj/item/clothing/accessory/storage/black_vest name = "black webbing vest" - desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands." + desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in your hands." icon_state = "vest_black" /obj/item/clothing/accessory/storage/brown_vest @@ -73,19 +73,19 @@ /obj/item/clothing/accessory/storage/black_drop_pouches name = "black drop pouches" gender = PLURAL - desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in hands." + desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in your hands." icon_state = "thigh_black" /obj/item/clothing/accessory/storage/brown_drop_pouches name = "brown drop pouches" gender = PLURAL - desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in hands." + desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in your hands." icon_state = "thigh_brown" /obj/item/clothing/accessory/storage/white_drop_pouches name = "white drop pouches" gender = PLURAL - desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in hands." + desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in your hands." icon_state = "thigh_white" /obj/item/clothing/accessory/storage/knifeharness diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7df6e169fa8..7e118f883ae 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -40,11 +40,11 @@ playsound(src, 'sound/voice/growl.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof") m_type = 2 - message = "lets out an woof." + message = "lets out a woof." playsound(src, 'sound/voice/woof.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof2") m_type = 2 - message = "lets out an woof." + message = "lets out a woof." playsound(src, 'sound/voice/woof2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("nya") message = "lets out a nya." @@ -164,7 +164,7 @@ message = "does a flip!" m_type = 1 if("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, mrowl, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") return TRUE if(message) From 5bd37da557d7a3474c7f77c92e8eb3c1af415427 Mon Sep 17 00:00:00 2001 From: David Winters Date: Mon, 8 Jun 2020 05:19:15 -0400 Subject: [PATCH 2/7] VSEdit clothing.dm --- code/modules/clothing/under/accessories/clothing.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 1a2b0896ea9..50c2f78d7fd 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -381,10 +381,12 @@ // End of sweaters //*** +//VOREStation edit (Date) /obj/item/clothing/accessory/cowledvest name = "cowled vest" desc = "A body warmer for the 24th century." icon_state = "cowled_vest" +//VSEdit end /obj/item/clothing/accessory/asymmetric name = "blue asymmetrical jacket" From c909d1ab1b49bdfe27a98077778f959f46c96d64 Mon Sep 17 00:00:00 2001 From: David Winters Date: Tue, 7 Jul 2020 13:44:07 -0400 Subject: [PATCH 3/7] Revert "Minor typo fixes" This reverts commit 0c3fa4743ce940497b835899e96ab816e0ba45bb. --- code/modules/clothing/under/accessories/clothing.dm | 2 +- code/modules/clothing/under/accessories/storage.dm | 8 ++++---- code/modules/mob/living/carbon/human/emote_vr.dm | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 50c2f78d7fd..fc46eb4017f 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -384,7 +384,7 @@ //VOREStation edit (Date) /obj/item/clothing/accessory/cowledvest name = "cowled vest" - desc = "A body warmer for the 24th century." + desc = "A body warmer for the 26th century." icon_state = "cowled_vest" //VSEdit end diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 96efdeb5d39..f3fd40fa009 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -57,7 +57,7 @@ /obj/item/clothing/accessory/storage/black_vest name = "black webbing vest" - desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in your hands." + desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands." icon_state = "vest_black" /obj/item/clothing/accessory/storage/brown_vest @@ -73,19 +73,19 @@ /obj/item/clothing/accessory/storage/black_drop_pouches name = "black drop pouches" gender = PLURAL - desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in your hands." + desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in hands." icon_state = "thigh_black" /obj/item/clothing/accessory/storage/brown_drop_pouches name = "brown drop pouches" gender = PLURAL - desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in your hands." + desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in hands." icon_state = "thigh_brown" /obj/item/clothing/accessory/storage/white_drop_pouches name = "white drop pouches" gender = PLURAL - desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in your hands." + desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in hands." icon_state = "thigh_white" /obj/item/clothing/accessory/storage/knifeharness diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7e118f883ae..7df6e169fa8 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -40,11 +40,11 @@ playsound(src, 'sound/voice/growl.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof") m_type = 2 - message = "lets out a woof." + message = "lets out an woof." playsound(src, 'sound/voice/woof.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof2") m_type = 2 - message = "lets out a woof." + message = "lets out an woof." playsound(src, 'sound/voice/woof2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("nya") message = "lets out a nya." @@ -164,7 +164,7 @@ message = "does a flip!" m_type = 1 if("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, mrowl, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") return TRUE if(message) From ab10ff2f8cea6a020f6afe0db1e5527487d3ad28 Mon Sep 17 00:00:00 2001 From: David Winters Date: Tue, 7 Jul 2020 13:46:27 -0400 Subject: [PATCH 4/7] Removed drop pouches edit --- code/modules/clothing/under/accessories/clothing.dm | 2 +- code/modules/mob/living/carbon/human/emote_vr.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index fc46eb4017f..50c2f78d7fd 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -384,7 +384,7 @@ //VOREStation edit (Date) /obj/item/clothing/accessory/cowledvest name = "cowled vest" - desc = "A body warmer for the 26th century." + desc = "A body warmer for the 24th century." icon_state = "cowled_vest" //VSEdit end diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7df6e169fa8..85f97a78afb 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -40,11 +40,11 @@ playsound(src, 'sound/voice/growl.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof") m_type = 2 - message = "lets out an woof." + message = "lets out a woof." playsound(src, 'sound/voice/woof.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof2") m_type = 2 - message = "lets out an woof." + message = "lets out a woof." playsound(src, 'sound/voice/woof2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("nya") message = "lets out a nya." From 048ede477328d61bcebbbc2f7d2b5b8943f03b94 Mon Sep 17 00:00:00 2001 From: David Winters Date: Tue, 7 Jul 2020 13:52:41 -0400 Subject: [PATCH 5/7] added missing emote to *vhelp --- code/modules/mob/living/carbon/human/emote_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 85f97a78afb..7e118f883ae 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -164,7 +164,7 @@ message = "does a flip!" m_type = 1 if("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, mrowl, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, nsay, nme, flip") return TRUE if(message) From 1392eec74f018d4ac1609ed86ce78988696081da Mon Sep 17 00:00:00 2001 From: David Winters Date: Tue, 7 Jul 2020 13:58:14 -0400 Subject: [PATCH 6/7] Actually remembered to fill in the date God, am I bad at this. --- code/modules/clothing/under/accessories/clothing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 50c2f78d7fd..a0f637084a7 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -381,7 +381,7 @@ // End of sweaters //*** -//VOREStation edit (Date) +//VOREStation edit 7/7/20 /obj/item/clothing/accessory/cowledvest name = "cowled vest" desc = "A body warmer for the 24th century." From 9e72efca03cc1c5ff96397300d82c7830898d9fe Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 27 Jul 2020 01:43:56 -0400 Subject: [PATCH 7/7] Update clothing.dm --- code/modules/clothing/under/accessories/clothing.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index a0f637084a7..4cf239f9856 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -381,12 +381,10 @@ // End of sweaters //*** -//VOREStation edit 7/7/20 /obj/item/clothing/accessory/cowledvest name = "cowled vest" - desc = "A body warmer for the 24th century." + desc = "A body warmer for the 24th century." //VOREStation Edit icon_state = "cowled_vest" -//VSEdit end /obj/item/clothing/accessory/asymmetric name = "blue asymmetrical jacket" @@ -401,4 +399,4 @@ /obj/item/clothing/accessory/asymmetric/green name = "green asymmetrical jacket" desc = "Insultingly avant-garde in aqua." - icon_state = "asym_green" \ No newline at end of file + icon_state = "asym_green"