cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with AIs not being properly listed (Gotta love that special-snowflake code).

Browse Source 
While I was at it, implemented the attack sounds for simple animals, most importantly constructs. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4189 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-07-27 02:55:11 +00:00
parent 9822174a60
commit d5738657cc
9 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
View File

@@ -338,6 +338,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -363,6 +363,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

2
code/modules/mob/living/carbon/metroid/metroid.dm
View File

@@ -319,6 +319,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

2
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -316,6 +316,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

3
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -60,6 +60,7 @@
spawn(0)
ainame(src)
living_mob_list += src
mob_list += src
return
@@ -347,6 +348,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

2
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -666,6 +666,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

1
code/modules/mob/living/simple_animal/behemoth.dm
View File

@@ -29,6 +29,7 @@
a_intent = "harm"
stop_automated_movement = 1
status_flags = CANPARALYSE
attack_sound = 'punch4.ogg'
var/energy = 0
var/max_energy = 1000

9
code/modules/mob/living/simple_animal/constructs.dm
View File

@@ -32,6 +32,7 @@
a_intent = "harm"
stop_automated_movement = 1
status_flags = CANPARALYSE
attack_sound = 'punch3.ogg'
Life()
@@ -108,6 +109,8 @@
if(M.melee_damage_upper <= 0)
M.emote("[M.friendly] \the <EM>[src]</EM>")
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
@@ -169,6 +172,7 @@
stop_automated_movement = 1
status_flags = CANPARALYSE
see_in_dark = 7
attack_sound = 'bladeslice.ogg'
Life()
..()
@@ -238,6 +242,8 @@
if(M.melee_damage_upper <= 0)
M.emote("[M.friendly] \the <EM>[src]</EM>")
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
@@ -300,6 +306,7 @@
a_intent = "harm"
stop_automated_movement = 1
status_flags = CANPARALYSE
attack_sound = 'punch2.ogg'
Life()
..()
@@ -320,6 +327,8 @@
if(M.melee_damage_upper <= 0)
M.emote("[M.friendly] \the <EM>[src]</EM>")
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)

2
code/modules/mob/living/simple_animal/life.dm
View File

@@ -255,6 +255,8 @@
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
else
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)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)