From af209d6e63293221d571346fdcd1db9bb0165332 Mon Sep 17 00:00:00 2001 From: Danny Kay Date: Tue, 13 Aug 2024 14:16:32 -0700 Subject: [PATCH] Refactor IS_IN_VIEWER_RECT for something something paramaeters --- code/controllers/subsystem/chat.dm | 1 + code/game/objects/grope_kiss.dm | 6 +++--- code/modules/admin/admin_verbs.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/say_vr.dm | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index 5d4c0b7119..31addc8d46 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -218,6 +218,7 @@ SUBSYSTEM_DEF(chat) spawn(5 SECONDS) to_chat(world, span_boldnotice("Initialized [LAZYLEN(emoticon_cache)] emoticons! ;D")) to_chat(world, span_boldnotice("Initialized [LAZYLEN(flirts)] flirty messages! <3")) + to_chat(world, span_boldnotice("VisualChat engaged! Have a very visual day! <3")) // to_chat(world, span_boldnotice("Initialized [LAZYLEN(stock_image_packs)] stock image packs! 'w'")) // /datum/controller/subsystem/chat/proc/build_stock_image_packs() diff --git a/code/game/objects/grope_kiss.dm b/code/game/objects/grope_kiss.dm index 08f4c2d824..fea0ade3b0 100644 --- a/code/game/objects/grope_kiss.dm +++ b/code/game/objects/grope_kiss.dm @@ -911,7 +911,7 @@ GLOBAL_LIST_EMPTY(shotglass_gropers) var/watTsee = make_message_for_target(doer, target, actions, tense, LAZYACCESS(partname, 1)) var/watEsee = make_message_for_everyone(doer, target, actions, tense, LAZYACCESS(partname, 1)) var/watIsee = make_message_for_myself_to_me(doer, target, actions, tense, LAZYACCESS(partname, 1)) - var/watYEsee = make_message_for_myself_to_others(doer, target, actions, tense, LAZYACCESS(partname, 1)) + var/watYEsee = make_message_for_myself_to_others(doer, target, actions, tense, LAZYACCESS(partname, 1)) // catch the wave! if(target == doer) playsound(doer, snd, 50, TRUE) to_chat(doer, span_love(watIsee)) @@ -1071,8 +1071,8 @@ GLOBAL_LIST_EMPTY(shotglass_gropers) return "side" else if(turnt == dirTarg) - return "back" - return "front" + return "front" + return "back" /// now, check a special ring of turfs around the target var/list/turfz = list() turfz.len = 8 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 36a70c26a9..1c04323972 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1480,9 +1480,9 @@ GLOBAL_DATUM_INIT(vap, /datum/visualchat_admin_panel, new) a custom message mode. The mode is set to [replacetext(msgmode, ":","")]. If the previous sentence was \ cut off, please make a note of it. Cool huh? And now I'm done. Hi. [msgmode]" message2say2 = "[msgmode]" - var/msgmess = SSchat.PreviewHornyFurryDatingSimMessage(user, null, message2say, FALSE) + var/msgmess = SSchat.PreviewHornyFurryDatingSimMessage(C.mob, null, message2say, FALSE) if(message2say2) - msgmess += "

[SSchat.PreviewHornyFurryDatingSimMessage(user, null, message2say2, FALSE)]

" + msgmess += "

[SSchat.PreviewHornyFurryDatingSimMessage(C.mob, null, message2say2, FALSE)]

" perp_previewmsgs += list(list("Mode" = msgmode, "Message" = msgmess)) var/list/monkey = list( "PerpCKEY" = their_ckey, diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 678fbfc1b7..dd95f39356 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -341,7 +341,7 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0) // Gremling is just gonna do gremlin things and add this here > w> Cant be assed trying to fit this in somewhere else for now. if(href_list["enlargeImage"]) - var/dat = {""} + var/dat = {""} var/datum/browser/popup = new(usr, "enlargeImage", "Full Sized Picture!",1024,1024) popup.set_content(dat) popup.open() diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 7e492b1eca..f2e46927fb 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -33,12 +33,12 @@ //mob_type_blacklist_typecache = list(/mob/living/brain) var/subtler = FALSE message_range = 1 + mommychat_partial = FALSE // full blown /datum/emote/living/subtle/subtler key = "subtler" key_third_person = "subtler" subtler = TRUE - mommychat_partial = FALSE // full blown /datum/emote/living/subtle/proc/check_invalid(mob/user, input) if(stop_bad_mime.Find(input, 1, 1)) @@ -101,7 +101,7 @@ //broadcast to ghosts, if they have a client, are dead, arent in the lobby, allow ghostsight, and, if subtler, are admemes user.emote_for_ghost_sight(message, subtler, message_range) - playsound(get_turf(user), 'sound/f13effects/sunsetsounds/blush.ogg', 80, FALSE, -14,) + playsound(get_turf(user), 'sound/f13effects/sunsetsounds/blush.ogg', 80, FALSE, SOUND_DISTANCE(2)) ///////////////// VERB CODE /mob/living/proc/subtle_keybind()