cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

followup

Browse Source
This commit is contained in:
BongaTheProto
2023-02-16 17:04:00 -05:00
parent 972df3f711
commit b61500c13a
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/client/preferences.dm
View File

@@ -1346,6 +1346,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Announce Login:</b> <a href='?_src_=prefs;preference=announce_login'>[(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"]</a><br>"
dat += "<br>"
dat += "<b>Combo HUD Lighting:</b> <a href = '?_src_=prefs;preference=combohud_lighting'>[(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"]</a><br>"
dat += "<b>Use Modern Player Panel:</b> <a href='?_src_=prefs;preference=use_new_playerpanel'>[use_new_playerpanel ? "Yes" : "No"]</a><br>" //SPLURT Edit
//deadmin
dat += "<h2>Deadmin While Playing</h2>"

BIN
icons/emoji_32.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 20 KiB

12
modular_sand/code/datums/elements/holder_micro.dm
View File

@@ -168,10 +168,12 @@
set category = "IC"
set src in view(usr.client)
if(!src)
var/datum/component/interaction_menu_granter/menu = usr.GetComponent(/datum/component/interaction_menu_granter)
if(!menu)
to_chat(usr, span_warning("You must have done something really bad to not have an interaction component."))
return
if(!src)
to_chat(usr, span_warning("Your interaction target is gone!"))
return
var/datum/component/interaction_menu_granter/menu = held_mob.GetComponent(/datum/component/interaction_menu_granter)
if(menu)
menu.open_menu(usr, src)
else // you bad
remove_verb(src, /mob/proc/interact_with)