diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 16cd23326a5..2a2d9e299f2 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -236,9 +236,9 @@ var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", SSshuttle.emergency.timeLeft() ) as num|null if(!timer) return - SSshuttle.emergency.setTimer(timer*10) + SSshuttle.emergency.setTimer(timer SECONDS) log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.") - minor_announce("The emergency shuttle will reach its destination in [DisplayTimeText(timer)].") + minor_announce("The emergency shuttle will reach its destination in [DisplayTimeText(timer SECONDS)].") message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.") else if(href_list["trigger_centcom_recall"]) if(!check_rights(R_ADMIN)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index dd270a7ab5a..809ebab40aa 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -98,8 +98,8 @@ take_bodypart_damage(10 + 5 * extra_speed, check_armor = TRUE, wound_bonus = extra_speed * 5) victim.Paralyze(20) Paralyze(20) - visible_message("[src] crashes into [victim] [extra_speed ? "really hard" : ""], knocking them both over!",\ - "You violently crash into [victim] [extra_speed ? "extra hard" : ""]!") + visible_message("[src] crashes into [victim][extra_speed ? " really hard" : ""], knocking them both over!",\ + "You violently crash into [victim][extra_speed ? " extra hard" : ""]!") playsound(src,'sound/weapons/punch1.ogg',50,TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 3fe359d2b45..343e0319787 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -191,7 +191,7 @@ to_chat(src, "Not a valid name, please try again.") dragon_name() return - visible_message("Your name is now [chosen_name], the feared Space Dragon.") + to_chat(src, "Your name is now [chosen_name], the feared Space Dragon.") fully_replace_character_name(null, chosen_name) /** diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index c130dbb57f5..f138bdeb09f 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -9,7 +9,9 @@ /obj/effect/proc_holder/spell/targeted/touch/Destroy() remove_hand() - to_chat(usr, "The power of the spell dissipates from your hand.") + if(action?.owner) + var/mob/guy_who_needs_to_know = action.owner + to_chat(guy_who_needs_to_know, "The power of the spell dissipates from your hand.") ..() /obj/effect/proc_holder/spell/targeted/touch/proc/remove_hand(recharge = FALSE)