cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some optimizations for fingerprints. General debugging.

Browse Source
This commit is contained in:
SkyMarshal
2012-03-05 16:33:47 -07:00
parent 8ae86d253f
commit 43f7487429
5 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/gun.dm
View File

@@ -85,8 +85,8 @@
else if(target && M == target)
PreFire(M,user)
return
else if(user.a_intent == "hurt" && (istype(src.in_chamber, /obj/item/projectile/beam) || istype(src.in_chamber, /obj/item/projectile/energy)\
|| istype(src.in_chamber, /obj/item/projectile/bullet)) && !istype(src.in_chamber, /obj/item/projectile/bullet/stunshot) && load_into_chamber())
else if(user.a_intent == "hurt" && load_into_chamber() && (istype(src.in_chamber, /obj/item/projectile/beam) || istype(src.in_chamber, /obj/item/projectile/energy)\
|| istype(src.in_chamber, /obj/item/projectile/bullet)))
//Lets shoot them, then.
user.visible_message("\red <b> [user] fires \the [src] point blank at [M]!</b>")
M.bullet_act(in_chamber,"head")
@@ -97,9 +97,11 @@
if (M.weakened < 10)
M.weakened = 10
if(M.stat != 2) M.stat = 1
if(M.health <= -50) //I pumped 7 more rounds into the guy, and only did an extra 26 damage :|
M.apply_damage(45) //So we'll put him an inch from death.
del(in_chamber)
return
else if(user.a_intent != "hurt" && istype(src,/obj/item/weapon/gun/energy/taser) && load_into_chamber())
else if(user.a_intent != "hurt" && load_into_chamber() && istype(src,/obj/item/weapon/gun/energy/taser))
if (prob(50))
if (M.paralysis < 60 && (!(M.mutations & 8)) )
M.paralysis = 60