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

Adds if statement

Browse Source
This commit is contained in:
Yoshax
2015-05-11 13:16:07 +01:00
parent cb8a4c7d75
commit 9bdfeb5ab1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/defines/obj/weapon.dm
View File

@@ -232,9 +232,9 @@
O.show_message("<span class='danger'>[H] steps on \the [src].</span>", 1) O.show_message("<span class='danger'>[H] steps on \the [src].</span>", 1)
if(H.lying) if(H.lying)
var/obj/item/organ/external/affecting = pick(H.organs) var/obj/item/organ/external/affecting = pick(H.organs)
affecting.take_damage(30, 0) if(affecting.take_damage(30, 0))
H.UpdateDamageIcon()
affecting.embed(src) affecting.embed(src)
H.UpdateDamageIcon()
else else
var/list/potentialorgans = list() var/list/potentialorgans = list()
for(var/organ in list("l_leg", "r_leg", "l_foot", "r_foot")) for(var/organ in list("l_leg", "r_leg", "l_foot", "r_foot"))
@@ -242,9 +242,9 @@
if(R && !(R.status & ORGAN_DESTROYED)) if(R && !(R.status & ORGAN_DESTROYED))
potentialorgans += R potentialorgans += R
var/obj/item/organ/external/affecting = pick(potentialorgans) var/obj/item/organ/external/affecting = pick(potentialorgans)
affecting.take_damage(30, 0) if(affecting.take_damage(30, 0))
H.UpdateDamageIcon()
affecting.embed(src) affecting.embed(src)
H.UpdateDamageIcon()
if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))