From 7752e0d6240289514b1005fb8dffef8e8fe88130 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 22 Sep 2021 22:30:43 +0200 Subject: [PATCH 01/27] synthtissue and sr --- code/game/objects/items/defib.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 6 +-- code/modules/reagents/chemistry/holder.dm | 12 ++++- code/modules/reagents/chemistry/reagents.dm | 4 ++ .../chemistry/reagents/medicine_reagents.dm | 24 ++++----- .../nanites/nanite_programs/healing.dm | 2 +- .../reagents/chemistry/reagents/healing.dm | 51 +++++++++++++------ 7 files changed, 66 insertions(+), 35 deletions(-) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 0570de6bcf..2a197cf844 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -423,7 +423,7 @@ if((!req_defib && grab_ghost) || (req_defib && defib.grab_ghost)) H.notify_ghost_cloning("Your heart is being defibrillated!") H.grab_ghost() // Shove them back in their body. - else if(H.can_defib()) + else if(H.can_revive()) H.notify_ghost_cloning("Your heart is being defibrillated. Re-enter your corpse if you want to be revived!", source = src) do_help(H, user) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f6ef8e8177..8b8caa1513 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -898,16 +898,16 @@ update_inv_handcuffed() update_hud_handcuffed() -/mob/living/carbon/proc/can_defib() +/mob/living/carbon/proc/can_revive(ignore_timelimit = FALSE, maximum_brute_dam = MAX_REVIVE_BRUTE_DAMAGE, maximum_fire_dam = MAX_REVIVE_FIRE_DAMAGE, ignore_heart = FALSE) var/tlimit = DEFIB_TIME_LIMIT * 10 var/obj/item/organ/heart = getorgan(/obj/item/organ/heart) if(suiciding || hellbound || HAS_TRAIT(src, TRAIT_HUSK) || AmBloodsucker(src)) return - if((world.time - timeofdeath) > tlimit) + if(!ignore_timelimit && (world.time - timeofdeath) > tlimit) return if((getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE)) return - if(!heart || (heart.organ_flags & ORGAN_FAILING)) + if(!ignore_heart && (!heart || (heart.organ_flags & ORGAN_FAILING))) return var/obj/item/organ/brain/BR = getorgan(/obj/item/organ/brain) if(QDELETED(BR) || BR.brain_death || (BR.organ_flags & ORGAN_FAILING) || suiciding) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 922e14e580..9e939078e3 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -199,6 +199,7 @@ var/transfer_amount = T.volume * part if(preserve_data) trans_data = copy_data(T) + post_copy_data(T) transferred += "[T] - [transfer_amount]" R.add_reagent(T.type, transfer_amount * multiplier, trans_data, chem_temp, T.purity, pH, no_react = TRUE, ignore_pH = TRUE) //we only handle reaction after every reagent has been transfered. @@ -239,7 +240,8 @@ var/datum/reagent/T = reagent var/copy_amount = T.volume * part if(preserve_data) - trans_data = T.data + trans_data = copy_data(T) + post_copy_data(T) R.add_reagent(T.type, copy_amount * multiplier, trans_data) src.update_total() @@ -266,7 +268,8 @@ var/datum/reagent/current_reagent = CR if(current_reagent.type == reagent) if(preserve_data) - trans_data = current_reagent.data + trans_data = copy_data(current_reagent) + post_copy_data(current_reagent) R.add_reagent(current_reagent.type, amount, trans_data, chem_temp, current_reagent.purity, pH, no_react = TRUE) remove_reagent(current_reagent.type, amount, 1) if(log && amount > 0) @@ -1116,6 +1119,11 @@ return trans_data +/// +// Should be ran after using copy_data. Calls the reagent's post_copy_data, which usually does nothing. +/datum/reagents/proc/post_copy_data(datum/reagent/current_reagent) + return current_reagent.post_copy_data() + /datum/reagents/proc/get_reagent(type) var/list/cached_reagents = reagent_list . = locate(type) in cached_reagents diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index d6b7201ef9..334d91363a 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -178,6 +178,10 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity) log_reagent("MOB ADD: on_merge() (mixed purity): merged [volume - impureVol] of [type] and [volume] of [impure_chem]") +//Ran by a reagent holder on a specific reagent after copying its data. +/datum/reagent/proc/post_copy_data() + return + /datum/reagent/proc/on_update(atom/A) return diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 72a9779726..e052d2475e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -980,11 +980,11 @@ if(M.stat == DEAD) if(M.suiciding || M.hellbound) //they are never coming back M.visible_message("[M]'s body does not react...") - return + return ..() if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100 || HAS_TRAIT(M, TRAIT_HUSK)) //body is too damaged to be revived M.visible_message("[M]'s body convulses a bit, and then falls still once more.") M.do_jitter_animation(10) - return + return ..() else M.visible_message("[M]'s body starts convulsing!") M.notify_ghost_cloning(source = M) @@ -996,27 +996,27 @@ if(iscarbon(M)) var/mob/living/carbon/C = M if(!(C.dna && C.dna.species && (NOBLOOD in C.dna.species.species_traits))) - C.blood_volume = max(C.blood_volume, BLOOD_VOLUME_NORMAL*C.blood_ratio) //so you don't instantly re-die from a lack of blood - for(var/organ in C.internal_organs) - var/obj/item/organ/O = organ - if(O.damage > O.maxHealth/2) - O.setOrganDamage(O.maxHealth/2) //so you don't instantly die from organ damage when being revived - + C.blood_volume = max(C.blood_volume, BLOOD_VOLUME_BAD*C.blood_ratio) //so you don't instantly re-die from a lack of blood. You'll still need help if you had none though. + var/obj/item/organ/heart/H = C.getorganslot(ORGAN_SLOT_HEART) + if(H && H.organ_flags & ORGAN_FAILING) + H.applyOrganDamage(-15) M.adjustOxyLoss(-20, 0) M.adjustToxLoss(-20, 0) M.updatehealth() + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(!C.can_revive(ignore_timelimit = TRUE, maximum_brute_dam = 100, maximum_fire_dam = 100, ignore_heart = TRUE)) + return var/tplus = world.time - M.timeofdeath if(M.revive()) M.grab_ghost() M.emote("gasp") log_combat(M, M, "revived", src) var/list/policies = CONFIG_GET(keyed_list/policy) - var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds - var/late = timelimit && (tplus > timelimit) - var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] + var/policy = policies[POLICYCONFIG_ON_DEFIB_LATE] //Always causes memory loss due to the nature of strange reagent. if(policy) to_chat(M, policy) - M.log_message("revived using strange reagent, [tplus] deciseconds from time of death, considered [late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME) + M.log_message("revived using strange reagent, [tplus] deciseconds from time of death, considered late revival due to usage of strange reagent.", LOG_GAME) ..() diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm index 81a837504a..c5f36182c7 100644 --- a/code/modules/research/nanites/nanite_programs/healing.dm +++ b/code/modules/research/nanites/nanite_programs/healing.dm @@ -234,7 +234,7 @@ var/mob/living/carbon/C = host_mob if(C.get_ghost()) return FALSE - return C.can_defib() + return C.can_revive() /datum/nanite_program/defib/proc/zap() var/mob/living/carbon/C = host_mob diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 2cdaef9c91..013539fd66 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -98,8 +98,8 @@ description = "Synthetic tissue used for grafting onto damaged organs during surgery, or for treating limb damage. Has a very tight growth window between 305-320, any higher and the temperature will cause the cells to die. Additionally, growth time is considerably long, so chemists are encouraged to leave beakers with said reaction ongoing, while they tend to their other duties." pH = 7.6 metabolization_rate = 0.05 //Give them time to graft - data = list("grown_volume" = 0, "injected_vol" = 0) - var/borrowed_health + data = list("grown_volume" = 0, "injected_vol" = 0, "borrowed_health" = 0) + var/borrowed_health = 0 color = "#FFDADA" value = REAGENT_VALUE_COMMON @@ -107,31 +107,44 @@ if(iscarbon(M)) var/mob/living/carbon/C = M var/healing_factor = (((data["grown_volume"] / 100) + 1)*reac_volume) - if(method in list(PATCH, TOUCH)) - if (M.stat == DEAD) - M.visible_message("The synthetic tissue rapidly grafts into [M]'s wounds, attemping to repair the damage as quickly as possible.") + if(method == PATCH) //Needs to actually be applied via patch / hypo / medspray and not just beakersplashed. + if (C.stat == DEAD) + C.visible_message("The synthetic tissue rapidly grafts into [M]'s wounds, attemping to repair the damage as quickly as possible.") borrowed_health += healing_factor - M.adjustBruteLoss(-healing_factor*2) - M.adjustFireLoss(-healing_factor*2) - M.adjustToxLoss(-healing_factor) - M.adjustCloneLoss(-healing_factor) - M.updatehealth() + C.adjustBruteLoss(-healing_factor*2) + C.adjustFireLoss(-healing_factor*2) + C.adjustToxLoss(-healing_factor) + C.adjustCloneLoss(-healing_factor) + C.updatehealth() if(data["grown_volume"] > 135 && ((C.health + C.oxyloss)>=80)) - if(M.revive()) - M.emote("gasp") + var/tplus = world.time - M.timeofdeath + if(C.can_revive(ignore_timelimit = TRUE, maximum_brute_dam = MAX_REVIVE_BRUTE_DAMAGE / 2, maximum_fire_dam = MAX_REVIVE_FIRE_DAMAGE / 2, ignore_heart = TRUE) && C.revive()) + C.emote("gasp") borrowed_health *= 2 if(borrowed_health < 100) borrowed_health = 100 - log_combat(M, M, "revived", src) + log_combat(C, C, "revived", src) + var/list/policies = CONFIG_GET(keyed_list/policy) + var/policy = policies[POLICYCONFIG_ON_DEFIB_LATE] //Always causes memory loss due to the nature of synthtissue + if(policy) + to_chat(C, policy) + C.log_message("revived using synthtissue, [tplus] deciseconds from time of death, considered late revival due to usage of synthtissue.", LOG_GAME) else M.adjustBruteLoss(-healing_factor) M.adjustFireLoss(-healing_factor) - to_chat(M, "You feel your flesh merge with the synthetic tissue! It stings like hell!") + var/datum/reagent/synthtissue/active_tissue = M.reagents.has_reagent(/datum/reagent/synthtissue) + var/imperfect = FALSE //Merging with synthtissue that has borrowed health + if(active_tissue && active_tissue.borrowed_health) + borrowed_health += healing_factor + imperfect = TRUE + to_chat(M, "You feel your flesh [imperfect ? "partially and painfully" : ""] merge with the synthetic tissue! It stings like hell[imperfect ? " and is making you feel terribly sick." : ""]!") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) + data["borrowed_health"] += borrowed_health //Preserve health offset + borrowed_health = 0 //We are applying this to someone else, so this info will be transferred via data. if(method==INJECT) data["injected_vol"] = reac_volume var/obj/item/organ/heart/H = C.getorganslot(ORGAN_SLOT_HEART) - if(data["grown_volume"] > 50 && H.organ_flags & ORGAN_FAILING) + if(H && data["grown_volume"] > 50 && H.organ_flags & ORGAN_FAILING) H.applyOrganDamage(-20) ..() @@ -145,7 +158,7 @@ C.reagents.remove_reagent(type, 15) to_chat(C, "You feel something reform inside of you!") - data["injected_vol"] -= metabolization_rate + data["injected_vol"] = max(0, data["injected_vol"] - metabolization_rate * C.metabolism_efficiency) //No negatives. if(borrowed_health) C.adjustToxLoss(1) C.adjustCloneLoss(1) @@ -155,6 +168,7 @@ /datum/reagent/synthtissue/on_merge(passed_data) if(!passed_data) return ..() + borrowed_health += passed_data["borrowed_health"] if(passed_data["grown_volume"] > data["grown_volume"]) data["grown_volume"] = passed_data["grown_volume"] if(iscarbon(holder.my_atom)) @@ -166,11 +180,16 @@ /datum/reagent/synthtissue/on_new(passed_data) if(!passed_data) return ..() + borrowed_health += passed_data["borrowed_health"] if(passed_data["grown_volume"] > data["grown_volume"]) data["grown_volume"] = passed_data["grown_volume"] update_name() ..() +/datum/reagent/synthtissue/post_copy_data() + data["borrowed_health"] = 0 //We passed this along to something that needed it, set it back to 0 so we don't do it twice. + return ..() + /datum/reagent/synthtissue/proc/update_name() //They are but babes on creation and have to grow unto godhood switch(data["grown_volume"]) if(-INFINITY to 50) From 5b69a4680bc5f27a5742f313958d82d01583306b Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 22 Sep 2021 22:36:36 +0200 Subject: [PATCH 02/27] whew --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8b8caa1513..b709e132f5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -905,7 +905,7 @@ return if(!ignore_timelimit && (world.time - timeofdeath) > tlimit) return - if((getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE)) + if((getBruteLoss() >= maximum_brute_dam) || (getFireLoss() >= maximum_fire_dam)) return if(!ignore_heart && (!heart || (heart.organ_flags & ORGAN_FAILING))) return From 2e2aa36875f5e0834a09c8c707ad42648b3a7bba Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 22 Sep 2021 22:47:08 +0200 Subject: [PATCH 03/27] grab the ghost --- .../code/modules/reagents/chemistry/reagents/healing.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 013539fd66..7d4f35bf72 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -119,6 +119,7 @@ if(data["grown_volume"] > 135 && ((C.health + C.oxyloss)>=80)) var/tplus = world.time - M.timeofdeath if(C.can_revive(ignore_timelimit = TRUE, maximum_brute_dam = MAX_REVIVE_BRUTE_DAMAGE / 2, maximum_fire_dam = MAX_REVIVE_FIRE_DAMAGE / 2, ignore_heart = TRUE) && C.revive()) + C.grab_ghost() C.emote("gasp") borrowed_health *= 2 if(borrowed_health < 100) From 6cffeacd4216ef2d2d20f9bff126d9ece87677bb Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 22 Sep 2021 23:32:35 +0200 Subject: [PATCH 04/27] typo --- .../code/modules/reagents/chemistry/reagents/healing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 7d4f35bf72..58bf76df41 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -138,7 +138,7 @@ if(active_tissue && active_tissue.borrowed_health) borrowed_health += healing_factor imperfect = TRUE - to_chat(M, "You feel your flesh [imperfect ? "partially and painfully" : ""] merge with the synthetic tissue! It stings like hell[imperfect ? " and is making you feel terribly sick." : ""]!") + to_chat(M, "You feel your flesh [imperfect ? "partially and painfully" : ""] merge with the synthetic tissue! It stings like hell[imperfect ? " and is making you feel terribly sick" : ""]!") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) data["borrowed_health"] += borrowed_health //Preserve health offset borrowed_health = 0 //We are applying this to someone else, so this info will be transferred via data. From 31679157dc2541a6ac017520798892fd4559aee8 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 25 Sep 2021 02:24:12 +0200 Subject: [PATCH 05/27] adjust --- .../reagents/chemistry/reagents/healing.dm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 58bf76df41..df65780224 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -109,12 +109,16 @@ var/healing_factor = (((data["grown_volume"] / 100) + 1)*reac_volume) if(method == PATCH) //Needs to actually be applied via patch / hypo / medspray and not just beakersplashed. if (C.stat == DEAD) - C.visible_message("The synthetic tissue rapidly grafts into [M]'s wounds, attemping to repair the damage as quickly as possible.") - borrowed_health += healing_factor + C.visible_message("The synthetic tissue rapidly grafts into [M]'s wounds, attempting to repair the damage as quickly as possible.") + var/preheal_brute = C.getBruteLoss() + var/preheal_burn = C.getFireLoss() + var/preheal_tox = C.getToxLoss() + var/preheal_oxy = C.getOxyLoss() C.adjustBruteLoss(-healing_factor*2) C.adjustFireLoss(-healing_factor*2) C.adjustToxLoss(-healing_factor) C.adjustCloneLoss(-healing_factor) + borrowed_health += (preheal_brute - C.getBruteLoss()) + (preheal_burn - C.getFireLoss()) + (preheal_tox - C.getToxLoss()) + ((preheal_oxy - C.getOxyLoss()) / 2) //Ironically this means that while slimes get damaged by the toxheal, it will reduce borrowed health and longterm effects. Funky! C.updatehealth() if(data["grown_volume"] > 135 && ((C.health + C.oxyloss)>=80)) var/tplus = world.time - M.timeofdeath @@ -131,12 +135,14 @@ to_chat(C, policy) C.log_message("revived using synthtissue, [tplus] deciseconds from time of death, considered late revival due to usage of synthtissue.", LOG_GAME) else + var/preheal_brute = C.getBruteLoss() + var/preheal_burn = C.getFireLoss() M.adjustBruteLoss(-healing_factor) M.adjustFireLoss(-healing_factor) var/datum/reagent/synthtissue/active_tissue = M.reagents.has_reagent(/datum/reagent/synthtissue) var/imperfect = FALSE //Merging with synthtissue that has borrowed health if(active_tissue && active_tissue.borrowed_health) - borrowed_health += healing_factor + borrowed_health += (preheal_brute - C.getBruteLoss()) + (preheal_burn - C.getFireLoss()) imperfect = TRUE to_chat(M, "You feel your flesh [imperfect ? "partially and painfully" : ""] merge with the synthetic tissue! It stings like hell[imperfect ? " and is making you feel terribly sick" : ""]!") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) @@ -161,9 +167,9 @@ data["injected_vol"] = max(0, data["injected_vol"] - metabolization_rate * C.metabolism_efficiency) //No negatives. if(borrowed_health) - C.adjustToxLoss(1) + C.adjustToxLoss(1, forced = TRUE, toxins_type = TOX_OMNI) C.adjustCloneLoss(1) - borrowed_health -= 1 + borrowed_health = max(borrowed_health - 2, 0) ..() /datum/reagent/synthtissue/on_merge(passed_data) From 9f3688f9ccb8280d50ec0caa5a22328635178788 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 25 Sep 2021 02:32:29 +0200 Subject: [PATCH 06/27] health payback affected by metabolism --- .../code/modules/reagents/chemistry/reagents/healing.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index df65780224..e88e66705d 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -167,9 +167,10 @@ data["injected_vol"] = max(0, data["injected_vol"] - metabolization_rate * C.metabolism_efficiency) //No negatives. if(borrowed_health) - C.adjustToxLoss(1, forced = TRUE, toxins_type = TOX_OMNI) - C.adjustCloneLoss(1) - borrowed_health = max(borrowed_health - 2, 0) + var/payback = 2 * C.metabolism_efficiency //How much borrowed health we are paying back. Half as clonedam, half as true omni toxdam + C.adjustToxLoss(payback / 2, forced = TRUE, toxins_type = TOX_OMNI) + C.adjustCloneLoss(payback / 2) + borrowed_health = max(borrowed_health - payback, 0) ..() /datum/reagent/synthtissue/on_merge(passed_data) From 99a4af025b76c54b0b3be9a53833efb2f9420abf Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 25 Sep 2021 02:46:11 +0200 Subject: [PATCH 07/27] hearts don't need blood typo --- .../reagents/chemistry/reagents/medicine_reagents.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index e052d2475e..3ca96645ad 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -997,9 +997,9 @@ var/mob/living/carbon/C = M if(!(C.dna && C.dna.species && (NOBLOOD in C.dna.species.species_traits))) C.blood_volume = max(C.blood_volume, BLOOD_VOLUME_BAD*C.blood_ratio) //so you don't instantly re-die from a lack of blood. You'll still need help if you had none though. - var/obj/item/organ/heart/H = C.getorganslot(ORGAN_SLOT_HEART) - if(H && H.organ_flags & ORGAN_FAILING) - H.applyOrganDamage(-15) + var/obj/item/organ/heart/H = C.getorganslot(ORGAN_SLOT_HEART) + if(H && H.organ_flags & ORGAN_FAILING) + H.applyOrganDamage(-15) M.adjustOxyLoss(-20, 0) M.adjustToxLoss(-20, 0) M.updatehealth() From 64367ff7ba8824006e7e3f16bd92e562a17fb3bd Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 2 Oct 2021 18:33:57 +0200 Subject: [PATCH 08/27] edge case protection --- .../code/modules/reagents/chemistry/reagents/healing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index e88e66705d..d291278a5f 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -176,7 +176,7 @@ /datum/reagent/synthtissue/on_merge(passed_data) if(!passed_data) return ..() - borrowed_health += passed_data["borrowed_health"] + borrowed_health += max(0, passed_data["borrowed_health"]) if(passed_data["grown_volume"] > data["grown_volume"]) data["grown_volume"] = passed_data["grown_volume"] if(iscarbon(holder.my_atom)) From bb3eb904ebdfefdef23564da0136b53e164466ad Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 3 Nov 2021 03:03:18 +0100 Subject: [PATCH 09/27] resolves hypo inconsistancy --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9d2e4a8e31..1a6183ce9d 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -491,7 +491,7 @@ return var/fp_verb = mode == HYPO_SPRAY ? "spray" : "inject" - var/method = mode == HYPO_SPRAY ? TOUCH : INJECT + var/method = mode == HYPO_SPRAY ? PATCH : INJECT //Medsprays use patch when spraying, feels like an inconsistancy here. if(L != user) L.visible_message("[user] is trying to [fp_verb] [L] with [src]!", \ From eead0e6282615cc9469e19f9746ced788f6587c9 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 9 Dec 2021 18:35:26 +0100 Subject: [PATCH 10/27] slow --- code/__DEFINES/DNA.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index cf98755a36..a5b5cf6dc0 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -182,7 +182,7 @@ ////organ defines #define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING (1/(15 MINUTES / (2 SECONDS))) +#define STANDARD_ORGAN_HEALING (1/(15 MINUTES / (2 SECONDS))) / 3 //Base organ healing can be amped by a factor of up to x5 via satiety. This assumes it to be somewhat in the upper center of positive satiety as base. #define STANDARD_ORGAN_DECAY (1/(15 MINUTES / (2 SECONDS))) //designed to fail organs when left to decay for ~15 minutes. 2 SECOND is SSmobs tickrate. diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index de8e3d623d..a3a98dfe60 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -156,12 +156,12 @@ return FALSE if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing. applyOrganDamage(maxHealth * decay_factor) - return + return FALSE if(!is_cold() && damage) ///Damage decrements by a percent of its maxhealth var/healing_amount = -(maxHealth * healing_factor) ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's satiety - healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0 + healing_amount -= owner.satiety > 0 ? 4 * (maxHealth * healing_factor) * (owner.satiety / MAX_SATIETY) : 0 if(healing_amount) applyOrganDamage(healing_amount) //to FERMI_TWEAK return TRUE From 1e375d86a2a7941738ce94af6030aebdf3f758ee Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 9 Dec 2021 19:09:10 +0100 Subject: [PATCH 11/27] cyber organ oversight & synth satiety --- code/modules/surgery/organs/organ_internal.dm | 2 ++ code/modules/surgery/organs/stomach.dm | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index a3a98dfe60..734603fbc7 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -157,6 +157,8 @@ if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing. applyOrganDamage(maxHealth * decay_factor) return FALSE + if(organ_flags & ORGAN_SYNTHETIC) + return TRUE if(!is_cold() && damage) ///Damage decrements by a percent of its maxhealth var/healing_amount = -(maxHealth * healing_factor) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index f436b31513..89549d2d42 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -131,6 +131,13 @@ name = "ipc cell" icon_state = "stomach-ipc" +/obj/item/organ/stomach/ipc/on_life() + . = ..() + if(!.) + return + if(HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM) && owner.nutrition >= NUTRITION_LEVEL_FED) + owner.satiety += 5 //We don't need to cap the value as it's already automatically capped during nutrition level handling. Also effectively only +4 as you lose 1 per life tick. 300 seconds of sufficient charge to reach full satiety. + /obj/item/organ/stomach/ipc/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) From 051f5780dbdd7e173dcda60d0ed9275e11a9dfd5 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Fri, 31 Dec 2021 00:16:49 +0100 Subject: [PATCH 12/27] tweaks Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles. Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs) --- code/__DEFINES/reagents.dm | 3 +++ .../chemistry/reagents/medicine_reagents.dm | 4 ++++ .../modules/reagents/chemistry/reagents/healing.dm | 13 +++++++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 8864e41ae9..90128606ac 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -63,6 +63,9 @@ #define THRESHOLD_UNHUSK 50 // health threshold for synthflesh/rezadone to unhusk someone +#define SYNTHTISSUE_BORROW_CAP 250 //The cap for synthtissue's borrowed health value when used on someone dead or already having borrowed health. +#define SYNTHTISSUE_DAMAGE_FLIP_CYCLES 45 //After how many cycles the damage will be pure toxdamage as opposed to clonedamage like initially. Gradually changes during its cycles. + //reagent bitflags, used for altering how they works #define REAGENT_DEAD_PROCESS (1<<0) //calls on_mob_dead() if present in a dead body #define REAGENT_DONOTSPLIT (1<<1) //Do not split the chem at all during processing diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 3ca96645ad..a211a29298 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1000,6 +1000,10 @@ var/obj/item/organ/heart/H = C.getorganslot(ORGAN_SLOT_HEART) if(H && H.organ_flags & ORGAN_FAILING) H.applyOrganDamage(-15) + for(var/obj/item/organ/O as anything in C.internal_organs) + if(O.organ_flags & ORGAN_FAILING) + O.applyOrganDamage(-5) + M.adjustOxyLoss(-20, 0) M.adjustToxLoss(-20, 0) M.updatehealth() diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index d291278a5f..346a74006f 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -167,9 +167,10 @@ data["injected_vol"] = max(0, data["injected_vol"] - metabolization_rate * C.metabolism_efficiency) //No negatives. if(borrowed_health) - var/payback = 2 * C.metabolism_efficiency //How much borrowed health we are paying back. Half as clonedam, half as true omni toxdam - C.adjustToxLoss(payback / 2, forced = TRUE, toxins_type = TOX_OMNI) - C.adjustCloneLoss(payback / 2) + var/ratio = (current_cycle > SYNTHTISSUE_DAMAGE_FLIP_CYCLES) ? 0 : (1 - (current_cycle / SYNTHTISSUE_DAMAGE_FLIP_CYCLES)) + var/payback = 2 * C.metabolism_efficiency //How much borrowed health we are paying back. Starts as cloneloss, slowly flips over to toxloss. + C.adjustToxLoss((1 - ratio) * payback * REAGENTS_EFFECT_MULTIPLIER, forced = TRUE, toxins_type = TOX_OMNI) + C.adjustCloneLoss(ratio * payback * REAGENTS_EFFECT_MULTIPLIER) borrowed_health = max(borrowed_health - payback, 0) ..() @@ -188,7 +189,7 @@ /datum/reagent/synthtissue/on_new(passed_data) if(!passed_data) return ..() - borrowed_health += passed_data["borrowed_health"] + borrowed_health = min(passed_data["borrowed_health"] + borrowed_health, SYNTHTISSUE_BORROW_CAP) if(passed_data["grown_volume"] > data["grown_volume"]) data["grown_volume"] = passed_data["grown_volume"] update_name() @@ -220,9 +221,9 @@ C.adjustCloneLoss(borrowed_health*1.25) C.adjustAllOrganLoss(borrowed_health*0.25) M.updatehealth() - if(borrowed_health && C.health < -20) - M.stat = DEAD + if(C.stat != DEAD && borrowed_health && C.health < -20) M.visible_message("The synthetic tissue degrades off [M]'s wounds as they collapse to the floor.") + M.death() //NEEDS ON_MOB_DEAD() /datum/reagent/fermi/zeolites From 1d1a1538085a0d15b11d9cbb235ec9c56d46ba15 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 22 Jan 2022 19:17:05 +0100 Subject: [PATCH 13/27] buffnerf buffs cores for robots on lavaland nerfs cores when not on mining z --- code/datums/status_effects/buffs.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index ae05134b56..eda3470a0b 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -578,8 +578,12 @@ /datum/status_effect/regenerative_core/on_apply() . = ..() ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core") - - if(HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM)) //Robots can heal from cores, but only get 1/5th of the healing. They can use this to get past the damage threshhold however, and then regularely heal from there. + var/turf/T = get_turf(owner) + if(T && is_mining_level(T.z)) + if(HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM)) //Robots can heal from cores, though they ""only"" heal 20 brute + burn damage each instead of 25 + heal_amount *= 0.8 + else + duration = 10 SECONDS heal_amount *= 0.2 owner.adjustBruteLoss(-heal_amount, only_organic = FALSE) if(!AmBloodsucker(owner)) //use your coffin you lazy bastard From 0791a413467570330176bc89df8a1e9b00a3ea04 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 11 Mar 2022 16:38:23 -0500 Subject: [PATCH 14/27] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 424 ++++++++++-------- 1 file changed, 234 insertions(+), 190 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d0bc17a426..7e05043377 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -5389,7 +5389,9 @@ /turf/open/floor/plasteel, /area/security/brig) "ajX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 5 + }, /turf/open/floor/plating, /area/engineering/atmos) "ajY" = ( @@ -5935,6 +5937,9 @@ /obj/item/chair, /obj/item/stack/ore/silver, /obj/item/stack/ore/iron, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/atmos) "akN" = ( @@ -5948,6 +5953,8 @@ dir = 4 }, /obj/structure/lattice, +/obj/item/broken_bottle, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "akP" = ( @@ -6356,6 +6363,9 @@ network = list("ss13","engine") }, /mob/living/simple_animal/parrot/Poly, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "alF" = ( @@ -7275,9 +7285,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "anw" = ( @@ -17486,7 +17494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGi" = ( /obj/structure/sign/warning/securearea, @@ -17518,7 +17526,7 @@ name = "Power Monitoring"; req_access_txt = "32" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGl" = ( /obj/machinery/door/firedoor, @@ -17562,7 +17570,7 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGo" = ( /obj/structure/sign/warning/fire, @@ -18063,15 +18071,6 @@ }, /turf/open/floor/plating, /area/medical/genetics) -"aHg" = ( -/obj/machinery/camera{ - c_tag = "Gravity Generator Room"; - dir = 6; - network = list("ss13","engine") - }, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, -/area/engineering/gravity_generator) "aHh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -18631,19 +18630,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) -"aIb" = ( -/obj/structure/sign/warning/radiation{ - pixel_x = -32 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engineering/gravity_generator) "aIc" = ( /turf/open/floor/circuit/green, /area/engineering/gravity_generator) "aId" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aIe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -19217,16 +19209,13 @@ }, /area/medical/genetics) "aJh" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "aJi" = ( /obj/machinery/gravity_generator/main/station, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aJj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -19897,10 +19886,6 @@ /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "aKp" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -19910,7 +19895,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aKr" = ( /obj/machinery/power/solar{ @@ -20007,7 +19992,9 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/engineering/gravity_generator) "aKy" = ( /obj/structure/cable/white{ @@ -20110,7 +20097,9 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, /area/engineering/main) "aKI" = ( /obj/structure/cable/white{ @@ -20604,7 +20593,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLF" = ( /obj/structure/table/reinforced, @@ -21194,7 +21183,7 @@ name = "Telecommunications"; req_access_txt = "61" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/tcommsat/server) "aMM" = ( /obj/effect/spawner/structure/window/reinforced, @@ -31944,7 +31933,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -32250,21 +32238,18 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bhS" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -32 }, -/obj/structure/disposaloutlet{ - dir = 4 +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plasteel, +/area/engineering/atmos) "bhX" = ( /obj/machinery/pool/filter{ pixel_y = 16 @@ -32981,7 +32966,7 @@ name = "Xenobiology Kill Room"; req_access_txt = "47" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/telecomms, /area/science/xenobiology) "bjw" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, @@ -34575,6 +34560,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -34697,8 +34685,12 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "cpn" = ( -/turf/closed/wall, -/area/space/station_ruins) +/obj/machinery/camera{ + c_tag = "Gravity Generator Room"; + network = list("ss13","engine") + }, +/turf/open/floor/plasteel/dark, +/area/engineering/gravity_generator) "csX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -34747,6 +34739,40 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"cLX" = ( +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno5"; + name = "Creature Cell #5" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -35415,7 +35441,7 @@ /area/asteroid/nearstation) "fTp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall/rust, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "fWh" = ( /turf/open/floor/wood{ @@ -35525,7 +35551,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/closed/wall/r_wall, +/obj/structure/sign/warning/radiation{ + pixel_x = -32 + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -25 + }, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "guM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -35805,8 +35838,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hIF" = ( -/turf/closed/wall, -/area/space) +/turf/open/floor/plasteel, +/area/engineering/gravity_generator) "hNO" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 5 @@ -36087,10 +36120,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "iVy" = ( @@ -36332,10 +36361,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "jCi" = ( @@ -36682,6 +36707,13 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"lbA" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "lcW" = ( /turf/open/floor/wood, /area/maintenance/starboard/aft) @@ -37034,6 +37066,17 @@ "mQi" = ( /turf/closed/wall/rust, /area/maintenance/starboard/central) +"mRi" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "mTv" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -37202,6 +37245,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/effect/turf_decal/caution, /turf/open/floor/plating, /area/engineering/atmos) "nIf" = ( @@ -37607,11 +37651,8 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "psq" = ( -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, /turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/area/engineering/gravity_generator) "puc" = ( /obj/structure/bed, /turf/open/floor/wood, @@ -37802,12 +37843,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qdY" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plating, -/area/engineering/atmos) +/turf/open/floor/plasteel, +/area/engineering/gravity_generator) "qeO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -37857,13 +37898,13 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "qpG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line, +/obj/item/extinguisher/mini, +/turf/open/floor/plasteel/dark/side{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/engineering/atmos) +/area/science/xenobiology) "qsc" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, @@ -38038,6 +38079,12 @@ icon_state = "wood-broken5" }, /area/maintenance/starboard/aft) +"rpu" = ( +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) @@ -38052,33 +38099,17 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "rCw" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno4"; - name = "Creature Cell #4" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "rEx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -40819,13 +40850,36 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "uBJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno4"; + name = "Creature Cell #4" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/broken_bottle, -/obj/item/pickaxe, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "uBW" = ( /obj/structure/cable{ icon_state = "0-8" @@ -41026,8 +41080,15 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vsf" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/floor/plasteel/dark, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "vsL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -41276,8 +41337,8 @@ /area/command/bridge) "wiJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/engineering/atmos) +/turf/closed/wall/r_wall, +/area/engineering/gravity_generator) "wkn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -41353,7 +41414,10 @@ /area/service/bar/atrium) "wDb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, +/obj/structure/sign/warning/radiation{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "wOe" = ( /obj/machinery/door/firedoor/heavy, @@ -41632,13 +41696,14 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/engineering/main) +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "xMv" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ @@ -41651,9 +41716,6 @@ /turf/closed/wall, /area/command/gateway) "xPz" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, @@ -41750,36 +41812,17 @@ /turf/open/floor/plasteel, /area/science/mixing) "yeE" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell #5" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/structure/cable/white{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "yeO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -41811,6 +41854,7 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "yhg" = ( +/obj/effect/turf_decal/sand/plating, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -66119,7 +66163,7 @@ aaa aaa aaa aaa -cpn +jFP jFP jFP jFP @@ -66376,7 +66420,7 @@ aaa aaa aaa aaa -hIF +aaa aaa jFP jFP @@ -66633,7 +66677,7 @@ aaa aaa aaa aaa -hIF +aaa aaa jFP jFP @@ -66890,7 +66934,7 @@ aaa aaa aaa aaa -hIF +aaa aaa aaa aaa @@ -68429,7 +68473,7 @@ dMl uhz gNH kas -aad +kas aad aad aad @@ -68685,13 +68729,13 @@ gSv xtL uhz nHD +bhS kas aad aad aad aad aad -aad bxd aad aac @@ -68942,13 +68986,13 @@ kiw nUk ezP xPz -kas -aad -aad -aad -aad -aad -aad +aGe +aGe +aGe +aGe +aGe +aGe +aGe bxd aad aad @@ -69202,8 +69246,8 @@ twh wiJ wDb fTp -wDb -wDb +qdY +fTp gre sIu bwY @@ -69456,10 +69500,10 @@ dgV fYx iIj ajX -qpG -sIu +aGe +cpn aHe -aIb +aId aJh aKp aLD @@ -69713,8 +69757,8 @@ orI xyo hNO bOy -uBJ aGe +hIF aId aIc aJi @@ -69970,9 +70014,9 @@ anx anx uok akM -qdY aGe -aHg +psq +aJh aId aHe pbT @@ -70226,8 +70270,8 @@ xIm rVj aAg akN -alI anu +alI aGe aGe sIu @@ -71783,7 +71827,7 @@ aPI bwV aRF aSP -xKp +aEt yhg aad bvo @@ -85686,7 +85730,7 @@ bgZ bhM ibv bgm -bgZ +bhg bhM sKZ aad @@ -86962,13 +87006,13 @@ baa aZl dfP bfP -bgo +qpG rCw -bhN +vsf ibv -bgo +lbA yeE -bhN +mRi nTi biZ bjs @@ -87219,13 +87263,13 @@ bem beO sOV bfP -bgm -bgm -bhS +bgo +uBJ +bhN ibv -bgm -bgm -bhS +bgo +cLX +bhN ibv bja bjt @@ -87476,13 +87520,13 @@ ben beP bfn bfP -vsf -bhg bgm +bgm +xKp ibv -psq -bgZ bgm +bgm +xKp xFw bjb bju @@ -87737,8 +87781,8 @@ bgm bhg bgm ibv -bgm -bhg +rpu +bgZ bgm bfP bjc From f7bcdb54155a57343538c73b1c51df02090b8394 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 11 Mar 2022 16:38:50 -0500 Subject: [PATCH 15/27] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 133 ++++++++++-------- 1 file changed, 71 insertions(+), 62 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 7e05043377..874e2e3179 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34582,6 +34582,12 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/science/xenobiology) +"bTd" = ( +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "bVs" = ( /obj/structure/girder, /obj/effect/turf_decal/sand/plating, @@ -34739,40 +34745,6 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) -"cLX" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell #5" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/science/xenobiology) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -35226,6 +35198,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/mixing) +"fds" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "fey" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36456,6 +36442,40 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"jRV" = ( +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno5"; + name = "Creature Cell #5" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "jXc" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -36707,13 +36727,6 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) -"lbA" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "lcW" = ( /turf/open/floor/wood, /area/maintenance/starboard/aft) @@ -37066,17 +37079,6 @@ "mQi" = ( /turf/closed/wall/rust, /area/maintenance/starboard/central) -"mRi" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "mTv" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -37478,6 +37480,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"oWO" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "oXj" = ( /obj/structure/toilet{ dir = 8 @@ -38079,12 +38091,6 @@ icon_state = "wood-broken5" }, /area/maintenance/starboard/aft) -"rpu" = ( -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) @@ -41088,6 +41094,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "vsL" = ( @@ -87010,9 +87019,9 @@ qpG rCw vsf ibv -lbA +oWO yeE -mRi +fds nTi biZ bjs @@ -87268,7 +87277,7 @@ uBJ bhN ibv bgo -cLX +jRV bhN ibv bja @@ -87781,7 +87790,7 @@ bgm bhg bgm ibv -rpu +bTd bgZ bgm bfP From 60f085cdcd63237145a13e76a153661ac40458ea Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 11 Mar 2022 16:44:21 -0500 Subject: [PATCH 16/27] god why are the decals like this --- _maps/map_files/OmegaStation/OmegaStation.dmm | 146 ++++++++---------- 1 file changed, 68 insertions(+), 78 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 874e2e3179..7c22eccba5 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -24663,16 +24663,6 @@ /area/science/lab) "aTI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel, /area/science/lab) "aTJ" = ( @@ -34582,12 +34572,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/science/xenobiology) -"bTd" = ( -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "bVs" = ( /obj/structure/girder, /obj/effect/turf_decal/sand/plating, @@ -34799,6 +34783,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"cYf" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "dai" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -35198,20 +35192,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/mixing) -"fds" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "fey" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36442,40 +36422,6 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) -"jRV" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell #5" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/science/xenobiology) "jXc" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -36579,6 +36525,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"kqC" = ( +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "kqH" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -36956,6 +36908,20 @@ "meo" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) +"mfw" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "mgs" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ dir = 1 @@ -37480,16 +37446,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"oWO" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "oXj" = ( /obj/structure/toilet{ dir = 8 @@ -38094,6 +38050,40 @@ "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) +"ryU" = ( +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno5"; + name = "Creature Cell #5" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "rzn" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -87019,9 +87009,9 @@ qpG rCw vsf ibv -oWO +cYf yeE -fds +mfw nTi biZ bjs @@ -87277,7 +87267,7 @@ uBJ bhN ibv bgo -jRV +ryU bhN ibv bja @@ -87790,7 +87780,7 @@ bgm bhg bgm ibv -bTd +kqC bgZ bgm bfP From a6d351a0911e79963d127a7756efc5ef2865024e Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 11 Mar 2022 16:47:12 -0500 Subject: [PATCH 17/27] i hate decals --- _maps/map_files/OmegaStation/OmegaStation.dmm | 382 ++++++++++-------- 1 file changed, 206 insertions(+), 176 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 7c22eccba5..1bb6d3f34c 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -7272,11 +7272,17 @@ /turf/open/floor/plating, /area/cargo/miningdock) "anu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/turf/closed/wall/r_wall, -/area/command/heads_quarters/ce) +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 4 + }, +/area/engineering/atmos) "anv" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -9664,7 +9670,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engineering/atmos) "arB" = ( /obj/effect/turf_decal/tile/red{ @@ -10252,10 +10258,10 @@ /obj/machinery/atmospherics/pipe/manifold/yellow/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/engineering/atmos) "asx" = ( @@ -10321,10 +10327,10 @@ /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/engineering/atmos) "asD" = ( @@ -10342,20 +10348,20 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/engineering/atmos) "asG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/supply/visible, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/engineering/atmos) "asH" = ( @@ -10956,10 +10962,10 @@ /obj/item/clothing/suit/hazardvest, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "atJ" = ( /turf/open/floor/wood, @@ -11486,10 +11492,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "auC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -12027,10 +12033,10 @@ /obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "avH" = ( /obj/structure/table/wood, @@ -12584,10 +12590,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "awL" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -12845,10 +12851,9 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "axq" = ( /obj/machinery/light{ @@ -12863,9 +12868,11 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "axr" = ( /obj/structure/cable/white{ @@ -12875,9 +12882,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "axs" = ( /obj/structure/reagent_dispensers/fueltank, @@ -12889,9 +12898,12 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "axt" = ( /obj/effect/spawner/structure/window/reinforced, @@ -13857,10 +13869,10 @@ /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/engineering/atmos) "azn" = ( @@ -29743,9 +29755,12 @@ network = list("ss13","engine") }, /obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/dark/corner{ dir = 4 }, -/turf/open/floor/plasteel/checker, /area/engineering/atmos) "bdw" = ( /obj/machinery/holopad, @@ -32231,14 +32246,13 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bhS" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, -/obj/structure/closet/emcloset/anchored, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 4 + }, /area/engineering/atmos) "bhX" = ( /obj/machinery/pool/filter{ @@ -33634,6 +33648,15 @@ dir = 8 }, /area/hallway/secondary/exit) +"bnS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "boD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34675,12 +34698,11 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "cpn" = ( -/obj/machinery/camera{ - c_tag = "Gravity Generator Room"; - network = list("ss13","engine") +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/engineering/gravity_generator) +/turf/closed/wall/r_wall, +/area/command/heads_quarters/ce) "csX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -34719,6 +34741,40 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"cCv" = ( +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno5"; + name = "Creature Cell #5" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "cGA" = ( /obj/machinery/pool/controller, /turf/open/floor/wood, @@ -34783,16 +34839,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"cYf" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "dai" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -34951,6 +34997,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"dZL" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "eaf" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/cable{ @@ -35510,6 +35566,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"gkP" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "glC" = ( /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) @@ -35549,6 +35619,12 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"gBW" = ( +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "gGq" = ( /obj/machinery/mass_driver{ dir = 4; @@ -35804,8 +35880,15 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hIF" = ( +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -32 + }, +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/engineering/gravity_generator) +/area/engineering/atmos) "hNO" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 5 @@ -36525,12 +36608,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"kqC" = ( -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "kqH" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -36908,20 +36985,6 @@ "meo" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) -"mfw" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "mgs" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ dir = 1 @@ -37619,6 +37682,10 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "psq" = ( +/obj/machinery/camera{ + c_tag = "Gravity Generator Room"; + network = list("ss13","engine") + }, /turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "puc" = ( @@ -37811,10 +37878,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qdY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "qeO" = ( @@ -37866,13 +37929,8 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "qpG" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/turf_decal/stripes/line, -/obj/item/extinguisher/mini, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, -/area/science/xenobiology) +/turf/open/floor/plasteel/dark, +/area/engineering/gravity_generator) "qsc" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, @@ -38050,40 +38108,6 @@ "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) -"ryU" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell #5" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/science/xenobiology) "rzn" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -40846,36 +40870,12 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "uBJ" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno4"; - name = "Creature Cell #4" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/science/xenobiology) +/turf/open/floor/plasteel, +/area/engineering/gravity_generator) "uBW" = ( /obj/structure/cable{ icon_state = "0-8" @@ -41076,18 +41076,12 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vsf" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line, +/obj/item/extinguisher/mini, +/turf/open/floor/plasteel/dark/side{ + dir = 1 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, /area/science/xenobiology) "vsL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -41217,6 +41211,20 @@ "vMb" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) +"vMG" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "vPH" = ( /obj/effect/turf_decal/box, /obj/machinery/power/tracker, @@ -41695,13 +41703,35 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" }, -/obj/structure/disposaloutlet{ +/obj/machinery/door/poddoor/preopen{ + id = "xeno4"; + name = "Creature Cell #4" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ dir = 4 }, -/turf/open/floor/plasteel/dark, /area/science/xenobiology) "xMv" = ( /obj/structure/lattice, @@ -68728,7 +68758,7 @@ gSv xtL uhz nHD -bhS +hIF kas aad aad @@ -69245,7 +69275,7 @@ twh wiJ wDb fTp -qdY +uBJ fTp gre sIu @@ -69500,7 +69530,7 @@ fYx iIj ajX aGe -cpn +psq aHe aId aJh @@ -69757,7 +69787,7 @@ xyo hNO bOy aGe -hIF +qdY aId aIc aJi @@ -70014,7 +70044,7 @@ anx uok akM aGe -psq +qpG aJh aId aHe @@ -70269,7 +70299,7 @@ xIm rVj aAg akN -anu +cpn alI aGe aGe @@ -71799,7 +71829,7 @@ vMb srR tac arr -bKQ +anu fFw auq qEl @@ -72056,7 +72086,7 @@ gap fnp aqA viy -bKQ +anu qIp mae eOs @@ -73084,7 +73114,7 @@ aor apv aqA arw -oiL +bhS jxc mae hqX @@ -87005,13 +87035,13 @@ baa aZl dfP bfP -qpG -rCw vsf +rCw +vMG ibv -cYf +dZL yeE -mfw +gkP nTi biZ bjs @@ -87263,11 +87293,11 @@ beO sOV bfP bgo -uBJ +xKp bhN ibv bgo -ryU +cCv bhN ibv bja @@ -87521,11 +87551,11 @@ bfn bfP bgm bgm -xKp +bnS ibv bgm bgm -xKp +bnS xFw bjb bju @@ -87780,7 +87810,7 @@ bgm bhg bgm ibv -kqC +gBW bgZ bgm bfP From f70745bf6aa7f3c175bcb945b26454a290f8e8de Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sat, 12 Mar 2022 16:34:39 -0500 Subject: [PATCH 18/27] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 1bb6d3f34c..f2454479b1 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -13907,7 +13907,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plasteel, From 32803f1cd1cbf2cae8dbb55e6a35ec9818bdd2f5 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 12 Mar 2022 13:54:18 -0800 Subject: [PATCH 19/27] Makes should_do_equalization actually work --- code/controllers/subsystem/air.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 7329dd653f..3bab2bfdf3 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -396,12 +396,15 @@ SUBSYSTEM_DEF(air) */ /datum/controller/subsystem/air/proc/run_delay_heuristics() - if(!equalize_enabled) - cost_equalize = 0 - if(should_do_equalization) - eq_cooldown-- - if(eq_cooldown <= 0) - equalize_enabled = TRUE + if(should_do_equalization) + if(!equalize_enabled) + cost_equalize = 0 + if(should_do_equalization) + eq_cooldown-- + if(eq_cooldown <= 0) + equalize_enabled = TRUE + else + equalize_enabled = FALSE var/total_thread_time = cost_turfs + cost_equalize + cost_groups + cost_post_process if(total_thread_time) var/wait_ms = wait * 100 From 9a73e5971b57129411c3791b6f34e5ecf7c4928a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 12:16:41 -0500 Subject: [PATCH 20/27] Automatic changelog generation for PR #15548 [ci skip] --- html/changelogs/AutoChangeLog-pr-15548.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15548.yml diff --git a/html/changelogs/AutoChangeLog-pr-15548.yml b/html/changelogs/AutoChangeLog-pr-15548.yml new file mode 100644 index 0000000000..5359cb55b2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15548.yml @@ -0,0 +1,7 @@ +author: "TripleShades" +delete-after: True +changes: + - rscdel: "[Omega] Engineering Supermatter shortcut airlock to Cooling Loop +tweak: [Omega] Gravity Generator walkable area" + - bugfix: "[Omega] Two Xenobiology pens now have chutes" + - bugfix: "[Omega] Makes a t-junction pipe in Atmospherics not visible above the floor" From cb1848d06c2d0e3ff37dbb8a097648af339400bf Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Sun, 13 Mar 2022 20:50:30 +0100 Subject: [PATCH 21/27] no more free money (#15375) --- .../file_system/programs/budgetordering.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 1f8fd6f7a6..84ddab9e37 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -79,7 +79,6 @@ if(id_card?.registered_account) if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access)) requestonly = FALSE - buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department) can_approve_requests = TRUE else requestonly = TRUE @@ -236,8 +235,7 @@ return if(!self_paid && ishuman(usr) && !account) - var/obj/item/card/id/id_card = card_slot?.GetID() - account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department) + account = SSeconomy.get_dep_account(ACCOUNT_CAR) var/turf/T = get_turf(src) var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account) @@ -263,9 +261,7 @@ var/id = text2num(params["id"]) for(var/datum/supply_order/SO in SSshuttle.requestlist) if(SO.id == id) - var/obj/item/card/id/id_card = card_slot?.GetID() - if(id_card && id_card?.registered_account) - SO.paying_account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department) + SO.paying_account = SSeconomy.get_dep_account(ACCOUNT_CAR) SSshuttle.requestlist -= SO SSshuttle.shoppinglist += SO . = TRUE From dda24ad2878473101fdb79ebee48d75e05bf60ad Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 14:50:33 -0500 Subject: [PATCH 22/27] Automatic changelog generation for PR #15375 [ci skip] --- html/changelogs/AutoChangeLog-pr-15375.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15375.yml diff --git a/html/changelogs/AutoChangeLog-pr-15375.yml b/html/changelogs/AutoChangeLog-pr-15375.yml new file mode 100644 index 0000000000..062aeb8bda --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15375.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "NTIRN can no longer access non-cargo departmental budgets." From 950d0cc4892d4d9319f46e49a9ef9a285d4fa038 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 16:25:00 -0500 Subject: [PATCH 23/27] Automatic changelog generation for PR #15195 [ci skip] --- html/changelogs/AutoChangeLog-pr-15195.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15195.yml diff --git a/html/changelogs/AutoChangeLog-pr-15195.yml b/html/changelogs/AutoChangeLog-pr-15195.yml new file mode 100644 index 0000000000..6df7e7f43f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15195.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "rebalanced synthtissue's and strange reagent's revival. +tweak: Hyposprays on spray mode now use \"patch\" as opposed to \"touch\" to mirror normal medsprays." From 094cd129de4db8d5d7402468f1ec506c0f3396da Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 16:26:03 -0500 Subject: [PATCH 24/27] Automatic changelog generation for PR #15425 [ci skip] --- html/changelogs/AutoChangeLog-pr-15425.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15425.yml diff --git a/html/changelogs/AutoChangeLog-pr-15425.yml b/html/changelogs/AutoChangeLog-pr-15425.yml new file mode 100644 index 0000000000..f9006ccd4e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15425.yml @@ -0,0 +1,6 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "Base organ healing rate reduced by 66% (It can still be increased to up to 500% of the base value via sufficient satiety)" + - bugfix: "Cybernetic organs no longer passively heal damage despite the proc stating they didn't." + - balance: "Synthetics now gain satiety at sufficient charge (~5 minutes to max satiety from 0)" From 99a1835e9dbcacf60f0a33c53fcc9d43b0fbd8d1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 16:26:08 -0500 Subject: [PATCH 25/27] Automatic changelog generation for PR #15476 [ci skip] --- html/changelogs/AutoChangeLog-pr-15476.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15476.yml diff --git a/html/changelogs/AutoChangeLog-pr-15476.yml b/html/changelogs/AutoChangeLog-pr-15476.yml new file mode 100644 index 0000000000..f0601e8dad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15476.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "Regenerative cores when used on Synthetics on lavaland now heal for 20 brute + burn instead of 5" + - balance: "Regenerative cores when used now on lavaland now only heal 5 brute + burn, regardless of whom they are used on. Additionally, their damage slowdown negation is reduced to ten seconds." From b9aca99a69146fd8cc7895535f1a456a5ed259f1 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 14 Mar 2022 00:38:42 +0000 Subject: [PATCH 26/27] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15195.yml | 5 ----- html/changelogs/AutoChangeLog-pr-15375.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15425.yml | 6 ------ html/changelogs/AutoChangeLog-pr-15476.yml | 5 ----- html/changelogs/AutoChangeLog-pr-15548.yml | 7 ------- 5 files changed, 27 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15195.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15375.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15425.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15476.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15548.yml diff --git a/html/changelogs/AutoChangeLog-pr-15195.yml b/html/changelogs/AutoChangeLog-pr-15195.yml deleted file mode 100644 index 6df7e7f43f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15195.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "rebalanced synthtissue's and strange reagent's revival. -tweak: Hyposprays on spray mode now use \"patch\" as opposed to \"touch\" to mirror normal medsprays." diff --git a/html/changelogs/AutoChangeLog-pr-15375.yml b/html/changelogs/AutoChangeLog-pr-15375.yml deleted file mode 100644 index 062aeb8bda..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15375.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "NTIRN can no longer access non-cargo departmental budgets." diff --git a/html/changelogs/AutoChangeLog-pr-15425.yml b/html/changelogs/AutoChangeLog-pr-15425.yml deleted file mode 100644 index f9006ccd4e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15425.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "Base organ healing rate reduced by 66% (It can still be increased to up to 500% of the base value via sufficient satiety)" - - bugfix: "Cybernetic organs no longer passively heal damage despite the proc stating they didn't." - - balance: "Synthetics now gain satiety at sufficient charge (~5 minutes to max satiety from 0)" diff --git a/html/changelogs/AutoChangeLog-pr-15476.yml b/html/changelogs/AutoChangeLog-pr-15476.yml deleted file mode 100644 index f0601e8dad..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15476.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "Regenerative cores when used on Synthetics on lavaland now heal for 20 brute + burn instead of 5" - - balance: "Regenerative cores when used now on lavaland now only heal 5 brute + burn, regardless of whom they are used on. Additionally, their damage slowdown negation is reduced to ten seconds." diff --git a/html/changelogs/AutoChangeLog-pr-15548.yml b/html/changelogs/AutoChangeLog-pr-15548.yml deleted file mode 100644 index 5359cb55b2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15548.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscdel: "[Omega] Engineering Supermatter shortcut airlock to Cooling Loop -tweak: [Omega] Gravity Generator walkable area" - - bugfix: "[Omega] Two Xenobiology pens now have chutes" - - bugfix: "[Omega] Makes a t-junction pipe in Atmospherics not visible above the floor" From 61d54fb437e611e08ddf7b6bf5e89aa2733ea343 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 Mar 2022 21:09:06 -0500 Subject: [PATCH 27/27] Automatic changelog generation for PR #15550 [ci skip] --- html/changelogs/AutoChangeLog-pr-15550.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15550.yml diff --git a/html/changelogs/AutoChangeLog-pr-15550.yml b/html/changelogs/AutoChangeLog-pr-15550.yml new file mode 100644 index 0000000000..171df9bb0c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15550.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "atmos equalization config now works properly"