Skip to content

Ports "Data core must die" discordia-space/CEV-Eris#8594 #124

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

Open
flleeppyy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ports "Data core must die" discordia-space/CEV-Eris#8594 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf41110
Data Core Must Die (https://github.com/discordia-space/CEV-Eris/pull/…
vode-code Sep 9, 2025
df57314
make it compatible with our tgui :)
flleeppyy Sep 10, 2025
6325a53
asdffsdfasd
flleeppyy Sep 10, 2025
6b0700e
Merge branch 'master' of https://github.com/monkestation/Monkeris int…
flleeppyy Oct 4, 2025
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
5 changes: 2 additions & 3 deletions cev_eris.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@
#include "code\datums\chat_payload.dm"
#include "code\datums\chatmessage.dm"
#include "code\datums\contract.dm"
#include "code\datums\datacore.dm"
#include "code\datums\datum.dm"
#include "code\datums\datum_click_handlers.dm"
#include "code\datums\datum_hud.dm"
Expand Down Expand Up @@ -832,14 +831,12 @@
#include "code\game\machinery\computer\computer.dm"
#include "code\game\machinery\computer\guestpass.dm"
#include "code\game\machinery\computer\law.dm"
#include "code\game\machinery\computer\medical.dm"
#include "code\game\machinery\computer\message.dm"
#include "code\game\machinery\computer\Operating.dm"
#include "code\game\machinery\computer\pod.dm"
#include "code\game\machinery\computer\prisoner.dm"
#include "code\game\machinery\computer\prisonshuttle.dm"
#include "code\game\machinery\computer\robot.dm"
#include "code\game\machinery\computer\security.dm"
#include "code\game\machinery\computer\station_alert.dm"
#include "code\game\machinery\doors\airlock.dm"
#include "code\game\machinery\doors\airlock_control.dm"
Expand Down Expand Up @@ -1558,6 +1555,7 @@
#include "code\modules\asset_cache\assets\chat.dm"
#include "code\modules\asset_cache\assets\icon_ref_map.dm"
#include "code\modules\asset_cache\assets\notes.dm"
#include "code\modules\asset_cache\assets\legacyuiicons.dm"
#include "code\modules\asset_cache\assets\sanity.dm"
#include "code\modules\asset_cache\assets\sheetmaterials.dm"
#include "code\modules\asset_cache\assets\stats.dm"
Expand Down Expand Up @@ -2394,6 +2392,7 @@
#include "code\modules\nano\modules\human_appearance.dm"
#include "code\modules\nano\modules\law_manager.dm"
#include "code\modules\nano\modules\nano_module.dm"
#include "code\modules\nano\modules\tgui_type.dm"
#include "code\modules\onestar\generator.dm"
#include "code\modules\onestar\os_cash.dm"
#include "code\modules\onestar\os_turret.dm"
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#define JOBS_MEDICAL "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer"
#define JOBS_SCIENCE "Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
#define JOBS_MOEBIUS "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer","Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
#define JOBS_CARGO "Guild Merchant","Guild Technician","Guild Miner",
#define JOBS_GUILD "Guild Merchant","Guild Technician","Guild Miner",
#define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE
#define JOBS_CHURCH "NeoTheology Preacher","NeoTheology Acolyte","NeoTheology Agrolyte","NeoTheology Custodian"
#define JOBS_NONHUMAN "AI","Robot","pAI"
#define JOBS_SILICON "AI","Robot","pAI"
#define CREDITS "¢"
#define CREDS "¢"

