mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-11 16:14:08 +01:00
Leland Kemble
9f1d18dbdf
## About The Pull Request You can't put more than one of the same dna in the vault, because the probe checks when it scans you that your dna isn't in the probe's storage or the vault's storage. But it doesn't check other probes, so multiple probes can have the same dna, and can all upload the same dna to the vault for duplicate DNA. This PR adds a check when you upload to a vault that throws out dna already in the vault before it's counted. ## Why It's Good For The Game Duplicate DNA is clearly not intentional ## Changelog 🆑 fix: You can no longer duplicate DNA for the DNA vault objective by scanning yourself on several probes at once. /🆑
197 lines
7.8 KiB
Plaintext
197 lines
7.8 KiB
Plaintext
#define DNA_PROBE_SCAN_PLANTS (1<<0)
|
|
#define DNA_PROBE_SCAN_ANIMALS (1<<1)
|
|
#define DNA_PROBE_SCAN_HUMANS (1<<2)
|
|
|
|
/**
|
|
* DNA Probe
|
|
*
|
|
* Used for scanning DNA, and can be uploaded to a DNA vault.
|
|
*/
|
|
|
|
/obj/item/dna_probe
|
|
name = "DNA Sampler"
|
|
desc = "Can be used to take chemical and genetic samples of pretty much anything. Needs to be linked with a DNA vault first."
|
|
icon = 'icons/obj/medical/syringe.dmi'
|
|
inhand_icon_state = "sampler"
|
|
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
|
|
icon_state = "sampler"
|
|
item_flags = NOBLUDGEON
|
|
///What sources of DNA this sampler can extract from.
|
|
var/allowed_scans = DNA_PROBE_SCAN_PLANTS | DNA_PROBE_SCAN_ANIMALS | DNA_PROBE_SCAN_HUMANS
|
|
///List of all Animal DNA scanned with this sampler.
|
|
var/list/stored_dna_animal = list()
|
|
///List of all Plant DNA scanned with this sampler.
|
|
var/list/stored_dna_plants = list()
|
|
///List of all Human DNA scanned with this sampler.
|
|
var/list/stored_dna_human = list()
|
|
///weak ref to the dna vault
|
|
var/datum/weakref/dna_vault_ref
|
|
|
|
/obj/item/dna_probe/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
|
|
if(istype(interacting_with, /obj/machinery/dna_vault))
|
|
if(dna_vault_ref?.resolve())
|
|
// Weirdly we can upload to any existing DNA vault so long as we're linked to any other existing DNA vault.
|
|
return try_upload_dna(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
|
|
return try_linking_vault(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
|
|
|
|
if (!valid_scan_target(interacting_with))
|
|
return NONE
|
|
|
|
if (scan_dna(interacting_with, user))
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
/obj/item/dna_probe/proc/try_linking_vault(obj/machinery/dna_vault/target, mob/user)
|
|
var/obj/machinery/dna_vault/our_vault = dna_vault_ref?.resolve()
|
|
if(!our_vault)
|
|
dna_vault_ref = WEAKREF(target)//linking the dna vault with the probe
|
|
balloon_alert(user, "vault linked")
|
|
playsound(src, 'sound/machines/terminal/terminal_success.ogg', 50)
|
|
return TRUE
|
|
return FALSE
|
|
|
|
/obj/item/dna_probe/proc/try_upload_dna(obj/machinery/dna_vault/target, mob/user)
|
|
var/uploaded = 0
|
|
stored_dna_plants -= target.plant_dna
|
|
stored_dna_human -= target.human_dna
|
|
stored_dna_animal -= target.animal_dna
|
|
var/plant_dna_length = length(stored_dna_plants)
|
|
var/human_dna_length = length(stored_dna_human)
|
|
var/animal_dna_length = length(stored_dna_animal)
|
|
if(plant_dna_length)
|
|
uploaded += plant_dna_length
|
|
target.plant_dna += stored_dna_plants
|
|
stored_dna_plants.Cut()
|
|
if(human_dna_length)
|
|
uploaded += human_dna_length
|
|
target.human_dna += stored_dna_human
|
|
stored_dna_human.Cut()
|
|
if(animal_dna_length)
|
|
uploaded += animal_dna_length
|
|
target.animal_dna += stored_dna_animal
|
|
stored_dna_animal.Cut()
|
|
target.check_goal()
|
|
playsound(target, 'sound/machines/compiler/compiler-stage1.ogg', 50)
|
|
to_chat(user, span_notice("[uploaded] new datapoints uploaded."))
|
|
return uploaded
|
|
|
|
/obj/item/dna_probe/proc/scan_dna(atom/target, mob/user)
|
|
var/obj/machinery/dna_vault/our_vault = dna_vault_ref?.resolve()
|
|
if(!our_vault)
|
|
playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 50)
|
|
balloon_alert(user, "need database!")
|
|
return
|
|
if(istype(target, /obj/machinery/hydroponics))
|
|
var/obj/machinery/hydroponics/hydro_tray = target
|
|
if(!hydro_tray.myseed)
|
|
return
|
|
if(our_vault.plant_dna[hydro_tray.myseed.type])
|
|
to_chat(user, span_notice("Plant data is already present in vault storage."))
|
|
return
|
|
if(stored_dna_plants[hydro_tray.myseed.type])
|
|
to_chat(user, span_notice("Plant data already present in local storage."))
|
|
return
|
|
if(hydro_tray.plant_status != HYDROTRAY_PLANT_HARVESTABLE) // So it's bit harder.
|
|
to_chat(user, span_alert("Plant needs to be ready to harvest to perform full data scan.")) //Because space dna is actually magic
|
|
return
|
|
stored_dna_plants[hydro_tray.myseed.type] = TRUE
|
|
playsound(src, 'sound/machines/compiler/compiler-stage2.ogg', 50)
|
|
balloon_alert(user, "data added")
|
|
return TRUE
|
|
else if(ishuman(target))
|
|
var/mob/living/carbon/human/human_target = target
|
|
if(our_vault.human_dna[human_target.dna.unique_identity])
|
|
to_chat(user, span_notice("Humanoid data already present in vault storage."))
|
|
return
|
|
if(stored_dna_human[human_target.dna.unique_identity])
|
|
to_chat(user, span_notice("Humanoid data already present in local storage."))
|
|
return
|
|
if(!(human_target.mob_biotypes & MOB_ORGANIC))
|
|
to_chat(user, span_alert("No compatible DNA detected."))
|
|
return .
|
|
stored_dna_human[human_target.dna.unique_identity] = TRUE
|
|
playsound(src, 'sound/machines/compiler/compiler-stage2.ogg', 50)
|
|
balloon_alert(user, "data added")
|
|
return TRUE
|
|
|
|
if(!isliving(target))
|
|
return
|
|
|
|
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien))
|
|
if(!isanimal_or_basicmob(target) && !is_type_in_typecache(target, non_simple_animals) && !ismonkey(target))
|
|
return
|
|
|
|
var/mob/living/living_target = target
|
|
if(our_vault.animal_dna[living_target.type])
|
|
to_chat(user, span_notice("Animal data already present in vault storage."))
|
|
return
|
|
if(stored_dna_animal[living_target.type])
|
|
to_chat(user, span_notice("Animal data already present in local storage."))
|
|
return
|
|
if(!(living_target.mob_biotypes & MOB_ORGANIC))
|
|
to_chat(user, span_alert("No compatible DNA detected."))
|
|
return .
|
|
stored_dna_animal[living_target.type] = TRUE
|
|
playsound(src, 'sound/machines/compiler/compiler-stage2.ogg', 50)
|
|
balloon_alert(user, "data added")
|
|
return TRUE
|
|
|
|
/obj/item/dna_probe/proc/valid_scan_target(atom/target)
|
|
if((allowed_scans & DNA_PROBE_SCAN_PLANTS) && istype(target, /obj/machinery/hydroponics))
|
|
return TRUE
|
|
if((allowed_scans & DNA_PROBE_SCAN_HUMANS) && ishuman(target))
|
|
return TRUE
|
|
if((allowed_scans & DNA_PROBE_SCAN_ANIMALS) && isliving(target))
|
|
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien))
|
|
if(isanimal_or_basicmob(target) || is_type_in_typecache(target, non_simple_animals) || ismonkey(target))
|
|
return TRUE
|
|
return FALSE
|
|
|
|
#define CARP_MIX_DNA_TIMER (15 SECONDS)
|
|
|
|
///Used for scanning carps, and then turning yourself into one.
|
|
/obj/item/dna_probe/carp_scanner
|
|
name = "Carp DNA Sampler"
|
|
desc = "Can be used to take chemical and genetic samples of animals."
|
|
///Whether we have Carp DNA
|
|
var/carp_dna_loaded = FALSE
|
|
|
|
/obj/item/dna_probe/carp_scanner/examine_more(mob/user)
|
|
. = ..()
|
|
. = list(span_notice("Using this on a Space Carp will harvest its DNA. Use it in-hand once complete to mutate it with yourself."))
|
|
|
|
/obj/item/dna_probe/carp_scanner/scan_dna(atom/target, mob/user)
|
|
if(istype(target, /mob/living/basic/carp))
|
|
carp_dna_loaded = TRUE
|
|
playsound(src, 'sound/machines/compiler/compiler-stage2.ogg', 50)
|
|
balloon_alert(user, "dna scanned")
|
|
else
|
|
return ..()
|
|
|
|
/obj/item/dna_probe/carp_scanner/valid_scan_target(atom/target)
|
|
if (istype(target, /mob/living/basic/carp))
|
|
return TRUE
|
|
return ..()
|
|
|
|
/obj/item/dna_probe/carp_scanner/attack_self(mob/user, modifiers)
|
|
. = ..()
|
|
if(!carp_dna_loaded)
|
|
to_chat(user, span_notice("Space carp DNA is required to use the self-mutation mechanism!"))
|
|
return
|
|
to_chat(user, span_notice("You pull out the needle from [src] and flip the switch, and start injecting yourself with it."))
|
|
if(!do_after(user, CARP_MIX_DNA_TIMER))
|
|
return
|
|
var/mob/living/basic/space_dragon/new_dragon = user.change_mob_type(/mob/living/basic/space_dragon, location = loc, delete_old_mob = TRUE)
|
|
new_dragon.add_filter("anger_glow", 3, list("type" = "outline", "color" = COLOR_CARP_RIFT_RED, "size" = 5))
|
|
new_dragon.add_movespeed_modifier(/datum/movespeed_modifier/dragon_rage)
|
|
priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert")
|
|
qdel(src)
|
|
|
|
#undef CARP_MIX_DNA_TIMER
|
|
|
|
#undef DNA_PROBE_SCAN_PLANTS
|
|
#undef DNA_PROBE_SCAN_ANIMALS
|
|
#undef DNA_PROBE_SCAN_HUMANS
|