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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Discovery Scanner and DNA probe now check if the mob is holographic #5741

Merged
merged 3 commits into from Nov 10, 2021
Merged

Discovery Scanner and DNA probe now check if the mob is holographic #5741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bd9e02
Discovery Scanner now checking if the mob is holographic
rkvothe14 Nov 7, 2021
42418d7
Preventing holographic scanners from being DNA probed
rkvothe14 Nov 8, 2021
7e8c511
Updating comment
rkvothe14 Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/exploration_crew/discovery_research/discoverable_component.dm
View file
Open in desktop
Expand Up @@ -41,6 +41,9 @@
if(linked_techweb.scanned_atoms[A.type] && !unique)
to_chat(user, "<span class='warning'>Datapoints about [A] already in system.</span>")
return
if(A.flags_1 & HOLOGRAM_1)
to_chat(user, "<span class='warning'>[A] is holographic, no datapoints can be extracted.</span>")
return
scanned = TRUE
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, point_reward)
linked_techweb.scanned_atoms[A.type] = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/station_goals/dna_vault.dm
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@
if(isanimal(target) || is_type_in_typecache(target,non_simple_animals))
if(isanimal(target))
var/mob/living/simple_animal/A = target
if(!A.healable)//simple approximation of being animal not a robot or similar
if(!A.healable || (A.flags_1 & HOLOGRAM_1)) //simple approximation of being animal not a robot or similar. Also checking if holographic
to_chat(user, "<span class='warning'>No compatible DNA detected.</span>")
return
if(animals[target.type])
Expand Down