From f9865e39c1136afff1e147ca29c17bf3d8da3681 Mon Sep 17 00:00:00 2001 From: coiax Date: Sat, 1 Apr 2017 16:15:13 +0100 Subject: [PATCH] Fixes grammar on objects landing and bouncing off rims (#25722) Similar messages for basket ball hoops, and things landing in disposal bins. Huh. --- code/modules/holodeck/items.dm | 6 +++--- code/modules/recycling/disposal-unit.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 87196414841..11b016fd228 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -124,10 +124,10 @@ if(istype(I, /obj/item/projectile)) return if(prob(50)) - I.loc = src.loc - visible_message(" Swish! \the [I] lands in \the [src].") + I.forceMove(get_turf(src)) + visible_message("Swish! [I] lands in [src].") else - visible_message(" \the [I] bounces off of \the [src]'s rim!") + visible_message("[I] bounces off of [src]'s rim!") return 0 else return ..() diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index c1c8b305dcc..bf5421190fa 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -340,11 +340,11 @@ if(istype(I, /obj/item/projectile)) return if(prob(75)) - I.loc = src - visible_message("\the [I] lands in \the [src].") + I.forceMove(src) + visible_message("[I] lands in [src].") update_icon() else - visible_message("\the [I] bounces off of \the [src]'s rim!") + visible_message("[I] bounces off of [src]'s rim!") return 0 else return ..(mover, target, height)