Skip to content

Commit

Permalink
meow.
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoonij authored Dec 16, 2024
1 parent 1fd433d commit 502468c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion code/datums/vault_genes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var/cached_tox_breath_dam_max

/datum/vault_gene/toxin/apply(mob/living/carbon/human/human, source)
to_chat(human, span_notice("Ваше тело стало невоспримчиво к токсинам в воздухе."))
to_chat(human, span_notice("Ваше тело стало невоспримчивым к токсинам в воздухе."))

var/obj/item/organ/internal/lungs/lungs = human.get_int_organ(/obj/item/organ/internal/lungs)

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/dna_upgrader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
)

/obj/item/dna_upgrader/update_icon_state()
icon_state = "dnaupgrader[used ? FALSE : ""]"
icon_state = "initial(icon_state)[used ? "0" : ""]"

/obj/item/dna_upgrader/update_name(updates = ALL)
. = ..()
Expand All @@ -32,7 +32,7 @@
return FALSE

if(used)
balloon_alert(human, "было использовано!")
balloon_alert(human, "Инъектор пуст!")
return FALSE

if(HAS_TRAIT(human, TRAIT_NO_DNA))
Expand Down
17 changes: 10 additions & 7 deletions code/modules/station_goals/dna_vault.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
var/plant_count

/datum/station_goal/dna_vault/New()
. = ..()
..()

animal_count = rand(15, 20) // might be too few given ~15 roundstart stationside ones
human_count = rand(round(0.75 * SSticker.mode.num_players_started()), SSticker.mode.num_players_started()) // 75%+ roundstart population.
Expand Down Expand Up @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/l
/obj/item/circuitboard/machine/dna_vault
board_name = "DNA Vault"
build_path = /obj/machinery/dna_vault
origin_tech = "engineering=2; combat=2; bluespace=2" // No freebies!
origin_tech = "engineering=2;combat=2;bluespace=2" // No freebies!
req_components = list(
/obj/item/stock_parts/capacitor/super = 5,
/obj/item/stock_parts/manipulator/pico = 5,
Expand Down Expand Up @@ -166,7 +166,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/l

/obj/machinery/dna_vault/New()
// TODO: Replace this, bsa and gravgen with some big machinery datum
var/list/occupied = list()
LAZYINITLIST(occupied)

Check failure on line 169 in code/modules/station_goals/dna_vault.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "occupied"

Check failure on line 169 in code/modules/station_goals/dna_vault.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "occupied"

for(var/direct in list(EAST, WEST, SOUTHEAST, SOUTHWEST))
LAZYADD(occupied, get_step(src, direct))

Check failure on line 172 in code/modules/station_goals/dna_vault.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "occupied"

Check failure on line 172 in code/modules/station_goals/dna_vault.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "occupied"

Check failure on line 172 in code/modules/station_goals/dna_vault.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "occupied"
Expand All @@ -186,10 +186,10 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/l
dna_max = G.human_count
break

return ..()
..()

/obj/machinery/dna_vault/update_icon_state()
icon_state = "vault[stat & NOPOWER ? "off" : ""]"
icon_state = "initial(icon_state)[stat & NOPOWER ? "off" : ""]"

/obj/machinery/dna_vault/power_change(forced = FALSE)
if(!..())
Expand Down Expand Up @@ -225,15 +225,18 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/l
if(LAZYIN(power_lottery, user))
return

var/list/genes = list()
LAZYINITLIST(genes)

for(var/datum/vault_gene/gene as anything in subtypesof(/datum/vault_gene))
if(!initial(gene.name))
continue

LAZYADD(genes, initial(gene.name))

var/list/picked_genes = list()
if(!LAZYLEN(genes))
CRASH("[src] rolled 0 genes.")

LAZYINITLIST(picked_genes)

LAZYADD(picked_genes, pick_n_take(genes))
LAZYADD(picked_genes, pick_n_take(genes))
Expand Down

0 comments on commit 502468c

Please sign in to comment.