Merge pull request #10947 from Ghommie/Ghommie-cit563

Holopad static fix and a few other mistakes.
This commit is contained in:
kevinz000
2020-02-15 12:16:23 -07:00
committed by GitHub
6 changed files with 24 additions and 22 deletions
@@ -14,13 +14,10 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/insult/run_emote(mob/living/user, params)
var/insult_message = ""
var/miming = user.mind ? user.mind.miming : 0
if(!user.is_muzzled())
insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen")
message = insult_message
else if(miming)
if(user.mind?.miming)
message = "creatively gesticulates."
else if(!user.is_muzzled())
message = pick_list_replacements(INSULTS_FILE, "insult_gen")
else
message = "muffles something."
. = ..()
@@ -36,7 +33,7 @@
sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
if(iscyborg(user))
var/mob/living/silicon/robot/S = user
if(S.cell.charge < 20)
if(S.cell?.charge < 20)
to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
return
S.cell.use(200)