cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sorts out issues raised by Fox & DZD

Browse Source
This commit is contained in:
VampyrBytes
2016-06-19 18:03:51 +01:00
parent e346003268
commit 6d487a19b7
3 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/Emote_system/emote.dm
+12 -11
View File
@@ -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 = "<span class = '[emoteSpanClass]'>[message]</span>"
message = "<span class='[emoteSpanClass]'>[message]</span>"
return message
/datum/emote/proc/standardMessage(var/mob/user, var/list/params)
var/message = "<span class = '[userSpanClass]'>\The [user]</span> [text]"
var/message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[userSpanClass]'>\The [user]</span> [mimeText]"
var/message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[userSpanClass]'>\The [user]</span> makes a "
var/message = "<span class='[userSpanClass]'>\The [user]</span> 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 = "<span class = 'italics'>... You can almost hear someone talking ...</span>"
msg = "<span class='italics'>... You can almost hear someone talking ...</span>"
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 "<span class = '[userSpanClass]'>You</span> hear someone [selfText]"
return "<span class='[userSpanClass]'>You</span> 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
code/datums/Emote_system/emote_handler.dm
+3 -3
View File
@@ -43,7 +43,7 @@
return 0
if(!commands[command] && !(command == "me"))
to_chat(owner, "<span class = 'notice'>Unknown emote, please check *help for emotes available to your character</span>")
to_chat(owner, "<span class='notice'>Unknown emote, please check *help for emotes available to your character</span>")
return 0
if(!emote)
@@ -55,14 +55,14 @@
var/prevented = emote.prevented(owner)
if(prevented)
to_chat(owner, "<span class = 'notice'>You can't do that because [prevented]!</span>")
to_chat(owner, "<span class='notice'>You can't do that because [prevented]!</span>")
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
code/datums/Emote_system/emotes.dm
+20 -28
View File
@@ -334,7 +334,7 @@
/datum/emote/dap/addTarget(var/mob/user, var/list/params, var/message = "")
if(!params["target"] || params["target"] == user)
message = "<span class = '[userSpanClass]'>[user]</span> sadly can't find anybody to give daps to, and daps \himself. Shameful"
message = "<span class='[userSpanClass]'>[user]</span> 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 = "<span class = '[userSpanClass]'>\The [user]</span> [U.species.death_message]"
var/message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[emoteSpanClass]'><span class = '[userSpanClass]'>\The [user]</span> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart</span>"
message = "<span class='[emoteSpanClass]'><span class='[userSpanClass]'>\The [user]</span> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart</span>"
return message
message = "<span class = '[emoteSpanClass]'><span class = '[userSpanClass]'>\The [user]</span> [pick("passes wind","farts")]</span>"
message = "<span class='[emoteSpanClass]'><span class='[userSpanClass]'>\The [user]</span> [pick("passes wind","farts")]</span>"
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), "<span class='warning'><b>[user] farted on the Bible!</b></span>")
to_chat(viewers(user), "<span class='notice'><b>A mysterious force smites [user]!</b></span>")
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 = "<span class = '[userSpanClass]'>\The [user]</span> [text] \his wings"
var/message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[userSpanClass]'>\The [user]</span> flops and flails around on the floor"
message = "<span class='[userSpanClass]'>\The [user]</span> 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 = "<span class = '[userSpanClass]'>\The [user]</span> [text] over [params["target"]]!"
message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[userSpanClass]'>\The [user] holds out his hand to [params["target"]]"
message = "<span class='[userSpanClass]'>\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 = "<span class = '[userSpanClass]'>\The [user]</span> [text] [params["num"]]"
var/message = "<span class='[userSpanClass]'>\The [user]</span> [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 = "<span class = '[userSpanClass]'>\The [user]</span> [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 = "<span class='[userSpanClass]'>\The [user]</span> [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)