From d29d74621c4e4e497077f1e26bb530ce5ccaac19 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Mon, 6 Apr 2026 08:00:04 +0200 Subject: [PATCH] filters cig messages properly (#19369) --- .../objects/items/weapons/cigs_lighters.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5d07d4d4cea..1cad9ee3ded 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -285,7 +285,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/nicotine_amt = 2 matchmes = span_notice("USER lights their NAME with their FLAME.") lightermes = span_notice("USER manages to light their NAME with FLAME.") - zippomes = span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.") + zippomes = span_notice(span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.")) weldermes = span_notice("USER casually lights the NAME with FLAME.") ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME.") special_handling = TRUE @@ -351,7 +351,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM nicotine_amt = 4 matchmes = span_notice("USER lights their NAME with their FLAME.") lightermes = span_notice("USER manages to offend their NAME by lighting it with FLAME.") - zippomes = span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.") + zippomes = span_notice(span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.")) weldermes = span_notice("USER insults NAME by lighting it with FLAME.") ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.") @@ -422,7 +422,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM chem_volume = 50 matchmes = span_notice("USER lights their NAME with their FLAME.") lightermes = span_notice("USER manages to light their NAME with FLAME.") - zippomes = span_rose("With much care, USER lights their NAME with their FLAME.") + zippomes = span_notice(span_rose("With much care, USER lights their NAME with their FLAME.")) weldermes = span_notice("USER recklessly lights NAME with FLAME.") ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.") is_pipe = 1 @@ -673,7 +673,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(istype(src, /obj/item/flame/lighter/zippo)) - cig.light(span_rose("[user] whips the [name] out and holds it for [M].")) + cig.light(span_notice(span_rose("[user] whips the [name] out and holds it for [M]."))) else cig.light(span_notice("[user] holds the [name] out for [M], and lights the [cig.name].")) else @@ -715,7 +715,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "[base_state]on" item_state = "[base_state]on" playsound(src, activation_sound, 75, 1) - user.visible_message(span_rose("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")) + user.visible_message(span_notice(span_rose("Without even breaking stride, [user] flips open and lights [src] in one smooth movement."))) set_light(2, 0.5, "#FF9933") START_PROCESSING(SSobj, src) @@ -724,7 +724,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "[base_state]" item_state = "[base_state]" playsound(src, deactivation_sound, 75, 1) - user.visible_message(span_rose("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")) + user.visible_message(span_notice(span_rose("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing."))) set_light(0) STOP_PROCESSING(SSobj, src) @@ -840,7 +840,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[base_state]on" playsound(src, activation_sound, 75, 1) if(prob(50)) - user.visible_message(span_rose("[user] safely activates the [src] with a push of a button!")) + user.visible_message(span_notice(span_rose("[user] safely activates the [src] with a push of a button!"))) else if(prob(95)) user.visible_message(span_notice("After a few attempts, [user] manages to excite the supermatter within the [src].")) @@ -866,7 +866,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[base_state]" playsound(src, deactivation_sound, 75, 1) if(istype(src, /obj/item/flame/lighter/supermatter) ) - user.visible_message(span_rose("You hear a quiet click, as [user] shuts the [src] without even looking at what they're doing.")) + user.visible_message(span_notice(span_rose("You hear a quiet click, as [user] shuts the [src] without even looking at what they're doing."))) else user.visible_message(span_notice("[user] quietly shuts the [src].")) @@ -889,7 +889,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(istype(src, /obj/item/flame/lighter/supermatter)) - cig.light(span_rose("[user] whips the [name] out and holds it for [M].")) + cig.light(span_notice(span_rose("[user] whips the [name] out and holds it for [M]."))) else cig.light(span_notice("[user] holds the [name] out for [M], and lights the [cig.name].")) else @@ -914,7 +914,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[base_state]on" playsound(src, activation_sound, 75, 1) if(prob(50)) - user.visible_message(span_rose("[user] safely activates the [src] with a push of a button!")) + user.visible_message(span_notice(span_rose("[user] safely activates the [src] with a push of a button!"))) else if(prob(95)) user.visible_message(span_notice("After a few attempts, [user] manages to excite the supermatter within the [src].")) @@ -940,7 +940,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[base_state]" playsound(src, deactivation_sound, 75, 1) if(istype(src, /obj/item/flame/lighter/supermatter/syndismzippo) ) - user.visible_message(span_rose("You hear a quiet click, as [user] shuts the [src] without even looking at what they're doing.")) + user.visible_message(span_notice(span_rose("You hear a quiet click, as [user] shuts the [src] without even looking at what they're doing."))) else user.visible_message(span_notice("[user] quietly shuts the [src].")) @@ -963,7 +963,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(istype(src, /obj/item/flame/lighter/supermatter/syndismzippo)) - cig.light(span_rose("[user] whips the [name] out and holds it for [M].")) + cig.light(span_notice(span_rose("[user] whips the [name] out and holds it for [M]."))) else cig.light(span_notice("[user] holds the [name] out for [M], and lights the [cig.name].")) else @@ -990,8 +990,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/i = rand(1, 100) switch(i) if(1 to 22) - to_chat(user, span_rose("[user] safely reveals the supermatter shard within the [src]!")) - user.visible_message(span_rose("You safely revealed the supermatter shard within the [src]!")) + to_chat(user, span_notice(span_rose("[user] safely reveals the supermatter shard within the [src]!"))) + user.visible_message(span_notice(span_rose("You safely revealed the supermatter shard within the [src]!"))) if (user.get_left_hand() == src) user.apply_damage(1, IRRADIATE, BP_L_HAND) else // Even using this safely will irradiate you a tiny tiny bit. @@ -1115,7 +1115,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[base_state]" playsound(src, deactivation_sound, 75, 1) if (istype(src, /obj/item/flame/lighter/supermatter/expsmzippo)) - user.visible_message(span_rose("You hear a quiet click, as [user] closes the [src].")) + user.visible_message(span_notice(span_rose("You hear a quiet click, as [user] closes the [src]."))) else user.visible_message(span_notice("[user] quietly shuts the [src].")) @@ -1136,7 +1136,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if (istype(src, /obj/item/flame/lighter/supermatter/expsmzippo)) - cig.light(span_rose("[user] whips the [name] out and holds it for [M].")) + cig.light(span_notice(span_rose("[user] whips the [name] out and holds it for [M]."))) else cig.light(span_notice("[user] holds the [name] out for [M], and lights the [cig.name].")) else