Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Project ARES: Announcement Signatures #6030

Merged
merged 11 commits into from
May 2, 2024
Merged

Project ARES: Announcement Signatures #6030

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44eabf1
x
realforest2001 Jan 27, 2024
52c2a58
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
realforest2001 Jan 30, 2024
9272fc9
Merge branch 'master' into project/ares/announcename
realforest2001 Mar 27, 2024
cfe92b3
Merge branch 'master' into project/ares/announcename
realforest2001 Apr 3, 2024
ac85742
Merge branch 'master' into project/ares/announcename
realforest2001 Apr 16, 2024
0c47ce8
changes and var names
realforest2001 Apr 20, 2024
4ae6785
Merge branch 'master' into project/ares/announcename
realforest2001 Apr 20, 2024
1aabd61
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
realforest2001 Apr 28, 2024
c4cf57a
changes
realforest2001 Apr 28, 2024
18676e5
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
realforest2001 May 1, 2024
189f023
tweaks
realforest2001 May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/defines/procs/announcement.dm
View file
Open in desktop
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@

switch(logging)
if(ARES_LOG_MAIN)
log_ares_announcement(title, message)
log_ares_announcement(title, message, signature)
if(ARES_LOG_SECURITY)
log_ares_security(title, message)
log_ares_security(title, message, signature)
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved

else if(faction_to_display == "Everyone (-Yautja)")
for(var/mob/M in targets)
Expand Down
14 changes: 10 additions & 4 deletions code/game/machinery/ARES/ARES_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,23 +150,29 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name))

/proc/log_ares_announcement(title, message)
/proc/log_ares_announcement(title, message, signature)
if(!ares_can_log())
return FALSE
var/final_msg = message
if(signature)
final_msg = "[signature]: - [final_msg]"
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_announcement.Add(new /datum/ares_record/announcement(title, message))
datacore.records_announcement.Add(new /datum/ares_record/announcement(title, final_msg))

/proc/log_ares_requisition(source, details, user_name)
if(!ares_can_log())
return FALSE
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_asrs.Add(new /datum/ares_record/requisition_log(source, details, user_name))

/proc/log_ares_security(title, details)
/proc/log_ares_security(title, details, signature)
if(!ares_can_log())
return FALSE
var/final_msg = details
if(signature)
final_msg = "[signature]: - [final_msg]"
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_security.Add(new /datum/ares_record/security(title, details))
datacore.records_security.Add(new /datum/ares_record/security(title, final_msg))

/proc/log_ares_antiair(details)
if(!ares_can_log())
Expand Down
Loading