mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Alien fixes/changes:
Alien stun chance on harm decreased. Alien stab intent changed to stun intent which deals light damage. It does have a very high chance of knock down and an even higher chance of disarming the target. Hud icon changed to reflect this. Upped the chance aliens stunning cyborgs with stun intent. Updated aliens attacking monkeys code. Aliens can now directly attack the AI. General code cleanup for alien attacks and others attacking aliens (hand to hand). Humanoid aliens may no longer run on tables. Fixed a typo in the Corrode ability. Increased the amount of abuse resin walls can take. Changed how damaging them works (as windows). Hulks may now smash straight through resin walls. Aliens may now destroy them without acid (and can no longer use acid on them). Spit now produces a message when used. Fixed aliens not being stunned by stun batons. Aliens can now attack/destroy turrets. Removed alien vision loss from being shot by lasors. Aliens are not deterred by flash now (flashbangs should still work). You can no-longer stab aliens in their nonexistent eyes with screwdrivers or forks. Changing a mob into an alien now properly sets their intent (help). Minor, misc alien code adjustments. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@762 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -39,9 +39,8 @@
|
||||
density = 1
|
||||
opacity = 1
|
||||
anchored = 1
|
||||
unacidable = 0 //So aliens can destroy their own walls if they need to.
|
||||
|
||||
var/health = 20
|
||||
//Alien can now normally destroy resin walls so they are no longer targetable with acid.
|
||||
var/health = 50
|
||||
|
||||
/obj/alien/weeds
|
||||
name = "weeds"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Alien Resin Walls are dense and block line of sight. They should probably be much stronger than they are now. -- TLE
|
||||
// Resin walls improved. /N
|
||||
|
||||
/*/obj/alien/resin/ex_act(severity)
|
||||
world << "[severity] - [health]"
|
||||
@@ -12,10 +12,116 @@
|
||||
if(src.health < 1)
|
||||
del(src)
|
||||
return*/
|
||||
|
||||
/*
|
||||
/obj/alien/resin/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
for(var/mob/M in viewers(src, null))
|
||||
M.show_message(text("\red <B>[src] is struck with [src]!</B>"), 1)
|
||||
src.health -= 2
|
||||
if(src.health <= 0)
|
||||
del(src)
|
||||
del(src)
|
||||
*/
|
||||
|
||||
/obj/alien/resin/bullet_act(flag)
|
||||
if (flag == PROJECTILE_BULLET)
|
||||
health -= 35
|
||||
if(health <=0)
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/alien/resin/ex_act(severity)
|
||||
switch(severity)
|
||||
if(1.0)
|
||||
del(src)
|
||||
return
|
||||
if(2.0)
|
||||
del(src)
|
||||
return
|
||||
if(3.0)
|
||||
if (prob(50))
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
/obj/alien/resin/blob_act()
|
||||
density = 0
|
||||
del(src)
|
||||
|
||||
/obj/alien/resin/meteorhit()
|
||||
//*****RM
|
||||
//world << "glass at [x],[y],[z] Mhit"
|
||||
src.health = 0
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/alien/resin/hitby(AM as mob|obj)
|
||||
..()
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message(text("\red <B>[src] was hit by [AM].</B>"), 1)
|
||||
var/tforce = 0
|
||||
if(ismob(AM))
|
||||
tforce = 10
|
||||
else
|
||||
tforce = AM:throwforce
|
||||
playsound(src.loc, 'attackblob.ogg', 100, 1)
|
||||
src.health = max(0, src.health - tforce)
|
||||
if (src.health <= 0)
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/alien/resin/attack_hand()
|
||||
if ((usr.mutations & 8))
|
||||
usr << text("\blue You easily destroy the resin wall.")
|
||||
for(var/mob/O in oviewers())
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red [] destroys the resin wall!", usr)
|
||||
src.health = 0
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/alien/resin/attack_paw()
|
||||
if ((usr.mutations & 8))
|
||||
usr << text("\blue You easily destroy the resin wall.")
|
||||
for(var/mob/O in oviewers())
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red [] destroys the resin wall!", usr)
|
||||
src.health = 0
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/alien/resin/attack_alien()
|
||||
if (istype(usr, /mob/living/carbon/alien/larva))//Safety check for larva. /N
|
||||
return
|
||||
usr << text("\green You claw at the resin wall.")
|
||||
for(var/mob/O in oviewers())
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red [] claws at the resin wall!", usr)
|
||||
playsound(src.loc, 'attackblob.ogg', 100, 1)
|
||||
src.health -= rand(10, 20)
|
||||
if(src.health <= 0)
|
||||
usr << text("\green You slice the resin wall to pieces.")
|
||||
for(var/mob/O in oviewers())
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red [] slices the resin wall apart!", usr)
|
||||
src.health = 0
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
/obj/alien/resin/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
var/aforce = W.force
|
||||
src.health = max(0, src.health - aforce)
|
||||
playsound(src.loc, 'attackblob.ogg', 100, 1)
|
||||
if (src.health <= 0)
|
||||
src.density = 0
|
||||
del(src)
|
||||
return
|
||||
..()
|
||||
return
|
||||
@@ -10,6 +10,8 @@
|
||||
var/mob/living/carbon/human/H = M
|
||||
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding))
|
||||
safety = 1
|
||||
if (istype(M, /mob/living/carbon/alien))//So aliens don't get flashed (they have no external eyes)/N
|
||||
safety = 1
|
||||
if(isrobot(user))
|
||||
spawn(0)
|
||||
var/atom/movable/overlay/animation = new(user.loc)
|
||||
@@ -21,7 +23,7 @@
|
||||
sleep(5)
|
||||
del(animation)
|
||||
if (!( safety ))
|
||||
if (M.client)
|
||||
if (M.client)//Probably here to prevent forced conversion of dced players. /N
|
||||
if (status == 0)
|
||||
user << "\red The bulb has been burnt out!"
|
||||
return
|
||||
@@ -48,12 +50,13 @@
|
||||
if(user.mind in ticker.mode:head_revolutionaries)
|
||||
ticker.mode:add_revolutionary(M.mind)
|
||||
|
||||
for(var/mob/O in viewers(user, null))
|
||||
if(status == 1)
|
||||
if(!istype(M, /mob/living/carbon/alien)) //So aliens don't show up as being blinded when it has no effect on them./N
|
||||
O.show_message(text("\red [] blinds [] with the flash!", user, M))
|
||||
else
|
||||
O.show_message(text("\red [] fails to blind [] with the flash!", user, M))
|
||||
for(var/mob/O in viewers(user, null))
|
||||
if(status == 1)
|
||||
O.show_message(text("\red [] blinds [] with the flash!", user, M))
|
||||
else
|
||||
for(var/mob/O in viewers(user, null))
|
||||
if(status == 1)
|
||||
O.show_message(text("\blue [] fails to blind [] with the flash!", user, M))
|
||||
src.attack_self(user, 1)
|
||||
return
|
||||
|
||||
@@ -98,5 +101,7 @@
|
||||
var/mob/living/carbon/human/H = M
|
||||
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding))
|
||||
safety = 1
|
||||
if (istype(M, /mob/living/carbon/alien))//So aliens don't see those annoying flash screens.
|
||||
safety = 1
|
||||
if (!( safety ))
|
||||
flick("flash", M.flash)
|
||||
|
||||
@@ -32,10 +32,15 @@ KNIFE
|
||||
if(!(user.zone_sel.selecting == ("eyes" || "head")))
|
||||
return ..()
|
||||
var/mob/living/carbon/human/H = M
|
||||
|
||||
if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
|
||||
// you can't stab someone in the eyes wearing a mask!
|
||||
user << "\blue You're going to need to remove that mask/helmet/glasses first."
|
||||
return
|
||||
if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N
|
||||
user << "\blue You cannot locate any eyes on this creature!"
|
||||
return
|
||||
|
||||
for(var/mob/O in viewers(M, null))
|
||||
if(O == (user || M)) continue
|
||||
if(M == user) O.show_message(text("\red [] has stabbed themself with []!", user, src), 1)
|
||||
|
||||
@@ -127,7 +127,7 @@ STUN BATON
|
||||
if(status == 1 && charges == 0)
|
||||
user << "\red Not enough charge"
|
||||
return
|
||||
if((charges > 0 && status == 1) && (istype(H, /mob/living/carbon/human)))
|
||||
if((charges > 0 && status == 1) && (istype(H, /mob/living/carbon)))
|
||||
flick("baton_active", src)
|
||||
if (user.a_intent == "hurt")
|
||||
/* if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
|
||||
@@ -176,39 +176,6 @@ STUN BATON
|
||||
M.lastattacker = user
|
||||
for(var/mob/O in viewers(M))
|
||||
if (O.client) O.show_message("\red <B>[M] has been stunned with the stun baton by [user]!</B>", 1, "\red You hear someone fall", 2)
|
||||
else if((charges > 0 && status == 1) && (istype(M, /mob/living/carbon/monkey)))
|
||||
flick("baton_active", src)
|
||||
if (user.a_intent == "hurt")
|
||||
playsound(src.loc, 'Genhit.ogg', 50, 1, -1)
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
R.cell.charge -= 20
|
||||
else
|
||||
charges--
|
||||
if (M.weakened < 1 && (!(M.mutations & 8)) )
|
||||
M.weakened = 1
|
||||
if (M.stuttering < 1 && (!(M.mutations & 8)) )
|
||||
M.stuttering = 1
|
||||
..()
|
||||
if (M.stunned < 1 && (!(M.mutations & 8)) )
|
||||
M.stunned = 1
|
||||
else
|
||||
playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/R = user
|
||||
R.cell.charge -= 20
|
||||
else
|
||||
charges--
|
||||
if (M.weakened < 10 && (!(M.mutations & 8)) )
|
||||
M.weakened = 10
|
||||
if (M.stuttering < 10 && (!(M.mutations & 8)) )
|
||||
M.stuttering = 10
|
||||
if (M.stunned < 10 && (!(M.mutations & 8)) )
|
||||
M.stunned = 10
|
||||
user.lastattacked = M
|
||||
M.lastattacker = user
|
||||
for(var/mob/O in viewers(M))
|
||||
if (O.client) O.show_message("\red <B>[M] has been stunned with the stun baton by [user]!</B>", 1, "\red You hear someone fall", 2)
|
||||
|
||||
/obj/item/weapon/classic_baton/attack(mob/M as mob, mob/user as mob)
|
||||
if ((usr.mutations & 16) && prob(50))
|
||||
|
||||
@@ -36,10 +36,15 @@ WELDINGTOOOL
|
||||
if(!(user.zone_sel.selecting == ("eyes" || "head")))
|
||||
return ..()
|
||||
var/mob/living/carbon/human/H = M
|
||||
|
||||
if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
|
||||
// you can't stab someone in the eyes wearing a mask!
|
||||
user << "\blue You're going to need to remove that mask/helmet/glasses first."
|
||||
return
|
||||
if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N
|
||||
user << "\blue You cannot locate any eyes on this creature!"
|
||||
return
|
||||
|
||||
for(var/mob/O in viewers(M, null))
|
||||
if(O == (user || M)) continue
|
||||
if(M == user) O.show_message(text("\red [] has stabbed themself with []!", user, src), 1)
|
||||
|
||||
Reference in New Issue
Block a user