Skip to content

Commit

Permalink
Updates for compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
Koshenko committed Mar 6, 2024
1 parent 11294f5 commit c27b43d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions mojave/items/misc/fluff.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
if(do_after(user, 8 SECONDS, target = src, interaction_key = DOAFTER_SOURCE_DECON))
var/drop_location = user.drop_location()
user.show_message(span_notice("You disassemble \the [src] into scrap and parts."), MSG_VISUAL)
new /obj/item/stack/sheet/ms13/glass(loc, 3)
new /obj/item/stack/sheet/ms13/scrap(loc, 2)
new /obj/item/stack/sheet/ms13/scrap_electronics(loc, 2)
new /obj/item/stack/sheet/ms13/lens(loc, 1)
new /obj/item/stack/sheet/ms13/glass(drop_location, 3)
new /obj/item/stack/sheet/ms13/scrap(drop_location, 2)
new /obj/item/stack/sheet/ms13/scrap_electronics(drop_location, 2)
new /obj/item/stack/sheet/ms13/lens(drop_location, 1)
qdel(src)

/obj/item/ms13/fluff/microscope/examine(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion mojave/items/tools/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
icon_state = "ruler"
inhand_icon_state = "ruler"
hitsound = 'mojave/sound/ms13weapons/meleesounds/ruler_slap.ogg'
pickup_sound = 'mojave/sound/ms13weapons/meleesounds/knife_pickup.ogg'
pickup_sound = 'mojave/sound/ms13weapons/meleesounds/knife_pickup2.ogg'
attack_verb_continuous = list("smacks", "hits", "thwaps")
attack_verb_simple = list("smack", "hits", "thwap")
force = 5
Expand Down

0 comments on commit c27b43d

Please sign in to comment.