Skip to content

Commit

Permalink
Consistent \the usage.
Browse files Browse the repository at this point in the history
Plus a bit extra in `/obj/item/lightstick/attack_hand()` because it's right there.
  • Loading branch information
SabreML committed Dec 1, 2023
1 parent ddf86a9 commit 357728a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/explosives/plastic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@

//vehicle interior stuff checks
if(SSinterior.in_interior(target))
to_chat(user, SPAN_WARNING("It's too cramped in here to deploy \the [src]."))
to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src]."))
return FALSE

if(istype(target, /obj/effect) || istype(target, /obj/structure/machinery))
Expand All @@ -195,7 +195,7 @@
if(istype(target, /turf/closed/wall))
var/turf/closed/wall/W = target
if(W.hull)
to_chat(user, SPAN_WARNING("You are unable to stick \the [src] to [W]!"))
to_chat(user, SPAN_WARNING("You are unable to stick [src] to [W]!"))
return FALSE

if(istype(target, /obj/structure/window))
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/lightstick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
if(!anchored)//If planted
return

to_chat(user, "You start pulling out \the [src].")
if(!do_after(user,20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
to_chat(user, "You start pulling out [src].")
if(!do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
return

anchored = FALSE
user.visible_message("[user.name] removes \the [src] from the ground.","You remove [src] from the ground.")
user.visible_message("[user.name] removes [src] from the ground.", "You remove [src] from the ground.")
icon_state = "lightstick_[s_color][anchored]"
set_light(0)
pixel_x = 0
pixel_y = 0
playsound(user, 'sound/weapons/Genhit.ogg', 25, 1)
playsound(user, 'sound/weapons/Genhit.ogg', 25, TRUE)

//Red
/obj/item/lightstick/planted
Expand Down

0 comments on commit 357728a

Please sign in to comment.