diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm index 1a1c1888f90..d1d6592998f 100644 --- a/code/datums/Emote_system/emote.dm +++ b/code/datums/Emote_system/emote.dm @@ -89,8 +89,8 @@ VampyrBytes doAction(user, params) - for (var/obj/item/weapon/implant/I in user) - if (I.implanted) + for(var/obj/item/weapon/implant/I in user) + if(I.implanted) I.trigger(command, user) return @@ -198,7 +198,7 @@ VampyrBytes if(!isliving(user)) return var/mob/living/L = user - if (L.silent) + if(L.silent) return 1 /datum/emote/proc/checkForParams(var/list/params) @@ -212,11 +212,11 @@ VampyrBytes return if(startText) message = "[startText] [message]" - message = "[message]" + message = "[message]" return message /datum/emote/proc/standardMessage(var/mob/user, var/list/params) - var/message = "\The [user] [text]" + var/message = "\The [user] [text]" if("target" in params) message = addTarget(user, params, message) return message @@ -226,13 +226,13 @@ VampyrBytes return if(checkForParams(params)) return paramMimeMessage(user, params) - var/message = "\The [user] [mimeText]" + var/message = "\The [user] [mimeText]" if(message && "target" in params) message = addTarget(user, params, message) return message /datum/emote/proc/muzzleMessage(var/mob/user, var/list/params) - var/message = "\The [user] makes a " + var/message = "\The [user] makes a " if(muzzledNoise) message += "[muzzledNoise] " message += "noise" @@ -287,6 +287,7 @@ VampyrBytes /datum/emote/proc/processMessage(var/mob/user, var/list/params, var/message = "") var/visualOrAudible = audible + 1 + testing("message = [message]") if(doMime(user)) visualOrAudible = 1 @@ -301,10 +302,10 @@ VampyrBytes outputMessage(M, msg) continue - if(M.stat == UNCONSCIOUS || (M.sleeping > 0 && M.stat != 2)) - if (!visualOrAudible == 2) + if(M.stat == UNCONSCIOUS || (M.sleeping && M.stat != DEAD)) + if(!visualOrAudible == 2) continue - msg = "... You can almost hear someone talking ..." + msg = "... You can almost hear someone talking ..." outputMessage(M, msg) continue @@ -388,7 +389,7 @@ VampyrBytes //non-audible emotes and the standard message for audible ones /datum/emote/proc/createBlindMessage(var/mob/user, var/list/params, var/message) if(audible && selfText) - return "You hear someone [selfText]" + return "You hear someone [selfText]" // set up different messages for deaf people here. Empty will mean no message for // audible emotes and standard for non-audible ones diff --git a/code/datums/Emote_system/emote_handler.dm b/code/datums/Emote_system/emote_handler.dm index 0e2b8fd0238..be962a72dc7 100644 --- a/code/datums/Emote_system/emote_handler.dm +++ b/code/datums/Emote_system/emote_handler.dm @@ -43,7 +43,7 @@ return 0 if(!commands[command] && !(command == "me")) - to_chat(owner, "Unknown emote, please check *help for emotes available to your character") + to_chat(owner, "Unknown emote, please check *help for emotes available to your character") return 0 if(!emote) @@ -55,14 +55,14 @@ var/prevented = emote.prevented(owner) if(prevented) - to_chat(owner, "You can't do that because [prevented]!") + to_chat(owner, "You can't do that because [prevented]!") return 0 return emote.doEmote(owner, command) /datum/emoteHandler/proc/showCommands() var/emoteList = "Available emotes are " var/commandAdded = 0 - for (var/c in commands) + for(var/c in commands) if(commandAdded) emoteList += ", " emoteList += c diff --git a/code/datums/Emote_system/emotes.dm b/code/datums/Emote_system/emotes.dm index 81657b7fab1..a5383c30c23 100644 --- a/code/datums/Emote_system/emotes.dm +++ b/code/datums/Emote_system/emotes.dm @@ -334,7 +334,7 @@ /datum/emote/dap/addTarget(var/mob/user, var/list/params, var/message = "") if(!params["target"] || params["target"] == user) - message = "[user] sadly can't find anybody to give daps to, and daps \himself. Shameful" + message = "[user] sadly can't find anybody to give daps to, and daps \himself. Shameful" return message return ..() @@ -362,7 +362,7 @@ /datum/emote/deathgasp/human/standardMessage(var/mob/user, var/list/params) var/mob/living/carbon/human/U = user - var/message = "\The [user] [U.species.death_message]" + var/message = "\The [user] [U.species.death_message]" return message /datum/emote/deathgasp/human/createSelfMessage(var/mob/user, var/list/params, var/message) @@ -460,13 +460,11 @@ /datum/emote/fart/standardMessage(var/mob/user) var/message - if(SUPER_FART in user.mutations) - return // super fart will make the message when triggered if(TOXIC_FARTS in user.mutations) - message = "\The [user] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart" + message = "\The [user] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart" return message - message = "\The [user] [pick("passes wind","farts")]" + message = "\The [user] [pick("passes wind","farts")]" return message /datum/emote/fart/createSelfMessage(var/mob/user, var/list/params, var/message) @@ -478,23 +476,13 @@ /datum/emote/fart/doAction(var/mob/user) if(TOXIC_FARTS in user.mutations) for(var/mob/M in range(get_turf(user),2)) - if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT)) + if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT)) continue - if (M == user) + if(M == user) continue - M.reagents.add_reagent("space_drugs",rand(1,10)) - - if(SUPER_FART in user.mutations) - var/mob/living/U = user - for(var/datum/action/spell_action/spell in U.actions) - if (spell.name == "Super Fart") - spell.Trigger() - break + M.reagents.add_reagent("jenkem", 1) if(locate(/obj/item/weapon/storage/bible) in get_turf(user)) - if(SUPER_FART in user.mutations) - sleep(30) // need to wait for them to finish the super fart before gibbing them - to_chat(viewers(user), "[user] farted on the Bible!") to_chat(viewers(user), "A mysterious force smites [user]!") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -518,7 +506,7 @@ return 1 /datum/emote/flap/standardMessage(var/mob/user, var/list/params) - var/message = "\The [user] [text] \his wings" + var/message = "\The [user] [text] \his wings" return message /datum/emote/flap/angry @@ -566,7 +554,7 @@ /datum/emote/flip/createMessage(var/mob/user, var/list/params) var/message = "" if(user.lying || user.weakened) - message = "\The [user] flops and flails around on the floor" + message = "\The [user] flops and flails around on the floor" else message = ..() return message @@ -600,7 +588,7 @@ var/obj/item/weapon/grab/G = user.get_active_hand() if(istype(G) && G.affecting && !G.affecting.buckled) params["target"] = G.affecting - message = "\The [user] [text] over [params["target"]]!" + message = "\The [user] [text] over [params["target"]]!" return message return ..() @@ -745,7 +733,7 @@ if(.) return var/mob/living/silicon/robot/U = user - if (!(istype(U.module, /obj/item/weapon/robot_module/security))) + if(!(istype(U.module, /obj/item/weapon/robot_module/security))) return "you are not security" /datum/emote/handshake @@ -772,7 +760,7 @@ /datum/emote/handshake/addTarget(var/mob/user, var/list/params, var/message) var/mob/target = params["target"] if(target.r_hand) - message = "\The [user] holds out his hand to [params["target"]]" + message = "\The [user] holds out his hand to [params["target"]]" return message return ..() @@ -914,7 +902,7 @@ if(.) return var/mob/living/silicon/robot/U = user - if (!(istype(U.module, /obj/item/weapon/robot_module/security))) + if(!(istype(U.module, /obj/item/weapon/robot_module/security))) return "You are not THE LAW, pal" /datum/emote/light @@ -1290,7 +1278,7 @@ return number /datum/emote/sign/paramMessage(var/mob/user, var/list/params) - var/message = "\The [user] [text] [params["num"]]" + var/message = "\The [user] [text] [params["num"]]" return message /datum/emote/sign/fingers @@ -1317,7 +1305,7 @@ return number /datum/emote/sign/fingers/paramMessage(var/mob/user, var/list/params) - var/message = "\The [user] [text] [params["num"]] finger\s" // no, we can't just add " finger\s" to the parent version because the text macro won't work then :( VB + var/message = "\The [user] [text] [params["num"]] finger\s" // no, we can't just add " finger\s" to the parent version because the text macro won't work then :( VB return message /datum/emote/slap @@ -1332,6 +1320,10 @@ targetMob = 1 targetText = "" +/datum/emote/slap/New() + ..() + cooldown = 0 + /datum/emote/slap/available(var/mob/user) if(ishuman(user)) return 1 @@ -1392,7 +1384,7 @@ if(R && (!(R.status & ORGAN_DESTROYED)) && (!(R.status & ORGAN_SPLINTED)) && (!(R.status & ORGAN_BROKEN))) right_hand_good = 1 - if (!left_hand_good && !right_hand_good) + if(!left_hand_good && !right_hand_good) return "You need at least one hand in good working order to snap your fingers" /datum/emote/snap/standardMessage(var/mob/user, var/list/params)