mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Fix a small runtime in actions when dropping rigs (#9271)
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com> Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
@@ -35,7 +35,7 @@ GLOBAL_DATUM_INIT(item_unequipped_event, /decl/observ/item_unequipped, new)
|
||||
**********************/
|
||||
|
||||
/obj/item/dropped(var/mob/user)
|
||||
..()
|
||||
. = ..(user)
|
||||
//SEND_SIGNAL(user, COMSIG_OBSERVER_MOB_UNEQUIPPED, src)
|
||||
//SEND_SIGNAL(src, COMSIG_OBSERVER_ITEM_UNEQUIPPED, user)
|
||||
if(user) // Cannot always guarantee that user won't be null
|
||||
|
||||
@@ -790,7 +790,7 @@
|
||||
toggle_piece(piece, H, ONLY_DEPLOY)
|
||||
|
||||
/obj/item/rig/dropped(var/mob/user)
|
||||
..()
|
||||
. = ..(user)
|
||||
for(var/piece in list("helmet","gauntlets","chest","boots"))
|
||||
toggle_piece(piece, user, ONLY_RETRACT)
|
||||
if(wearer && wearer.wearing_rig == src)
|
||||
|
||||
@@ -350,7 +350,7 @@
|
||||
var/obj/item/rig_module/gauntlets/storing_module
|
||||
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user)
|
||||
. = ..()
|
||||
. = ..(user)
|
||||
if(storing_module)
|
||||
src.forceMove(storing_module)
|
||||
storing_module.stored_gauntlets = src
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
var/obj/item/organ/my_augment = null // Used to reference the object's host organ.
|
||||
|
||||
/obj/item/dropped(mob/user)
|
||||
. = ..()
|
||||
. = ..(user)
|
||||
if(src)
|
||||
if(destroy_on_drop && !QDELETED(src))
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user