Skip to content

Commit

Permalink
imma finish this soon.
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Sep 11, 2024
1 parent ee47dd3 commit 29fa837
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 54 deletions.
1 change: 0 additions & 1 deletion code/controllers/subsystem/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SUBSYSTEM_DEF(datacore)
DATACORE_RECORDS_OUTPOST,
DATACORE_RECORDS_SECURITY,
DATACORE_RECORDS_MEDICAL,
//DATACORE_RECORDS_LOCKED
)

var/securityPrintCount = 0
Expand Down
10 changes: 9 additions & 1 deletion code/game/data_huds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ Medical HUD! Basic mode needs suit sensors on.

//HELPERS

/mob/living/carbon/human/proc/get_datacore_key()
var/linked_datacore
var/obj/item/clothing/glasses/hud/glass_hud = user.get_item_by_slot(ITEM_SLOT_EYES)
if(glass_hud && glass_hud.linked_ship)
linked_datacore = glass_hud.linked_ship
return linked_datacore


//called when a carbon changes virus
/mob/living/carbon/proc/check_virus()
var/threat
Expand Down Expand Up @@ -272,7 +280,7 @@ Security HUDs! Basic mode shows only the job.
holder.pixel_y = I.Height() - world.icon_size
var/perpname = get_face_name(get_id_name(""))
if(perpname)
var/datum/data/record/R = SSdatacore.get_record_by_name(perpname, DATACORE_RECORDS_SECURITY)
var/datum/data/record/R = SSdatacore.get_record_by_name(perpname, get_datacore_key())
if(R)
switch(R.fields[DATACORE_CRIMINAL_STATUS])
if("*Arrest*")
Expand Down
29 changes: 0 additions & 29 deletions code/game/objects/items/devices/ship_linker.dm

This file was deleted.

2 changes: 2 additions & 0 deletions code/modules/clothing/glasses/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
. = ..()
if(linked_ship)
. += "It is currently connected to [linked_ship] records."
else
. += "They could show additional information if linked to a helm."

/obj/item/clothing/glasses/hud/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
Expand Down
7 changes: 2 additions & 5 deletions code/modules/mob/living/carbon/human/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,8 @@

var/perpname = get_face_name(get_id_name(""))
if(perpname && (HAS_TRAIT(user, TRAIT_SECURITY_HUD) || HAS_TRAIT(user, TRAIT_MEDICAL_HUD)))
var/obj/item/clothing/glasses/hud/glass_hud = user.get_item_by_slot(ITEM_SLOT_EYES)
var/linked_datacore = DATACORE_RECORDS_OUTPOST
if(glass_hud && glass_hud.linked_ship)
linked_datacore = glass_hud.linked_ship
var/datum/data/record/target_record = SSdatacore.get_record_by_name(perpname, linked_datacore)
var/linked_datacore = get_datacore_key()
var/datum/data/record/target_record = SSdatacore.get_record_by_name(perpname, get_datacore_key())
if(target_record)
. += "<br><span class='deptradio'>found record for datacore: [linked_datacore] </span>"
. += "<span class='deptradio'>Rank:</span> [target_record.fields[DATACORE_RANK]]<span class='deptradio'> Name:</span> [target_record.fields[DATACORE_NAME]]"
Expand Down
18 changes: 1 addition & 17 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,7 @@
var/perpname = get_face_name(get_id_name(""))
if(!HAS_TRAIT(human_or_ghost_user, TRAIT_SECURITY_HUD) && !HAS_TRAIT(human_or_ghost_user, TRAIT_MEDICAL_HUD))
return
var/obj/item/clothing/glasses/hud/glass_hud = human_or_ghost_user.get_item_by_slot(ITEM_SLOT_EYES)
var/linked_datacore = DATACORE_RECORDS_OUTPOST
if(glass_hud && glass_hud.linked_ship)
linked_datacore = glass_hud.linked_ship
var/linked_datacore = get_datacore_key()
var/datum/data/record/target_record = SSdatacore.get_record_by_name(perpname, linked_datacore)
if(href_list["photo_front"] || href_list["photo_side"])
if(!target_record)
Expand Down Expand Up @@ -569,19 +566,6 @@
if(weaponcheck.Invoke(belt) || weaponcheck.Invoke(back)) //if a weapon is present in the belt or back slot
threatcount += 2 //not enough to trigger look_for_perp() on it's own unless they also have criminal status.

//Check for arrest warrant
if(judgement_criteria & JUDGE_RECORDCHECK)
var/perpname = get_face_name(get_id_name())
var/datum/data/record/target_record = SSdatacore.get_record_by_name(perpname, DATACORE_RECORDS_SECURITY)
if(target_record && target_record.fields[DATACORE_CRIMINAL_STATUS])
switch(target_record.fields[DATACORE_CRIMINAL_STATUS])
if("*Arrest*")
threatcount += 5
if("Incarcerated")
threatcount += 2
if("Paroled")
threatcount += 2

//Check for dresscode violations
if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
threatcount += 2
Expand Down
1 change: 0 additions & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,6 @@
#include "code\game\objects\items\devices\reverse_bear_trap.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\ship_linker.dm"
#include "code\game\objects\items\devices\spyglasses.dm"
#include "code\game\objects\items\devices\swapper.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
Expand Down

0 comments on commit 29fa837

Please sign in to comment.