diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index da6f8f90c89..40f5a3b9593 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -112,7 +112,8 @@ if (B) beaker.reagents.reagent_list |= B - beaker.reagents.update_total() + beaker.reagents.del_reagent("clonexadone") //Fix for infinite meat spawning when taking blood from human + beaker.reagents.update_total() //to an IV drip full of clonex beaker.on_reagent_change() beaker.reagents.handle_reactions() update_icon() diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index d5349ceae69..1063c910156 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -571,6 +571,7 @@ custom_action(step, atom/used_atom, mob/user) user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]") holder.overlays += used_atom.icon_state+"+o" + user.drop_item() del used_atom return 1 diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 523e0ff72eb..1e762e68b3f 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -110,6 +110,11 @@ for(var/mob/O in oviewers(src)) O.show_message("\red [usr] destroys the [name]!", 1) health = 0 + else + usr << "\blue You claw at the [name]." + for(var/mob/O in oviewers(src)) + O.show_message("\red [usr] claws at the [name]!", 1) + health -= rand(5,10) healthcheck() return diff --git a/code/game/objects/storage/coat.dm b/code/game/objects/storage/coat.dm index c01a3087105..e5151ae5ded 100644 --- a/code/game/objects/storage/coat.dm +++ b/code/game/objects/storage/coat.dm @@ -211,8 +211,14 @@ orient2hud() return -/obj/item/weapon/storage/emp_act(severity) +/obj/item/clothing/suit/emp_act(severity) if(!istype(src.loc, /mob/living)) for(var/obj/O in contents) O.emp_act(severity) - ..() \ No newline at end of file + ..() + +/obj/item/clothing/suit/hear_talk(mob/M, var/msg) + for (var/atom/A in src) + if(istype(A,/obj/)) + var/obj/O = A + O.hear_talk(M, msg) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a0d9749744c..8e92cf653d9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -380,7 +380,7 @@ u_equip(item) update_icons() - if (istype(usr, /mob/living/carbon/monkey)) //Check if a monkey is throwing. Modify/remove this line as required. + if (istype(usr, /mob/living/carbon)) //Check if a carbon mob is throwing. Modify/remove this line as required. item.loc = src.loc if(src.client) src.client.screen -= item diff --git a/icons/mob/human_races/r_def_lizard.dmi b/icons/mob/human_races/r_def_lizard.dmi index 6d7f8128ce3..ccb9736ddff 100644 Binary files a/icons/mob/human_races/r_def_lizard.dmi and b/icons/mob/human_races/r_def_lizard.dmi differ diff --git a/icons/mob/human_races/r_lizard.dmi b/icons/mob/human_races/r_lizard.dmi index e8fb53fdac0..8f8615d44e1 100644 Binary files a/icons/mob/human_races/r_lizard.dmi and b/icons/mob/human_races/r_lizard.dmi differ