Skip to content

Commit

Permalink
Modularisation 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Crowbar764 committed Jul 11, 2024
1 parent 06af8da commit 155804c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions code/datums/components/crafting/crafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@
. = ..()
if(.)
return

switch(action)
if("make", "make_mass")
var/mob/user = usr
Expand All @@ -551,7 +550,6 @@
to_chat(user, span_notice("You made [crafted_items] item\s."))
else
make_action(crafting_recipe, user)

busy = FALSE
if("toggle_recipes")
display_craftable_only = !display_craftable_only
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/devices/transfer_valve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
//Triggers mousetraps
/obj/item/transfer_valve/attack_hand(mob/user, list/modifiers)
. = ..()

if(.)
return
if(attached_device)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/admin/verbs/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ ADMIN_VERB(cmd_admin_check_player_exp, R_ADMIN, "Player Playtime", "View player
to_chat(user, span_warning("Tracking is disabled in the server configuration file."), confidential = TRUE)
return

// SPLURT EDIT START
new /datum/player_playtime(usr)
// SPLURT EDIT END

/client/proc/trigger_centcom_recall()
if(!check_rights(R_ADMIN))
Expand Down

0 comments on commit 155804c

Please sign in to comment.