mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Merge pull request #3400 from LorenLuke/Limb-sever-speed
Limbs no longer sever at supersonic speeds.
This commit is contained in:
@@ -882,7 +882,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
|||||||
if(!clean)
|
if(!clean)
|
||||||
// Throw limb around.
|
// Throw limb around.
|
||||||
if(src && istype(loc,/turf))
|
if(src && istype(loc,/turf))
|
||||||
throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
|
throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
|
||||||
dir = 2
|
dir = 2
|
||||||
if(DROPLIMB_BURN)
|
if(DROPLIMB_BURN)
|
||||||
new /obj/effect/decal/cleanable/ash(get_turf(victim))
|
new /obj/effect/decal/cleanable/ash(get_turf(victim))
|
||||||
@@ -901,19 +901,19 @@ Note that amputating the affected organ does in fact remove the infection from t
|
|||||||
gore.basecolor = use_blood_colour
|
gore.basecolor = use_blood_colour
|
||||||
gore.update_icon()
|
gore.update_icon()
|
||||||
|
|
||||||
gore.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
|
gore.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
|
||||||
|
|
||||||
for(var/obj/item/organ/I in internal_organs)
|
for(var/obj/item/organ/I in internal_organs)
|
||||||
I.removed()
|
I.removed()
|
||||||
if(istype(loc,/turf))
|
if(istype(loc,/turf))
|
||||||
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
|
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
|
||||||
|
|
||||||
for(var/obj/item/I in src)
|
for(var/obj/item/I in src)
|
||||||
if(I.w_class <= ITEMSIZE_SMALL)
|
if(I.w_class <= ITEMSIZE_SMALL)
|
||||||
qdel(I)
|
qdel(I)
|
||||||
continue
|
continue
|
||||||
I.loc = get_turf(src)
|
I.loc = get_turf(src)
|
||||||
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
|
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
|
||||||
|
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user