]*)?>)((?:.|\\n)*)", ""), "$1[time] $2")
to_chat(src,msg)
else if(teleop)
to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[msg]")
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f539abbe98..c7cabffc73 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -51,6 +51,8 @@
output += "Observe
"
+ /*
+ //nobody uses this feature
if(!IsGuestKey(src.key))
establish_db_connection()
@@ -69,6 +71,7 @@
output += "Show Player Polls (NEW!)
"
else
output += "Show Player Polls
"
+ */
output += "View Changelog
"
diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm
index 201e0a6f81..cf1adc86a0 100644
--- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm
@@ -4,6 +4,8 @@
/datum/sprite_accessory/marking //Override for base markings
color_blend_mode = ICON_ADD
species_allowed = list() //This lets all races use
+ var/digitigrade_acceptance = MARKING_NONDIGI_ONLY
+ var/digitigrade_icon = 'icons/mob/human_races/markings_digi.dmi'
/datum/sprite_accessory/marking/vr_vulp_belly
name = "belly fur (Vulp)"
@@ -1128,4 +1130,105 @@
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "backsail"
color_blend_mode = ICON_MULTIPLY
- body_parts = list(BP_TORSO)
\ No newline at end of file
+ body_parts = list(BP_TORSO)
+
+//Digitigrade markings
+/datum/sprite_accessory/marking/digi
+ icon = 'icons/mob/human_races/markings_digi.dmi'
+ digitigrade_acceptance = MARKING_DIGITIGRADE_ONLY
+
+/datum/sprite_accessory/marking/digi/fullleft
+ name = "Digitigrade Full Left Leg(Only works with digitigrade legs)"
+ icon_state = "full"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/fullright
+ name = "Digitigrade Full Right Leg(Only works with digitigrade legs)"
+ icon_state = "full"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/longsockleft
+ name = "Digitigrade Long Socks Left(Only works with digitigrade legs)"
+ icon_state = "longsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/longsockright
+ name = "Digitigrade Long Socks Right(Only works with digitigrade legs)"
+ icon_state = "longsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/medsockleft
+ name = "Digitigrade Medium Socks Left(Only works with digitigrade legs)"
+ icon_state = "medsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/medsockright
+ name = "Digitigrade Medium Socks Right(Only works with digitigrade legs)"
+ icon_state = "medsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/shortsockleft
+ name = "Digitigrade Short Socks Left(Only works with digitigrade legs)"
+ icon_state = "shortsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/shortsockright
+ name = "Digitigrade Short Socks Right(Only works with digitigrade legs)"
+ icon_state = "shortsock"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/toesleft
+ name = "Digitigrade Toes Left(Only works with digitigrade legs)"
+ icon_state = "toes"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/toesright
+ name = "Digitigrade Toes Right(Only works with digitigrade legs)"
+ icon_state = "toes"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/stripesleft
+ name = "Digitigrade Stripes Left(Only works with digitigrade legs)"
+ icon_state = "stripes"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/stripesright
+ name = "Digitigrade Stripes Right(Only works with digitigrade legs)"
+ icon_state = "stripes"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/smallspotsleft
+ name = "Digitigrade Small Spots Left(Only works with digitigrade legs)"
+ icon_state = "smallspots"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/smallspotsright
+ name = "Digitigrade Small Spots Right(Only works with digitigrade legs)"
+ icon_state = "smallspots"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/digi/bigspotsleft
+ name = "Digitigrade Big Spots Left(Only works with digitigrade legs)"
+ icon_state = "bigspots"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/digi/bigspotsright
+ name = "Digitigrade Big Spots Right(Only works with digitigrade legs)"
+ icon_state = "bigspots"
+ color_blend_mode = ICON_MULTIPLY
+ body_parts = list(BP_R_LEG,BP_R_FOOT)
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index b22ee48e98..76283cdf51 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -45,6 +45,8 @@
var/body_hair // Icon blend for body hair if any.
var/mob/living/applied_pressure
var/list/markings = list() // Markings (body_markings) to apply to the icon
+ var/skip_robo_icon = FALSE //to force it to use the normal species icon
+ var/digi_prosthetic = FALSE //is it a prosthetic that can be digitigrade
// Wound and structural data.
var/wound_update_accuracy = 1 // how often wounds should be updated, a higher number means less often
@@ -201,6 +203,12 @@
O = O.parent
return 0
+//new function to check for markings
+/obj/item/organ/external/proc/is_hidden_by_markings()
+ for(var/M in markings)
+ var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
+ if(istype(mark_style,/datum/sprite_accessory/marking) && (organ_tag in mark_style.hide_body_parts))
+ return 1
/obj/item/organ/external/proc/dislocate()
if(dislocated == -1)
diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index 1c6be2a3e3..7304bb126a 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -81,6 +81,17 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
+ var/digitigrade = 0
+
+ // preferentially take digitigrade value from owner if available, THEN DNA.
+ // this allows limbs to be set properly when being printed in the bioprinter without an owner
+ // this also allows the preview mannequin to update properly because customisation topic calls don't call a DNA check
+ var/check_digi = istype(src,/obj/item/organ/external/leg) || istype(src,/obj/item/organ/external/foot)
+ if(owner)
+ digitigrade = check_digi && owner.digitigrade
+ else if(dna)
+ digitigrade = check_digi && dna.digitigrade
+
for(var/M in markings)
if (!markings[M]["on"])
continue
@@ -139,8 +150,12 @@ var/global/list/limb_icon_cache = list()
mob_icon = new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]")
should_apply_transparency = TRUE
apply_colouration(mob_icon)
+ else if(is_hidden_by_markings())
+ mob_icon = new /icon('icons/mob/human_races/r_blank.dmi', "[icon_name][gender ? "_[gender]" : ""]")
+ should_apply_transparency = TRUE
else
- mob_icon = new /icon(species.get_icobase(owner, (status & ORGAN_MUTATED)), "[icon_name][gender ? "_[gender]" : ""]")
+ //Use digi icon if digitigrade, otherwise use regular icon. Ternary operator is based.
+ mob_icon = new /icon(digitigrade ? species.icodigi : species.get_icobase(owner, (status & ORGAN_MUTATED)), "[icon_name][gender ? "_[gender]" : ""]")
should_apply_transparency = TRUE
apply_colouration(mob_icon)
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index e0408d024c..50d7cca9e7 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -147,6 +147,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
SPECIES_VR_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi',
)
if(7) icon = 'icons/obj/pda_slider.dmi' //VOREStation edit
+ if(8)
+ icon = 'icons/obj/pda_vintage.dmi'
+ desc = "A vintage communication device. This device has been refitted for compatibility with modern messaging systems, ROM cartridges and ID cards. Despite its heavy modifications it does not feature voice communication."
+
else
icon = 'icons/obj/pda_old.dmi'
log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
diff --git a/code/modules/projectiles/guns/launcher/confetti.dm b/code/modules/projectiles/guns/launcher/confetti.dm
new file mode 100644
index 0000000000..3d23b19385
--- /dev/null
+++ b/code/modules/projectiles/guns/launcher/confetti.dm
@@ -0,0 +1,105 @@
+//The confetti cannon is a simple weapon meant to be a toy. You shoot confetti at people and it makes a funny sound. Don't give this any combat use.
+/obj/item/weapon/gun/launcher/confetti_cannon
+ name = "confetti cannon"
+ desc = "For those times when you absolutely need colored paper everywhere."
+ icon = 'icons/obj/weapons_vr.dmi'
+ icon_state = "confetti_cannon"
+ item_state = "confetti_cannon"
+ w_class = ITEMSIZE_NORMAL
+ origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 2)
+ throw_distance = 7
+ release_force = 5
+ var/obj/item/weapon/grenade/confetti/party_ball/chambered = null
+
+ var/confetti_charge = 0
+ var/max_confetti = 20
+
+/obj/item/weapon/gun/launcher/confetti_cannon/examine(mob/user)
+ . = ..()
+ if(get_dist(user, src) <= 2)
+ . += "It's loaded with [confetti_charge] ball\s of confetti."
+
+/obj/item/weapon/gun/launcher/confetti_cannon/attackby(obj/item/I as obj, mob/user as mob)
+ if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/shreddedp))
+ if(confetti_charge < max_confetti)
+ user.drop_item()
+ ++confetti_charge
+ to_chat(usr, "You put the paper in the [src].")
+ qdel(I)
+ else
+ to_chat(usr, "[src] cannot hold more paper.")
+
+/obj/item/weapon/gun/launcher/confetti_cannon/proc/pump(mob/M as mob)
+ playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+ if(!chambered)
+ if(confetti_charge)
+ chambered = new /obj/item/weapon/grenade/confetti/party_ball
+ --confetti_charge
+ to_chat(usr, "You compress a new confetti ball.")
+ else
+ to_chat(usr, "The [src] is out of confetti!")
+ else
+ to_chat(usr, "The [src] is already loaded!")
+
+/obj/item/weapon/gun/launcher/confetti_cannon/attack_self(mob/user)
+ pump(user)
+
+/obj/item/weapon/gun/launcher/confetti_cannon/consume_next_projectile()
+ if(chambered)
+ chambered.activate(null)
+ return chambered
+
+/obj/item/weapon/gun/launcher/confetti_cannon/handle_post_fire(mob/user)
+ chambered = null
+
+/obj/item/weapon/gun/launcher/confetti_cannon/overdrive
+ name = "overdrive confetti cannon"
+ desc = "For those times when you absolutely need colored paper everywhere, EVERYWHERE."
+ confetti_charge = 100
+ max_confetti = 100
+
+/obj/item/weapon/gun/launcher/confetti_cannon/fake_shottie
+ name = "horror movie shotgun"
+ desc = "The one necessary for survival of any Final Girl."
+ icon = 'icons/obj/gun2.dmi'
+ icon_state = "ithaca"
+ item_state = "ithaca"
+ confetti_charge = 20
+
+/obj/item/weapon/gun/launcher/confetti_cannon/robot
+ name = "Party Cannon"
+ desc = "Confetti, pies, banana peels, chaos!"
+
+/obj/item/weapon/gun/launcher/confetti_cannon/robot/pump(mob/M as mob)
+ playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+ if(!chambered)
+ var/choice = tgui_alert(usr, "Load the Party Canon with?", "Change What?", list("Confetti","Banana Peel","Cream Pie"))
+ if(!choice)
+ return
+ playsound(src, 'sound/effects/pop.ogg', 50, 0)
+ switch(choice)
+ if("Confetti")
+ chambered = new /obj/item/weapon/grenade/confetti/party_ball
+ to_chat(usr, "Confetti loaded.")
+ if(istype(usr,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = usr
+ R.cell.charge -= 200
+ if("Banana Peel")
+ chambered = new /obj/item/weapon/bananapeel
+ to_chat(usr, "Banana peel loaded.")
+ if(istype(usr,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = usr
+ R.cell.charge -= 200
+ if("Cream Pie")
+ chambered = new /obj/item/weapon/reagent_containers/food/snacks/pie
+ to_chat(usr, "Banana cream pie loaded.")
+ if(istype(usr,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = usr
+ R.cell.charge -= 200
+ else
+ to_chat(usr, "The [src] is already loaded!")
+
+/obj/item/weapon/gun/launcher/confetti_cannon/robot/consume_next_projectile()
+ if(istype(chambered,/obj/item/weapon/grenade/confetti/party_ball))
+ chambered.activate(null)
+ return chambered
\ No newline at end of file
diff --git a/code/modules/research/prosfab_designs_vr.dm b/code/modules/research/prosfab_designs_vr.dm
index 7cc81d794a..d5195b28ad 100644
--- a/code/modules/research/prosfab_designs_vr.dm
+++ b/code/modules/research/prosfab_designs_vr.dm
@@ -21,6 +21,12 @@
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
build_path = /obj/item/borg/upgrade/bellysizeupgrade
+/datum/design/item/prosfab/robot_upgrade/bellycapupgrade
+ name = "Robohound Capability Expansion Module"
+ id = "borg_hound_capability_module"
+ req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4)
+ materials = list(MAT_STEEL = 8000, MAT_GLASS = 6000)
+ build_path = /obj/item/borg/upgrade/bellycapupgrade
/*
Some job related borg upgrade modules, adding useful items for puppers.
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index df40634606..4e7281af6e 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -99,6 +99,11 @@
for(var/modifier_type in R.genetic_modifiers)
H.add_modifier(modifier_type)
+ //Apply legs
+ H.digitigrade = R.dna.digitigrade // ensure clone mob has digitigrade var set appropriately
+ if(H.dna.digitigrade <> R.dna.digitigrade)
+ H.dna.digitigrade = R.dna.digitigrade // ensure cloned DNA is set appropriately from record??? for some reason it doesn't get set right despite the override to datum/dna/Clone()
+
//Apply damage
H.adjustCloneLoss(H.getMaxHealth()*1.5)
H.Paralyse(4)
diff --git a/code/modules/virus2/admin.dm b/code/modules/virus2/admin.dm
index 30e673960c..687473c106 100644
--- a/code/modules/virus2/admin.dm
+++ b/code/modules/virus2/admin.dm
@@ -178,7 +178,7 @@
if("infectee")
var/list/candidates = list()
for(var/mob/living/carbon/G in living_mob_list)
- if(G.stat != DEAD && G.species)
+ if(G.stat != DEAD && G.species && !isbelly(G.loc))
if(G.species.get_bodytype() in species)
candidates["[G.name][G.client ? "" : " (no client)"]"] = G
else
diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm
index 0a89665a30..e8a275e838 100644
--- a/code/modules/virus2/disease2.dm
+++ b/code/modules/virus2/disease2.dm
@@ -284,7 +284,7 @@ var/global/list/virusDB = list()
var/list/candidates = list() //list of candidate keys
for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
+ if(G.client && G.stat != DEAD && !isbelly(G.loc))
candidates += G
if(!candidates.len) return
@@ -297,7 +297,7 @@ var/global/list/virusDB = list()
var/list/candidates = list() //list of candidate keys
for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
+ if(G.client && G.stat != DEAD && !isbelly(G.loc))
candidates += G
if(!candidates.len) return
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index e2a16c9463..4914633fa1 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1008,6 +1008,14 @@
set desc = "Switch sharp/fuzzy scaling for current mob."
appearance_flags ^= PIXEL_SCALE
fuzzy = !fuzzy
+ update_transform()
+
+/mob/living/proc/center_offset()
+ set name = "Switch center offset mode"
+ set category = "Preferences"
+ set desc = "Switch sprite center offset to fix even/odd symmetry."
+ offset_override = !offset_override
+ update_transform()
/mob/living/examine(mob/user, infix, suffix)
. = ..()
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index 15d05d269d..4229a222d8 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -856,6 +856,11 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
l.adjust_nutrition(thismuch)
ourtarget.death() // To make sure all on-death procs get properly called
if(ourtarget)
+ if(ourtarget.is_preference_enabled(/datum/client_preference/digestion_noises))
+ if(!b.fancy_vore)
+ SEND_SOUND(ourtarget, sound(get_sfx("classic_death_sounds")))
+ else
+ SEND_SOUND(ourtarget, sound(get_sfx("fancy_death_prey")))
b.handle_digestion_death(ourtarget)
if("Absorb")
if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly absorb you. Is this something you are okay with happening to you?","Instant Absorb", list("No", "Yes")) != "Yes")
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index d31348300d..7b6c39d9ab 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -3,6 +3,8 @@
/mob
var/step_mechanics_pref = TRUE // Allow participation in macro-micro step mechanics
var/pickup_pref = TRUE // Allow participation in macro-micro pickup mechanics
+ var/center_offset = 0.5 // Center offset for uneven scaling symmetry.
+ var/offset_override = FALSE // Pref toggle for center offset.
/mob/living
var/holder_default
@@ -30,9 +32,12 @@
/mob/living/update_icons()
. = ..()
ASSERT(!ishuman(src))
+ var/cent_offset = center_offset
+ if(fuzzy || offset_override || dir == EAST || dir == WEST)
+ cent_offset = 0
var/matrix/M = matrix()
M.Scale(size_multiplier * icon_scale_x, size_multiplier * icon_scale_y)
- M.Translate(0, (vis_height/2)*(size_multiplier-1))
+ M.Translate(cent_offset * size_multiplier * icon_scale_x, (vis_height/2)*(size_multiplier-1))
transform = M
/**
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index 073d91bd39..b62c4a8146 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -73,7 +73,7 @@ h1.alert, h2.alert {color: #000000;}
/* VOREStation Edit Start */
.emote {}
-.emote_subtle {font-style: italic;}
+.emotesubtle {font-style: italic;}
/* VOREStation Edit End */
/* Game Messages */
diff --git a/icons/inventory/feet/mob_digi.dmi b/icons/inventory/feet/mob_digi.dmi
new file mode 100644
index 0000000000..c2a1a9ab82
Binary files /dev/null and b/icons/inventory/feet/mob_digi.dmi differ
diff --git a/icons/inventory/suit/mob_digi.dmi b/icons/inventory/suit/mob_digi.dmi
new file mode 100644
index 0000000000..43ec6bc337
Binary files /dev/null and b/icons/inventory/suit/mob_digi.dmi differ
diff --git a/icons/inventory/uniform/mob_digi.dmi b/icons/inventory/uniform/mob_digi.dmi
new file mode 100644
index 0000000000..637e63b889
Binary files /dev/null and b/icons/inventory/uniform/mob_digi.dmi differ
diff --git a/icons/mob/human_races/markings_digi.dmi b/icons/mob/human_races/markings_digi.dmi
new file mode 100644
index 0000000000..c9f504c584
Binary files /dev/null and b/icons/mob/human_races/markings_digi.dmi differ
diff --git a/icons/mob/human_races/masks/blood_digitigrade.dmi b/icons/mob/human_races/masks/blood_digitigrade.dmi
new file mode 100644
index 0000000000..5980ce30f7
Binary files /dev/null and b/icons/mob/human_races/masks/blood_digitigrade.dmi differ
diff --git a/icons/mob/human_races/r_blank.dmi b/icons/mob/human_races/r_blank.dmi
new file mode 100644
index 0000000000..9b2fb0341d
Binary files /dev/null and b/icons/mob/human_races/r_blank.dmi differ
diff --git a/icons/mob/human_races/r_digi.dmi b/icons/mob/human_races/r_digi.dmi
new file mode 100644
index 0000000000..4a38e7155e
Binary files /dev/null and b/icons/mob/human_races/r_digi.dmi differ
diff --git a/icons/mob/human_races/r_digi_xeno.dmi b/icons/mob/human_races/r_digi_xeno.dmi
new file mode 100644
index 0000000000..fee592f02e
Binary files /dev/null and b/icons/mob/human_races/r_digi_xeno.dmi differ
diff --git a/icons/mob/human_races/r_xenomorph_hybrid.dmi b/icons/mob/human_races/r_xenomorph_hybrid.dmi
new file mode 100644
index 0000000000..811456cd1f
Binary files /dev/null and b/icons/mob/human_races/r_xenomorph_hybrid.dmi differ
diff --git a/icons/mob/robot/clerical_wide.dmi b/icons/mob/robot/clerical_wide.dmi
new file mode 100644
index 0000000000..d472990269
Binary files /dev/null and b/icons/mob/robot/clerical_wide.dmi differ
diff --git a/icons/mob/robot/crisis_large.dmi b/icons/mob/robot/crisis_large.dmi
index c15c4ee5c7..fe3eddf6ac 100644
Binary files a/icons/mob/robot/crisis_large.dmi and b/icons/mob/robot/crisis_large.dmi differ
diff --git a/icons/mob/robot/protector_wide.dmi b/icons/mob/robot/protector_wide.dmi
new file mode 100644
index 0000000000..7028585c11
Binary files /dev/null and b/icons/mob/robot/protector_wide.dmi differ
diff --git a/icons/mob/robot/service_wide.dmi b/icons/mob/robot/service_wide.dmi
index 1ec76e9e83..3c3613c94f 100644
Binary files a/icons/mob/robot/service_wide.dmi and b/icons/mob/robot/service_wide.dmi differ
diff --git a/icons/mob/robot/syndie_large.dmi b/icons/mob/robot/syndie_large.dmi
new file mode 100644
index 0000000000..3a0db17d6e
Binary files /dev/null and b/icons/mob/robot/syndie_large.dmi differ
diff --git a/icons/mob/robot/syndie_wide.dmi b/icons/mob/robot/syndie_wide.dmi
new file mode 100644
index 0000000000..23e2b9d13e
Binary files /dev/null and b/icons/mob/robot/syndie_wide.dmi differ
diff --git a/icons/obj/food_package.dmi b/icons/obj/food_package.dmi
index cf22ac48ed..ab8e1c901f 100644
Binary files a/icons/obj/food_package.dmi and b/icons/obj/food_package.dmi differ
diff --git a/icons/obj/food_snacks.dmi b/icons/obj/food_snacks.dmi
index 6962741815..3761135206 100644
Binary files a/icons/obj/food_snacks.dmi and b/icons/obj/food_snacks.dmi differ
diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi
index 1e79233304..0f07fdeb2e 100644
Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 8f2ed0d8bb..f55e4af910 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/pda_vintage.dmi b/icons/obj/pda_vintage.dmi
new file mode 100644
index 0000000000..a386937edd
Binary files /dev/null and b/icons/obj/pda_vintage.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index e8841c78cc..8866b481c1 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ
diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi
index cf0cdbd120..e90dc8b1da 100644
Binary files a/icons/obj/trash_vr.dmi and b/icons/obj/trash_vr.dmi differ
diff --git a/icons/obj/vending_vr.dmi b/icons/obj/vending_vr.dmi
index a11ef2b241..961483a8d2 100644
Binary files a/icons/obj/vending_vr.dmi and b/icons/obj/vending_vr.dmi differ
diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi
index 968c6e8ef2..06274f9cf7 100644
Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ
diff --git a/interface/fonts.dm b/interface/fonts.dm
new file mode 100644
index 0000000000..31db4fa961
--- /dev/null
+++ b/interface/fonts.dm
@@ -0,0 +1,6 @@
+/// A font datum, it exists to define a custom font to use in a span style later.
+/datum/font
+ /// Font name, just so people know what to put in their span style.
+ var/name
+ /// The font file we link to.
+ var/font_family
diff --git a/interface/skin.dmf b/interface/skin.dmf
index c3683f6846..2afdc438bb 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1429,32 +1429,6 @@ window "rpane"
is-checked = true
group = "rpanemode"
button-type = pushbox
- elem "browseb"
- type = BUTTON
- pos = 580,0
- size = 60x16
- anchor1 = 100,0
- anchor2 = 100,0
- background-color = none
- is-visible = false
- saved-params = "is-checked"
- text = "Browser"
- command = ".winset \"rpanewindow.left=browserwindow\""
- group = "rpanemode"
- button-type = pushbox
- elem "infob"
- type = BUTTON
- pos = 60,0
- size = 60x16
- anchor1 = -1,-1
- anchor2 = -1,-1
- background-color = none
- is-visible = false
- saved-params = "is-checked"
- text = "Info"
- command = ".winset \"rpanewindow.left=infowindow\""
- group = "rpanemode"
- button-type = pushbox
elem "mediapanel"
type = BROWSER
pos = 392,25
@@ -1465,28 +1439,6 @@ window "rpane"
is-visible = false
saved-params = ""
-window "browserwindow"
- elem "browserwindow"
- type = MAIN
- pos = 281,0
- size = 640x480
- anchor1 = -1,-1
- anchor2 = -1,-1
- saved-params = "pos;size;is-minimized;is-maximized"
- title = "Browser"
- is-pane = true
- elem "browser"
- type = BROWSER
- pos = 0,0
- size = 640x499
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = #ffffff
- is-default = true
- saved-params = ""
- on-show = ".winset\"rpane.infob.is-visible=true?rpane.infob.pos=130,0;rpane.textb.is-visible=true;rpane.browseb.is-visible=true;rpane.browseb.is-checked=true;rpane.rpanewindow.pos=0,30;rpane.rpanewindow.size=0x0;rpane.rpanewindow.left=browserwindow\""
- on-hide = ".winset\"rpane.infob.is-visible=true?rpane.infob.is-checked=true rpane.infob.pos=65,0 rpane.rpanewindow.left=infowindow:rpane.rpanewindow.left=textwindow rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0\""
-
window "preferences_window"
elem "preferences_window"
type = MAIN
diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm
index d5a56d023a..10768614d8 100644
--- a/maps/stellar_delight/stellar_delight1.dmm
+++ b/maps/stellar_delight/stellar_delight1.dmm
@@ -3036,7 +3036,9 @@
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/oreprocessing)
"fL" = (
-/obj/machinery/firealarm/angled,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck1/resleeving)
"fM" = (
@@ -4303,6 +4305,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/machinery/light,
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck1/resleeving)
"iq" = (
@@ -5409,6 +5412,9 @@
name = "Station Intercom (General)";
pixel_y = 21
},
+/obj/machinery/light{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/stellardelight/deck1/starboard)
"kN" = (
@@ -7407,12 +7413,12 @@
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/port)
"oW" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/structure/cable/white{
icon_state = "1-2"
},
+/obj/machinery/firealarm/angled{
+ dir = 8
+ },
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck1/resleeving)
"oX" = (
@@ -8053,6 +8059,9 @@
"qo" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/closet/emcloset,
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techfloor,
/area/stellardelight/deck1/port)
"qp" = (
@@ -14369,6 +14378,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck1/lowermed)
"Ev" = (
@@ -18280,9 +18292,6 @@
/obj/structure/closet/crate/bin{
anchored = 1
},
-/obj/machinery/light{
- dir = 1
- },
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck1/resleeving)
"MZ" = (
diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm
index 1654195a57..256c4bdc0d 100644
--- a/maps/stellar_delight/stellar_delight3.dmm
+++ b/maps/stellar_delight/stellar_delight3.dmm
@@ -273,6 +273,18 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
+"aI" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/vines,
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
"aJ" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/window/bay/reinforced,
@@ -288,6 +300,12 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
+"aL" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
"aM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -296,6 +314,17 @@
/area/stellardelight/deck2/central)
"aN" = (
/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/effect/landmark/vermin,
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
+"aO" = (
+/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -305,8 +334,9 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/effect/landmark/vermin,
/turf/simulated/open,
-/area/stellardelight/deck2/starboard)
+/area/stellardelight/deck2/fore)
"aP" = (
/obj/structure/bed/chair/shuttle{
dir = 1
@@ -329,9 +359,58 @@
"aQ" = (
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/stellardelight/deck3/commandhall)
+"aR" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/effect/landmark/vines,
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
"aS" = (
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/forestarrooma)
+"aT" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/blue{
+ icon_state = "1-2"
+ },
+/obj/effect/landmark/vermin,
+/turf/simulated/open,
+/area/stellardelight/deck2/starboard)
+"aU" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/effect/landmark/vines,
+/turf/simulated/open,
+/area/stellardelight/deck2/port)
+"aV" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/landmark/vines,
+/turf/simulated/open,
+/area/stellardelight/deck2/starboard)
"aX" = (
/obj/structure/sign/deck3{
pixel_x = 32
@@ -341,11 +420,6 @@
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
-"ba" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/landmark/vines,
-/turf/simulated/open,
-/area/stellardelight/deck2/fore)
"bb" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 8
@@ -888,17 +962,6 @@
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/foreportrooma)
-"db" = (
-/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/open,
-/area/stellardelight/deck2/starboard)
"df" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -6032,13 +6095,6 @@
/obj/structure/low_wall/bay/reinforced/steel,
/turf/simulated/floor,
/area/stellardelight/deck2/port)
-"wc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/landmark/vermin,
-/turf/simulated/open,
-/area/stellardelight/deck2/starboard)
"wd" = (
/obj/structure/table/standard,
/obj/item/weapon/aiModule/oxygen,
@@ -7841,13 +7897,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portaft)
-"Cb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/effect/landmark/vermin,
-/turf/simulated/open,
-/area/stellardelight/deck2/fore)
"Cc" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/angled_bay/hatch{
@@ -9525,13 +9574,6 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
-"ID" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/landmark/vines,
-/turf/simulated/open,
-/area/stellardelight/deck2/fore)
"IG" = (
/obj/structure/cable/blue{
icon_state = "4-8"
@@ -10679,13 +10721,6 @@
/obj/random/maintenance,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/starboardfore)
-"Mv" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/effect/landmark/vines,
-/turf/simulated/open,
-/area/stellardelight/deck2/fore)
"Mw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1
@@ -10905,13 +10940,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/stellardelight/deck3/cryo)
-"Nd" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/effect/landmark/vines,
-/turf/simulated/open,
-/area/stellardelight/deck2/port)
"Ne" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -11569,13 +11597,6 @@
"OX" = (
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portcent)
-"OY" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/landmark/vines,
-/turf/simulated/open,
-/area/stellardelight/deck2/starboard)
"Pa" = (
/obj/structure/lattice,
/turf/simulated/open,
@@ -13769,16 +13790,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/turf/simulated/floor/airless,
/area/maintenance/stellardelight/deck3/starboardcent)
-"Xe" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/open,
-/area/stellardelight/deck2/fore)
"Xf" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/open,
@@ -22020,7 +22031,7 @@ CS
oW
oW
oW
-Nd
+QF
oW
oW
oW
@@ -22162,7 +22173,7 @@ Yw
uf
uf
uf
-Mk
+aU
uf
uf
uf
@@ -22842,7 +22853,7 @@ qF
qF
qF
qF
-Cb
+aL
qF
qF
qF
@@ -22851,7 +22862,7 @@ Cp
qF
qF
qF
-Mv
+aL
qF
qF
qF
@@ -22984,7 +22995,7 @@ qi
qi
qi
qi
-Xe
+aN
qi
qi
qi
@@ -22993,7 +23004,7 @@ kO
qi
qi
qi
-Xe
+aR
qi
qi
qi
@@ -23829,8 +23840,8 @@ qp
NF
qp
Qp
-ba
-Ie
+Hf
+aI
tV
cb
gy
@@ -25824,7 +25835,7 @@ sd
sd
sd
sd
-wy
+aO
sd
sd
sd
@@ -25840,7 +25851,7 @@ sd
sd
Rj
FL
-aN
+aT
FL
FL
OI
@@ -25966,7 +25977,7 @@ qF
qF
qF
qF
-ID
+KF
qF
qF
qF
@@ -25982,7 +25993,7 @@ qF
hC
aJ
ow
-wc
+ZC
ow
yP
Ks
@@ -26715,7 +26726,7 @@ mS
mS
mS
mS
-db
+aV
mS
mS
Rz
@@ -26857,7 +26868,7 @@ ow
ow
ow
ow
-OY
+ZC
yP
ow
ZM
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 424654bb77..b05742514c 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -133,6 +133,22 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor,
/area/tether/exploration/hallway)
+"aap" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/highsecurity{
+ name = "Telecomms Access";
+ req_access = list(61);
+ req_one_access = list()
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/techfloor,
+/area/tcommsat/entrance{
+ name = "\improper Telecomms Entrance"
+ })
"aaq" = (
/turf/simulated/wall/r_wall,
/area/maintenance/station/exploration)
@@ -12607,7 +12623,7 @@
frequency = 1443;
level = 3;
name = "Distribution and Waste Monitor";
- sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank")
+ sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank")
},
/turf/simulated/floor/tiled,
/area/engineering/engineering_monitoring)
@@ -21737,21 +21753,6 @@
/obj/structure/sign/department/eng,
/turf/simulated/wall/r_wall,
/area/hallway/station/docks)
-"jmn" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/highsecurity{
- name = "Telecomms Access";
- req_one_access = list(10,12,16,17,61)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techfloor,
-/area/tcommsat/entrance{
- name = "\improper Telecomms Entrance"
- })
"jms" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/space/void/mining,
@@ -23210,7 +23211,6 @@
/area/gateway/prep_room)
"kHf" = (
/obj/machinery/conveyor_switch/oneway{
- //convdir = -1; //Incompatable with new behavior -Reo;
id = "QMLoad2"
},
/obj/machinery/light{
@@ -28372,24 +28372,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/quartermaster/office)
-"qSM" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/dock_two)
"qTD" = (
/obj/item/weapon/bedsheet/brown,
/obj/structure/bed/padded,
@@ -47053,7 +47035,7 @@ aaa
aaa
fLT
cOV
-qSM
+rQq
vcG
fLT
aaa
@@ -47195,7 +47177,7 @@ xIm
jRT
fLT
kbq
-qSM
+rQq
jGw
fLT
aaa
@@ -49041,7 +49023,7 @@ aaa
aaa
fLT
lNz
-qSM
+rQq
qZs
fLT
aaa
@@ -49574,7 +49556,7 @@ hkR
lGY
nJx
acR
-jmn
+aap
acZ
adg
adr
diff --git a/sound/effects/confetti_ball.ogg b/sound/effects/confetti_ball.ogg
new file mode 100644
index 0000000000..8db31be074
Binary files /dev/null and b/sound/effects/confetti_ball.ogg differ
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index a7cf248a48..ab45774318 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -4,7 +4,7 @@
"version": "4.4.1",
"type": "module",
"dependencies": {
- "axios": "^0.27.2",
+ "axios": "^1.6.0",
"glob": "^8.0.3",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
diff --git a/tgui/packages/tgui-panel/Notifications.js b/tgui/packages/tgui-panel/Notifications.js
new file mode 100644
index 0000000000..2b92995287
--- /dev/null
+++ b/tgui/packages/tgui-panel/Notifications.js
@@ -0,0 +1,28 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { Flex } from 'tgui/components';
+
+export const Notifications = (props) => {
+ const { children } = props;
+ return {children}
;
+};
+
+const NotificationsItem = (props) => {
+ const { rightSlot, children } = props;
+ return (
+
+
+ {children}
+
+ {rightSlot && (
+ {rightSlot}
+ )}
+
+ );
+};
+
+Notifications.Item = NotificationsItem;
diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js
new file mode 100644
index 0000000000..83150ab6ef
--- /dev/null
+++ b/tgui/packages/tgui-panel/Panel.js
@@ -0,0 +1,128 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { Button, Section, Stack } from 'tgui/components';
+import { Pane } from 'tgui/layouts';
+import { NowPlayingWidget, useAudio } from './audio';
+import { ChatPanel, ChatTabs } from './chat';
+import { useGame } from './game';
+import { Notifications } from './Notifications';
+import { PingIndicator } from './ping';
+import { ReconnectButton } from './reconnect';
+import { SettingsPanel, useSettings } from './settings';
+
+export const Panel = (props, context) => {
+ // IE8-10: Needs special treatment due to missing Flex support
+ if (Byond.IS_LTE_IE10) {
+ return ;
+ }
+ const audio = useAudio(context);
+ const settings = useSettings(context);
+ const game = useGame(context);
+ if (process.env.NODE_ENV !== 'production') {
+ const { useDebug, KitchenSink } = require('tgui/debug');
+ const debug = useDebug(context);
+ if (debug.kitchenSink) {
+ return ;
+ }
+ }
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {audio.visible && (
+
+
+
+ )}
+ {settings.visible && (
+
+
+
+ )}
+
+
+
+
+
+
+ {game.connectionLostAt && (
+ }>
+ You are either AFK, experiencing lag or the connection has
+ closed.
+
+ )}
+ {game.roundRestartedAt && (
+
+ The connection has been closed because the server is
+ restarting. Please wait while you automatically reconnect.
+
+ )}
+
+
+
+
+
+ );
+};
+
+const HoboPanel = (props, context) => {
+ const settings = useSettings(context);
+ return (
+
+
+
+ {(settings.visible && ) || (
+
+ )}
+
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/audio/NowPlayingWidget.js b/tgui/packages/tgui-panel/audio/NowPlayingWidget.js
new file mode 100644
index 0000000000..30052c3f3a
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/NowPlayingWidget.js
@@ -0,0 +1,109 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { toFixed } from 'common/math';
+import { useDispatch, useSelector } from 'common/redux';
+import { Button, Collapsible, Flex, Knob, Section } from 'tgui/components';
+import { useSettings } from '../settings';
+import { selectAudio } from './selectors';
+
+export const NowPlayingWidget = (props, context) => {
+ const audio = useSelector(context, selectAudio),
+ dispatch = useDispatch(context),
+ settings = useSettings(context),
+ title = audio.meta?.title,
+ URL = audio.meta?.link,
+ Artist = audio.meta?.artist || 'Unknown Artist',
+ upload_date = audio.meta?.upload_date || 'Unknown Date',
+ album = audio.meta?.album || 'Unknown Album',
+ duration = audio.meta?.duration,
+ date = !isNaN(upload_date)
+ ? upload_date?.substring(0, 4) +
+ '-' +
+ upload_date?.substring(4, 6) +
+ '-' +
+ upload_date?.substring(6, 8)
+ : upload_date;
+
+ return (
+
+ {(audio.playing && (
+
+ {
+
+
+ {URL !== 'Song Link Hidden' && (
+
+ URL: {URL}
+
+ )}
+
+ Duration: {duration}
+
+ {Artist !== 'Song Artist Hidden' &&
+ Artist !== 'Unknown Artist' && (
+
+ Artist: {Artist}
+
+ )}
+ {album !== 'Song Album Hidden' && album !== 'Unknown Album' && (
+
+ Album: {album}
+
+ )}
+ {upload_date !== 'Song Upload Date Hidden' &&
+ upload_date !== 'Unknown Date' && (
+
+ Uploaded: {date}
+
+ )}
+
+
+ }
+
+ )) || (
+
+ Nothing to play.
+
+ )}
+ {audio.playing && (
+
+
+ )}
+
+ toFixed(value * 100) + '%'}
+ onDrag={(e, value) =>
+ settings.update({
+ adminMusicVolume: value,
+ })
+ }
+ />
+
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/audio/hooks.js b/tgui/packages/tgui-panel/audio/hooks.js
new file mode 100644
index 0000000000..504b4f5c6e
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/hooks.js
@@ -0,0 +1,17 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { useSelector, useDispatch } from 'common/redux';
+import { selectAudio } from './selectors';
+
+export const useAudio = (context) => {
+ const state = useSelector(context, selectAudio);
+ const dispatch = useDispatch(context);
+ return {
+ ...state,
+ toggle: () => dispatch({ type: 'audio/toggle' }),
+ };
+};
diff --git a/tgui/packages/tgui-panel/audio/index.js b/tgui/packages/tgui-panel/audio/index.js
new file mode 100644
index 0000000000..ac7d4c2ca7
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/index.js
@@ -0,0 +1,10 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export { useAudio } from './hooks';
+export { audioMiddleware } from './middleware';
+export { NowPlayingWidget } from './NowPlayingWidget';
+export { audioReducer } from './reducer';
diff --git a/tgui/packages/tgui-panel/audio/middleware.js b/tgui/packages/tgui-panel/audio/middleware.js
new file mode 100644
index 0000000000..ac49929aaa
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/middleware.js
@@ -0,0 +1,37 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { AudioPlayer } from './player';
+
+export const audioMiddleware = (store) => {
+ const player = new AudioPlayer();
+ player.onPlay(() => {
+ store.dispatch({ type: 'audio/playing' });
+ });
+ player.onStop(() => {
+ store.dispatch({ type: 'audio/stopped' });
+ });
+ return (next) => (action) => {
+ const { type, payload } = action;
+ if (type === 'audio/playMusic') {
+ const { url, ...options } = payload;
+ player.play(url, options);
+ return next(action);
+ }
+ if (type === 'audio/stopMusic') {
+ player.stop();
+ return next(action);
+ }
+ if (type === 'settings/update' || type === 'settings/load') {
+ const volume = payload?.adminMusicVolume;
+ if (typeof volume === 'number') {
+ player.setVolume(volume);
+ }
+ return next(action);
+ }
+ return next(action);
+ };
+};
diff --git a/tgui/packages/tgui-panel/audio/player.js b/tgui/packages/tgui-panel/audio/player.js
new file mode 100644
index 0000000000..f9dfa41cef
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/player.js
@@ -0,0 +1,117 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { createLogger } from 'tgui/logging';
+
+const logger = createLogger('AudioPlayer');
+
+export class AudioPlayer {
+ constructor() {
+ // Doesn't support HTMLAudioElement
+ if (Byond.IS_LTE_IE9) {
+ return;
+ }
+ // Set up the HTMLAudioElement node
+ this.node = document.createElement('audio');
+ this.node.style.setProperty('display', 'none');
+ document.body.appendChild(this.node);
+ // Set up other properties
+ this.playing = false;
+ this.volume = 1;
+ this.options = {};
+ this.onPlaySubscribers = [];
+ this.onStopSubscribers = [];
+ // Listen for playback start events
+ this.node.addEventListener('canplaythrough', () => {
+ logger.log('canplaythrough');
+ this.playing = true;
+ this.node.playbackRate = this.options.pitch || 1;
+ this.node.currentTime = this.options.start || 0;
+ this.node.volume = this.volume;
+ this.node.play();
+ for (let subscriber of this.onPlaySubscribers) {
+ subscriber();
+ }
+ });
+ // Listen for playback stop events
+ this.node.addEventListener('ended', () => {
+ logger.log('ended');
+ this.stop();
+ });
+ // Listen for playback errors
+ this.node.addEventListener('error', (e) => {
+ if (this.playing) {
+ logger.log('playback error', e.error);
+ this.stop();
+ }
+ });
+ // Check every second to stop the playback at the right time
+ this.playbackInterval = setInterval(() => {
+ if (!this.playing) {
+ return;
+ }
+ const shouldStop =
+ this.options.end > 0 && this.node.currentTime >= this.options.end;
+ if (shouldStop) {
+ this.stop();
+ }
+ }, 1000);
+ }
+
+ destroy() {
+ if (!this.node) {
+ return;
+ }
+ this.node.stop();
+ document.removeChild(this.node);
+ clearInterval(this.playbackInterval);
+ }
+
+ play(url, options = {}) {
+ if (!this.node) {
+ return;
+ }
+ logger.log('playing', url, options);
+ this.options = options;
+ this.node.src = url;
+ }
+
+ stop() {
+ if (!this.node) {
+ return;
+ }
+ if (this.playing) {
+ for (let subscriber of this.onStopSubscribers) {
+ subscriber();
+ }
+ }
+ logger.log('stopping');
+ this.playing = false;
+ this.node.src = '';
+ }
+
+ setVolume(volume) {
+ if (!this.node) {
+ return;
+ }
+ this.volume = volume;
+ this.node.volume = volume;
+ }
+
+ onPlay(subscriber) {
+ if (!this.node) {
+ return;
+ }
+ this.onPlaySubscribers.push(subscriber);
+ }
+
+ onStop(subscriber) {
+ if (!this.node) {
+ return;
+ }
+ this.onStopSubscribers.push(subscriber);
+ }
+}
diff --git a/tgui/packages/tgui-panel/audio/reducer.js b/tgui/packages/tgui-panel/audio/reducer.js
new file mode 100644
index 0000000000..17684060ff
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/reducer.js
@@ -0,0 +1,50 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+const initialState = {
+ visible: false,
+ playing: false,
+ track: null,
+};
+
+export const audioReducer = (state = initialState, action) => {
+ const { type, payload } = action;
+ if (type === 'audio/playing') {
+ return {
+ ...state,
+ visible: true,
+ playing: true,
+ };
+ }
+ if (type === 'audio/stopped') {
+ return {
+ ...state,
+ visible: false,
+ playing: false,
+ };
+ }
+ if (type === 'audio/playMusic') {
+ return {
+ ...state,
+ meta: payload,
+ };
+ }
+ if (type === 'audio/stopMusic') {
+ return {
+ ...state,
+ visible: false,
+ playing: false,
+ meta: null,
+ };
+ }
+ if (type === 'audio/toggle') {
+ return {
+ ...state,
+ visible: !state.visible,
+ };
+ }
+ return state;
+};
diff --git a/tgui/packages/tgui-panel/audio/selectors.js b/tgui/packages/tgui-panel/audio/selectors.js
new file mode 100644
index 0000000000..89cb8f1361
--- /dev/null
+++ b/tgui/packages/tgui-panel/audio/selectors.js
@@ -0,0 +1,7 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const selectAudio = (state) => state.audio;
diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.js b/tgui/packages/tgui-panel/chat/ChatPageSettings.js
new file mode 100644
index 0000000000..c0d9962d25
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.js
@@ -0,0 +1,89 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { useDispatch, useSelector } from 'common/redux';
+import { Button, Collapsible, Divider, Input, Section, Stack } from 'tgui/components';
+import { removeChatPage, toggleAcceptedType, updateChatPage } from './actions';
+import { MESSAGE_TYPES } from './constants';
+import { selectCurrentChatPage } from './selectors';
+
+export const ChatPageSettings = (props, context) => {
+ const page = useSelector(context, selectCurrentChatPage);
+ const dispatch = useDispatch(context);
+ return (
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/chat/ChatPanel.js b/tgui/packages/tgui-panel/chat/ChatPanel.js
new file mode 100644
index 0000000000..3132a66ce7
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/ChatPanel.js
@@ -0,0 +1,73 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { shallowDiffers } from 'common/react';
+import { Component, createRef } from 'inferno';
+import { Button } from 'tgui/components';
+import { chatRenderer } from './renderer';
+
+export class ChatPanel extends Component {
+ constructor() {
+ super();
+ this.ref = createRef();
+ this.state = {
+ scrollTracking: true,
+ };
+ this.handleScrollTrackingChange = (value) =>
+ this.setState({
+ scrollTracking: value,
+ });
+ }
+
+ componentDidMount() {
+ chatRenderer.mount(this.ref.current);
+ chatRenderer.events.on(
+ 'scrollTrackingChanged',
+ this.handleScrollTrackingChange
+ );
+ this.componentDidUpdate();
+ }
+
+ componentWillUnmount() {
+ chatRenderer.events.off(
+ 'scrollTrackingChanged',
+ this.handleScrollTrackingChange
+ );
+ }
+
+ componentDidUpdate(prevProps) {
+ requestAnimationFrame(() => {
+ chatRenderer.ensureScrollTracking();
+ });
+ const shouldUpdateStyle =
+ !prevProps || shallowDiffers(this.props, prevProps);
+ if (shouldUpdateStyle) {
+ chatRenderer.assignStyle({
+ 'width': '100%',
+ 'white-space': 'pre-wrap',
+ 'font-size': this.props.fontSize,
+ 'line-height': this.props.lineHeight,
+ });
+ }
+ }
+
+ render() {
+ const { scrollTracking } = this.state;
+ return (
+ <>
+
+ {!scrollTracking && (
+
+ )}
+
+ );
+ }
+}
diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.js b/tgui/packages/tgui-panel/chat/ChatTabs.js
new file mode 100644
index 0000000000..1d4f6f65ed
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/ChatTabs.js
@@ -0,0 +1,68 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { useDispatch, useSelector } from 'common/redux';
+import { Box, Tabs, Flex, Button } from 'tgui/components';
+import { changeChatPage, addChatPage } from './actions';
+import { selectChatPages, selectCurrentChatPage } from './selectors';
+import { openChatSettings } from '../settings/actions';
+
+const UnreadCountWidget = ({ value }) => (
+
+ {Math.min(value, 99)}
+
+);
+
+export const ChatTabs = (props, context) => {
+ const pages = useSelector(context, selectChatPages);
+ const currentPage = useSelector(context, selectCurrentChatPage);
+ const dispatch = useDispatch(context);
+ return (
+
+
+
+ {pages.map((page) => (
+ 0 && (
+
+ )
+ }
+ onClick={() =>
+ dispatch(
+ changeChatPage({
+ pageId: page.id,
+ })
+ )
+ }>
+ {page.name}
+
+ ))}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/chat/actions.js b/tgui/packages/tgui-panel/chat/actions.js
new file mode 100644
index 0000000000..e9919fcfa2
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/actions.js
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { createAction } from 'common/redux';
+import { createPage } from './model';
+
+export const loadChat = createAction('chat/load');
+export const rebuildChat = createAction('chat/rebuild');
+export const updateMessageCount = createAction('chat/updateMessageCount');
+export const addChatPage = createAction('chat/addPage', () => ({
+ payload: createPage(),
+}));
+export const changeChatPage = createAction('chat/changePage');
+export const updateChatPage = createAction('chat/updatePage');
+export const toggleAcceptedType = createAction('chat/toggleAcceptedType');
+export const removeChatPage = createAction('chat/removePage');
+export const changeScrollTracking = createAction('chat/changeScrollTracking');
+export const saveChatToDisk = createAction('chat/saveToDisk');
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
new file mode 100644
index 0000000000..2efc1d0a3e
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -0,0 +1,148 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const MAX_VISIBLE_MESSAGES = 2500;
+export const MAX_PERSISTED_MESSAGES = 1000;
+export const MESSAGE_SAVE_INTERVAL = 10000;
+export const MESSAGE_PRUNE_INTERVAL = 60000;
+export const COMBINE_MAX_MESSAGES = 5;
+export const COMBINE_MAX_TIME_WINDOW = 5000;
+export const IMAGE_RETRY_DELAY = 250;
+export const IMAGE_RETRY_LIMIT = 10;
+export const IMAGE_RETRY_MESSAGE_AGE = 60000;
+
+// Default message type
+export const MESSAGE_TYPE_UNKNOWN = 'unknown';
+
+// Internal message type
+export const MESSAGE_TYPE_INTERNAL = 'internal';
+
+// Must match the set of defines in code/__DEFINES/chat.dm
+export const MESSAGE_TYPE_SYSTEM = 'system';
+export const MESSAGE_TYPE_LOCALCHAT = 'localchat';
+export const MESSAGE_TYPE_RADIO = 'radio';
+export const MESSAGE_TYPE_INFO = 'info';
+export const MESSAGE_TYPE_WARNING = 'warning';
+export const MESSAGE_TYPE_DEADCHAT = 'deadchat';
+export const MESSAGE_TYPE_OOC = 'ooc';
+export const MESSAGE_TYPE_ADMINPM = 'adminpm';
+export const MESSAGE_TYPE_COMBAT = 'combat';
+export const MESSAGE_TYPE_ADMINCHAT = 'adminchat';
+export const MESSAGE_TYPE_MODCHAT = 'modchat';
+export const MESSAGE_TYPE_PRAYER = 'prayer';
+export const MESSAGE_TYPE_EVENTCHAT = 'eventchat';
+export const MESSAGE_TYPE_ADMINLOG = 'adminlog';
+export const MESSAGE_TYPE_ATTACKLOG = 'attacklog';
+export const MESSAGE_TYPE_DEBUG = 'debug';
+
+// Metadata for each message type
+export const MESSAGE_TYPES = [
+ // Always-on types
+ {
+ type: MESSAGE_TYPE_SYSTEM,
+ name: 'System Messages',
+ description: 'Messages from your client, always enabled',
+ selector: '.boldannounce',
+ important: true,
+ },
+ // Basic types
+ {
+ type: MESSAGE_TYPE_LOCALCHAT,
+ name: 'Local',
+ description: 'In-character local messages (say, emote, etc)',
+ selector: '.say, .emote',
+ },
+ {
+ type: MESSAGE_TYPE_RADIO,
+ name: 'Radio',
+ description: 'All departments of radio messages',
+ selector:
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling',
+ },
+ {
+ type: MESSAGE_TYPE_INFO,
+ name: 'Info',
+ description: 'Non-urgent messages from the game and items',
+ selector:
+ '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce, .hear, .smallnotice, .holoparasite, .boldnotice',
+ },
+ {
+ type: MESSAGE_TYPE_WARNING,
+ name: 'Warnings',
+ description: 'Urgent messages from the game and items',
+ selector:
+ '.warning:not(.pm), .critical, .userdanger, .italics, .alertsyndie, .warningplain',
+ },
+ {
+ type: MESSAGE_TYPE_DEADCHAT,
+ name: 'Deadchat',
+ description: 'All of deadchat',
+ selector: '.deadsay, .ghostalert',
+ },
+ {
+ type: MESSAGE_TYPE_OOC,
+ name: 'OOC',
+ description: 'The bluewall of global OOC messages',
+ selector: '.ooc, .adminooc, .adminobserverooc, .oocplain',
+ },
+ {
+ type: MESSAGE_TYPE_ADMINPM,
+ name: 'Admin PMs',
+ description: 'Messages to/from admins (adminhelp)',
+ selector: '.pm, .adminhelp',
+ },
+ {
+ type: MESSAGE_TYPE_COMBAT,
+ name: 'Combat Log',
+ description: 'Urist McTraitor has stabbed you with a knife!',
+ selector: '.danger',
+ },
+ {
+ type: MESSAGE_TYPE_UNKNOWN,
+ name: 'Unsorted',
+ description: 'Everything we could not sort, always enabled',
+ },
+ // Admin stuff
+ {
+ type: MESSAGE_TYPE_ADMINCHAT,
+ name: 'Admin Chat',
+ description: 'ASAY messages',
+ selector: '.admin_channel, .adminsay',
+ admin: true,
+ },
+ {
+ type: MESSAGE_TYPE_MODCHAT,
+ name: 'Mod Chat',
+ description: 'MSAY messages',
+ selector: '.mod_channel',
+ admin: true,
+ },
+ {
+ type: MESSAGE_TYPE_PRAYER,
+ name: 'Prayers',
+ description: 'Prayers from players',
+ admin: true,
+ },
+ {
+ type: MESSAGE_TYPE_ADMINLOG,
+ name: 'Admin Log',
+ description: 'ADMIN LOG: Urist McAdmin has jumped to coordinates X, Y, Z',
+ selector: '.log_message',
+ admin: true,
+ },
+ {
+ type: MESSAGE_TYPE_ATTACKLOG,
+ name: 'Attack Log',
+ description: 'Urist McTraitor has shot John Doe',
+ admin: true,
+ },
+ {
+ type: MESSAGE_TYPE_DEBUG,
+ name: 'Debug Log',
+ description: 'DEBUG: SSPlanets subsystem Recover().',
+ admin: true,
+ },
+];
diff --git a/tgui/packages/tgui-panel/chat/index.js b/tgui/packages/tgui-panel/chat/index.js
new file mode 100644
index 0000000000..d5ad6fa921
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/index.js
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export { ChatPageSettings } from './ChatPageSettings';
+export { ChatPanel } from './ChatPanel';
+export { ChatTabs } from './ChatTabs';
+export { chatMiddleware } from './middleware';
+export { chatReducer } from './reducer';
diff --git a/tgui/packages/tgui-panel/chat/middleware.js b/tgui/packages/tgui-panel/chat/middleware.js
new file mode 100644
index 0000000000..ecafbd2364
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/middleware.js
@@ -0,0 +1,178 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import DOMPurify from 'dompurify';
+import { storage } from 'common/storage';
+import { loadSettings, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from '../settings/actions';
+import { selectSettings } from '../settings/selectors';
+import { addChatPage, changeChatPage, changeScrollTracking, loadChat, rebuildChat, removeChatPage, saveChatToDisk, toggleAcceptedType, updateMessageCount } from './actions';
+import { MAX_PERSISTED_MESSAGES, MESSAGE_SAVE_INTERVAL } from './constants';
+import { createMessage, serializeMessage } from './model';
+import { chatRenderer } from './renderer';
+import { selectChat, selectCurrentChatPage } from './selectors';
+
+// List of blacklisted tags
+const FORBID_TAGS = ['a', 'iframe', 'link', 'video'];
+
+const saveChatToStorage = async (store) => {
+ const state = selectChat(store.getState());
+ const fromIndex = Math.max(
+ 0,
+ chatRenderer.messages.length - MAX_PERSISTED_MESSAGES
+ );
+ const messages = chatRenderer.messages
+ .slice(fromIndex)
+ .map((message) => serializeMessage(message));
+ storage.set('chat-state', state);
+ storage.set('chat-messages', messages);
+};
+
+const loadChatFromStorage = async (store) => {
+ const [state, messages] = await Promise.all([
+ storage.get('chat-state'),
+ storage.get('chat-messages'),
+ ]);
+ // Discard incompatible versions
+ if (state && state.version <= 4) {
+ store.dispatch(loadChat());
+ return;
+ }
+ if (messages) {
+ for (let message of messages) {
+ if (message.html) {
+ message.html = DOMPurify.sanitize(message.html, {
+ FORBID_TAGS,
+ });
+ }
+ }
+ const batch = [
+ ...messages,
+ createMessage({
+ type: 'internal/reconnected',
+ }),
+ ];
+ chatRenderer.processBatch(batch, {
+ prepend: true,
+ });
+ }
+ store.dispatch(loadChat(state));
+};
+
+export const chatMiddleware = (store) => {
+ let initialized = false;
+ let loaded = false;
+ const sequences = [];
+ const sequences_requested = [];
+ chatRenderer.events.on('batchProcessed', (countByType) => {
+ // Use this flag to workaround unread messages caused by
+ // loading them from storage. Side effect of that, is that
+ // message count can not be trusted, only unread count.
+ if (loaded) {
+ store.dispatch(updateMessageCount(countByType));
+ }
+ });
+ chatRenderer.events.on('scrollTrackingChanged', (scrollTracking) => {
+ store.dispatch(changeScrollTracking(scrollTracking));
+ });
+ setInterval(() => {
+ saveChatToStorage(store);
+ }, MESSAGE_SAVE_INTERVAL);
+ return (next) => (action) => {
+ const { type, payload } = action;
+ if (!initialized) {
+ initialized = true;
+ loadChatFromStorage(store);
+ }
+ if (type === 'chat/message') {
+ let payload_obj;
+ try {
+ payload_obj = JSON.parse(payload);
+ } catch (err) {
+ return;
+ }
+
+ const sequence = payload_obj.sequence;
+ if (sequences.includes(sequence)) {
+ return;
+ }
+
+ const sequence_count = sequences.length;
+ seq_check: if (sequence_count > 0) {
+ if (sequences_requested.includes(sequence)) {
+ sequences_requested.splice(sequences_requested.indexOf(sequence), 1);
+ // if we are receiving a message we requested, we can stop reliability checks
+ break seq_check;
+ }
+
+ // cannot do reliability if we don't have any messages
+ const expected_sequence = sequences[sequence_count - 1] + 1;
+ if (sequence !== expected_sequence) {
+ for (
+ let requesting = expected_sequence;
+ requesting < sequence;
+ requesting++
+ ) {
+ requested_sequences.push(requesting);
+ Byond.sendMessage('chat/resend', requesting);
+ }
+ }
+ }
+
+ chatRenderer.processBatch([payload_obj.content]);
+ return;
+ }
+ if (type === loadChat.type) {
+ next(action);
+ const page = selectCurrentChatPage(store.getState());
+ chatRenderer.changePage(page);
+ chatRenderer.onStateLoaded();
+ loaded = true;
+ return;
+ }
+ if (
+ type === changeChatPage.type ||
+ type === addChatPage.type ||
+ type === removeChatPage.type ||
+ type === toggleAcceptedType.type
+ ) {
+ next(action);
+ const page = selectCurrentChatPage(store.getState());
+ chatRenderer.changePage(page);
+ return;
+ }
+ if (type === rebuildChat.type) {
+ chatRenderer.rebuildChat();
+ return next(action);
+ }
+
+ if (
+ type === updateSettings.type ||
+ type === loadSettings.type ||
+ type === addHighlightSetting.type ||
+ type === removeHighlightSetting.type ||
+ type === updateHighlightSetting.type
+ ) {
+ next(action);
+ const settings = selectSettings(store.getState());
+ chatRenderer.setHighlight(
+ settings.highlightSettings,
+ settings.highlightSettingById
+ );
+
+ return;
+ }
+ if (type === 'roundrestart') {
+ // Save chat as soon as possible
+ saveChatToStorage(store);
+ return next(action);
+ }
+ if (type === saveChatToDisk.type) {
+ chatRenderer.saveToDisk();
+ return;
+ }
+ return next(action);
+ };
+};
diff --git a/tgui/packages/tgui-panel/chat/model.js b/tgui/packages/tgui-panel/chat/model.js
new file mode 100644
index 0000000000..fa12153890
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/model.js
@@ -0,0 +1,56 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { createUuid } from 'common/uuid';
+import { MESSAGE_TYPES, MESSAGE_TYPE_INTERNAL } from './constants';
+
+export const canPageAcceptType = (page, type) =>
+ type.startsWith(MESSAGE_TYPE_INTERNAL) || page.acceptedTypes[type];
+
+export const createPage = (obj) => {
+ let acceptedTypes = {};
+
+ for (let typeDef of MESSAGE_TYPES) {
+ acceptedTypes[typeDef.type] = !!typeDef.important;
+ }
+
+ return {
+ id: createUuid(),
+ name: 'New Tab',
+ acceptedTypes: acceptedTypes,
+ unreadCount: 0,
+ createdAt: Date.now(),
+ ...obj,
+ };
+};
+
+export const createMainPage = () => {
+ const acceptedTypes = {};
+ for (let typeDef of MESSAGE_TYPES) {
+ acceptedTypes[typeDef.type] = true;
+ }
+ return createPage({
+ name: 'Main',
+ acceptedTypes,
+ });
+};
+
+export const createMessage = (payload) => ({
+ createdAt: Date.now(),
+ ...payload,
+});
+
+export const serializeMessage = (message) => ({
+ type: message.type,
+ text: message.text,
+ html: message.html,
+ times: message.times,
+ createdAt: message.createdAt,
+});
+
+export const isSameMessage = (a, b) =>
+ (typeof a.text === 'string' && a.text === b.text) ||
+ (typeof a.html === 'string' && a.html === b.html);
diff --git a/tgui/packages/tgui-panel/chat/reducer.js b/tgui/packages/tgui-panel/chat/reducer.js
new file mode 100644
index 0000000000..b727a7c1ba
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/reducer.js
@@ -0,0 +1,183 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { addChatPage, changeChatPage, loadChat, removeChatPage, toggleAcceptedType, updateChatPage, updateMessageCount, changeScrollTracking } from './actions';
+import { canPageAcceptType, createMainPage } from './model';
+
+const mainPage = createMainPage();
+
+export const initialState = {
+ version: 5,
+ currentPageId: mainPage.id,
+ scrollTracking: true,
+ pages: [mainPage.id],
+ pageById: {
+ [mainPage.id]: mainPage,
+ },
+};
+
+export const chatReducer = (state = initialState, action) => {
+ const { type, payload } = action;
+ if (type === loadChat.type) {
+ // Validate version and/or migrate state
+ if (payload?.version !== state.version) {
+ return state;
+ }
+ // Enable any filters that are not explicitly set, that are
+ // enabled by default on the main page.
+ // NOTE: This mutates acceptedTypes on the state.
+ for (let id of Object.keys(payload.pageById)) {
+ const page = payload.pageById[id];
+ const filters = page.acceptedTypes;
+ const defaultFilters = mainPage.acceptedTypes;
+ for (let type of Object.keys(defaultFilters)) {
+ if (filters[type] === undefined) {
+ filters[type] = defaultFilters[type];
+ }
+ }
+ }
+ // Reset page message counts
+ // NOTE: We are mutably changing the payload on the assumption
+ // that it is a copy that comes straight from the web storage.
+ for (let id of Object.keys(payload.pageById)) {
+ const page = payload.pageById[id];
+ page.unreadCount = 0;
+ }
+ return {
+ ...state,
+ ...payload,
+ };
+ }
+ if (type === changeScrollTracking.type) {
+ const scrollTracking = payload;
+ const nextState = {
+ ...state,
+ scrollTracking,
+ };
+ if (scrollTracking) {
+ const pageId = state.currentPageId;
+ const page = {
+ ...state.pageById[pageId],
+ unreadCount: 0,
+ };
+ nextState.pageById = {
+ ...state.pageById,
+ [pageId]: page,
+ };
+ }
+ return nextState;
+ }
+ if (type === updateMessageCount.type) {
+ const countByType = payload;
+ const pages = state.pages.map((id) => state.pageById[id]);
+ const currentPage = state.pageById[state.currentPageId];
+ const nextPageById = { ...state.pageById };
+ for (let page of pages) {
+ let unreadCount = 0;
+ for (let type of Object.keys(countByType)) {
+ // Message does not belong here
+ if (!canPageAcceptType(page, type)) {
+ continue;
+ }
+ // Current page is scroll tracked
+ if (page === currentPage && state.scrollTracking) {
+ continue;
+ }
+ // This page received the same message which we can read
+ // on the current page.
+ if (page !== currentPage && canPageAcceptType(currentPage, type)) {
+ continue;
+ }
+ unreadCount += countByType[type];
+ }
+ if (unreadCount > 0) {
+ nextPageById[page.id] = {
+ ...page,
+ unreadCount: page.unreadCount + unreadCount,
+ };
+ }
+ }
+ return {
+ ...state,
+ pageById: nextPageById,
+ };
+ }
+ if (type === addChatPage.type) {
+ return {
+ ...state,
+ currentPageId: payload.id,
+ pages: [...state.pages, payload.id],
+ pageById: {
+ ...state.pageById,
+ [payload.id]: payload,
+ },
+ };
+ }
+ if (type === changeChatPage.type) {
+ const { pageId } = payload;
+ const page = {
+ ...state.pageById[pageId],
+ unreadCount: 0,
+ };
+ return {
+ ...state,
+ currentPageId: pageId,
+ pageById: {
+ ...state.pageById,
+ [pageId]: page,
+ },
+ };
+ }
+ if (type === updateChatPage.type) {
+ const { pageId, ...update } = payload;
+ const page = {
+ ...state.pageById[pageId],
+ ...update,
+ };
+ return {
+ ...state,
+ pageById: {
+ ...state.pageById,
+ [pageId]: page,
+ },
+ };
+ }
+ if (type === toggleAcceptedType.type) {
+ const { pageId, type } = payload;
+ const page = { ...state.pageById[pageId] };
+ page.acceptedTypes = { ...page.acceptedTypes };
+ page.acceptedTypes[type] = !page.acceptedTypes[type];
+ return {
+ ...state,
+ pageById: {
+ ...state.pageById,
+ [pageId]: page,
+ },
+ };
+ }
+ if (type === removeChatPage.type) {
+ const { pageId } = payload;
+ const nextState = {
+ ...state,
+ pages: [...state.pages],
+ pageById: {
+ ...state.pageById,
+ },
+ };
+ delete nextState.pageById[pageId];
+ nextState.pages = nextState.pages.filter((id) => id !== pageId);
+ if (nextState.pages.length === 0) {
+ nextState.pages.push(mainPage.id);
+ nextState.pageById[mainPage.id] = mainPage;
+ nextState.currentPageId = mainPage.id;
+ }
+ if (!nextState.currentPageId || nextState.currentPageId === pageId) {
+ nextState.currentPageId = nextState.pages[0];
+ }
+ return nextState;
+ }
+ return state;
+};
diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js
new file mode 100644
index 0000000000..7a528cd4fd
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/renderer.js
@@ -0,0 +1,608 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { EventEmitter } from 'common/events';
+import { classes } from 'common/react';
+import { createLogger } from 'tgui/logging';
+import { COMBINE_MAX_MESSAGES, COMBINE_MAX_TIME_WINDOW, IMAGE_RETRY_DELAY, IMAGE_RETRY_LIMIT, IMAGE_RETRY_MESSAGE_AGE, MAX_PERSISTED_MESSAGES, MAX_VISIBLE_MESSAGES, MESSAGE_PRUNE_INTERVAL, MESSAGE_TYPES, MESSAGE_TYPE_INTERNAL, MESSAGE_TYPE_UNKNOWN } from './constants';
+import { render } from 'inferno';
+import { canPageAcceptType, createMessage, isSameMessage } from './model';
+import { highlightNode, linkifyNode } from './replaceInTextNode';
+import { Tooltip } from '../../tgui/components';
+
+const logger = createLogger('chatRenderer');
+
+// We consider this as the smallest possible scroll offset
+// that is still trackable.
+const SCROLL_TRACKING_TOLERANCE = 24;
+
+// List of injectable component names to the actual type
+export const TGUI_CHAT_COMPONENTS = {
+ Tooltip,
+};
+
+// List of injectable attibute names mapped to their proper prop
+// We need this because attibutes don't support lowercase names
+export const TGUI_CHAT_ATTRIBUTES_TO_PROPS = {
+ 'position': 'position',
+ 'content': 'content',
+};
+
+const findNearestScrollableParent = (startingNode) => {
+ const body = document.body;
+ let node = startingNode;
+ while (node && node !== body) {
+ // This definitely has a vertical scrollbar, because it reduces
+ // scrollWidth of the element. Might not work if element uses
+ // overflow: hidden.
+ if (node.scrollWidth < node.offsetWidth) {
+ return node;
+ }
+ node = node.parentNode;
+ }
+ return window;
+};
+
+const createHighlightNode = (text, color) => {
+ const node = document.createElement('span');
+ node.className = 'Chat__highlight';
+ node.setAttribute('style', 'background-color:' + color);
+ node.textContent = text;
+ return node;
+};
+
+const createMessageNode = () => {
+ const node = document.createElement('div');
+ node.className = 'ChatMessage';
+ return node;
+};
+
+const createReconnectedNode = () => {
+ const node = document.createElement('div');
+ node.className = 'Chat__reconnected';
+ return node;
+};
+
+const handleImageError = (e) => {
+ setTimeout(() => {
+ /** @type {HTMLImageElement} */
+ const node = e.target;
+ const attempts = parseInt(node.getAttribute('data-reload-n'), 10) || 0;
+ if (attempts >= IMAGE_RETRY_LIMIT) {
+ logger.error(`failed to load an image after ${attempts} attempts`);
+ return;
+ }
+ const src = node.src;
+ node.src = null;
+ node.src = src + '#' + attempts;
+ node.setAttribute('data-reload-n', attempts + 1);
+ }, IMAGE_RETRY_DELAY);
+};
+
+/**
+ * Assigns a "times-repeated" badge to the message.
+ */
+const updateMessageBadge = (message) => {
+ const { node, times } = message;
+ if (!node || !times) {
+ // Nothing to update
+ return;
+ }
+ const foundBadge = node.querySelector('.Chat__badge');
+ const badge = foundBadge || document.createElement('div');
+ badge.textContent = times;
+ badge.className = classes(['Chat__badge', 'Chat__badge--animate']);
+ requestAnimationFrame(() => {
+ badge.className = 'Chat__badge';
+ });
+ if (!foundBadge) {
+ node.appendChild(badge);
+ }
+};
+
+class ChatRenderer {
+ constructor() {
+ /** @type {HTMLElement} */
+ this.loaded = false;
+ /** @type {HTMLElement} */
+ this.rootNode = null;
+ this.queue = [];
+ this.messages = [];
+ this.visibleMessages = [];
+ this.page = null;
+ this.events = new EventEmitter();
+ // Scroll handler
+ /** @type {HTMLElement} */
+ this.scrollNode = null;
+ this.scrollTracking = true;
+ this.handleScroll = (type) => {
+ const node = this.scrollNode;
+ const height = node.scrollHeight;
+ const bottom = node.scrollTop + node.offsetHeight;
+ const scrollTracking =
+ Math.abs(height - bottom) < SCROLL_TRACKING_TOLERANCE;
+ if (scrollTracking !== this.scrollTracking) {
+ this.scrollTracking = scrollTracking;
+ this.events.emit('scrollTrackingChanged', scrollTracking);
+ logger.debug('tracking', this.scrollTracking);
+ }
+ };
+ this.ensureScrollTracking = () => {
+ if (this.scrollTracking) {
+ this.scrollToBottom();
+ }
+ };
+ // Periodic message pruning
+ setInterval(() => this.pruneMessages(), MESSAGE_PRUNE_INTERVAL);
+ }
+
+ isReady() {
+ return this.loaded && this.rootNode && this.page;
+ }
+
+ mount(node) {
+ // Mount existing root node on top of the new node
+ if (this.rootNode) {
+ node.appendChild(this.rootNode);
+ }
+ // Initialize the root node
+ else {
+ this.rootNode = node;
+ }
+ // Find scrollable parent
+ this.scrollNode = findNearestScrollableParent(this.rootNode);
+ this.scrollNode.addEventListener('scroll', this.handleScroll);
+ setImmediate(() => {
+ this.scrollToBottom();
+ });
+ // Flush the queue
+ this.tryFlushQueue();
+ }
+
+ onStateLoaded() {
+ this.loaded = true;
+ this.tryFlushQueue();
+ }
+
+ tryFlushQueue() {
+ if (this.isReady() && this.queue.length > 0) {
+ this.processBatch(this.queue);
+ this.queue = [];
+ }
+ }
+
+ assignStyle(style = {}) {
+ for (let key of Object.keys(style)) {
+ this.rootNode.style.setProperty(key, style[key]);
+ }
+ }
+
+ setHighlight(highlightSettings, highlightSettingById) {
+ this.highlightParsers = null;
+ if (!highlightSettings) {
+ return;
+ }
+ highlightSettings.map((id) => {
+ const setting = highlightSettingById[id];
+ const text = setting.highlightText;
+ const highlightColor = setting.highlightColor;
+ const highlightWholeMessage = setting.highlightWholeMessage;
+ const matchWord = setting.matchWord;
+ const matchCase = setting.matchCase;
+ const allowedRegex = /^[a-z0-9_\-$/^[\s\]\\]+$/gi;
+ const regexEscapeCharacters = /[!#$%^&*)(+=.<>{}[\]:;'"|~`_\-\\/]/g;
+ const lines = String(text)
+ .split(',')
+ .map((str) => str.trim())
+ .filter(
+ (str) =>
+ // Must be longer than one character
+ str &&
+ str.length > 1 &&
+ // Must be alphanumeric (with some punctuation)
+ allowedRegex.test(str) &&
+ // Reset lastIndex so it does not mess up the next word
+ ((allowedRegex.lastIndex = 0) || true)
+ );
+ let highlightWords;
+ let highlightRegex;
+ // Nothing to match, reset highlighting
+ if (lines.length === 0) {
+ return;
+ }
+ let regexExpressions = [];
+ // Organize each highlight entry into regex expressions and words
+ for (let line of lines) {
+ // Regex expression syntax is /[exp]/
+ if (line.charAt(0) === '/' && line.charAt(line.length - 1) === '/') {
+ const expr = line.substring(1, line.length - 1);
+ // Check if this is more than one character
+ if (/^(\[.*\]|\\.|.)$/.test(expr)) {
+ continue;
+ }
+ regexExpressions.push(expr);
+ } else {
+ // Lazy init
+ if (!highlightWords) {
+ highlightWords = [];
+ }
+ // We're not going to let regex characters fuck up our RegEx operation.
+ line = line.replace(regexEscapeCharacters, '\\$&');
+
+ highlightWords.push(line);
+ }
+ }
+ const regexStr = regexExpressions.join('|');
+ const flags = 'g' + (matchCase ? '' : 'i');
+ // We wrap this in a try-catch to ensure that broken regex doesn't break
+ // the entire chat.
+ try {
+ // setting regex overrides matchword
+ if (regexStr) {
+ highlightRegex = new RegExp('(' + regexStr + ')', flags);
+ } else {
+ const pattern = `${matchWord ? '\\b' : ''}(${highlightWords.join(
+ '|'
+ )})${matchWord ? '\\b' : ''}`;
+ highlightRegex = new RegExp(pattern, flags);
+ }
+ } catch {
+ // We just reset it if it's invalid.
+ highlightRegex = null;
+ }
+ // Lazy init
+ if (!this.highlightParsers) {
+ this.highlightParsers = [];
+ }
+ this.highlightParsers.push({
+ highlightWords,
+ highlightRegex,
+ highlightColor,
+ highlightWholeMessage,
+ });
+ });
+ }
+
+ scrollToBottom() {
+ // scrollHeight is always bigger than scrollTop and is
+ // automatically clamped to the valid range.
+ this.scrollNode.scrollTop = this.scrollNode.scrollHeight;
+ }
+
+ changePage(page) {
+ if (!this.isReady()) {
+ this.page = page;
+ this.tryFlushQueue();
+ return;
+ }
+ this.page = page;
+ // Fast clear of the root node
+ this.rootNode.textContent = '';
+ this.visibleMessages = [];
+ // Re-add message nodes
+ const fragment = document.createDocumentFragment();
+ let node;
+ for (let message of this.messages) {
+ if (canPageAcceptType(page, message.type)) {
+ node = message.node;
+ fragment.appendChild(node);
+ this.visibleMessages.push(message);
+ }
+ }
+ if (node) {
+ this.rootNode.appendChild(fragment);
+ node.scrollIntoView();
+ }
+ }
+
+ getCombinableMessage(predicate) {
+ const now = Date.now();
+ const len = this.visibleMessages.length;
+ const from = len - 1;
+ const to = Math.max(0, len - COMBINE_MAX_MESSAGES);
+ for (let i = from; i >= to; i--) {
+ const message = this.visibleMessages[i];
+ // prettier-ignore
+ const matches = (
+ // Is not an internal message
+ !message.type.startsWith(MESSAGE_TYPE_INTERNAL)
+ // Text payload must fully match
+ && isSameMessage(message, predicate)
+ // Must land within the specified time window
+ && now < message.createdAt + COMBINE_MAX_TIME_WINDOW
+ );
+ if (matches) {
+ return message;
+ }
+ }
+ return null;
+ }
+
+ processBatch(batch, options = {}) {
+ const { prepend, notifyListeners = true } = options;
+ const now = Date.now();
+ // Queue up messages until chat is ready
+ if (!this.isReady()) {
+ if (prepend) {
+ this.queue = [...batch, ...this.queue];
+ } else {
+ this.queue = [...this.queue, ...batch];
+ }
+ return;
+ }
+ // Insert messages
+ const fragment = document.createDocumentFragment();
+ const countByType = {};
+ let node;
+ for (let payload of batch) {
+ const message = createMessage(payload);
+ // Combine messages
+ const combinable = this.getCombinableMessage(message);
+ if (combinable) {
+ combinable.times = (combinable.times || 1) + 1;
+ updateMessageBadge(combinable);
+ continue;
+ }
+ // Reuse message node
+ if (message.node) {
+ node = message.node;
+ }
+ // Reconnected
+ else if (message.type === 'internal/reconnected') {
+ node = createReconnectedNode();
+ }
+ // Create message node
+ else {
+ node = createMessageNode();
+ // Payload is plain text
+ if (message.text) {
+ node.textContent = message.text;
+ }
+ // Payload is HTML
+ else if (message.html) {
+ node.innerHTML = message.html;
+ } else {
+ logger.error('Error: message is missing text payload', message);
+ }
+ // Get all nodes in this message that want to be rendered like jsx
+ const nodes = node.querySelectorAll('[data-component]');
+ for (let i = 0; i < nodes.length; i++) {
+ const childNode = nodes[i];
+ const targetName = childNode.getAttribute('data-component');
+ // Let's pull out the attibute info we need
+ let outputProps = {};
+ for (let j = 0; j < childNode.attributes.length; j++) {
+ const attribute = childNode.attributes[j];
+
+ let working_value = attribute.nodeValue;
+ // We can't do the "if it has no value it's truthy" trick
+ // Because getAttribute returns "", not null. Hate IE
+ if (working_value === '$true') {
+ working_value = true;
+ } else if (working_value === '$false') {
+ working_value = false;
+ } else if (!isNaN(working_value)) {
+ const parsed_float = parseFloat(working_value);
+ if (!isNaN(parsed_float)) {
+ working_value = parsed_float;
+ }
+ }
+
+ let canon_name = attribute.nodeName.replace('data-', '');
+ // html attributes don't support upper case chars, so we need to map
+ canon_name = TGUI_CHAT_ATTRIBUTES_TO_PROPS[canon_name];
+ outputProps[canon_name] = working_value;
+ }
+ const oldHtml = { __html: childNode.innerHTML };
+ while (childNode.firstChild) {
+ childNode.removeChild(childNode.firstChild);
+ }
+ const Element = TGUI_CHAT_COMPONENTS[targetName];
+ /* eslint-disable react/no-danger */
+ render(
+
+
+ ,
+ childNode
+ );
+ /* eslint-enable react/no-danger */
+ }
+
+ // Highlight text
+ if (!message.avoidHighlighting && this.highlightParsers) {
+ this.highlightParsers.map((parser) => {
+ const highlighted = highlightNode(
+ node,
+ parser.highlightRegex,
+ parser.highlightWords,
+ (text) => createHighlightNode(text, parser.highlightColor)
+ );
+ if (highlighted && parser.highlightWholeMessage) {
+ node.className += ' ChatMessage--highlighted';
+ }
+ });
+ }
+ // Linkify text
+ const linkifyNodes = node.querySelectorAll('.linkify');
+ for (let i = 0; i < linkifyNodes.length; ++i) {
+ linkifyNode(linkifyNodes[i]);
+ }
+ // Assign an image error handler
+ if (now < message.createdAt + IMAGE_RETRY_MESSAGE_AGE) {
+ const imgNodes = node.querySelectorAll('img');
+ for (let i = 0; i < imgNodes.length; i++) {
+ const imgNode = imgNodes[i];
+ imgNode.addEventListener('error', handleImageError);
+ }
+ }
+ }
+ // Store the node in the message
+ message.node = node;
+ // Query all possible selectors to find out the message type
+ if (!message.type) {
+ // IE8: Does not support querySelector on elements that
+ // are not yet in the document.
+ // prettier-ignore
+ const typeDef = !Byond.IS_LTE_IE8 && MESSAGE_TYPES
+ .find(typeDef => (
+ typeDef.selector && node.querySelector(typeDef.selector)
+ ));
+ message.type = typeDef?.type || MESSAGE_TYPE_UNKNOWN;
+ }
+ updateMessageBadge(message);
+ if (!countByType[message.type]) {
+ countByType[message.type] = 0;
+ }
+ countByType[message.type] += 1;
+ // TODO: Detect duplicates
+ this.messages.push(message);
+ if (canPageAcceptType(this.page, message.type)) {
+ fragment.appendChild(node);
+ this.visibleMessages.push(message);
+ }
+ }
+ if (node) {
+ const firstChild = this.rootNode.childNodes[0];
+ if (prepend && firstChild) {
+ this.rootNode.insertBefore(fragment, firstChild);
+ } else {
+ this.rootNode.appendChild(fragment);
+ }
+ if (this.scrollTracking) {
+ setImmediate(() => this.scrollToBottom());
+ }
+ }
+ // Notify listeners that we have processed the batch
+ if (notifyListeners) {
+ this.events.emit('batchProcessed', countByType);
+ }
+ }
+
+ pruneMessages() {
+ if (!this.isReady()) {
+ return;
+ }
+ // Delay pruning because user is currently interacting
+ // with chat history
+ if (!this.scrollTracking) {
+ logger.debug('pruning delayed');
+ return;
+ }
+ // Visible messages
+ {
+ const messages = this.visibleMessages;
+ const fromIndex = Math.max(0, messages.length - MAX_VISIBLE_MESSAGES);
+ if (fromIndex > 0) {
+ this.visibleMessages = messages.slice(fromIndex);
+ for (let i = 0; i < fromIndex; i++) {
+ const message = messages[i];
+ this.rootNode.removeChild(message.node);
+ // Mark this message as pruned
+ message.node = 'pruned';
+ }
+ // Remove pruned messages from the message array
+ // prettier-ignore
+ this.messages = this.messages.filter(message => (
+ message.node !== 'pruned'
+ ));
+ logger.log(`pruned ${fromIndex} visible messages`);
+ }
+ }
+ // All messages
+ {
+ const fromIndex = Math.max(
+ 0,
+ this.messages.length - MAX_PERSISTED_MESSAGES
+ );
+ if (fromIndex > 0) {
+ this.messages = this.messages.slice(fromIndex);
+ logger.log(`pruned ${fromIndex} stored messages`);
+ }
+ }
+ }
+
+ rebuildChat() {
+ if (!this.isReady()) {
+ return;
+ }
+ // Make a copy of messages
+ const fromIndex = Math.max(
+ 0,
+ this.messages.length - MAX_PERSISTED_MESSAGES
+ );
+ const messages = this.messages.slice(fromIndex);
+ // Remove existing nodes
+ for (let message of messages) {
+ message.node = undefined;
+ }
+ // Fast clear of the root node
+ this.rootNode.textContent = '';
+ this.messages = [];
+ this.visibleMessages = [];
+ // Repopulate the chat log
+ this.processBatch(messages, {
+ notifyListeners: false,
+ });
+ }
+
+ saveToDisk() {
+ // Allow only on IE11
+ if (Byond.IS_LTE_IE10) {
+ return;
+ }
+ // Compile currently loaded stylesheets as CSS text
+ let cssText = '';
+ const styleSheets = document.styleSheets;
+ for (let i = 0; i < styleSheets.length; i++) {
+ const cssRules = styleSheets[i].cssRules;
+ for (let i = 0; i < cssRules.length; i++) {
+ const rule = cssRules[i];
+ if (rule && typeof rule.cssText === 'string') {
+ cssText += rule.cssText + '\n';
+ }
+ }
+ }
+ cssText += 'body, html { background-color: #141414 }\n';
+ // Compile chat log as HTML text
+ let messagesHtml = '';
+ for (let message of this.visibleMessages) {
+ if (message.node) {
+ messagesHtml += message.node.outerHTML + '\n';
+ }
+ }
+ // Create a page
+ // prettier-ignore
+ const pageHtml = '\n'
+ + '\n'
+ + '\n'
+ + 'SS13 Chat Log\n'
+ + '\n'
+ + '\n'
+ + '\n'
+ + '\n'
+ + messagesHtml
+ + '
\n'
+ + '\n'
+ + '\n';
+ // Create and send a nice blob
+ const blob = new Blob([pageHtml]);
+ const timestamp = new Date()
+ .toISOString()
+ .substring(0, 19)
+ .replace(/[-:]/g, '')
+ .replace('T', '-');
+ window.navigator.msSaveBlob(blob, `ss13-chatlog-${timestamp}.html`);
+ }
+}
+
+// Make chat renderer global so that we can continue using the same
+// instance after hot code replacement.
+if (!window.__chatRenderer__) {
+ window.__chatRenderer__ = new ChatRenderer();
+}
+
+/** @type {ChatRenderer} */
+export const chatRenderer = window.__chatRenderer__;
diff --git a/tgui/packages/tgui-panel/chat/replaceInTextNode.js b/tgui/packages/tgui-panel/chat/replaceInTextNode.js
new file mode 100644
index 0000000000..753997b3b8
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/replaceInTextNode.js
@@ -0,0 +1,204 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+/**
+ * Replaces text matching a regular expression with a custom node.
+ */
+const regexParseNode = (params) => {
+ const { node, regex, createNode, captureAdjust } = params;
+ const text = node.textContent;
+ const textLength = text.length;
+ let nodes;
+ let new_node;
+ let match;
+ let lastIndex = 0;
+ let fragment;
+ let n = 0;
+ let count = 0;
+ // eslint-disable-next-line no-cond-assign
+ while ((match = regex.exec(text))) {
+ n += 1;
+ // Safety check to prevent permanent
+ // client crashing
+ if (++count > 9999) {
+ return {};
+ }
+ // Lazy init fragment
+ if (!fragment) {
+ fragment = document.createDocumentFragment();
+ }
+ // Lazy init nodes
+ if (!nodes) {
+ nodes = [];
+ }
+ const matchText = captureAdjust ? captureAdjust(match[0]) : match[0];
+ const matchLength = matchText.length;
+ // If matchText is set to be a substring nested within the original
+ // matched text make sure to properly offset the index
+ const matchIndex = match.index + match[0].indexOf(matchText);
+ // Insert previous unmatched chunk
+ if (lastIndex < matchIndex) {
+ new_node = document.createTextNode(text.substring(lastIndex, matchIndex));
+ nodes.push(new_node);
+ fragment.appendChild(new_node);
+ }
+ lastIndex = matchIndex + matchLength;
+ // Create a wrapper node
+ new_node = createNode(matchText);
+ nodes.push(new_node);
+ fragment.appendChild(new_node);
+ }
+ if (fragment) {
+ // Insert the remaining unmatched chunk
+ if (lastIndex < textLength) {
+ new_node = document.createTextNode(text.substring(lastIndex, textLength));
+ nodes.push(new_node);
+ fragment.appendChild(new_node);
+ }
+ // Commit the fragment
+ node.parentNode.replaceChild(fragment, node);
+ }
+
+ return {
+ nodes: nodes,
+ n: n,
+ };
+};
+
+/**
+ * Replace text of a node with custom nades if they match
+ * a regex expression or are in a word list
+ */
+export const replaceInTextNode = (regex, words, createNode) => (node) => {
+ let nodes;
+ let result;
+ let n = 0;
+
+ if (regex) {
+ result = regexParseNode({
+ node: node,
+ regex: regex,
+ createNode: createNode,
+ });
+ nodes = result.nodes;
+ n += result.n;
+ }
+
+ if (words) {
+ let i = 0;
+ let wordRegexStr = '(';
+ for (let word of words) {
+ // Capture if the word is at the beginning, end, middle,
+ // or by itself in a message
+ wordRegexStr += `^${word}\\W|\\W${word}\\W|\\W${word}$|^${word}$`;
+ // Make sure the last character for the expression is NOT '|'
+ if (++i !== words.length) {
+ wordRegexStr += '|';
+ }
+ }
+ wordRegexStr += ')';
+ const wordRegex = new RegExp(wordRegexStr, 'gi');
+ if (regex && nodes) {
+ for (let a_node of nodes) {
+ result = regexParseNode({
+ node: a_node,
+ regex: wordRegex,
+ createNode: createNode,
+ captureAdjust: (str) => str.replace(/^\W|\W$/g, ''),
+ });
+ n += result.n;
+ }
+ } else {
+ result = regexParseNode({
+ node: node,
+ regex: wordRegex,
+ createNode: createNode,
+ captureAdjust: (str) => str.replace(/^\W|\W$/g, ''),
+ });
+ n += result.n;
+ }
+ }
+ return n;
+};
+
+// Highlight
+// --------------------------------------------------------
+
+/**
+ * Default highlight node.
+ */
+const createHighlightNode = (text) => {
+ const node = document.createElement('span');
+ node.setAttribute('style', 'background-color:#fd4;color:#000');
+ node.textContent = text;
+ return node;
+};
+
+/**
+ * Highlights the text in the node based on the provided regular expression.
+ *
+ * @param {Node} node Node which you want to process
+ * @param {RegExp} regex Regular expression to highlight
+ * @param {(text: string) => Node} createNode Highlight node creator
+ * @returns {number} Number of matches
+ */
+export const highlightNode = (
+ node,
+ regex,
+ words,
+ createNode = createHighlightNode
+) => {
+ if (!createNode) {
+ createNode = createHighlightNode;
+ }
+ let n = 0;
+ const childNodes = node.childNodes;
+ for (let i = 0; i < childNodes.length; i++) {
+ const node = childNodes[i];
+ // Is a text node
+ if (node.nodeType === 3) {
+ n += replaceInTextNode(regex, words, createNode)(node);
+ } else {
+ n += highlightNode(node, regex, words, createNode);
+ }
+ }
+ return n;
+};
+
+// Linkify
+// --------------------------------------------------------
+
+// prettier-ignore
+const URL_REGEX = /(?:(?:https?:\/\/)|(?:www\.))(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#/%?=~_|$!:,.;(){}]+/ig;
+
+/**
+ * Highlights the text in the node based on the provided regular expression.
+ *
+ * @param {Node} node Node which you want to process
+ * @returns {number} Number of matches
+ */
+export const linkifyNode = (node) => {
+ let n = 0;
+ const childNodes = node.childNodes;
+ for (let i = 0; i < childNodes.length; i++) {
+ const node = childNodes[i];
+ const tag = String(node.nodeName).toLowerCase();
+ // Is a text node
+ if (node.nodeType === 3) {
+ n += linkifyTextNode(node);
+ } else if (tag !== 'a') {
+ n += linkifyNode(node);
+ }
+ }
+ return n;
+};
+
+const linkifyTextNode = replaceInTextNode(URL_REGEX, null, (text) => {
+ const node = document.createElement('a');
+ node.href = text;
+ node.textContent = text;
+ return node;
+});
diff --git a/tgui/packages/tgui-panel/chat/selectors.js b/tgui/packages/tgui-panel/chat/selectors.js
new file mode 100644
index 0000000000..6352b7cddf
--- /dev/null
+++ b/tgui/packages/tgui-panel/chat/selectors.js
@@ -0,0 +1,17 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { map } from 'common/collections';
+
+export const selectChat = (state) => state.chat;
+
+export const selectChatPages = (state) =>
+ map((id) => state.chat.pageById[id])(state.chat.pages);
+
+export const selectCurrentChatPage = (state) =>
+ state.chat.pageById[state.chat.currentPageId];
+
+export const selectChatPageById = (id) => (state) => state.chat.pageById[id];
diff --git a/tgui/packages/tgui-panel/game/actions.js b/tgui/packages/tgui-panel/game/actions.js
new file mode 100644
index 0000000000..e40014c44b
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/actions.js
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { createAction } from 'common/redux';
+
+export const roundRestarted = createAction('roundrestart');
+export const connectionLost = createAction('game/connectionLost');
+export const connectionRestored = createAction('game/connectionRestored');
diff --git a/tgui/packages/tgui-panel/game/constants.js b/tgui/packages/tgui-panel/game/constants.js
new file mode 100644
index 0000000000..f40a529a10
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/constants.js
@@ -0,0 +1,7 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const CONNECTION_LOST_AFTER = 20000;
diff --git a/tgui/packages/tgui-panel/game/hooks.js b/tgui/packages/tgui-panel/game/hooks.js
new file mode 100644
index 0000000000..859aaa09a4
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/hooks.js
@@ -0,0 +1,12 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { useSelector } from 'common/redux';
+import { selectGame } from './selectors';
+
+export const useGame = (context) => {
+ return useSelector(context, selectGame);
+};
diff --git a/tgui/packages/tgui-panel/game/index.js b/tgui/packages/tgui-panel/game/index.js
new file mode 100644
index 0000000000..3cca2e6557
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/index.js
@@ -0,0 +1,9 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export { useGame } from './hooks';
+export { gameMiddleware } from './middleware';
+export { gameReducer } from './reducer';
diff --git a/tgui/packages/tgui-panel/game/middleware.js b/tgui/packages/tgui-panel/game/middleware.js
new file mode 100644
index 0000000000..53dd45bb46
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/middleware.js
@@ -0,0 +1,53 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { pingSoft, pingSuccess } from '../ping/actions';
+import { connectionLost, connectionRestored, roundRestarted } from './actions';
+import { selectGame } from './selectors';
+import { CONNECTION_LOST_AFTER } from './constants';
+
+const withTimestamp = (action) => ({
+ ...action,
+ meta: {
+ ...action.meta,
+ now: Date.now(),
+ },
+});
+
+export const gameMiddleware = (store) => {
+ let lastPingedAt;
+
+ setInterval(() => {
+ const state = store.getState();
+ if (!state) {
+ return;
+ }
+ const game = selectGame(state);
+ const pingsAreFailing =
+ lastPingedAt && Date.now() >= lastPingedAt + CONNECTION_LOST_AFTER;
+ if (!game.connectionLostAt && pingsAreFailing) {
+ store.dispatch(withTimestamp(connectionLost()));
+ }
+ if (game.connectionLostAt && !pingsAreFailing) {
+ store.dispatch(withTimestamp(connectionRestored()));
+ }
+ }, 1000);
+
+ return (next) => (action) => {
+ const { type } = action;
+
+ if (type === pingSuccess.type || type === pingSoft.type) {
+ lastPingedAt = Date.now();
+ return next(action);
+ }
+
+ if (type === roundRestarted.type) {
+ return next(withTimestamp(action));
+ }
+
+ return next(action);
+ };
+};
diff --git a/tgui/packages/tgui-panel/game/reducer.js b/tgui/packages/tgui-panel/game/reducer.js
new file mode 100644
index 0000000000..97535524c5
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/reducer.js
@@ -0,0 +1,39 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { connectionLost } from './actions';
+import { connectionRestored } from './actions';
+
+const initialState = {
+ // TODO: This is where round info should be.
+ roundId: null,
+ roundTime: null,
+ roundRestartedAt: null,
+ connectionLostAt: null,
+};
+
+export const gameReducer = (state = initialState, action) => {
+ const { type, payload, meta } = action;
+ if (type === 'roundrestart') {
+ return {
+ ...state,
+ roundRestartedAt: meta.now,
+ };
+ }
+ if (type === connectionLost.type) {
+ return {
+ ...state,
+ connectionLostAt: meta.now,
+ };
+ }
+ if (type === connectionRestored.type) {
+ return {
+ ...state,
+ connectionLostAt: null,
+ };
+ }
+ return state;
+};
diff --git a/tgui/packages/tgui-panel/game/selectors.js b/tgui/packages/tgui-panel/game/selectors.js
new file mode 100644
index 0000000000..a3b93b327d
--- /dev/null
+++ b/tgui/packages/tgui-panel/game/selectors.js
@@ -0,0 +1,7 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const selectGame = (state) => state.game;
diff --git a/tgui/packages/tgui-panel/index.js b/tgui/packages/tgui-panel/index.js
new file mode 100644
index 0000000000..6bc6b32c46
--- /dev/null
+++ b/tgui/packages/tgui-panel/index.js
@@ -0,0 +1,114 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+// Themes
+import './styles/main.scss';
+import './styles/themes/light.scss';
+
+import { perf } from 'common/perf';
+import { combineReducers } from 'common/redux';
+import { setupHotReloading } from 'tgui-dev-server/link/client.cjs';
+import { setupGlobalEvents } from 'tgui/events';
+import { captureExternalLinks } from 'tgui/links';
+import { createRenderer } from 'tgui/renderer';
+import { configureStore, StoreProvider } from 'tgui/store';
+import { audioMiddleware, audioReducer } from './audio';
+import { chatMiddleware, chatReducer } from './chat';
+import { gameMiddleware, gameReducer } from './game';
+import { setupPanelFocusHacks } from './panelFocus';
+import { pingMiddleware, pingReducer } from './ping';
+import { settingsMiddleware, settingsReducer } from './settings';
+import { telemetryMiddleware } from './telemetry';
+
+perf.mark('inception', window.performance?.timing?.navigationStart);
+perf.mark('init');
+
+const store = configureStore({
+ reducer: combineReducers({
+ audio: audioReducer,
+ chat: chatReducer,
+ game: gameReducer,
+ ping: pingReducer,
+ settings: settingsReducer,
+ }),
+ middleware: {
+ pre: [
+ chatMiddleware,
+ pingMiddleware,
+ telemetryMiddleware,
+ settingsMiddleware,
+ audioMiddleware,
+ gameMiddleware,
+ ],
+ },
+});
+
+const renderApp = createRenderer(() => {
+ const { Panel } = require('./Panel');
+ return (
+
+
+
+ );
+});
+
+const setupApp = () => {
+ // Delay setup
+ if (document.readyState === 'loading') {
+ document.addEventListener('DOMContentLoaded', setupApp);
+ return;
+ }
+
+ setupGlobalEvents({
+ ignoreWindowFocus: true,
+ });
+ setupPanelFocusHacks();
+ captureExternalLinks();
+
+ // Re-render UI on store updates
+ store.subscribe(renderApp);
+
+ // Dispatch incoming messages as store actions
+ Byond.subscribe((type, payload) => store.dispatch({ type, payload }));
+
+ // Unhide the panel
+ Byond.winset('output', {
+ 'is-visible': false,
+ });
+ Byond.winset('browseroutput', {
+ 'is-visible': true,
+ 'is-disabled': false,
+ 'pos': '0x0',
+ 'size': '0x0',
+ });
+
+ // Resize the panel to match the non-browser output
+ Byond.winget('output').then((output) => {
+ Byond.winset('browseroutput', {
+ 'size': output.size,
+ });
+ });
+
+ // Enable hot module reloading
+ if (module.hot) {
+ setupHotReloading();
+ // prettier-ignore
+ module.hot.accept([
+ './audio',
+ './chat',
+ './game',
+ './Notifications',
+ './Panel',
+ './ping',
+ './settings',
+ './telemetry',
+ ], () => {
+ renderApp();
+ });
+ }
+};
+
+setupApp();
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
new file mode 100644
index 0000000000..d60ccaaa9b
--- /dev/null
+++ b/tgui/packages/tgui-panel/package.json
@@ -0,0 +1,13 @@
+{
+ "private": true,
+ "name": "tgui-panel",
+ "version": "4.3.1",
+ "dependencies": {
+ "common": "workspace:*",
+ "dompurify": "^2.3.1",
+ "inferno": "^7.4.8",
+ "tgui": "workspace:*",
+ "tgui-dev-server": "workspace:*",
+ "tgui-polyfill": "workspace:*"
+ }
+}
diff --git a/tgui/packages/tgui-panel/panelFocus.js b/tgui/packages/tgui-panel/panelFocus.js
new file mode 100644
index 0000000000..b7cea22931
--- /dev/null
+++ b/tgui/packages/tgui-panel/panelFocus.js
@@ -0,0 +1,47 @@
+/**
+ * Basically, hacks from goonchat which try to keep the map focused at all
+ * times, except for when some meaningful action happens o
+ *
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { vecLength, vecSubtract } from 'common/vector';
+import { canStealFocus, globalEvents } from 'tgui/events';
+import { focusMap } from 'tgui/focus';
+
+// Empyrically determined number for the smallest possible
+// text you can select with the mouse.
+const MIN_SELECTION_DISTANCE = 10;
+
+const deferredFocusMap = () => setImmediate(() => focusMap());
+
+export const setupPanelFocusHacks = () => {
+ let focusStolen = false;
+ let clickStartPos = null;
+ window.addEventListener('focusin', (e) => {
+ focusStolen = canStealFocus(e.target);
+ });
+ window.addEventListener('mousedown', (e) => {
+ clickStartPos = [e.screenX, e.screenY];
+ });
+ window.addEventListener('mouseup', (e) => {
+ if (clickStartPos) {
+ const clickEndPos = [e.screenX, e.screenY];
+ const dist = vecLength(vecSubtract(clickEndPos, clickStartPos));
+ if (dist >= MIN_SELECTION_DISTANCE) {
+ focusStolen = true;
+ }
+ }
+ if (!focusStolen) {
+ deferredFocusMap();
+ }
+ });
+ globalEvents.on('keydown', (key) => {
+ if (key.isModifierKey()) {
+ return;
+ }
+ deferredFocusMap();
+ });
+};
diff --git a/tgui/packages/tgui-panel/ping/PingIndicator.js b/tgui/packages/tgui-panel/ping/PingIndicator.js
new file mode 100644
index 0000000000..aadbd1c134
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/PingIndicator.js
@@ -0,0 +1,27 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { Color } from 'common/color';
+import { toFixed } from 'common/math';
+import { useSelector } from 'common/redux';
+import { Box } from 'tgui/components';
+import { selectPing } from './selectors';
+
+export const PingIndicator = (props, context) => {
+ const ping = useSelector(context, selectPing);
+ const color = Color.lookup(ping.networkQuality, [
+ new Color(220, 40, 40),
+ new Color(220, 200, 40),
+ new Color(60, 220, 40),
+ ]);
+ const roundtrip = ping.roundtrip ? toFixed(ping.roundtrip) : '--';
+ return (
+
+
+ {roundtrip}
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/ping/actions.js b/tgui/packages/tgui-panel/ping/actions.js
new file mode 100644
index 0000000000..27f103302c
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/actions.js
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { createAction } from 'common/redux';
+
+export const pingReply = createAction('ping/reply');
+
+/**
+ * Soft ping from the server.
+ * It's intended to send periodic server-side metadata about the client,
+ * e.g. its AFK status.
+ */
+export const pingSoft = createAction('ping/soft');
+
+export const pingSuccess = createAction('ping/success', (ping) => ({
+ payload: {
+ lastId: ping.id,
+ roundtrip: (Date.now() - ping.sentAt) * 0.5,
+ },
+}));
+
+export const pingFail = createAction('ping/fail');
diff --git a/tgui/packages/tgui-panel/ping/constants.js b/tgui/packages/tgui-panel/ping/constants.js
new file mode 100644
index 0000000000..54fd42fcd7
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/constants.js
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const PING_TIMEOUT = 2000;
+export const PING_MAX_FAILS = 3;
+export const PING_QUEUE_SIZE = 8;
+export const PING_ROUNDTRIP_BEST = 50;
+export const PING_ROUNDTRIP_WORST = 200;
diff --git a/tgui/packages/tgui-panel/ping/index.js b/tgui/packages/tgui-panel/ping/index.js
new file mode 100644
index 0000000000..1bbbe3ed34
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/index.js
@@ -0,0 +1,9 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export { pingMiddleware } from './middleware';
+export { PingIndicator } from './PingIndicator';
+export { pingReducer } from './reducer';
diff --git a/tgui/packages/tgui-panel/ping/middleware.js b/tgui/packages/tgui-panel/ping/middleware.js
new file mode 100644
index 0000000000..e5b593d822
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/middleware.js
@@ -0,0 +1,60 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { pingFail, pingReply, pingSoft, pingSuccess } from './actions';
+import { PING_QUEUE_SIZE, PING_TIMEOUT } from './constants';
+
+export const pingMiddleware = (store) => {
+ let initialized = false;
+ let index = 0;
+ const pings = [];
+
+ const sendPing = () => {
+ for (let i = 0; i < PING_QUEUE_SIZE; i++) {
+ const ping = pings[i];
+ if (ping && Date.now() - ping.sentAt > PING_TIMEOUT) {
+ pings[i] = null;
+ store.dispatch(pingFail());
+ }
+ }
+ const ping = { index, sentAt: Date.now() };
+ pings[index] = ping;
+ Byond.sendMessage('ping', { index });
+ index = (index + 1) % PING_QUEUE_SIZE;
+ };
+
+ return (next) => (action) => {
+ const { type, payload } = action;
+
+ if (!initialized) {
+ initialized = true;
+ sendPing();
+ }
+
+ if (type === pingSoft.type) {
+ const { afk } = payload;
+ // On each soft ping where client is not flagged as afk,
+ // initiate a new ping.
+ if (!afk) {
+ sendPing();
+ }
+ return next(action);
+ }
+
+ if (type === pingReply.type) {
+ const { index } = payload;
+ const ping = pings[index];
+ // Received a timed out ping
+ if (!ping) {
+ return;
+ }
+ pings[index] = null;
+ return next(pingSuccess(ping));
+ }
+
+ return next(action);
+ };
+};
diff --git a/tgui/packages/tgui-panel/ping/reducer.js b/tgui/packages/tgui-panel/ping/reducer.js
new file mode 100644
index 0000000000..b1e3d679cb
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/reducer.js
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { clamp01, scale } from 'common/math';
+import { pingFail, pingSuccess } from './actions';
+import { PING_MAX_FAILS, PING_ROUNDTRIP_BEST, PING_ROUNDTRIP_WORST } from './constants';
+
+export const pingReducer = (state = {}, action) => {
+ const { type, payload } = action;
+
+ if (type === pingSuccess.type) {
+ const { roundtrip } = payload;
+ const prevRoundtrip = state.roundtripAvg || roundtrip;
+ const roundtripAvg = Math.round(prevRoundtrip * 0.4 + roundtrip * 0.6);
+ const networkQuality =
+ 1 - scale(roundtripAvg, PING_ROUNDTRIP_BEST, PING_ROUNDTRIP_WORST);
+ return {
+ roundtrip,
+ roundtripAvg,
+ failCount: 0,
+ networkQuality,
+ };
+ }
+
+ if (type === pingFail.type) {
+ const { failCount = 0 } = state;
+ const networkQuality = clamp01(
+ state.networkQuality - failCount / PING_MAX_FAILS
+ );
+ const nextState = {
+ ...state,
+ failCount: failCount + 1,
+ networkQuality,
+ };
+ if (failCount > PING_MAX_FAILS) {
+ nextState.roundtrip = undefined;
+ nextState.roundtripAvg = undefined;
+ }
+ return nextState;
+ }
+
+ return state;
+};
diff --git a/tgui/packages/tgui-panel/ping/selectors.js b/tgui/packages/tgui-panel/ping/selectors.js
new file mode 100644
index 0000000000..1b8bfb4ee4
--- /dev/null
+++ b/tgui/packages/tgui-panel/ping/selectors.js
@@ -0,0 +1,7 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+export const selectPing = (state) => state.ping;
diff --git a/tgui/packages/tgui-panel/reconnect.tsx b/tgui/packages/tgui-panel/reconnect.tsx
new file mode 100644
index 0000000000..ecfd767169
--- /dev/null
+++ b/tgui/packages/tgui-panel/reconnect.tsx
@@ -0,0 +1,37 @@
+import { Button } from 'tgui/components';
+
+let url: string | null = null;
+
+setInterval(() => {
+ Byond.winget('', 'url').then((currentUrl) => {
+ // Sometimes, for whatever reason, BYOND will give an IP with a :0 port.
+ if (currentUrl && !currentUrl.match(/:0$/)) {
+ url = currentUrl;
+ }
+ });
+}, 5000);
+
+export const ReconnectButton = () => {
+ if (!url) {
+ return null;
+ }
+ return (
+ <>
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.js b/tgui/packages/tgui-panel/settings/SettingsPanel.js
new file mode 100644
index 0000000000..90abe4e36b
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/SettingsPanel.js
@@ -0,0 +1,311 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { toFixed } from 'common/math';
+import { useLocalState } from 'tgui/backend';
+import { useDispatch, useSelector } from 'common/redux';
+import { Box, Button, ColorBox, Divider, Dropdown, Flex, Input, LabeledList, NumberInput, Section, Stack, Tabs, TextArea } from 'tgui/components';
+import { ChatPageSettings } from '../chat';
+import { rebuildChat, saveChatToDisk } from '../chat/actions';
+import { THEMES } from '../themes';
+import { changeSettingsTab, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from './actions';
+import { SETTINGS_TABS, FONTS, MAX_HIGHLIGHT_SETTINGS } from './constants';
+import { selectActiveTab, selectSettings, selectHighlightSettings, selectHighlightSettingById } from './selectors';
+
+export const SettingsPanel = (props, context) => {
+ const activeTab = useSelector(context, selectActiveTab);
+ const dispatch = useDispatch(context);
+ return (
+
+
+
+
+ {SETTINGS_TABS.map((tab) => (
+
+ dispatch(
+ changeSettingsTab({
+ tabId: tab.id,
+ })
+ )
+ }>
+ {tab.name}
+
+ ))}
+
+
+
+
+ {activeTab === 'general' && }
+ {activeTab === 'chatPage' && }
+ {activeTab === 'textHighlight' && }
+
+
+ );
+};
+
+export const SettingsGeneral = (props, context) => {
+ const { theme, fontFamily, fontSize, lineHeight } = useSelector(
+ context,
+ selectSettings
+ );
+ const dispatch = useDispatch(context);
+ const [freeFont, setFreeFont] = useLocalState(context, 'freeFont', false);
+ return (
+
+ );
+};
+
+const TextHighlightSettings = (props, context) => {
+ const highlightSettings = useSelector(context, selectHighlightSettings);
+ const dispatch = useDispatch(context);
+ return (
+
+
+
+ {highlightSettings.map((id, i) => (
+
+ ))}
+ {highlightSettings.length < MAX_HIGHLIGHT_SETTINGS && (
+
+
+ )}
+
+
+
+
+
+
+ Can freeze the chat for a while.
+
+
+
+ );
+};
+
+const TextHighlightSetting = (props, context) => {
+ const { id, ...rest } = props;
+ const highlightSettingById = useSelector(context, selectHighlightSettingById);
+ const dispatch = useDispatch(context);
+ const {
+ highlightColor,
+ highlightText,
+ highlightWholeMessage,
+ matchWord,
+ matchCase,
+ } = highlightSettingById[id];
+ return (
+
+
+
+
+
+
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightWholeMessage: !highlightWholeMessage,
+ })
+ )
+ }
+ />
+
+
+
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ matchWord: !matchWord,
+ })
+ )
+ }
+ />
+
+
+
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ matchCase: !matchCase,
+ })
+ )
+ }
+ />
+
+
+
+
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightColor: value,
+ })
+ )
+ }
+ />
+
+
+