diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 367db4766b8..30e0782da19 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -478,19 +478,22 @@ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) + ///Have we combined this with another godeye? + var/double_eye = FALSE -/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, src) && W != src && W.loc == user) - if(W.icon_state == "godeye") - W.icon_state = "doublegodeye" - W.item_state = "doublegodeye" - W.desc = "A pair of strange eyes, said to have been torn from an omniscient creature that used to roam the wastes. There's no real reason to have two, but that isn't stopping you." +/obj/item/clothing/glasses/godeye/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/clothing/glasses/godeye) && W != src) + var/obj/item/clothing/glasses/godeye/second_eye = W + if(!second_eye.double_eye && !double_eye) + double_eye = TRUE + icon_state = "doublegodeye" + item_state = "doublegodeye" + name = "eyes of god" + desc = "A pair of strange eyes, said to have been torn from an omniscient creature that used to roam the wastes. There's no real reason to have two, but that isn't stopping you." if(iscarbon(user)) var/mob/living/carbon/C = user C.update_inv_wear_mask() - else - to_chat(user, "The eye winks at you and vanishes into the abyss, you feel really unlucky.") - qdel(src) + qdel(W) ..() /obj/item/clothing/glasses/tajblind diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 1c57e4b7511..52f9fdb2d00 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -509,7 +509,7 @@ icon_override = 'icons/goonstation/mob/clothing/mask.dmi' lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi' righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi' - flags = NODROP | AIRTIGHT + flags = NODROP | AIRTIGHT | DROPDEL flags_cover = MASKCOVERSMOUTH /obj/item/clothing/mask/cursedclown/equipped(mob/user, slot) diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index 516d40ee814..622086be3e7 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -239,15 +239,15 @@ dna = owner.dna.Clone() name = "[dna.real_name]'s head" if(owner.glasses) - owner.unEquip(owner.glasses) + owner.unEquip(owner.glasses, silent = TRUE) if(owner.head) - owner.unEquip(owner.head) + owner.unEquip(owner.head, silent = TRUE) if(owner.l_ear) - owner.unEquip(owner.l_ear) + owner.unEquip(owner.l_ear, silent = TRUE) if(owner.r_ear) - owner.unEquip(owner.r_ear) + owner.unEquip(owner.r_ear, silent = TRUE) if(owner.wear_mask) - owner.unEquip(owner.wear_mask) + owner.unEquip(owner.wear_mask, silent = TRUE) owner.update_hair() owner.update_fhair() owner.update_head_accessory()