diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index f2a9b0b59bb..d366dcd2224 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -310,7 +310,7 @@ /obj/item/weapon/storage/stma_kit name = "Sterile Masks" desc = "This box contains masks of sterility." - icon_state = "latex" + icon_state = "sterile" item_state = "syringe_kit" foldable = /obj/item/stack/sheet/cardboard //BubbleWrap diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 6ac10b71121..5e80ac31a9d 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -968,24 +968,25 @@ Frequency: if ((s_active && !( s_active in contents ) )) s_active.close(src) - if(module.type == /obj/item/weapon/robot_module/janitor) //you'd think checking the module would work - var/turf/tile = get_turf(loc) + if(module) + if(module.type == /obj/item/weapon/robot_module/janitor) //you'd think checking the module would work + var/turf/tile = get_turf(loc) - tile.clean_blood() - for(var/obj/effect/R in tile) - if(istype(R, /obj/effect/rune) || istype(R, /obj/effect/decal/cleanable) || istype(R, /obj/effect/overlay)) - del(R) + tile.clean_blood() + for(var/obj/effect/R in tile) + if(istype(R, /obj/effect/rune) || istype(R, /obj/effect/decal/cleanable) || istype(R, /obj/effect/overlay)) + del(R) - for(var/obj/item/cleaned_item in tile) - cleaned_item.clean_blood() + for(var/obj/item/cleaned_item in tile) + cleaned_item.clean_blood() - for(var/mob/living/carbon/human/cleaned_human in tile) //HUE HUE I CLEAN U - if(cleaned_human.lying) - cleaned_human.clean_blood() - cleaned_human << "\red [src] cleans your face!" - for(var/obj/item/carried_item in cleaned_human.contents) - carried_item.clean_blood() - return + for(var/mob/living/carbon/human/cleaned_human in tile) //HUE HUE I CLEAN U + if(cleaned_human.lying) + cleaned_human.clean_blood() + cleaned_human << "\red [src] cleans your face!" + for(var/obj/item/carried_item in cleaned_human.contents) + carried_item.clean_blood() + return /mob/living/silicon/robot/proc/self_destruct() gib(1) diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 1d871a557e4..f5a12b435f0 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