From 381e12f04a395d6413df0f7e89992e135fd79f76 Mon Sep 17 00:00:00 2001 From: Fermi Date: Tue, 2 Jul 2019 22:52:45 +0100 Subject: [PATCH] Fixing message_admins. --- code/modules/mob/living/living.dm | 8 +++----- modular_citadel/code/datums/status_effects/chems.dm | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8ab8991320..57a3f8d5e4 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -318,16 +318,14 @@ visible_message("[src] points at [A].", "You point at [A].") return TRUE -/mob/living/verb/succumb(whispered as num) +/mob/living/verb/succumb(whispered as null) set name = "Succumb" set category = "IC" - message_admins("succumb pressed") if(src.has_status_effect(/datum/status_effect/chem/enthrall)) - message_admins("status found") var/datum/status_effect/chem/enthrall/E = src.has_status_effect(/datum/status_effect/chem/enthrall) if(E.phase < 3) - message_admins("increasing phase") - E.phase += 1 + E.enthrallTally += 50 + to_chat(src, "You give into [E.master]'s influence'.") if (InCritical()) log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", LOG_ATTACK) adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 4622b84ac9..2fb5500c42 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -178,8 +178,8 @@ set category = "IC" set name = "Toggle Lewdchem" set desc = "Allows you to toggle if you'd like lewd flavour messages." - client?.prefs.lewdchem = !(client?.prefs.lewdchem) - to_chat(usr, "You [(client?.prefs.lewdchem?"will":"no longer")] receive lewdchem messages.") + client.prefs.lewdchem = !(client.prefs.lewdchem) + to_chat(usr, "You [(client.prefs.lewdchem?"will":"no longer")] receive lewdchem messages.") /datum/status_effect/chem/enthrall id = "enthrall"