From fe96173975c62e032b9c3080900db527d468f474 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 05:44:02 -0500 Subject: [PATCH 01/10] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index f7ac409378b4..500cd0869e5e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -37,6 +37,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/heatmod = 1 // multiplier for heat damage var/acidmod = 1 // multiplier for acid damage // yogs - Old Plant People var/stunmod = 1 // multiplier for stun duration + var/can_vault = 1 //if the species has been modified by a DNA vault var/attack_type = BRUTE //Type of damage attack does var/punchdamagelow = 1 //lowest possible punch damage. if this is set to 0, punches will always miss var/punchdamagehigh = 10 //highest possible punch damage @@ -1827,4 +1828,4 @@ GLOBAL_LIST_EMPTY(roundstart_races) to_chat(H, "You settle gently back onto the ground...") else to_chat(H, "You beat your wings and begin to hover gently above the ground...") - H.set_resting(FALSE, TRUE) \ No newline at end of file + H.set_resting(FALSE, TRUE) From 9e9f0db581199c04928de70ef1c09ddc0c7a5231 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 05:45:15 -0500 Subject: [PATCH 02/10] a --- code/modules/mob/living/carbon/human/species.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 500cd0869e5e..727c08b38296 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -37,7 +37,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/heatmod = 1 // multiplier for heat damage var/acidmod = 1 // multiplier for acid damage // yogs - Old Plant People var/stunmod = 1 // multiplier for stun duration - var/can_vault = 1 //if the species has been modified by a DNA vault var/attack_type = BRUTE //Type of damage attack does var/punchdamagelow = 1 //lowest possible punch damage. if this is set to 0, punches will always miss var/punchdamagehigh = 10 //highest possible punch damage From 09488473e5d15a13d941955fa748d7a2181d45e5 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 05:46:25 -0500 Subject: [PATCH 03/10] Update human_defines.dm --- code/modules/mob/living/carbon/human/human_defines.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 5fdedae183e6..d9e624da2ae4 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -47,6 +47,8 @@ var/datum/physiology/physiology + var/can_use_vault = 1 + var/list/datum/bioware = list() var/creamed = FALSE //to use with creampie overlays From ea9263e74c8a4dec09a387c771f9c0a03824208c Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 05:49:11 -0500 Subject: [PATCH 04/10] Update dna_vault.dm --- code/modules/station_goals/dna_vault.dm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index f6489418808b..166447f7b7e1 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -205,11 +205,14 @@ data["choiceA"] = "" data["choiceB"] = "" if(user && completed) - var/list/L = power_lottery[user] - if(L && L.len) - data["used"] = FALSE - data["choiceA"] = L[1] - data["choiceB"] = L[2] + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.can_use_vault == TRUE) + var/list/L = power_lottery[user] + if(L && L.len) + data["used"] = FALSE + data["choiceA"] = L[1] + data["choiceB"] = L[2] return data /obj/machinery/dna_vault/ui_act(action, params) @@ -277,8 +280,9 @@ ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault") if(VAULT_SPEED) to_chat(H, "Your legs feel faster.") - H.add_movespeed_modifier(MOVESPEED_ID_DNA_VAULT, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) + H.add_movespeed_modifier(MOVESPEED_ID_DNA_VAULT, update=TRUE, priority=100, multiplicative_slowdown=-0.74, blacklisted_movetypes=(FLYING|FLOATING)) if(VAULT_QUICK) to_chat(H, "Your arms move as fast as lightning.") H.next_move_modifier = 0.5 + H.can_use_vault = FALSE power_lottery[H] = list() From fe5333f169912dc272332d594e16626d00f17538 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 06:10:17 -0500 Subject: [PATCH 05/10] Update human_defines.dm --- code/modules/mob/living/carbon/human/human_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index d9e624da2ae4..35cc5712b57e 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -47,7 +47,7 @@ var/datum/physiology/physiology - var/can_use_vault = 1 + var/can_use_vault = TRUE var/list/datum/bioware = list() From cb2366f6d7a695decf533e39a9641e9d088b71ed Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 8 Dec 2019 06:10:42 -0500 Subject: [PATCH 06/10] Update dna_vault.dm --- code/modules/station_goals/dna_vault.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 166447f7b7e1..ab1cfa2c9bd4 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -207,7 +207,7 @@ if(user && completed) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.can_use_vault == TRUE) + if(H.can_use_vault) var/list/L = power_lottery[user] if(L && L.len) data["used"] = FALSE From 37d3011afcf87add1159206a8c92bdec364e3c11 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 13 Dec 2019 04:50:10 -0500 Subject: [PATCH 07/10] I think this does the thing probably tm --- code/modules/station_goals/dna_vault.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index ab1cfa2c9bd4..6be16ce35e3b 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -16,6 +16,7 @@ var/animal_count var/human_count var/plant_count + var/static/list/users = list() /datum/station_goal/dna_vault/New() ..() @@ -207,7 +208,7 @@ if(user && completed) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.can_use_vault) + if(!(H in users)) var/list/L = power_lottery[user] if(L && L.len) data["used"] = FALSE @@ -284,5 +285,5 @@ if(VAULT_QUICK) to_chat(H, "Your arms move as fast as lightning.") H.next_move_modifier = 0.5 - H.can_use_vault = FALSE + users += H power_lottery[H] = list() From 2ad2af8f776bf4cc51497fe37995cb1a2d8b7498 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 13 Dec 2019 04:50:42 -0500 Subject: [PATCH 08/10] cringecode --- code/modules/mob/living/carbon/human/human_defines.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 35cc5712b57e..5fdedae183e6 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -47,8 +47,6 @@ var/datum/physiology/physiology - var/can_use_vault = TRUE - var/list/datum/bioware = list() var/creamed = FALSE //to use with creampie overlays From b690d45a8659d186a02f6e56b2a8f357cd3a511a Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 13 Dec 2019 05:37:12 -0500 Subject: [PATCH 09/10] Update dna_vault.dm --- code/modules/station_goals/dna_vault.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 6be16ce35e3b..b83383767128 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -208,7 +208,7 @@ if(user && completed) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(!(H in users)) + if(!users[H]) var/list/L = power_lottery[user] if(L && L.len) data["used"] = FALSE @@ -285,5 +285,5 @@ if(VAULT_QUICK) to_chat(H, "Your arms move as fast as lightning.") H.next_move_modifier = 0.5 - users += H + users[H] = TRUE power_lottery[H] = list() From fe6d583ad7942fef7ff5dea4c8fd6600dca9b7a6 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 13 Dec 2019 05:41:30 -0500 Subject: [PATCH 10/10] bruh moment --- code/modules/station_goals/dna_vault.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index b83383767128..b2514da8674c 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -16,7 +16,6 @@ var/animal_count var/human_count var/plant_count - var/static/list/users = list() /datum/station_goal/dna_vault/New() ..() @@ -141,6 +140,7 @@ var/list/animals = list() var/list/plants = list() var/list/dna = list() + var/static/list/users = list() var/completed = FALSE var/list/power_lottery = list()