mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Miming check
This commit is contained in:
+1
-1
@@ -47,7 +47,7 @@
|
||||
var/linglink
|
||||
var/datum/martial_art/martial_art
|
||||
var/static/default_martial_art = new/datum/martial_art
|
||||
var/miming = 0 // Mime's vow of silence
|
||||
var/miming = FALSE // Mime's vow of silence
|
||||
var/list/antag_datums
|
||||
var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
|
||||
var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
if(H.mind)
|
||||
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null))
|
||||
H.mind.miming = 1
|
||||
H.mind.miming = TRUE
|
||||
|
||||
/obj/item/book/mimery
|
||||
name = "Guide to Dank Mimery"
|
||||
|
||||
@@ -1168,7 +1168,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
|
||||
glass_desc = "A drink from Mime Heaven."
|
||||
|
||||
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M)
|
||||
if(ishuman(M) && M.job == "Mime")
|
||||
if(ishuman(M) && M.mind?.miming)
|
||||
M.silent = max(M.silent, MIMEDRINK_SILENCE_DURATION)
|
||||
M.heal_bodypart_damage(1,1)
|
||||
. = 1
|
||||
@@ -1847,7 +1847,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
|
||||
glass_desc = "A fizzy cocktail for those looking to start fresh."
|
||||
|
||||
/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/M)
|
||||
if(ishuman(M) && M.job == "Mime")
|
||||
if(ishuman(M) && M.mind?.miming)
|
||||
M.silent = max(M.silent, MIMEDRINK_SILENCE_DURATION)
|
||||
M.heal_bodypart_damage(1,1)
|
||||
. = 1
|
||||
|
||||
@@ -142,9 +142,9 @@
|
||||
shot_glass_icon_state = "shotglass"
|
||||
|
||||
/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/M)
|
||||
if(ishuman(M) && M.job == "Mime")
|
||||
if(ishuman(M) && M.mind?.miming)
|
||||
M.silent = max(M.silent, MIMEDRINK_SILENCE_DURATION)
|
||||
M.heal_bodypart_damage(1,1, 0)
|
||||
M.heal_bodypart_damage(1,1)
|
||||
. = 1
|
||||
..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user