From 2ac3771ad13f06f00255075de7a2325a0407cdc5 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 12 Feb 2017 15:07:46 -0200 Subject: [PATCH] Fix the ccia headset having the wrong key (#1759) -fix wrong ccia radio key -fix messed up bike messages --- code/modules/cciaa/cciaa_items.dm | 2 +- code/modules/vehicles/bike.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index b09f708f2b1..6a94f878718 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -256,7 +256,7 @@ /obj/item/device/radio/headset/ert/ccia name = "central command internal affairs radio headset" - ks2type = /obj/item/device/encryptionkey/ert + ks2type = /obj/item/device/encryptionkey/ccia /obj/item/device/encryptionkey/ccia name = "\improper CCIA radio encryption key" diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index b276837823c..f251bd38374 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -51,12 +51,12 @@ if(usr.incapacitated()) return if(kickstand) - src.visible_message("You put up \the [src]'s kickstand.") + src.visible_message("\The [usr] puts up \the [src]'s kickstand.", "You put up \the [src]'s kickstand.", "You hear a thunk.") else if(istype(src.loc,/turf/space)) usr << " You don't think kickstands work in space..." return - src.visible_message("You put down \the [src]'s kickstand.") + src.visible_message("\The [usr] puts down \the [src]'s kickstand.", "You put down \the [src]'s kickstand.", "You hear a thunk.") if(pulledby) pulledby.stop_pulling()