mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
[NO GBP] more tablet additions (#66358)
About The Pull Request
actually makes the damn action button for the flashlight on your device work, as well as fixing clown/silicon/mime names properly showing up
fixes not chunky finger people not being able to use pdas
Why It's Good For The Game
tweaks to make the tablet more user friendly
Changelog
cl
fix: actually makes the flashlight action button work, and fixes silicon/clown/mime names showing up properly on tablets/messenger
/cl
This commit is contained in:
@@ -55,6 +55,9 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
|
||||
var/saved_identification = null // next two values are the currently imprinted id and job values
|
||||
var/saved_job = null
|
||||
|
||||
/// Allow people with chunky fingers to use?
|
||||
var/allow_chunky = FALSE
|
||||
|
||||
var/honkamnt = 0 /// honk honk honk honk honk honkh onk honkhnoohnk
|
||||
|
||||
var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with.
|
||||
@@ -68,6 +71,8 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
|
||||
|
||||
var/obj/item/paicard/pai = null
|
||||
|
||||
var/datum/action/item_action/toggle_computer_light/light_butt
|
||||
|
||||
/obj/item/modular_computer/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -81,6 +86,8 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
|
||||
soundloop = new(src, enabled)
|
||||
if(id)
|
||||
id.UpdateDisplay()
|
||||
if(has_light)
|
||||
light_butt = new(src)
|
||||
update_appearance()
|
||||
Add_Messenger()
|
||||
|
||||
@@ -100,10 +107,19 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
|
||||
|
||||
if(istype(pai))
|
||||
QDEL_NULL(pai)
|
||||
if(istype(light_butt))
|
||||
QDEL_NULL(light_butt)
|
||||
|
||||
physical = null
|
||||
return ..()
|
||||
|
||||
/obj/item/modular_computer/ui_action_click(mob/user, actiontype)
|
||||
if(istype(actiontype, light_butt))
|
||||
toggle_flashlight()
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/modular_computer/pre_attack_secondary(atom/A, mob/living/user, params)
|
||||
if(active_program?.tap(A, user, params))
|
||||
user.do_attack_animation(A) //Emulate this animation since we kill the attack in three lines
|
||||
@@ -527,6 +543,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
|
||||
set_light(comp_light_luminosity, 1, comp_light_color)
|
||||
else
|
||||
set_light(0)
|
||||
update_appearance()
|
||||
return TRUE
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
|
||||
// Operates TGUI
|
||||
/obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui)
|
||||
if(issilicon(user)) // silicons have some issues regarding real_name
|
||||
saved_identification = user.real_name
|
||||
if(!enabled)
|
||||
if(ui)
|
||||
ui.close()
|
||||
@@ -15,7 +13,7 @@
|
||||
ui.close()
|
||||
return
|
||||
|
||||
if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS))
|
||||
if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS) && !allow_chunky)
|
||||
to_chat(user, span_warning("Your fingers are too big to use this right now!"))
|
||||
return
|
||||
|
||||
|
||||
@@ -212,6 +212,14 @@
|
||||
insert_type = /obj/item/pen/fountain
|
||||
display_overlays = FALSE
|
||||
|
||||
/obj/item/modular_computer/tablet/pda/curator/Initialize(mapload)
|
||||
. = ..()
|
||||
var/obj/item/computer_hardware/hard_drive/hdd = all_components[MC_HDD]
|
||||
|
||||
if(hdd)
|
||||
for(var/datum/computer_file/program/messenger/msg in hdd.stored_files)
|
||||
msg.allow_emojis = TRUE
|
||||
|
||||
/obj/item/modular_computer/tablet/pda/syndicate
|
||||
name = "military PDA"
|
||||
greyscale_colors = "#891417#80FF80"
|
||||
|
||||
@@ -253,6 +253,7 @@
|
||||
greyscale_colors = "#999875#a92323"
|
||||
|
||||
bypass_state = TRUE
|
||||
allow_chunky = TRUE
|
||||
|
||||
var/default_disk = 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user