Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor IS_IN_VIEWER_RECT macro parameter order #61

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
43d3185
chore: Refactor IS_IN_VIEWER_RECT macro parameter order
Superlagg Jul 18, 2024
3ffa753
Refactor IS_IN_VIEWER_RECT macro parameter order
Superlagg Jul 21, 2024
a47d594
Refactor emoticonify proc to include momchat parameter
Superlagg Jul 22, 2024
b6a252b
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Jul 22, 2024
381f926
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Jul 23, 2024
c52a351
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Jul 26, 2024
0d99123
Co-authored-by: Tk420634 <[email protected]>
Superlagg Aug 5, 2024
f37922e
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Aug 10, 2024
da53b43
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Aug 10, 2024
1d17b2e
Refactor IS_IN_VIEWER_RECT macro to correct parameter order
Superlagg Aug 10, 2024
2bc3285
chore: Add put_away_them_grippers_hooh_you_got_them_grippers variable…
Superlagg Aug 10, 2024
757ef12
Refactor CoolChat to VisualChat in preferences.dm
Superlagg Aug 11, 2024
d0b9840
Refactor say.dm to remove unnecessary comments and improve readability
Superlagg Aug 11, 2024
88be652
Refactor IS_IN_RECT to fuck your mom
Superlagg Aug 11, 2024
c8e46d6
Refactor say.dm to remove unnecessary code and improve readability
Superlagg Aug 12, 2024
d94a62b
Adds profile shaming
Superlagg Aug 13, 2024
1f5eb3d
VisualChat gets Horny
Superlagg Aug 13, 2024
af209d6
Refactor IS_IN_VIEWER_RECT for something something paramaeters
Superlagg Aug 13, 2024
a5159a0
no lobby urnst
Superlagg Aug 15, 2024
1b03a13
ghost dicks quit eavesdropping
Superlagg Aug 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions code/__DEFINES/mommychat_image_packs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@

/datum/horny_image_pack
var/packname = "Cute Coderbussies"
var/examine_host = "catbox.moe"
var/examine_url = "12345.png"
var/say_host
var/say_url
var/ask_host
var/ask_url
var/exclaim_host
var/exclaim_url
var/yell_host
var/yell_url
var/whisper_host
var/whisper_url
var/sing_host
var/sing_url

/datum/horny_image_pack/proc/ListifyPack()
var/list/pak = list(
list(
"mode" = MODE_SAY,
"host" = say_host,
"url" = say_url,
),
list(
"mode" = MODE_ASK,
"host" = ask_host,
"url" = ask_url,
),
list(
"mode" = MODE_SING,
"host" = sing_host,
"url" = sing_url,
),
list(
"mode" = MODE_EXCLAIM,
"host" = exclaim_host,
"url" = exclaim_url,
),
list(
"mode" = MODE_YELL,
"host" = yell_host,
"url" = yell_url,
),
list(
"mode" = MODE_WHISPER,
"host" = whisper_host,
"url" = whisper_url,
),
list(
"mode" = ":flirty:",
"host" = "catbox.moe",
"url" = "12345.png",
),
)
return pak





5 changes: 4 additions & 1 deletion code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@
#define CHAT_NEWBIE (1<<14)
#define CHAT_HEAR_RADIOBLURBLES (1<<15)
#define CHAT_HEAR_RADIOSTATIC (1<<16)
#define CHAT_SEE_COOLCHAT (1<<17)

#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC|CHAT_BANKCARD|CHAT_REMOTE_LOOC|CHAT_AOOC|CHAT_NEWBIE|CHAT_HEAR_RADIOBLURBLES|CHAT_HEAR_RADIOSTATIC)
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC|CHAT_BANKCARD|CHAT_REMOTE_LOOC|CHAT_AOOC|CHAT_NEWBIE|CHAT_HEAR_RADIOBLURBLES|CHAT_HEAR_RADIOSTATIC|CHAT_SEE_COOLCHAT)

