Skip to content

Commit

Permalink
Merge branch 'master' into LZ-detector-rework-2
Browse files Browse the repository at this point in the history
  • Loading branch information
cuberound committed Oct 14, 2023
2 parents d5b2ce1 + 8100348 commit 7a4383f
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 5 deletions.
7 changes: 7 additions & 0 deletions code/_onclick/hud/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@
return
var/mob/living/carbon/human/H = mymob
var/mob/screenmob = viewer || H

if(!screenmob?.client)
return

if(!gear.len)
inventory_shown = FALSE
return //species without inv slots don't show items.
Expand Down Expand Up @@ -181,6 +185,9 @@
var/mob/living/carbon/human/H = mymob
var/mob/screenmob = viewer || H

if(!screenmob?.client)
return

if(H.hud_used)
if(H.hud_used.hud_shown)
if(H.s_store)
Expand Down
10 changes: 10 additions & 0 deletions code/game/machinery/bioprinter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@

switch(action)
if("print")
if(working)
//If we're already printing something then we're too busy to multi task.
to_chat(usr, SPAN_NOTICE("[src] is busy at the moment."))
return FALSE
var/recipe = params["recipe_id"]
var/valid_recipe = FALSE
for(var/datum/bioprinter_recipe/product_recipes in products)
Expand All @@ -124,6 +128,10 @@
message_admins("[key_name(usr)] attempted to print an invalid recipe on \the [src].")
return FALSE
var/datum/bioprinter_recipe/recipe_datum = new recipe
if(stored_metal < recipe_datum.metal)
to_chat(usr, SPAN_NOTICE("[src] does not have enough stored metal."))
QDEL_NULL(recipe_datum)
return FALSE
stored_metal -= recipe_datum.metal
to_chat(usr, SPAN_NOTICE("\The [src] is now printing the selected organ. Please hold."))
working = TRUE
Expand All @@ -146,6 +154,8 @@

/obj/structure/machinery/bioprinter/proc/print_limb(limb_path)
if(inoperable())
//In case we lose power or anything between the print and the callback we don't want to permenantly break the printer
working = FALSE
return
new limb_path(get_turf(src))
working = FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/taperecorder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
mytape.timestamp += mytape.used_capacity
var/language_known = (M.universal_speak || (speaking && (speaking.name in known_languages)))
var/mob_name = language_known ? M.GetVoice() : "Unknown"
var/message = language_known ? msg : speaking.scramble(msg)
var/message = (!speaking || language_known) ? msg : speaking.scramble(msg)
mytape.storedinfo += "\[[time2text(mytape.used_capacity,"mm:ss")]\] [mob_name] [verb], \"[italics ? "<i>" : null][message][italics ? "</i>" : null]\""


Expand Down
4 changes: 0 additions & 4 deletions code/modules/admin/tabs/server_tab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
if (!usr.client.admin_holder || !(usr.client.admin_holder.rights & R_MOD))
return

if(!check_rights(R_DEBUG, FALSE) && SSticker.current_state != GAME_STATE_FINISHED)
to_chat(usr, "You can't restart the world until the round has ended!")
return

var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel")
if(confirm == "Cancel")
return
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4663.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "fira"
delete-after: True
changes:
- bugfix: "Fixed Tape Recorder failing to record when no language information is present."
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4665.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "harryob"
delete-after: True
changes:
- admin: "administrators without R_DEBUG can now restart the server without starting the round"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4669.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Birdtalon"
delete-after: True
changes:
- bugfix: "Limb printer can no longer double print or print without metal."

0 comments on commit 7a4383f

Please sign in to comment.