cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Toned down Lamarr's aggressiveness

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@156 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-09-23 03:51:56 +00:00
parent bff9b2df04
commit 31d2f39fff
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/objects/alien/facehugger.dm
View File

@@ -206,8 +206,12 @@
if (path_target.len) path_target = new/list() if (path_target.len) path_target = new/list()
var/last_health = INFINITY var/last_health = INFINITY
var/view
for (var/mob/living/carbon/C in range(viewrange-2,src.loc)) if (lamarr)
view = 1
else
view = viewrange-2
for (var/mob/living/carbon/C in range(view,src.loc))
if (C.stat == 2 || isalien(C) || C.alien_egg_flag || !can_see(src,C,viewrange)) if (C.stat == 2 || isalien(C) || C.alien_egg_flag || !can_see(src,C,viewrange))
continue continue
if(C:stunned || C:paralysis || C:weakened) if(C:stunned || C:paralysis || C:weakened)
@@ -218,6 +222,7 @@
target = C target = C
if(target) if(target)
if (!lamarr || prob(10))
set_attack() set_attack()
else if(state != 2) else if(state != 2)
set_idle() set_idle()
@@ -225,10 +230,11 @@
else if(target) else if(target)
var/turf/distance = get_dist(src, target) var/turf/distance = get_dist(src, target)
if (!lamarr || prob(10))
set_attack() set_attack()
if(can_see(src,target,viewrange)) if(can_see(src,target,viewrange))
if(distance <= 1) if(distance <= 1 && (!lamarr || prob(20)))
for(var/mob/O in viewers(world.view,src)) for(var/mob/O in viewers(world.view,src))
O.show_message("\red <B>[src.target] has been leapt on by [lamarr ? src.name : "the alien"]!</B>", 1, "\red You hear someone fall", 2) O.show_message("\red <B>[src.target] has been leapt on by [lamarr ? src.name : "the alien"]!</B>", 1, "\red You hear someone fall", 2)
if (!lamarr) if (!lamarr)
@@ -275,7 +281,7 @@
if (get_dist(src, src.target) >= distance) src.frustration++ if (get_dist(src, src.target) >= distance) src.frustration++
else src.frustration-- else src.frustration--
if(frustration >= 35) set_null() if(frustration >= 35 || lamarr) set_null()
if(quick_move) if(quick_move)
spawn(cycle_pause/2) spawn(cycle_pause/2)