Skip to content

Commit

Permalink
more changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Feb 8, 2024
1 parent 2eeab05 commit 42654df
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions monkestation/code/modules/modular_guns/blackmarket/auction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down

0 comments on commit 42654df

Please sign in to comment.