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

Fixed a lot of text, mostly in simple_animal. The word "the" was being duplicated in a lot of cases when referring to objects or mobs. Basically, byond handles "the" for us. Poly was particularly guilty of this, but really it was all simple_mobs.

Browse Source 
Also fixed issue 566, where it was possible to weaken corpses.  Dead humans, humanoid aliens, and larvae should no longer be weakenable once they're dead.

Also also, changed the default name for human mobs from unknown to Unknown.  This is makes them consistent with humans whose identity is destroyed by acid or face damage.  They'll no longer show up as "The unknown" in messages, since Byond recognizes Unknown as a proper noun due to capitalization.

Finally, gave Runtime a DNA joke as a description.  Not sure why she didn't have a description.
This commit is contained in:
Rolan7
2013-05-22 05:24:44 -04:00
parent 64ed1f469a
commit 78b4d985e1
27 changed files with 121 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -294,7 +294,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
if (damage > 9||prob(5))//Regular humans have a very small chance of weakening an alien.
if ((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien.
Weaken(1,5)
for(var/mob/O in viewers(M, null))
if ((O.client && !( O.blinded )))
code/modules/mob/living/carbon/alien/larva/larva.dm
+3 -3
View File
@@ -265,8 +265,8 @@
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
if (damage > 4.9)
O.show_message(text("\red <B>[] has kicked []!</B>", M, src), 1)
if ((stat != DEAD) && (damage > 4.9))
Weaken(rand(10,15))
for(var/mob/O in viewers(M, null))
if ((O.client && !( O.blinded )))
@@ -277,7 +277,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 []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has attempted to kick []!</B>", M, src), 1)
return
/mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
code/modules/mob/living/carbon/human/human.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/mob/living/carbon/human
name = "unknown"
real_name = "unknown"
voice_name = "unknown"
name = "Unknown"
real_name = "Unknown"
voice_name = "Unknown"
icon = 'icons/mob/human.dmi'
icon_state = "caucasian1_m_s"
var/list/hud_list = list()
code/modules/mob/living/carbon/human/human_attackhand.dm
+1 -1
View File
@@ -96,7 +96,7 @@
"<span class='userdanger'>[M] has [attack_verb]ed [src]!</span>")
apply_damage(damage, BRUTE, affecting, armor_block)
if(damage >= 9)
if((stat != DEAD) && damage >= 9)
visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
"<span class='userdanger'>[M] has weakened [src]!</span>")
apply_effect(4, WEAKEN, armor_block)
code/modules/mob/living/simple_animal/constructs.dm
+13 -13
View File
@@ -7,7 +7,7 @@
emote_hear = list("wails","screeches")
response_help = "thinks better of touching"
response_disarm = "flails at"
response_harm = "punches the"
response_harm = "punches"
icon_dead = "shade_dead"
speed = -1
a_intent = "harm"
@@ -32,7 +32,7 @@
new /obj/item/weapon/ectoplasm (src.loc)
for(var/mob/M in viewers(src, null))
if((M.client && !( M.blinded )))
M.show_message("\red [src] collapses in a shattered heap ")
M.show_message("\red [src] collapses in a shattered heap. ")
ghostize()
del src
return
@@ -87,7 +87,7 @@
/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/construct/builder))
health += 5
M.emote("mends some of \the <EM>[src]'s</EM> wounds")
M.emote("mends some of \the <EM>[src]'s</EM> wounds.")
else
if(M.melee_damage_upper <= 0)
M.emote("[M.friendly] \the <EM>[src]</EM>")
@@ -109,12 +109,12 @@
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 the [O] by [user]. ")
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
@@ -131,7 +131,7 @@
icon_living = "behemoth"
maxHealth = 250
health = 250
response_harm = "harmlessly punches the"
response_harm = "harmlessly punches"
harm_intent_damage = 0
melee_damage_lower = 30
melee_damage_upper = 30
@@ -150,16 +150,16 @@
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 the [O] by [user]. ")
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
else
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
M.show_message("\red \b [O] bounces harmlessly off of [src]. ")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
@@ -224,7 +224,7 @@
maxHealth = 750
health = 750
speak_emote = list("rumbles")
response_harm = "harmlessly punches the"
response_harm = "harmlessly punches"
harm_intent_damage = 0
melee_damage_lower = 50
melee_damage_upper = 50
@@ -244,16 +244,16 @@
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 the [O] by [user]. ")
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
else
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
M.show_message("\red \b [O] bounces harmlessly off of [src]. ")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
code/modules/mob/living/simple_animal/friendly/cat.dm
+4 -7
View File
@@ -13,17 +13,14 @@
turns_per_move = 5
see_in_dark = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/cat/Runtime
name = "Runtime"
desc = ""
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
desc = "GCAT"
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
code/modules/mob/living/simple_animal/friendly/corgi.dm
+7 -7
View File
@@ -14,9 +14,9 @@
turns_per_move = 10
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
meat_amount = 3
response_help = "pets the"
response_disarm = "bops the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
see_in_dark = 5
var/obj/item/inventory_head
var/obj/item/inventory_back
@@ -49,15 +49,15 @@
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
usr << "\red This animal is wearing too much armor. You can't cause /him any damage."
usr << "\red This animal is wearing too much armor. You can't cause any damage."
for (var/mob/M in viewers(src, null))
M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.")
M.show_message("\red \b [user] hits [src] with [O], however [src] is too armored.")
else
usr << "\red This animal is wearing too much armor. You can't reach its skin."
for (var/mob/M in viewers(src, null))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
if(prob(15))
emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face.")
return
..()
code/modules/mob/living/simple_animal/friendly/crab.dm
+7 -7
View File
@@ -11,9 +11,9 @@
speak_chance = 1
turns_per_move = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "stomps the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
stop_automated_movement = 1
friendly = "pinches"
var/obj/item/inventory_head
@@ -60,20 +60,20 @@
del(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies the [MED] on [src]")
M.show_message("\blue [user] applies [MED] on [src]")
else
user << "\blue this [src] is dead, medical items won't bring it back to life."
user << "\blue this crab is dead, medical items won't bring it back to life."
else
if(O.force)
health -= O.force
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
M.show_message(capitalize("\red \b [src] has been attacked with [O] by [user]. "))
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
/mob/living/simple_animal/crab/GetMad()
name = "MEGAMADCRAB"
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+15 -15
View File
@@ -14,9 +14,9 @@
see_in_dark = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
meat_amount = 4
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
faction = "goat"
attacktext = "kicks"
health = 40
@@ -60,7 +60,7 @@
/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
..()
src.visible_message("\red [src] gets an evil-looking gleam in their eye.")
src.visible_message("\red [src] gets an evil-looking gleam in \his eye.")
/mob/living/simple_animal/hostile/retaliate/goat/Move()
..()
@@ -77,7 +77,7 @@
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
user << "\red The [O] is full."
user << "\red [O] is full."
if(!transfered)
user << "\red The udder is dry. Wait a bit longer..."
else
@@ -99,9 +99,9 @@
see_in_dark = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
meat_amount = 6
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
attacktext = "kicks"
health = 50
var/datum/reagents/udder = null
@@ -117,7 +117,7 @@
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
user << "\red The [O] is full."
user << "\red [O] is full."
if(!transfered)
user << "\red The udder is dry. Wait a bit longer..."
else
@@ -160,9 +160,9 @@
turns_per_move = 2
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
meat_amount = 1
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
attacktext = "kicks"
health = 1
var/amount_grown = 0
@@ -200,9 +200,9 @@ var/global/chicken_count = 0
turns_per_move = 3
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
meat_amount = 2
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
attacktext = "kicks"
health = 10
var/eggsleft = 0
code/modules/mob/living/simple_animal/friendly/mouse.dm
+3 -3
View File
@@ -14,9 +14,9 @@
maxHealth = 5
health = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "splats the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
density = 0
var/color //brown, gray and white, leave blank for random
code/modules/mob/living/simple_animal/friendly/mushroom.dm
+3 -3
View File
@@ -9,7 +9,7 @@
maxHealth = 5
health = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "whacks the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
harm_intent_damage = 5
code/modules/mob/living/simple_animal/friendly/tomato.dm
+3 -3
View File
@@ -9,7 +9,7 @@
maxHealth = 15
health = 15
meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
response_help = "prods the"
response_disarm = "pushes aside the"
response_harm = "smacks the"
response_help = "prods"
response_disarm = "pushes aside"
response_harm = "smacks"
harm_intent_damage = 5
code/modules/mob/living/simple_animal/hostile/alien.dm
+3 -3
View File
@@ -6,9 +6,9 @@
icon_living = "alienh_running"
icon_dead = "alien_l"
icon_gib = "syndicate_gib"
response_help = "pokes the"
response_disarm = "shoves the"
response_harm = "hits the"
response_help = "pokes"
response_disarm = "shoves"
response_harm = "hits"
speed = -1
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
maxHealth = 100
code/modules/mob/living/simple_animal/hostile/bear.dm
+3 -3
View File
@@ -14,9 +14,9 @@
turns_per_move = 5
see_in_dark = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "pokes the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "pokes"
stop_automated_movement_when_pulled = 0
maxHealth = 60
health = 60
code/modules/mob/living/simple_animal/hostile/carp.dm
+3 -3
View File
@@ -10,9 +10,9 @@
speak_chance = 0
turns_per_move = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
speed = -1
maxHealth = 25
health = 25
code/modules/mob/living/simple_animal/hostile/faithless.dm
+3 -3
View File
@@ -1,14 +1,14 @@
/mob/living/simple_animal/hostile/faithless
name = "Faithless"
name = "The Faithless"
desc = "The Wish Granter's faith in humanity, incarnate"
icon_state = "faithless"
icon_living = "faithless"
icon_dead = "faithless_dead"
speak_chance = 0
turns_per_move = 5
response_help = "passes through the"
response_help = "passes through"
response_disarm = "shoves"
response_harm = "hits the"
response_harm = "hits"
speed = -1
maxHealth = 80
health = 80
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+3 -3
View File
@@ -17,9 +17,9 @@
turns_per_move = 5
see_in_dark = 10
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "pokes the"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "pokes"
stop_automated_movement_when_pulled = 0
maxHealth = 200
health = 200
code/modules/mob/living/simple_animal/hostile/mimic.dm
+3 -3
View File
@@ -10,9 +10,9 @@
icon_living = "crate"
meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
response_help = "touches the"
response_disarm = "pushes the"
response_harm = "hits the"
response_help = "touches"
response_disarm = "pushes"
response_harm = "hits"
speed = -1
maxHealth = 250
health = 250
code/modules/mob/living/simple_animal/hostile/pirate.dm
+2 -2
View File
@@ -6,9 +6,9 @@
icon_dead = "piratemelee_dead"
speak_chance = 0
turns_per_move = 5
response_help = "pushes the"
response_help = "pushes"
response_disarm = "shoves"
response_harm = "hits the"
response_harm = "hits"
speed = -1
stop_automated_movement_when_pulled = 0
maxHealth = 100
code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+3 -3
View File
@@ -7,9 +7,9 @@
icon_gib = "clown_gib"
speak_chance = 0
turns_per_move = 5
response_help = "pokes the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"
speak = list("HONK", "Honk!", "Welcome to clown planet!")
emote_see = list("honks")
speak_chance = 1
code/modules/mob/living/simple_animal/hostile/russian.dm
+3 -3
View File
@@ -7,9 +7,9 @@
icon_gib = "syndicate_gib"
speak_chance = 0
turns_per_move = 5
response_help = "pokes the"
response_disarm = "shoves the"
response_harm = "hits the"
response_help = "pokes"
response_disarm = "shoves"
response_harm = "hits"
speed = -1
stop_automated_movement_when_pulled = 0
maxHealth = 100
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+6 -6
View File
@@ -7,9 +7,9 @@
icon_gib = "syndicate_gib"
speak_chance = 0
turns_per_move = 5
response_help = "pokes the"
response_disarm = "shoves the"
response_harm = "hits the"
response_help = "pokes"
response_disarm = "shoves"
response_harm = "hits"
speed = -1
stop_automated_movement_when_pulled = 0
maxHealth = 100
@@ -65,12 +65,12 @@
if (O.damtype == HALLOSS)
damage = 0
health -= damage
visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
visible_message("\red \b [src] has been attacked with [O] by [user]. ")
else
visible_message("\red \b [src] blocks the [O] with its shield! ")
visible_message("\red \b [src] blocks [O] with its shield! ")
else
usr << "\red This weapon is ineffective, it does no damage."
visible_message("\red [user] gently taps [src] with the [O]. ")
visible_message("\red [user] gently taps [src] with [O]. ")
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
code/modules/mob/living/simple_animal/hostile/tree.dm
+3 -3
View File
@@ -9,9 +9,9 @@
speak_chance = 0
turns_per_move = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
response_help = "brushes the"
response_disarm = "pushes the"
response_harm = "hits the"
response_help = "brushes"
response_disarm = "pushes"
response_harm = "hits"
speed = -1
maxHealth = 250
health = 250
code/modules/mob/living/simple_animal/parrot.dm
+11 -11
View File
@@ -26,7 +26,7 @@
/mob/living/simple_animal/parrot
name = "\improper Parrot"
name = "parrot"
desc = "The parrot squaks, \"It's a Parrot! BAWWK!\""
icon = 'icons/mob/animal.dmi'
icon_state = "parrot_fly"
@@ -43,9 +43,9 @@
turns_per_move = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/
response_help = "pets the"
response_disarm = "gently moves aside the"
response_harm = "swats the"
response_help = "pets"
response_disarm = "gently moves aside"
response_harm = "swats"
stop_automated_movement = 1
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -425,7 +425,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.loc = src
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item]!", "\blue You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -608,7 +608,7 @@
return -1
if(held_item)
src << "\red You are already holding the [held_item]"
src << "\red You are already holding [held_item]"
return 1
for(var/obj/item/I in view(1,src))
@@ -621,7 +621,7 @@
held_item = I
I.loc = src
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item]!", "\blue You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
src << "\red There is nothing of interest to take."
@@ -636,7 +636,7 @@
return -1
if(held_item)
src << "\red You are already holding the [held_item]"
src << "\red You are already holding [held_item]"
return 1
var/obj/item/stolen_item = null
@@ -652,7 +652,7 @@
C.u_equip(stolen_item)
held_item = stolen_item
stolen_item.loc = src
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs [held_item] out of [C]'s hand!", "\blue You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
src << "\red There is nothing of interest to take."
@@ -688,11 +688,11 @@
var/obj/item/weapon/grenade/G = held_item
G.loc = src.loc
G.prime()
src << "You let go of the [held_item]!"
src << "You let go of [held_item]!"
held_item = null
return 1
src << "You drop the [held_item]."
src << "You drop [held_item]."
held_item.loc = src.loc
held_item = null
code/modules/mob/living/simple_animal/shade.dm
+3 -3
View File
@@ -12,7 +12,7 @@
emote_hear = list("wails","screeches")
response_help = "puts their hand through"
response_disarm = "flails at"
response_harm = "punches the"
response_harm = "punches"
melee_damage_lower = 5
melee_damage_upper = 15
attacktext = "drains the life from"
@@ -51,10 +51,10 @@
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 the [O] by [user]. ")
M.show_message("\red \b [src] has been attacked with [O] by [user]. ")
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
return
code/modules/mob/living/simple_animal/simple_animal.dm
+8 -8
View File
@@ -238,7 +238,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("\red <B>\The [M]</B> [M.attacktext] [src]!", 1)
M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
@@ -258,7 +258,7 @@
if (health > 0)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message("\blue [M] [response_help] [src]")
O.show_message("\blue [M] [response_help] [src].")
if("grab")
if (M == src)
@@ -283,7 +283,7 @@
adjustBruteLoss(harm_intent_damage)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message("\red [M] [response_harm] [src]")
O.show_message("\red [M] [response_harm] [src]!")
return
@@ -346,7 +346,7 @@
if(M.Victim) return // can't attack while eating!
visible_message("\red <B>The [M.name] glomps [src]!</B>")
visible_message("\red <B>[M.name] glomps [src]!</B>")
var/damage = rand(1, 3)
@@ -374,9 +374,9 @@
del(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies the [MED] on [src]")
M.show_message("\blue [user] applies [MED] on [src]")
else
user << "\blue this [src] is dead, medical items won't bring it back to life."
user << "\blue [src] is dead, medical items won't bring it back to life."
if(meat_type && (stat == DEAD)) //if the animal has a meat, and if it is dead.
if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
new meat_type (get_turf(src))
@@ -392,12 +392,12 @@
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 the [O] by [user]. ")
M.show_message(capitalize("\red \b [src] has been attacked with [O] by [user]. "))
else
usr << "\red This weapon is ineffective, it does no damage."
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
M.show_message("\red [user] gently taps [src] with [O]. ")
code/modules/mob/living/simple_animal/worm.dm
+1 -1
View File
@@ -12,7 +12,7 @@
response_help = "touches"
response_disarm = "flails at"
response_harm = "punches the"
response_harm = "punches"
harm_intent_damage = 2