cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix a small runtime in actions when dropping rigs (#9271)

Browse Source 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2024-10-20 10:39:17 -07:00
committed by GitHub
parent 21d9525e0e
commit 608075a2ae
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/observation/unequipped.dm
View File

@@ -35,7 +35,7 @@ GLOBAL_DATUM_INIT(item_unequipped_event, /decl/observ/item_unequipped, new)
**********************/ **********************/
/obj/item/dropped(var/mob/user) /obj/item/dropped(var/mob/user)
..() . = ..(user)
//SEND_SIGNAL(user, COMSIG_OBSERVER_MOB_UNEQUIPPED, src) //SEND_SIGNAL(user, COMSIG_OBSERVER_MOB_UNEQUIPPED, src)
//SEND_SIGNAL(src, COMSIG_OBSERVER_ITEM_UNEQUIPPED, user) //SEND_SIGNAL(src, COMSIG_OBSERVER_ITEM_UNEQUIPPED, user)
if(user) // Cannot always guarantee that user won't be null if(user) // Cannot always guarantee that user won't be null

2
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -790,7 +790,7 @@
toggle_piece(piece, H, ONLY_DEPLOY) toggle_piece(piece, H, ONLY_DEPLOY)
/obj/item/rig/dropped(var/mob/user) /obj/item/rig/dropped(var/mob/user)
..() . = ..(user)
for(var/piece in list("helmet","gauntlets","chest","boots")) for(var/piece in list("helmet","gauntlets","chest","boots"))
toggle_piece(piece, user, ONLY_RETRACT) toggle_piece(piece, user, ONLY_RETRACT)
if(wearer && wearer.wearing_rig == src) if(wearer && wearer.wearing_rig == src)

2
code/modules/mining/kinetic_crusher.dm
View File

@@ -350,7 +350,7 @@
var/obj/item/rig_module/gauntlets/storing_module var/obj/item/rig_module/gauntlets/storing_module
/obj/item/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user) /obj/item/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user)
. = ..() . = ..(user)
if(storing_module) if(storing_module)
src.forceMove(storing_module) src.forceMove(storing_module)
storing_module.stored_gauntlets = src storing_module.stored_gauntlets = src

2
code/modules/organs/internal/augment.dm
View File

@@ -88,7 +88,7 @@
var/obj/item/organ/my_augment = null // Used to reference the object's host organ. var/obj/item/organ/my_augment = null // Used to reference the object's host organ.
/obj/item/dropped(mob/user) /obj/item/dropped(mob/user)
. = ..() . = ..(user)
if(src) if(src)
if(destroy_on_drop && !QDELETED(src)) if(destroy_on_drop && !QDELETED(src))
qdel(src) qdel(src)