Skip to content

Commit

Permalink
Button Adjustments and some other stuff
Browse files Browse the repository at this point in the history
Adds who button, removes langauge button, also fixes an old merp bug
  • Loading branch information
Tk420634 committed Dec 24, 2024
1 parent c6aa317 commit 5e7edcd
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 11 deletions.
2 changes: 1 addition & 1 deletion code/_onclick/hud/_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#define ui_combat_toggle "WEST+7:16,SOUTH:2"
#define ui_zonesel "WEST+7:16,SOUTH:3"
#define ui_crafting "WEST+6:-15,SOUTH+1:1"
#define ui_building "WEST+5:-14,SOUTH+1:1"
#define ui_building "WEST+5:1,SOUTH+1:1"
#define ui_language_menu "WEST+5:1,SOUTH+1:1"


Expand Down
2 changes: 2 additions & 0 deletions code/_onclick/hud/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/newbie_hud_button
var/atom/movable/screen/chardir_hud_button
var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle
var/atom/movable/screen/who
var/atom/movable/screen/flirt_hud_button
var/atom/movable/screen/merp_button
var/atom/movable/screen/erp_button
Expand Down Expand Up @@ -148,6 +149,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
chardir_hud_button = null
pvp_focus_toggle = null
flirt_hud_button = null
who = null
merp_button = null
erp_button = null
vore_button = null
Expand Down
16 changes: 10 additions & 6 deletions code/_onclick/hud/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@
var/atom/movable/screen/using
var/atom/movable/screen/inventory/inv_box

using = new/atom/movable/screen/language_menu
using.icon = ui_style
if(!widescreenlayout) // CIT CHANGE
using.screen_loc = ui_boxlang // CIT CHANGE
using.hud = src
static_inventory += using
// using = new/atom/movable/screen/language_menu
// using.icon = ui_style
// if(!widescreenlayout) // CIT CHANGE
// using.screen_loc = ui_boxlang // CIT CHANGE
// using.hud = src
// static_inventory += using

using = new /atom/movable/screen/area_creator
using.icon = ui_style
Expand Down Expand Up @@ -402,6 +402,10 @@
// pvp_focus_toggle.hud = src
// infodisplay += pvp_focus_toggle

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

flirt_hud_button = new /atom/movable/screen/flirt_hud_button()
flirt_hud_button.hud = src
infodisplay += flirt_hud_button
Expand Down
9 changes: 9 additions & 0 deletions code/_onclick/hud/screen_objects/character_actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@
if(usr.client)
usr.client.show_character_directory()

/atom/movable/screen/who
name = "Who"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "who" // milhouse who
screen_loc = "WEST+8:-16, SOUTH+1:-13"

/atom/movable/screen/who/Click(location,control,params)
SSwho.Who(usr.client)

/atom/movable/screen/flirt_hud_button
name = "Flirt with people!"
icon = 'icons/mob/screen_gen.dmi'
Expand Down
Binary file modified icons/mob/screen_gen.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_sand/code/datums/interactions/_interaction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@
var/word = ""
if(LAZYLEN(wordlist))
word = trim(pick(wordlist))
if(prob(1))
if(prob(0.1))
word = "bazinga" // required for linting
message = splicetext(message, charpos, charpos2 + 1, word)
// LAZYSET(formatted_cache, cachekey, message) // for sanic speed
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/interfaces/MobInteraction.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ const Lust = (props, context) => {
const TheirMaxLust = data.TheirMaxLust || 100;
const ItsJustMe = data.ItsJustMe || false;
const MTTC = data.MTTC; // Mean Time To Cum
const CanCum = data.CanCum || false;
const CanCum = true; // data.CanCum || false;
const MyName = data.MyName || "You";
const TheirName = data.TheirName || "Them";

Expand All @@ -334,7 +334,7 @@ const Lust = (props, context) => {
const LustFGColor = "pink";

const CumButtonText = "!! C U M !!";
const AutocumText = CanCum ? "Autocum: ON" : "Autocum: OFF";
const AutocumText = data.CanCum ? "Autocum: ON" : "Autocum: OFF";
// let AutocumArray = [];
// /// run through the bitfields in AutocumFlags and assemble the appropriate text
// if(AutocumFlags) {
Expand Down Expand Up @@ -364,7 +364,7 @@ const Lust = (props, context) => {
// AutocumText += "you feel like it!";
// }

const AutocumColor = CanCum ? "green" : "default";
const AutocumColor = "green"; // CanCum ? "green" : "default";

const CelWidth = ItsJustMe ? "100%" : "50%";

Expand Down

0 comments on commit 5e7edcd

Please sign in to comment.