Expand Down
4 changes: 3 additions & 1 deletion code/__DEFINES/perks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//fate perks
#define PERK_PAPER_WORM /datum/perk/fate/paper_worm
#define PERK_FREELACER /datum/perk/fate/freelancer
#define PERK_FREELANCER /datum/perk/fate/freelancer
#define PERK_NIHILIST /datum/perk/fate/nihilist
#define PERK_MORALIST /datum/perk/fate/moralist
#define PERK_ALCOHOLIC /datum/perk/fate/alcoholic
Expand Down Expand Up @@ -49,6 +49,8 @@
#define PERK_CODESPEAK_COP /datum/perk/codespeak
#define PERK_CODESPEAK_SERB /datum/perk/codespeak/serbian
#define PERK_TECHNOMANCER /datum/perk/inspiration
#define PERK_NEAT /datum/perk/neat
#define PERK_GREEN_THUMB /datum/perk/greenthumb
#define PERK_CLUB /datum/perk/job/club
#define PERK_CHANNELING /datum/perk/channeling

Expand Down
6 changes: 3 additions & 3 deletions code/__HELPERS/manifest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
"sec" = filtered_nano_crew_manifest(security_positions),\
"eng" = filtered_nano_crew_manifest(engineering_positions),\
"med" = filtered_nano_crew_manifest(medical_positions),\
"sup" = filtered_nano_crew_manifest(cargo_positions),\
"sup" = filtered_nano_crew_manifest(guild_positions),\
"chr" = filtered_nano_crew_manifest(church_positions),\
"bot" = silicon_nano_crew_manifest(nonhuman_positions),\
"bot" = silicon_nano_crew_manifest(silicon_positions),\
"civ" = filtered_nano_crew_manifest(civilian_positions)\
)

/proc/flat_nano_crew_manifest()
. = list()
. += filtered_nano_crew_manifest(null, TRUE)
. += silicon_nano_crew_manifest(nonhuman_positions)
. += silicon_nano_crew_manifest(silicon_positions)
4 changes: 2 additions & 2 deletions code/__HELPERS/names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ var/syndicate_code_response//Code response for contractors.
var/locations[] = SSmapping.teleportlocs.len ? SSmapping.teleportlocs : drinks//if null, defaults to drinks instead.

var/names[] = list()
for(var/datum/data/record/t in data_core.general)//Picks from crew manifest.
names += t.fields["name"]
for(var/datum/computer_file/report/crew_record/t in GLOB.all_crew_records)//Picks from crew manifest.
names += t.get_name()

var/maxwords = words//Extra var to check for duplicates.

Expand Down
23 changes: 9 additions & 14 deletions code/__HELPERS/unsorted.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,26 +276,21 @@ Turf and target are seperate in case you want to teleport some distance from a t
mind.name = newname

if(oldname)
//update the datacore records! This is goig to be a bit costly.
for(var/list/L in list(data_core.general, data_core.medical, data_core.security, data_core.locked))
for(var/datum/data/record/R in L)
if(R.fields["name"] == oldname)
R.fields["name"] = newname
break
for(var/datum/computer_file/report/crew_record/R in GLOB.all_crew_records)
if(R.get_name() == oldname)
R.set_name(newname)

//update our pda and id if we have them on our person
var/list/searching = GetAllContents(searchDepth = 3)
var/search_id = 1
var/search_pda = 1

for(var/A in searching)
if( search_id && istype(A,/obj/item/card/id) )
for(var/obj/A in GetAllContents(searchDepth = 3))
if(istype(A,/obj/item/card/id))
var/obj/item/card/id/ID = A
if(ID.registered_name == oldname)
ID.registered_name = newname
ID.name = "[newname]'s ID Card ([ID.assignment])"
if(!search_pda) break
search_id = 0
if(istype(A.loc, /obj/item/modular_computer))
var/obj/item/modular_computer/tolabel = A.loc
tolabel.update_label()
break
return 1


Expand Down
1 change: 0 additions & 1 deletion code/controllers/subsystems/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ SUBSYSTEM_DEF(ticker)
if(!H.mind || player_is_antag(H.mind, only_offstation_roles = 1) || !SSjob.ShouldCreateRecords(H.mind.assigned_role))
continue
CreateModularRecord(H)
data_core.manifest()

CHECK_TICK

Expand Down
Loading
Loading