Skip to content

Commit

Permalink
Merge pull request NebulaSS13#4702 from NebulaSS13/staging
Browse files Browse the repository at this point in the history
Updating dev from staging.
  • Loading branch information
MistakeNot4892 authored Jan 7, 2025
2 parents e00cd6f + 5ea1d2b commit 0a2d482
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
7 changes: 6 additions & 1 deletion code/controllers/master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,17 @@ var/global/datum/controller/master/Master = new
CRASH("Attempted to set invalid runlevel: [new_runlevel]")

// Starts the mc, and sticks around to restart it if the loop ever ends.
var/global/_announced_start = FALSE
/datum/controller/master/proc/StartProcessing(delay)
set waitfor = 0
if(delay)
sleep(delay)
report_progress("Master starting processing")
SSwebhooks.send(WEBHOOK_ROUNDPREP, list("map" = station_name(), "url" = get_world_url()))

if(!global._announced_start) // Only announce roundstart once.
SSwebhooks.send(WEBHOOK_ROUNDPREP, list("map" = station_name(), "url" = get_world_url()))
global._announced_start = TRUE

var/rtn = Loop()
if (rtn > 0 || processing < 0)
return //this was suppose to happen.
Expand Down
3 changes: 3 additions & 0 deletions code/modules/crafting/handmade_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
if((. = ..()))
update_icon()

/obj/item/chems/glass/handmade/get_mould_difficulty()
return SKILL_NONE

/obj/item/chems/glass/handmade/teapot
name = "teapot"
desc = "A handmade, slightly lumpy teapot."
Expand Down
13 changes: 7 additions & 6 deletions code/modules/detectivework/evidence/_evidence_type.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
var/max_entries = 10 //will hold that many entries, removing oldest when overflown
var/list/data
var/remove_on_transfer //if it should be removed when picked up by forensic samplers
var/spot_skill = SKILL_EXPERT // at what Forensics skill level someone can see it on examine. Set to null, can never see it
var/spot_skill = SKILL_EXPERT // at what Forensics skill level someone can see it on examine. Set to null, can never see it

//subtypes can implement any merging if needed before calling parent
/datum/forensics/proc/add_data(newdata)
if(!newdata)
return
if(unique && (newdata in data))
return
LAZYADD(data, newdata)
if(unique)
LAZYDISTINCTADD(data, newdata)
else
LAZYADD(data, newdata)
if(length(data) > max_entries)
data.Cut(1,2)
data.len = max_entries

/datum/forensics/proc/add_from_atom(atom/A)

Expand All @@ -28,7 +29,7 @@
for(var/D in data)
. += "<li>[D]"
return jointext(., "<br>")

/datum/forensics/proc/can_spot(mob/detective, atom/location)
. = FALSE
if(spot_skill && detective.skill_check(SKILL_FORENSICS,spot_skill))
Expand Down
1 change: 1 addition & 0 deletions code/modules/detectivework/evidence/fingerprints.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
continue
for(var/datum/fingerprint/F in data)
if(F.merge(newprint))
newdata -= newprint
continue
..()

Expand Down

0 comments on commit 0a2d482

Please sign in to comment.