Skip to content

Commit

Permalink
Refactor IS_IN_VIEWER_RECT for something something paramaeters
Browse files Browse the repository at this point in the history
  • Loading branch information
Superlagg committed Aug 13, 2024
1 parent 1f5eb3d commit af209d6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions code/controllers/subsystem/chat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/grope_kiss.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 += "<p>[SSchat.PreviewHornyFurryDatingSimMessage(user, null, message2say2, FALSE)]</p>"
msgmess += "<p>[SSchat.PreviewHornyFurryDatingSimMessage(C.mob, null, message2say2, FALSE)]</p>"
perp_previewmsgs += list(list("Mode" = msgmode, "Message" = msgmess))
var/list/monkey = list(
"PerpCKEY" = their_ckey,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {"<img src='[SSchat.GetPicForMode(usr, MODE_PROFILE_PIC)]'>"}
var/dat = {"<img src='[SSchat.GetPicForMode(src, MODE_PROFILE_PIC)]'>"}
var/datum/browser/popup = new(usr, "enlargeImage", "Full Sized Picture!",1024,1024)
popup.set_content(dat)
popup.open()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/say_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit af209d6

Please sign in to comment.