mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Fixes reading paper bundles and removing accessories on other people (#21214)
Apparently the adjacent check wasn't set properly on these two. Also it fixes that when removing someone's accessory, it tried to apply some modifiers to the one removing it instead of the one wearing it.
This commit is contained in:
@@ -137,17 +137,14 @@
|
||||
update_accessory_slowdown()
|
||||
recalculate_body_temperature_change()
|
||||
|
||||
/obj/item/clothing/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A)
|
||||
/obj/item/clothing/proc/remove_accessory(mob/wearer, obj/item/clothing/accessory/A)
|
||||
if(!(A in accessories))
|
||||
return
|
||||
|
||||
if(use_check_and_message(user))
|
||||
return
|
||||
|
||||
A.on_removed(user)
|
||||
A.on_removed(wearer)
|
||||
LAZYREMOVE(accessories, A)
|
||||
update_clothing_icon()
|
||||
update_accessory_slowdown(user)
|
||||
update_accessory_slowdown(wearer)
|
||||
recalculate_body_temperature_change()
|
||||
|
||||
/obj/item/clothing/proc/remove_accessory_verb()
|
||||
@@ -187,6 +184,9 @@
|
||||
else
|
||||
A = accessories[1]
|
||||
|
||||
if(use_check_and_message(user))
|
||||
return
|
||||
|
||||
remove_accessory(usr, A)
|
||||
|
||||
if(try_reopen_radial_after_removal)
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
user.visible_message(SPAN_DANGER("\The [user] tears off \the [A] from [src]'s [suit.name]!"))
|
||||
attack_log += "\[[time_stamp()]\] <font color='orange'>Has had \the [A] removed by [user.name] ([user.ckey])</font>"
|
||||
user.attack_log += "\[[time_stamp()]\] <span class='warning'>Attempted to remove [name]'s ([ckey]) [A.name]</span>"
|
||||
suit.remove_accessory(user, A)
|
||||
suit.remove_accessory(src, A)
|
||||
return 1
|
||||
|
||||
// Are we placing or stripping?
|
||||
|
||||
Reference in New Issue
Block a user