More Minor pAI Tweaks

- EMPs will only instantly kill full health pAIs on a 20% chance,
possible brute/burn from EMPs isn't instantly deadly anymore.
- pAIs can no longer bump things around.
- Cleans up unneeded if statement in pAI pull proc, still cannot pull
anything.
- pAI card (not mobile form) now properly reacts to explosions.
- Adds 1/10 second delay between a pAI being hit/bonked and closing up
(Effectively meaningless gameplay-wise).
This commit is contained in:
DZD
2014-12-09 19:00:46 -05:00
parent 8e4f2f6399
commit 55a2779cf8
2 changed files with 26 additions and 16 deletions
+21 -16
View File
@@ -174,16 +174,16 @@
switch(severity)
if(1.0)
if (src.stat != 2)
adjustBruteLoss(100)
adjustFireLoss(100)
if (src.stat != 2) //Let's not have two of these instantly kill you.
adjustBruteLoss(45)
adjustFireLoss(45)
if(2.0)
if (src.stat != 2)
adjustBruteLoss(60)
adjustFireLoss(60)
adjustBruteLoss(30)
adjustFireLoss(30)
if(3.0)
if (src.stat != 2)
adjustBruteLoss(30)
adjustBruteLoss(20)
src.updatehealth()
@@ -200,8 +200,6 @@
src.updatehealth()
return
//mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
/mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."
@@ -236,8 +234,6 @@
O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
return
///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob)
/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
usr:cameraFollow = null
if (!C)
@@ -412,13 +408,16 @@
src.updatehealth()
else
visible_message("<span class='warning'>[user.name] bonks [src] harmlessly with [W].</span>")
if(stat != 2) close_up()
spawn(1)
if(stat != 2)
close_up()
return
/mob/living/silicon/pai/attack_hand(mob/user as mob)
if(stat == 2) return
visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
close_up()
spawn(1)
close_up()
//I'm not sure how much of this is necessary, but I would rather avoid issues.
/mob/living/silicon/pai/proc/close_up()
@@ -443,10 +442,15 @@
canmove = 0
icon_state = "[chassis]"
/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
/mob/living/silicon/pai/Bump(atom/movable/AM as mob|obj, yes)
return
if(istype(AM,/obj/item))
src << "<span class='warning'>You are far too small to pull anything!</span>"
/mob/living/silicon/pai/Bumped(AM as mob|obj)
return
/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
src << "<span class='warning'>You are far too small to pull anything!</span>"
return
/mob/living/silicon/pai/examine()
@@ -479,6 +483,7 @@
..(Proj)
updatehealth()
if (stat != 2)
close_up()
spawn(1)
close_up()
return 2