diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 22a73d9b32..19cdf2a18b 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -39,6 +39,8 @@ H << "Some of \the [src] gets in your eyes!" H.eye_blind += 5 H.eye_blurry += 10 + spawn(1) + if(istype(loc, /turf/)) qdel(src) /obj/item/weapon/ore/phoron diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 72bf93753c..92a6089e9f 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -247,7 +247,7 @@ var/global/list/sparring_attack_cache = list() if(5) user.visible_message("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ /datum/unarmed_attack/light_strike - deal_halloss = 1 + deal_halloss = 3 attack_noun = list("tap","light strike") attack_verb = list("tapped", "lightly struck") damage = 2 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 6473addf04..302b8eb101 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -677,10 +677,8 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/soap(src) src.modules += new /obj/item/weapon/extinguisher(src) - src.modules += new/obj/item/weapon/tank/jetpack/carbondioxide(src) - for(var/obj/item/weapon/tank/jetpack/carbondioxide in src.modules) - robot.internals = src - break + robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src) + src.modules += robot.internals src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) src.emag.name = "Plasma Cutter"