diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm index c63142e6d1b..5009f455470 100644 --- a/code/game/gamemodes/events/clang.dm +++ b/code/game/gamemodes/events/clang.dm @@ -13,7 +13,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 icon = 'objects.dmi' icon_state = "immrod" throwforce = 100 - density = 0 + density = 1 anchored = 1 Bump(atom/clong) @@ -29,7 +29,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 O.show_message("CLANG", 2) if (istype(clong, /mob)) if(clong.density || prob(10)) - src.throw_impact(clong) + clong.meteorhit(src) if(clong && prob(25)) src.loc = clong.loc diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 71168156b12..570d66226dd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -884,7 +884,10 @@ var/dam_zone = pick("chest", "chest", "chest", "head", "groin") if (istype(src.organs[dam_zone], /datum/organ/external)) var/datum/organ/external/temp = src.organs[dam_zone] - temp.take_damage((istype(O, /obj/meteor/small) ? 10 : 25), 30) + if (istype(O, /obj/immovablerod)) + temp.take_damage(101, 0) + else + temp.take_damage((istype(O, /obj/meteor/small) ? 10 : 25), 30) src.UpdateDamageIcon() src.updatehealth() return