cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 11:30:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

ports give emote msg from bay (#7467)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2019-11-23 22:13:56 +08:00
committed by Werner
parent 44bc8543ed
commit 4950066b2f
3 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/give.dm
+12 -11
View File
@@ -5,38 +5,39 @@
if(incapacitated())
return
if(!istype(target) || target.stat || target.lying || target.resting || target.restrained() || target.client == null)
to_chat(usr, "<span class='warning'>[target.name] is in no condition to handle items!</span>")
to_chat(usr, span("warning", "[target.name] is in no condition to handle items!"))
return
var/obj/item/I = usr.get_active_hand()
if(!I)
I = usr.get_inactive_hand()
if(!I)
to_chat(usr, "<span class='warning'>You don't have anything in your hands to give to \the [target].</span>")
to_chat(usr, span("warning", "You don't have anything in your hands to give to \the [target]."))
return
if(alert(target,"[usr] wants to give you \a [I]. Will you accept it?",,"Yes","No") == "No")
target.visible_message("<span class='notice'>\The [usr] tried to hand \the [I] to \the [target], \
but \the [target] didn't want it.</span>")
target.visible_message(span("warning", "\The [usr] tried to hand \the [I] to \the [target], \
but \the [target] didn't want it."))
return
if(!I) return
if(!Adjacent(target))
to_chat(usr, "<span class='warning'>You need to stay in reaching distance while giving an object.</span>")
to_chat(target, "<span class='warning'>\The [usr] moved too far away.</span>")
to_chat(usr, span("warning", "You need to stay in reaching distance while giving an object."))
to_chat(target, span("warning", "\The [usr] moved too far away."))
return
if(I.loc != usr || (usr.l_hand != I && usr.r_hand != I))
to_chat(usr, "<span class='warning'>You need to keep the item in your hands.</span>")
to_chat(target, "<span class='warning'>\The [usr] seems to have given up on passing \the [I] to you.</span>")
to_chat(usr, span("warning", "You need to keep the item in your hands."))
to_chat(target, span("warning", "\The [usr] seems to have given up on passing \the [I] to you."))
return
if(target.r_hand != null && target.l_hand != null)
to_chat(target, "<span class='warning'>Your hands are full.</span>")
to_chat(usr, "<span class='warning'>Their hands are full.</span>")
to_chat(target, span("warning", "Your hands are full."))
to_chat(usr, span("warning", "Their hands are full."))
return
if(usr.unEquip(I))
target.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea.
target.visible_message("<span class='notice'>\The [usr] handed \the [I] to \the [target].</span>")
usr.visible_message(span("notice", "\The [usr] handed \the [I] to \the [target]."), span("notice", "You give \the [I] to \the [target]."))
code/modules/reagents/reagent_containers/pill.dm
+6 -6
View File
@@ -25,7 +25,7 @@
if(!M.can_eat(src))
return
to_chat(M, "<span class='notice'>You swallow \the [src].</span>")
M.visible_message(span("notice", "[M] swallows a pill."), span("notice", "You swallow \the [src]."), null, 2)
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
qdel(src)
@@ -35,13 +35,13 @@
if(!M.can_force_feed(user, src))
return
user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
user.visible_message(span("warning", "[user] attempts to force [M] to swallow \the [src]."))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!do_mob(user, M))
return
user.visible_message("<span class='warning'>[user] forces [M] to swallow \the [src].</span>")
user.visible_message(span("warning", "[user] forces [M] to swallow \the [src]."))
var/contained = reagentlist()
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [name] by [key_name(user)] Reagents: [contained]</font>")
@@ -60,16 +60,16 @@
if(proximity && target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>")
to_chat(user, span("notice", "[target] is empty. Can't dissolve \the [src]."))
return
to_chat(user, "<span class='notice'>You dissolve \the [src] in [target].</span>")
to_chat(user, span("notice", "You dissolve \the [src] in [target]."))
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Spiked \a [target] with a pill. Reagents: [reagentlist()]</font>")
msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(target))
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
O.show_message("<span class='warning'>[user] puts something in \the [target].</span>", 1)
O.show_message(span("warning", "[user] puts something in \the [target]."), 1)
qdel(src)
return