cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up a few lines of unnecessary alien code.

Browse Source 
Cleaned up mob projectile code a bit so it uses switch.
It's now much harder to play punch-out with a xeno, unless you're the hulk.
Xenos can now stick humans and monkeys into resin walls. Inside a resin wall, the person cannot escape unless the wall is destroyed (there is a 5% they will crawl out on their own). They are also paralyzed and cannot suicide.
Robots will now spark when you clobber or shoot them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1467 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2011-04-17 23:27:28 +00:00
parent b7db69b6f8
commit a95f87d6bc
9 changed files with 522 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+59 -56
View File
@@ -236,65 +236,67 @@
return
/mob/living/silicon/robot/bullet_act(flag)
if (flag == PROJECTILE_BULLET)
if (src.stat != 2)
src.bruteloss += 60
src.updatehealth()
return
/*
else if (flag == PROJECTILE_MEDBULLET)
if (src.stat != 2)
src.bruteloss += 30
src.updatehealth()
*/
else if (flag == PROJECTILE_WEAKBULLET)
if (src.stat != 2)
src.bruteloss += 15
src.updatehealth()
return
/*
else if (flag == PROJECTILE_MPBULLET)
if (src.stat != 2)
src.bruteloss += 20
src.updatehealth()
switch(flag)
if(PROJECTILE_BULLET)
if (src.stat != 2)
src.bruteloss += 60
src.updatehealth()
return
/*
if(PROJECTILE_MEDBULLET)
if (src.stat != 2)
src.bruteloss += 30
src.updatehealth()
*/
if(PROJECTILE_WEAKBULLET)
if (src.stat != 2)
src.bruteloss += 15
src.updatehealth()
return
/*
if(PROJECTILE_MPBULLET)
if (src.stat != 2)
src.bruteloss += 20
src.updatehealth()
else if (flag == PROJECTILE_SLUG)
if (src.stat != 2)
src.bruteloss += 40
src.updatehealth()
if(PROJECTILE_SLUG)
if (src.stat != 2)
src.bruteloss += 40
src.updatehealth()
else if (flag == PROJECTILE_BAG)
if (src.stat != 2)
src.bruteloss += 2
src.updatehealth()
*/
if(PROJECTILE_BAG)
if (src.stat != 2)
src.bruteloss += 2
src.updatehealth()
*/
else if (flag == PROJECTILE_TASER)
if (src.stat != 2)
src.fireloss += rand(0,10)
src.stunned += rand(0,3)
return
else if (flag == PROJECTILE_DART)
if (src.stat != 2)
src.stunned += 5
src.fireloss += 10
src.updatehealth()
return
/*
else if (flag == PROJECTILE_WAVE)
if (src.stat != 2)
src.bruteloss += 25
src.updatehealth()
return
*/
else if(flag == PROJECTILE_LASER)
if (src.stat != 2)
src.bruteloss += 20
src.updatehealth()
else if(flag == PROJECTILE_PULSE)
if (src.stat != 2)
src.bruteloss += 40
src.updatehealth()
if(PROJECTILE_TASER)
if (src.stat != 2)
src.fireloss += rand(0,10)
src.stunned += rand(0,3)
return
if(PROJECTILE_DART)
if (src.stat != 2)
src.stunned += 5
src.fireloss += 10
src.updatehealth()
return
/*
if(PROJECTILE_WAVE)
if (src.stat != 2)
src.bruteloss += 25
src.updatehealth()
return
*/
if(PROJECTILE_LASER)
if (src.stat != 2)
src.bruteloss += 20
src.updatehealth()
if(PROJECTILE_PULSE)
if (src.stat != 2)
src.bruteloss += 40
src.updatehealth()
spark_system.start()
return
@@ -495,6 +497,7 @@
else
user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
else
spark_system.start()
return ..()
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)