cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issues with Decapitation and NODROP items (#18622)

Browse Source 
* fixes

* hal requests

* Update glasses.dm
This commit is contained in:
Sirryan2002
2022-08-07 22:31:32 -04:00
committed by GitHub
parent ceb107860f
commit 189df0c7eb
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/glasses.dm
+12 -9
View File
@@ -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, "<span class='notice'>The eye winks at you and vanishes into the abyss, you feel really unlucky.</span>")
qdel(src)
qdel(W)
..()
/obj/item/clothing/glasses/tajblind
code/modules/clothing/masks/miscellaneous.dm
+1 -1
View File
@@ -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)
code/modules/surgery/organs/subtypes/standard.dm
+5 -5
View File
@@ -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()