#define PARALLAX_INSANE -1 //for show offs
#define PARALLAX_HIGH 0 //default.
Expand Down Expand Up @@ -162,6 +163,7 @@ GLOBAL_LIST_INIT(undie_position_strings, list("Under Clothes", "Over Clothes", "
#define PMR_DAN_MESSED_UP_CHATPREFS "chatprefs" // Player Master Changelog
#define PMR_ADDED_RADIO_BLURBLES "CHAT_HEAR_RADIOBLURBLES" // Player Master Changelog
#define PMR_ADDED_RADIO_STATIC "PMR_ADDED_RADIO_STATIC" // Player Master Changelog
#define PMR_ADDED_COOLCHAT "fill-me-to-the-brimcon" // Player Master Changelog

/// The master Preferences Changelog to check the player's prefs against.
/// includes a list of actions that need to be taken to update the player's prefs.
Expand All @@ -170,4 +172,5 @@ GLOBAL_LIST_INIT(undie_position_strings, list("Under Clothes", "Over Clothes", "
PMR_ADDED_RADIO_STATIC,\
PMR_ADDED_RADIO_BLURBLES,\
PMR_DAN_MESSED_UP_CHATPREFS,\
PMR_ADDED_COOLCHAT,\
)
1 change: 1 addition & 0 deletions code/__DEFINES/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
#define MODE_ASK "ask"
#define MODE_EXCLAIM "exclaim"
#define MODE_YELL "yell"
#define MODE_PROFILE_PIC "Profile / Examine" // if you rename this, Rename the string that appears in HornyChat.js

GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_COMMON = FREQ_COMMON,
Expand Down
12 changes: 5 additions & 7 deletions code/__DEFINES/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,11 @@
\n\
- @ moves your name to that position in emotes and subtles. \n\
\n\
- ! at the start of a radio comm to emote over the radio \n\

\n\
We have added the following emoticons to say, add them to the end of your 'say' messages for say verb variation \n\
:), :(, :D, ;D, :P, :O, :|, :/, :S, :*, :3, :>, :<, :C, :L, <3, :X, :#, :$, \n\
:@, :^), :&, :!, :?, B^U, :B, :J, >:(, >:D, >:P, >:3, >:O, >:|, >:/, >:S, \n\
"
- ! at the start of a radio comm to emote over the radio "
// \n
// We have added the following emoticons to say, add them to the end of your 'say' messages for say verb variation \n
// :), :(, :D, ;D, :P, :O, :|, :/, :S, :*, :3, :>, :<, :C, :L, <3, :X, :#, :$, \n
// :@, :^), :&, :!, :?, B^U, :B, :J, >:(, >:D, >:P, >:3, >:O, >:|, >:/, >:S, \n
//Dan is the best, <3 ~TK
//put space before the \ so it reads properly
// use \ for readability, but one big line. \n for a new line. \n\ for a new line and readability.
1 change: 1 addition & 0 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
#define INIT_ORDER_DEMO -99 // o avoid a bunch of changes related to initialization being written, do this last
#define INIT_ORDER_CHAT -100 //Should be last to ensure chat remains smooth during init.
#define INIT_ORDER_INTERACTIONS -150
#define INIT_ORDER_RENTALS -160

// Subsystem fire priority, from lowest to highest priority
// If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/voreconstants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,4 @@ GLOBAL_LIST_INIT(prey_release_sounds, list(
#define ADMIN_CHAT_FILTER_DMS "ADMIN_CHAT_FILTER_DMS"

#define SEE_FANCY_OFF_SCREEN_RUNECHAT "SEE_FANCY_OFF_SCREEN_RUNECHAT"
#define SHOW_ME_HORNY_FURRIES "SHOW_ME_HORNY_FURRIES"
4 changes: 3 additions & 1 deletion code/__HELPERS/game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,10 @@ GLOBAL_LIST_EMPTY(chat_chuds)
dingus:
for(var/client/C in GLOB.clients)
var/mob/M = C.mob
if(isnewplayer(M))
continue dingus // quit talkin to ghosts, unless ur an admeme
var/turf/viewer_turf = get_turf(M)
if(source_turf.z != viewer_turf.z)
if(source_turf.z != viewer_turf.z) // TODO: let people yell up stairs
continue dingus
var/westest = max(viewer_turf.x - 9, 1)
var/eastest = min(viewer_turf.x + 9, world.maxx)
Expand Down
7 changes: 5 additions & 2 deletions code/__HELPERS/text.dm
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,10 @@ GLOBAL_LIST_INIT(hex_6toc, list("6","7","8","9","a","b","c"))
return replacetext(text, keyword, span_color(keyword, color))

///does both of above, for chat log coloring of player messages.
/proc/color_for_chatlog(text, color, name)
/proc/color_for_chatlog(text, color, name, datum/rental_mommy/chat/momchat)
var/out = color_keyword(text, color, name)
out = alternating_color_span(out, color, "\"", FALSE)
return out
. = out
if(momchat) // do it again, but this time with all our dumb vars
momchat.speakername = color_keyword(momchat.speakername, color, name)
momchat.message = alternating_color_span(momchat.message_langtreated_spanned_quotes, color, "\"", FALSE)
8 changes: 4 additions & 4 deletions code/_onclick/hud/ghost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
using.hud = src
static_inventory += using

using = new /atom/movable/screen/ghost/character_directory()
using.screen_loc = ui_ghost_char_dir // THIS IS A DEFINE!!!
using.hud = src
static_inventory += using
// using = new /atom/movable/screen/ghost/character_directory()
// using.screen_loc = ui_ghost_char_dir // THIS IS A DEFINE!!!
// using.hud = src
// static_inventory += using

using = new /atom/movable/screen/language_menu
using.icon = ui_style // THIS IS A DEFINE!!!
Expand Down
6 changes: 3 additions & 3 deletions code/_onclick/hud/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,9 @@
newbie_hud_button.hud = src
infodisplay += newbie_hud_button

chardir_hud_button = new /atom/movable/screen/chardir_hud_button()
chardir_hud_button.hud = src
infodisplay += chardir_hud_button
// chardir_hud_button = new /atom/movable/screen/chardir_hud_button()
// chardir_hud_button.hud = src
// infodisplay += chardir_hud_button

// pvp_focus_toggle = new /atom/movable/screen/pvp_focus_toggle()
// pvp_focus_toggle.hud = src
Expand Down
Loading
Loading