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

Fixes #2726

Browse Source
This commit is contained in:
hornygranny
2014-02-20 12:11:00 -08:00
parent b3342a6303
commit a86de57c05
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/theblob.dm
+1 -1
View File
@@ -149,7 +149,7 @@
/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user)
playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
src.visible_message("\red <B>The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]")
src.visible_message("<span class='danger'>The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
var/damage = 0
switch(W.damtype)
if("fire")
code/game/objects/effects/spiders.dm
+2 -2
View File
@@ -22,9 +22,9 @@
/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user)
if(W.attack_verb.len)
visible_message("\red <B>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")
visible_message("<span class='danger'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
else
visible_message("\red <B>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")
visible_message("<span class='danger'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
var/damage = W.force / 4.0
code/modules/flufftext/Hallucination.dm
+1 -1
View File
@@ -300,7 +300,7 @@ proc/check_panel(mob/M)
if(prob(15))
if(weapon_name)
my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
my_target.show_message("\red <B>[my_target] has been attacked with [weapon_name] by [src.name] </B>", 1)
my_target.show_message("<span class='danger'>[my_target] has been attacked with [weapon_name] by [src.name] </span>", 1)
my_target.halloss += 8
if(prob(20)) my_target.eye_blurry += 3
if(prob(33))
code/modules/mob/living/carbon/monkey/monkey.dm
+14 -14
View File
@@ -99,7 +99,7 @@
contract_disease(D,1,0)
else
for(var/mob/O in viewers(src, null))
O.show_message("\red <B>[M.name] has attempted to bite [name]!</B>", 1)
O.show_message("<span class='danger'>[M.name] has attempted to bite [name]!</span>", 1)
return
/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob)
@@ -122,7 +122,7 @@
if (prob(75))
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has punched [name]!</span>", M), 1)
playsound(loc, "punch", 25, 1, -1)
var/damage = rand(5, 10)
@@ -133,7 +133,7 @@
spawn( 0 )
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has knocked out [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has knocked out [name]!</span>", M), 1)
return
adjustBruteLoss(damage)
updatehealth()
@@ -141,7 +141,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has attempted to punch [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has attempted to punch [name]!</span>", M), 1)
else
if (M.a_intent == "grab")
if (M == src || anchored)
@@ -165,13 +165,13 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has pushed down [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has pushed down [name]!</span>", M), 1)
else
if(drop_item())
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has disarmed [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has disarmed [name]!</span>", M), 1)
return
/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
@@ -199,18 +199,18 @@
Paralyse(rand(10, 15))
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has wounded [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has wounded [name]!</span>", M), 1)
else
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has slashed [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has slashed [name]!</span>", M), 1)
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has attempted to lunge at [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has attempted to lunge at [name]!</span>", M), 1)
if ("grab")
if (M == src || anchored)
@@ -234,12 +234,12 @@
Weaken(15)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has tackled down [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has tackled down [name]!</span>", M), 1)
else
if(drop_item())
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has disarmed [name]!</B>", M), 1)
O.show_message(text("<span class='danger'>[] has disarmed [name]!</span>", M), 1)
adjustBruteLoss(damage)
updatehealth()
return
@@ -251,7 +251,7 @@
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
O.show_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", 1)
add_logs(M, src, "attacked", admin=0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
@@ -269,7 +269,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>The [M.name] glomps []!</B>", src), 1)
O.show_message(text("<span class='danger'>The [M.name] glomps []!</span>", src), 1)
var/damage = rand(1, 3)
@@ -299,7 +299,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>The [M.name] has shocked []!</B>", src), 1)
O.show_message(text("<span class='danger'>The [M.name] has shocked []!</span>", src), 1)
Weaken(power)
if (stuttering < power)
code/modules/mob/living/simple_animal/constructs.dm
+3 -3
View File
@@ -111,7 +111,7 @@
adjustBruteLoss(damage)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
M.show_message("<span class='danger'>[src] has been attacked with [O] by [user].</span>")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
@@ -153,7 +153,7 @@
adjustBruteLoss(damage)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
M.show_message("<span class='danger'>[src] has been attacked with [O] by [user].</span>")
else
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
@@ -277,7 +277,7 @@
adjustBruteLoss(damage)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
M.show_message("<span class='danger'>[src] has been attacked with [O] by [user].</span>")
else
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+2 -2
View File
@@ -64,9 +64,9 @@
if (O.damtype == HALLOSS)
damage = 0
health -= damage
visible_message("\red \b [src] has been attacked with [O] by [user]. ")
visible_message("<span class='danger'>[src] has been attacked with [O] by [user].</span>")
else
visible_message("\red \b [src] blocks [O] with its shield! ")
visible_message("<span class='danger'>[src] blocks [O] with its shield!</span>")
else
usr << "\red This weapon is ineffective, it does no damage."
visible_message("\red [user] gently taps [src] with [O]. ")
code/modules/mob/living/simple_animal/shade.dm
+1 -1
View File
@@ -51,7 +51,7 @@
health -= damage
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
M.show_message("<span class='danger'>[src] has been attacked with [O] by [user].</span>")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -412,7 +412,7 @@
adjustBruteLoss(damage)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b "+"[src] has been attacked with [O] by [user]. ")
M.show_message("<span class='danger'>"+"[src] has been attacked with [O] by [user].</span>")
/mob/living/simple_animal/movement_delay()
var/tally = 0 //Incase I need to add stuff other than "speed" later
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+2 -2
View File
@@ -93,8 +93,8 @@
else
//Default attack message and don't weaken the target.
for(var/mob/O in viewers(user, null))
if(target != user) O.show_message(text("\red <B>[target] has been attacked with a bottle of [src.name], by [user]!</B>"), 1)
else O.show_message(text("\red <B>[target] has attacked himself with a bottle of [src.name]!</B>"), 1)
if(target != user) O.show_message(text("<span class='danger'>[target] has been attacked with a bottle of [src.name], by [user]!</span>"), 1)
else O.show_message(text("<span class='danger'>[target] has attacked himself with a bottle of [src.name]!</span>"), 1)
//Attack logs
add_logs(user, target, "attacked", object="bottle")