diff --git a/monkestation/code/modules/modular_guns/ballistics/parts/underbarrel/mk58/makeshift.dm b/monkestation/code/modules/modular_guns/ballistics/parts/underbarrel/mk58/makeshift.dm index 565273b3a8b8..177d858293b0 100644 --- a/monkestation/code/modules/modular_guns/ballistics/parts/underbarrel/mk58/makeshift.dm +++ b/monkestation/code/modules/modular_guns/ballistics/parts/underbarrel/mk58/makeshift.dm @@ -14,8 +14,10 @@ /obj/item/attachment/underbarrel/mk_58/makeshift/illegal_switch/unique_attachment_effects_per_reset(obj/item/gun/modular) modular.burst_size = 9 modular.fire_delay = 1 + modular.w_class = WEIGHT_CLASS_BULKY /obj/item/attachment/underbarrel/mk_58/makeshift/illegal_switch/unique_attachment_effects_removal(obj/item/gun/modular) modular.burst_size = initial(modular.burst_size) modular.fire_delay = initial(modular.fire_delay) + modular.w_class = WEIGHT_CLASS_NORMAL diff --git a/monkestation/code/modules/modular_guns/blackmarket/auction.dm b/monkestation/code/modules/modular_guns/blackmarket/auction.dm index 98062ebc325d..aba1916e12d6 100644 --- a/monkestation/code/modules/modular_guns/blackmarket/auction.dm +++ b/monkestation/code/modules/modular_guns/blackmarket/auction.dm @@ -136,6 +136,8 @@ /datum/market/auction/proc/grab_purchase_info(datum/market_item/auction/item, category, method) purchase(item.type, category, method, item.uplink, item.user) + if(item.user) + message_admins("[item.user] has won the auction for [item]") /datum/market/auction/guns diff --git a/monkestation/code/modules/modular_guns/components/attachments.dm b/monkestation/code/modules/modular_guns/components/attachments.dm index 303e062f0ca3..97cc96225f3f 100644 --- a/monkestation/code/modules/modular_guns/components/attachments.dm +++ b/monkestation/code/modules/modular_guns/components/attachments.dm @@ -126,7 +126,6 @@ GROUP, TOOL, ITEM for reading whereas hand is just GROUP, ITEM. Prioritizes hand return if(!do_after(user, 1.5 SECONDS, item)) return - SEND_SIGNAL(parent, COMSIG_ATTACHMENT_DETACHED, choice) for(var/datum/attachment_handler/listed as anything in (hand_slots + tool_slots)) if(!listed.stored) @@ -137,7 +136,7 @@ GROUP, TOOL, ITEM for reading whereas hand is just GROUP, ITEM. Prioritizes hand choice.forceMove(get_turf(user)) user.balloon_alert(user, "Successfully removed [choice.name].") - + SEND_SIGNAL(parent, COMSIG_ATTACHMENT_DETACHED, choice) ///this is literally all to handle tools around us for shit