mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 19:44:46 +01:00
ticker followup (#18275)
* ticker followup * . * . * fix the timer * . * move sleep out of ticker * area * strip improper
This commit is contained in:
@@ -178,7 +178,7 @@ var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
|
||||
/proc/init_lunchable_list(var/list/lunches)
|
||||
. = list()
|
||||
for(var/obj/O as anything in lunches)
|
||||
var/name = replacetext(initial(O.name), new/regex("\improper *", "g"), "")
|
||||
var/name = strip_improper(initial(O.name))
|
||||
.[name] = O
|
||||
return sortAssoc(.)
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
if(!isbelly(loc) || !vore_death_privacy)
|
||||
for(var/mob/observer/dead/O in GLOB.mob_list)
|
||||
if(O.client?.prefs?.read_preference(/datum/preference/toggle/show_dsay))
|
||||
to_chat(O, span_deadsay(span_bold("[src]") + " has died in " + span_bold("[get_area(src)]") + ". [ghost_follow_link(src, O)] "))
|
||||
to_chat(O, span_deadsay(span_bold("[src]") + " has died in " + span_bold(strip_improper("[A]")) + ". [ghost_follow_link(src, O)] "))
|
||||
|
||||
if(!gibbed && !isbelly(loc))
|
||||
playsound(src, pick(get_species_sound(get_gendered_sound(src))["death"]), src.species.death_volume, 1, 20, volume_channel = VOLUME_CHANNEL_DEATH_SOUNDS)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
if(G.emped == 1)
|
||||
t += "<BR>[tracked_gpstag]: ERROR"
|
||||
else
|
||||
t += "<BR>[tracked_gpstag]: [format_text(gps_area.name)] ([pos.x], [pos.y], [pos.z])"
|
||||
t += "<BR>[tracked_gpstag]: [strip_improper(gps_area.name)] ([pos.x], [pos.y], [pos.z])"
|
||||
|
||||
var/datum/browser/popup = new(user, "GPS", name, 600, 450)
|
||||
popup.set_content(t)
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
data["message_current_id"] = current_viewing_message_id
|
||||
data["message_current"] = current_viewing_message
|
||||
|
||||
// data["lastCallLoc"] = SSshuttle.emergencyLastCallLoc ? format_text(SSshuttle.emergencyLastCallLoc.name) : null
|
||||
// data["lastCallLoc"] = SSshuttle.emergencyLastCallLoc ? strip_improper(SSshuttle.emergencyLastCallLoc.name) : null
|
||||
data["msg_cooldown"] = message_cooldown ? (round((message_cooldown - world.time) / 10)) : 0
|
||||
data["cc_cooldown"] = centcomm_message_cooldown ? (round((centcomm_message_cooldown - world.time) / 10)) : 0
|
||||
|
||||
|
||||
@@ -76,8 +76,7 @@ Notes:
|
||||
content = "<p>[content]</p>"
|
||||
|
||||
// Strip macros from item names
|
||||
title = replacetext(title, "\proper", "")
|
||||
title = replacetext(title, "\improper", "")
|
||||
title = strip_improper(title)
|
||||
|
||||
//Make our dumb param object
|
||||
params = {"{ "cursor": "[params]", "screenLoc": "[thing.screen_loc]" }"}
|
||||
|
||||
Reference in New Issue
Block a user