mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 20:47:43 +01:00
Magboot and glove fix (#19415)
* Magboot and glove fix * Update armblade.dm * Update leash.dm
This commit is contained in:
@@ -279,23 +279,25 @@
|
||||
to_chat(wearer, span_danger("The inside of your head hurts..."))
|
||||
wearer.adjustBrainLoss(brainloss_cost)
|
||||
|
||||
/obj/item/clothing/head/psy_crown/equipped(var/mob/living/carbon/human/H)
|
||||
/obj/item/clothing/head/psy_crown/equipped(mob/living/carbon/human/user)
|
||||
..()
|
||||
if(istype(H) && H.head == src && H.is_sentient())
|
||||
if(istype(user) && user.head == src && user.is_sentient())
|
||||
START_PROCESSING(SSobj, src)
|
||||
if(flavor_equip)
|
||||
to_chat(H, flavor_equip)
|
||||
to_chat(user, flavor_equip)
|
||||
|
||||
/obj/item/clothing/head/psy_crown/dropped(var/mob/living/carbon/human/H)
|
||||
/obj/item/clothing/head/psy_crown/dropped(mob/living/carbon/human/user, equipping, slot)
|
||||
if(equipping || loc == user)
|
||||
return ..()
|
||||
..()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
if(H.is_sentient())
|
||||
if(loc == H) // Still inhand.
|
||||
if(user.is_sentient())
|
||||
if(loc == user) // Still inhand.
|
||||
if(flavor_unequip)
|
||||
to_chat(H, flavor_unequip)
|
||||
to_chat(user, flavor_unequip)
|
||||
return
|
||||
if(flavor_drop)
|
||||
to_chat(H, flavor_drop)
|
||||
to_chat(user, flavor_drop)
|
||||
|
||||
/obj/item/clothing/head/psy_crown/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
user.client.screen |= pilot_hud
|
||||
user.client.images |= raw_images
|
||||
|
||||
/obj/item/clothing/head/pilot/dropped(mob/user)
|
||||
/obj/item/clothing/head/pilot/dropped(mob/user, equipping, slot)
|
||||
. = ..()
|
||||
if(user.client)
|
||||
user.client.screen -= pilot_hud
|
||||
|
||||
@@ -8,7 +8,9 @@
|
||||
body_parts_covered = 0
|
||||
special_handling = TRUE
|
||||
|
||||
/obj/item/clothing/head/soft/dropped(mob/user)
|
||||
/obj/item/clothing/head/soft/dropped(mob/user, equipping, slot)
|
||||
if(equipping)
|
||||
return ..()
|
||||
icon_state = initial(icon_state)
|
||||
flipped = FALSE
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user