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

Updates PR with Fox's suggestions

Browse Source
This commit is contained in:
ZomgPonies
2015-03-24 19:27:05 -04:00
parent 3f51d1135a
commit 8dfaa39ecb
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+12
View File
@@ -236,7 +236,15 @@
if(isturf(src.loc))
var/mob/living/carbon/H = AM
if(H.m_intent == "run")
if(H.lying)
H.apply_damage(20,BRUTE,"chest")
else
H.apply_damage(20,BRUTE,(pick("l_leg", "r_leg")))
armed = 0
icon_state = "beartrap0"
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
H.visible_message("<span class='danger'>[H] triggers \the [src].</span>", \
"<span class='userdanger'>You trigger \the [src]!</span>")
H.legcuffed = src
src.loc = H
H.update_inv_legcuffed()
@@ -250,7 +258,11 @@
O.show_message("\red <B>[H] steps on \the [src].</B>", 1)
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))
armed = 0
icon_state = "beartrap0"
var/mob/living/simple_animal/SA = AM
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
SA.visible_message("<span class='danger'>[SA] triggers \the [src].</span>", \
"<span class='userdanger'>You trigger \the [src]!</span>")
SA.health -= 20
..()
code/game/objects/items/weapons/grenades/ghettobomb.dm
-12
View File
@@ -121,18 +121,6 @@
/obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
update_mob()
explosion(src.loc,0,0,2,2) //explosion(src.loc,-1,-1,-1, flame_range = range)
if(istype(loc, /obj/item/weapon/legcuffs/beartrap))
var/obj/item/weapon/legcuffs/beartrap/boomtrap = loc
if(istype(boomtrap.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = loc.loc
if(H.legcuffed)
var/datum/organ/external/l = H.get_organ("l_leg")
var/datum/organ/external/r = H.get_organ("r_leg")
if(l && !(l.status & ORGAN_DESTROYED))
l.status |= ORGAN_DESTROYED
if(r && !(r.status & ORGAN_DESTROYED))
r.status |= ORGAN_DESTROYED
qdel(H.legcuffed)
qdel(src)
/obj/item/weapon/grenade/iedcasing/examine(mob/user)