cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes up a lot more messages to look like emotes. (#9133)

Browse Source
This commit is contained in:
Matt Atlas
2020-06-18 10:29:47 +02:00
committed by GitHub
parent a00f2555ea
commit c6d9cba325
39 changed files with 132 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/observer/observer.dm
+2 -2
View File
@@ -397,13 +397,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
moved_event.register(following, src, /atom/movable/proc/move_to_destination)
destroyed_event.register(following, src, /mob/abstract/observer/proc/stop_following)
to_chat(src, "<span class='notice'>Now following \the [following].</span>")
to_chat(src, SPAN_NOTICE("Now following \the <b>[following]</b>."))
move_to_destination(following, following.loc, following.loc)
updateghostsight()
/mob/abstract/observer/proc/stop_following()
if(following)
to_chat(src, "<span class='notice'>No longer following \the [following]</span>")
to_chat(src, SPAN_NOTICE("No longer following \the <b>[following]</b>."))
moved_event.unregister(following, src)
destroyed_event.unregister(following, src)
following = null
code/modules/mob/inventory.dm
+1 -1
View File
@@ -367,7 +367,7 @@ var/list/slot_equipment_priority = list( \
//actually throw it!
if (item)
src.visible_message("<span class='warning'>[src] has thrown [item].</span>")
src.visible_message("<span class='warning'>[src] throws \a [item].</span>")
if(!src.lastarea)
src.lastarea = get_area(src.loc)
code/modules/mob/living/carbon/carbon.dm
+5 -5
View File
@@ -206,7 +206,7 @@
status += "peeling away"
if(org.is_stump())
status += "MISSING"
status += SPAN_DANGER("MISSING")
if(org.status & ORGAN_MUTATED)
status += "weirdly shapen"
if(org.dislocated == 2)
@@ -218,11 +218,11 @@
if(!org.is_usable())
status += "dangling uselessly"
if(org.status & ORGAN_BLEEDING)
status += span("danger", "bleeding")
status += SPAN_DANGER("bleeding")
if(status.len)
src.show_message("My [org.name] is [span("warning", "[english_list(status)].")]" ,1)
src.show_message("My [org.name] is [span("warning", "[english_list(status)].")]", 1)
else
src.show_message("My [org.name] is [span("notice", "OK.")]" ,1)
src.show_message("My [org.name] feels [span("notice", "OK.")]" ,1)
if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
@@ -299,7 +299,7 @@
else if(istype(tapper))
tapper.species.tap(tapper,src)
else
M.visible_message(span("notice", "[M] taps [src] to get their attention!"), \
M.visible_message("<b>[M]</b> taps [src] to get their attention!", \
span("notice", "You tap [src] to get their attention!"))
if(stat != DEAD)
code/modules/mob/living/carbon/give.dm
+5 -7
View File
@@ -2,9 +2,7 @@
set category = "IC"
set name = "Give"
if(incapacitated())
return
if(!istype(target) || target.stat || target.lying || target.resting || target.restrained() || target.client == null)
if(use_check(target))
to_chat(usr, span("warning", "[target.name] is in no condition to handle items!"))
return
@@ -16,11 +14,11 @@
return
if(alert(target,"[usr] wants to give you \a [I]. Will you accept it?",,"Yes","No") == "No")
target.visible_message(span("warning", "\The [usr] tried to hand \the [I] to \the [target], \
but \the [target] didn't want it."))
target.visible_message("<b>[target]</b> pushes [usr]'s hand away.")
return
if(!I) return
if(!I)
return
if(!Adjacent(target))
to_chat(usr, span("warning", "You need to stay in reaching distance while giving an object."))
@@ -41,4 +39,4 @@
I.on_give(usr, target)
if(!QDELETED(I)) // if on_give deletes the item, we don't want runtimes below
target.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea.
usr.visible_message(span("notice", "\The [usr] handed \the [I] to \the [target]."), span("notice", "You give \the [I] to \the [target]."))
usr.visible_message("<b>[usr]</b> hands [target] \a [I].", span("notice", "You give \the [target] a [I]."))
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1952,7 +1952,7 @@
if(istype(heart) && !(heart.status & ORGAN_DEAD))
var/active_breaths = 0
if(!nervous_system_failure() && active_breaths)
visible_message("\The [src] jerks and gasps for breath!")
visible_message("\The <b>[src]</b> jerks and gasps for breath!")
else
visible_message("\The <b>[src]</b> twitches a bit as \his heart restarts!")
shock_stage = min(shock_stage, 100) // 120 is the point at which the heart stops.
code/modules/mob/living/carbon/human/human_powers.dm
+6 -6
View File
@@ -203,7 +203,7 @@ mob/living/carbon/human/proc/change_monitor()
last_special = world.time + 50
visible_message("<span class='warning'><b>\The [src]</b> rips viciously at \the [G.affecting]'s body with its claws!</span>")
visible_message("<span class='warning'><b>[src]</b> rips viciously at \the [G.affecting]'s body with its claws!</span>")
if(istype(G.affecting,/mob/living/carbon/human))
var/mob/living/carbon/human/H = G.affecting
@@ -370,14 +370,14 @@ mob/living/carbon/human/proc/change_monitor()
return
H.apply_damage(25, BRUTE, hit_zone, damage_flags = DAM_SHARP|DAM_EDGE)
visible_message(SPAN_WARNING("<b>\The [src]</b> rips viciously at \the [G.affecting]'s [affected] with its mandibles!"))
visible_message(SPAN_WARNING("<b>[src]</b> rips viciously at \the [G.affecting]'s [affected] with its mandibles!"))
msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(H)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(src),ckey_target=key_name(H))
else
var/mob/living/M = G.affecting
if(!istype(M))
return
M.apply_damage(25, BRUTE, damage_flags = DAM_SHARP|DAM_EDGE)
visible_message(SPAN_WARNING("<b>\The [src]</b> rips viciously at \the [G.affecting]'s flesh with its mandibles!"))
visible_message(SPAN_WARNING("<b>[src]</b> rips viciously at \the [G.affecting]'s flesh with its mandibles!"))
msg_admin_attack("[key_name_admin(src)] mandible'd [key_name_admin(M)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(src),ckey_target=key_name(M))
playsound(get_turf(src), 'sound/weapons/slash.ogg', 50, TRUE)
last_special = world.time + 100
@@ -576,7 +576,7 @@ mob/living/carbon/human/proc/change_monitor()
last_special = world.time + 30
visible_message("<span class='warning'><b>\The [src]</b> launches a spine-quill at [target]!</span>")
visible_message("<span class='warning'><b>[src]</b> launches a spine-quill at [target]!</span>")
src.apply_damage(10,BRUTE)
playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1)
@@ -1216,14 +1216,14 @@ mob/living/carbon/human/proc/change_monitor()
return
H.apply_damage(40, BRUTE, hit_zone)
visible_message("<span class='warning'><b>\The [src]</b> viciously crushes [affected] of [G.affecting] with its metallic arms!</span>")
visible_message("<span class='warning'><b>[src]</b> viciously crushes [affected] of [G.affecting] with its metallic arms!</span>")
msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(H)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(src),ckey_target=key_name(H))
else
var/mob/living/M = G.affecting
if(!istype(M))
return
M.apply_damage(40,BRUTE)
visible_message("<span class='warning'><b>\The [src]</b> viciously crushes [G.affecting]'s flesh with its metallic arms!</span>")
visible_message("<span class='warning'><b>[src]</b> viciously crushes [G.affecting]'s flesh with its metallic arms!</span>")
msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(M)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(src),ckey_target=key_name(M))
playsound(src.loc, 'sound/weapons/heavysmash.ogg', 50, 1)
last_special = world.time + 100
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -1100,7 +1100,7 @@
if (shock_stage >= 60)
if(shock_stage == 60)
visible_message("[src]'s body becomes limp.", "Your body becomes limp.")
visible_message("<b>[src]</b>'s body becomes limp.", "Your body becomes limp.")
if (prob(2))
custom_pain("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!", shock_stage, nohalloss = TRUE)
Weaken(20)
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -193,7 +193,7 @@
return 1
//this proc handles being hit by a thrown atom
/mob/living/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)//Standardization and logging -Sieve
/mob/living/hitby(atom/movable/AM, var/speed = THROWFORCE_SPEED_DIVISOR)//Standardization and logging -Sieve
if(!aura_check(AURA_TYPE_THROWN, AM, speed))
return
if(istype(AM,/obj/))
code/modules/mob/living/simple_animal/hostile/hostile.dm
+1 -1
View File
@@ -285,7 +285,7 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
var/obj/effect/energy_field/e = locate(/obj/effect/energy_field, get_step(src, dir))
if(e)
e.Stress(rand(1,2))
visible_message("<span class='danger'>\the [src] [attacktext] \the [e]!</span>")
visible_message("<span class='danger'>\The [src] [attacktext] \the [e]!</span>")
src.do_attack_animation(e)
target_mob = e
stance = HOSTILE_STANCE_ATTACKING
code/modules/mob/living/simple_animal/simple_animal.dm
+2 -2
View File
@@ -378,11 +378,11 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
if(I_HELP)
if (health > 0)
M.visible_message("<span class='notice'>[M] [response_help] \the [src]</span>")
M.visible_message("<span class='notice'>[M] [response_help] \the [src].</span>")
poke()
if(I_DISARM)
M.visible_message("<span class='notice'>[M] [response_disarm] \the [src]</span>")
M.visible_message("<span class='notice'>[M] [response_disarm] \the [src].</span>")
M.do_attack_animation(src)
poke(1)
//TODO: Push the mob away or something