From 7752e0d6240289514b1005fb8dffef8e8fe88130 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 22 Sep 2021 22:30:43 +0200 Subject: [PATCH 01/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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 a44d0af4dc352b9468c0582eb1e4a838f1ebdc20 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 9 Mar 2022 07:49:02 -0800 Subject: [PATCH 14/52] hackish supermatter dying on spaced nearby turfs --- code/modules/power/supermatter/supermatter.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 201200a95d..fb5e63c372 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -469,15 +469,20 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //((((some value between 0.5 and 1 * temp - ((273.15 + 40) * some values between 1 and 10)) * some number between 0.25 and knock your socks off / 150) * 0.25 //Heat and mols account for each other, a lot of hot mols are more damaging then a few //Mols start to have a positive effect on damage after 350 + var/spaced = 0 + for(var/turf/open/space/T in range(2,src)) + spaced++ damage = max(damage + (max(clamp(removed.total_moles() / 200, 0.5, 1) * removed.return_temperature() - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ) * DAMAGE_INCREASE_MULTIPLIER, 0) //Power only starts affecting damage when it is above 5000 damage = max(damage + (max(power - POWER_PENALTY_THRESHOLD, 0)/500) * DAMAGE_INCREASE_MULTIPLIER, 0) //Molar count only starts affecting damage when it is above 1800 damage = max(damage + (max(combined_gas - MOLE_PENALTY_THRESHOLD, 0)/80) * DAMAGE_INCREASE_MULTIPLIER, 0) + damage = max(damage + spaced * 0.1 * DAMAGE_INCREASE_MULTIPLIER, 0) + //There might be a way to integrate healing and hurting via heat //healing damage - if(combined_gas < MOLE_PENALTY_THRESHOLD) + if(combined_gas < MOLE_PENALTY_THRESHOLD && !spaced) //Only has a net positive effect when the temp is below 313.15, heals up to 2 damage. Psycologists increase this temp min by up to 45 damage = max(damage + (min(removed.return_temperature() - (T0C + HEAT_PENALTY_THRESHOLD), 0) / 150), 0) From 9b4c3a5be3f26e2131d65f183b0f9c17e82c91a9 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 10 Mar 2022 21:35:08 -0800 Subject: [PATCH 15/52] Adds a minimum greater vote count to extend rounds --- code/__DEFINES/vote.dm | 3 +++ code/controllers/subsystem/vote.dm | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 88e70b884e..bbe6ddf2b7 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -5,6 +5,9 @@ #define HIGHEST_MEDIAN_VOTING "HIGHEST_MEDIAN" #define INSTANT_RUNOFF_VOTING "IRV" +#define VOTE_TRANSFER "Initiate Crew Transfer" +#define VOTE_CONTINUE "Continue Playing" + #define SHOW_RESULTS (1<<0) #define SHOW_VOTES (1<<1) #define SHOW_WINNER (1<<2) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 868351a833..9196c5f4a1 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -32,6 +32,8 @@ SUBSYSTEM_DEF(vote) var/list/stored_modetier_results = list() // The aggregated tier list of the modes available in secret. + var/transfer_votes_done = 0 + /datum/controller/subsystem/vote/fire() //called by master_controller if(mode) if(end_time < world.time) @@ -248,8 +250,17 @@ SUBSYSTEM_DEF(vote) if(vote_system == SCORE_VOTING) calculate_scores(vote_title_text) if(vote_system == HIGHEST_MEDIAN_VOTING) - calculate_highest_median(vote_title_text) // nothing uses this at the moment - var/list/winners = vote_system == INSTANT_RUNOFF_VOTING ? get_runoff_results() : get_result() + calculate_highest_median(vote_title_text) + var/list/winners = list() + if(mode == "transfer") + var/greater_amount_required = 2 + transfer_votes_done + text += "\nExtending requires [greater_amount_required] more votes to win." + if(choices[VOTE_TRANSFER] + greater_amount_required >= choices[VOTE_CONTINUE]) + winners = list(VOTE_TRANSFER) + else + winners = list(VOTE_CONTINUE) + else + winners = vote_system == INSTANT_RUNOFF_VOTING ? get_runoff_results() : get_result() var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic" if(winners.len > 0) if(was_roundtype_vote) @@ -305,7 +316,7 @@ SUBSYSTEM_DEF(vote) if(vote_system == SCHULZE_VOTING) admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" else if(vote_system == HIGHEST_MEDIAN_VOTING) - admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" + admintext += "\nIt should be noted that this is not a raw tally of votes but rather the median score plus a tiebreaker!" for(var/i=1,i<=choices.len,i++) var/votes = choices[choices[i]] admintext += "\n[choices[i]]: [votes]" @@ -339,7 +350,7 @@ SUBSYSTEM_DEF(vote) if(SSmapping.changemap(config.maplist[.])) to_chat(world, "The map vote has chosen [VM.map_name] for next round!") if("transfer") // austation begin -- Crew autotransfer vote - if(. == "Initiate Crew Transfer") + if(. == VOTE_TRANSFER) SSshuttle.autoEnd() var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) @@ -446,7 +457,7 @@ SUBSYSTEM_DEF(vote) continue choices |= M if("transfer") // austation begin -- Crew autotranfer vote - choices.Add("Initiate Crew Transfer","Continue Playing") // austation end + choices.Add(VOTE_TRANSFER,VOTE_CONTINUE) // austation end if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote choices.Add("dynamic", "extended") if("custom") From 2abe8f1ed6a7fbf8f4040dd0f97330012ee2c679 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 10 Mar 2022 21:38:39 -0800 Subject: [PATCH 16/52] Actually, no, just a minimum extend vote count --- code/controllers/subsystem/vote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 9196c5f4a1..57d4a5f7cc 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -253,9 +253,9 @@ SUBSYSTEM_DEF(vote) calculate_highest_median(vote_title_text) var/list/winners = list() if(mode == "transfer") - var/greater_amount_required = 2 + transfer_votes_done - text += "\nExtending requires [greater_amount_required] more votes to win." - if(choices[VOTE_TRANSFER] + greater_amount_required >= choices[VOTE_CONTINUE]) + var/amount_required = 3 + transfer_votes_done + text += "\nExtending requires at least [amount_required] votes to win." + if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) winners = list(VOTE_TRANSFER) else winners = list(VOTE_CONTINUE) From 857253a07b9f1c9290ab6abc7392df2db3fcb3ce Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 10 Mar 2022 21:42:27 -0800 Subject: [PATCH 17/52] who names a var T. --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index fb5e63c372..22ce4e7ce5 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -470,7 +470,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //Heat and mols account for each other, a lot of hot mols are more damaging then a few //Mols start to have a positive effect on damage after 350 var/spaced = 0 - for(var/turf/open/space/T in range(2,src)) + for(var/turf/open/space/_space_turf in range(2,src)) spaced++ damage = max(damage + (max(clamp(removed.total_moles() / 200, 0.5, 1) * removed.return_temperature() - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ) * DAMAGE_INCREASE_MULTIPLIER, 0) //Power only starts affecting damage when it is above 5000 From 4e2b8949fa493266e18d05d435a60cdeda615bc4 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 10 Mar 2022 21:47:21 -0800 Subject: [PATCH 18/52] it is important that we actually keep track --- code/controllers/subsystem/vote.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 57d4a5f7cc..772d7f7b8d 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -254,6 +254,7 @@ SUBSYSTEM_DEF(vote) var/list/winners = list() if(mode == "transfer") var/amount_required = 3 + transfer_votes_done + transfer_votes_done += 1 text += "\nExtending requires at least [amount_required] votes to win." if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) winners = list(VOTE_TRANSFER) From 0791a413467570330176bc89df8a1e9b00a3ea04 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 11 Mar 2022 16:38:23 -0500 Subject: [PATCH 19/52] 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 20/52] 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 21/52] 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 22/52] 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 23/52] 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 24/52] 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 25/52] 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 26/52] 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 27/52] 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 28/52] 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 29/52] 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 30/52] 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 31/52] 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 32/52] 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" From b597675ef4af0c7bb0a9b8943eb3e7b874effbf7 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Mon, 14 Mar 2022 11:41:20 -0700 Subject: [PATCH 33/52] Fix explosive compressor impossibility --- code/modules/research/anomaly/explosive_compressor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/anomaly/explosive_compressor.dm b/code/modules/research/anomaly/explosive_compressor.dm index 23983e31dc..54236e3763 100644 --- a/code/modules/research/anomaly/explosive_compressor.dm +++ b/code/modules/research/anomaly/explosive_compressor.dm @@ -1,4 +1,4 @@ -#define MAX_RADIUS_REQUIRED 8000 //tritbomb +#define MAX_RADIUS_REQUIRED 175 //tritbomb #define MIN_RADIUS_REQUIRED 20 //maxcap /** * # Explosive compressor machines From 2c5a3736e074c8813109bebc21cec1ed6664eb6c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 14 Mar 2022 13:47:12 -0500 Subject: [PATCH 34/52] Automatic changelog generation for PR #15546 [ci skip] --- html/changelogs/AutoChangeLog-pr-15546.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15546.yml diff --git a/html/changelogs/AutoChangeLog-pr-15546.yml b/html/changelogs/AutoChangeLog-pr-15546.yml new file mode 100644 index 0000000000..a451b8863b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15546.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Supermatter now takes damage when near space tiles" From 2331a30220cc6223536e8f92f3aaac99a69b5737 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 14 Mar 2022 13:48:13 -0500 Subject: [PATCH 35/52] Automatic changelog generation for PR #15547 [ci skip] --- html/changelogs/AutoChangeLog-pr-15547.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15547.yml diff --git a/html/changelogs/AutoChangeLog-pr-15547.yml b/html/changelogs/AutoChangeLog-pr-15547.yml new file mode 100644 index 0000000000..0c14f8a9bb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15547.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Round continuation limitations based on population voting for continuation" From f4db7324461cea147f4331892e0051f3b7ab999e Mon Sep 17 00:00:00 2001 From: TripleShades Date: Mon, 14 Mar 2022 18:05:34 -0400 Subject: [PATCH 36/52] Update MetaStation.dmm --- _maps/map_files/MetaStation/MetaStation.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 48054115e6..aac84a1989 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19118,6 +19118,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=14-Starboard-Central"; + location = "13.2-Tcommstore" + }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bxn" = ( @@ -21190,10 +21194,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=14-Starboard-Central"; - location = "13.2-Tcommstore" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/primary/starboard) From 9f0ebe17ab15edf9f83294cf82516d2212a3a210 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 15 Mar 2022 00:36:30 +0000 Subject: [PATCH 37/52] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15546.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15547.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15550.yml | 4 ---- 3 files changed, 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15546.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15547.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15550.yml diff --git a/html/changelogs/AutoChangeLog-pr-15546.yml b/html/changelogs/AutoChangeLog-pr-15546.yml deleted file mode 100644 index a451b8863b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15546.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Supermatter now takes damage when near space tiles" diff --git a/html/changelogs/AutoChangeLog-pr-15547.yml b/html/changelogs/AutoChangeLog-pr-15547.yml deleted file mode 100644 index 0c14f8a9bb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15547.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Round continuation limitations based on population voting for continuation" diff --git a/html/changelogs/AutoChangeLog-pr-15550.yml b/html/changelogs/AutoChangeLog-pr-15550.yml deleted file mode 100644 index 171df9bb0c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15550.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "atmos equalization config now works properly" From 6f8fc5125d461dbd409222a72ce4502363f2706b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:24:46 -0700 Subject: [PATCH 38/52] Update space.dm --- code/_rendering/parallax/types/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_rendering/parallax/types/space.dm b/code/_rendering/parallax/types/space.dm index 38ad62aede..1a6cf191cb 100644 --- a/code/_rendering/parallax/types/space.dm +++ b/code/_rendering/parallax/types/space.dm @@ -17,7 +17,7 @@ P.pixel_x = planet_offset_x P.pixel_y = planet_offset_y . += P - if(random_layer) + if(ispath(random_layer, /atom/movable/screen/parallax_layer)) . += new random_layer if(ispath(random_layer, /atom/movable/screen/parallax_layer/space/random/space_gas)) var/atom/movable/screen/parallax_layer/space/random/space_gas/SG = locate(random_layer) in objects From 33e63e381b11f2d885e91317e086de8f3ab66c8a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 15 Mar 2022 14:24:20 -0500 Subject: [PATCH 39/52] Automatic changelog generation for PR #15553 [ci skip] --- html/changelogs/AutoChangeLog-pr-15553.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15553.yml diff --git a/html/changelogs/AutoChangeLog-pr-15553.yml b/html/changelogs/AutoChangeLog-pr-15553.yml new file mode 100644 index 0000000000..465500699e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15553.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Implosion compressor now doesn't scale beyond bombs' ability to explode" From 7c1f0ae14fc99be54e99bf8e1ce5f9fa25726f37 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 16 Mar 2022 00:37:27 +0000 Subject: [PATCH 40/52] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15553.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15553.yml diff --git a/html/changelogs/AutoChangeLog-pr-15553.yml b/html/changelogs/AutoChangeLog-pr-15553.yml deleted file mode 100644 index 465500699e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15553.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Implosion compressor now doesn't scale beyond bombs' ability to explode" From 37fef7fbbae5f7b815578309ebbc183f5e412aad Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 16 Mar 2022 15:33:31 -0300 Subject: [PATCH 41/52] Upload files --- code/__HELPERS/_logging.dm | 4 + .../configuration/entries/logging.dm | 81 +++++++++++++------ config/entries/logging.txt | 3 + 3 files changed, 63 insertions(+), 25 deletions(-) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 4bc9ccaacd..44e877dbf4 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -109,6 +109,10 @@ if (CONFIG_GET(flag/log_attack)) WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]") +/proc/log_victim(text) + if (CONFIG_GET(flag/victim)) + WRITE_LOG(GLOB.world_attack_log, "VICTIM: [text]") + /proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE) if (CONFIG_GET(flag/log_manifest)) WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]") diff --git a/code/controllers/configuration/entries/logging.dm b/code/controllers/configuration/entries/logging.dm index 54bd5cb713..e9fe04f2d4 100644 --- a/code/controllers/configuration/entries/logging.dm +++ b/code/controllers/configuration/entries/logging.dm @@ -1,88 +1,119 @@ -/datum/config_entry/flag/log_ooc // log OOC channel +/// log OOC channel +/datum/config_entry/flag/log_ooc config_entry_value = TRUE -/datum/config_entry/flag/log_access // log login/logout +/// log login/logout +/datum/config_entry/flag/log_access config_entry_value = TRUE /// Config entry which special logging of failed logins under suspicious circumstances. /datum/config_entry/flag/log_suspicious_login config_entry_value = TRUE -/datum/config_entry/flag/log_say // log client say +/// log client say +/datum/config_entry/flag/log_say config_entry_value = TRUE -/datum/config_entry/flag/log_admin // log admin actions +/// log admin actions +/datum/config_entry/flag/log_admin protection = CONFIG_ENTRY_LOCKED config_entry_value = TRUE -/datum/config_entry/flag/log_prayer // log prayers +/// log prayers +/datum/config_entry/flag/log_prayer config_entry_value = TRUE -/datum/config_entry/flag/log_law // log lawchanges +/// log lawchanges +/datum/config_entry/flag/log_law config_entry_value = TRUE -/datum/config_entry/flag/log_game // log game events +/// log game events +/datum/config_entry/flag/log_game config_entry_value = TRUE -/datum/config_entry/flag/log_virus // log virology data +/// log virology data +/datum/config_entry/flag/log_virus config_entry_value = TRUE -/datum/config_entry/flag/log_vote // log voting +/// log voting +/datum/config_entry/flag/log_vote config_entry_value = TRUE -/datum/config_entry/flag/log_craft // log crafting +/// log crafting +/datum/config_entry/flag/log_craft config_entry_value = TRUE -/datum/config_entry/flag/log_whisper // log client whisper +/// log client whisper +/datum/config_entry/flag/log_whisper config_entry_value = TRUE -/datum/config_entry/flag/log_attack // log attack messages +/// log attack messages +/datum/config_entry/flag/log_attack config_entry_value = TRUE -/datum/config_entry/flag/log_emote // log emotes +/// log attack messages +/datum/config_entry/flag/log_victim config_entry_value = TRUE -/datum/config_entry/flag/log_adminchat // log admin chat messages +/// log emotes +/datum/config_entry/flag/log_emote + config_entry_value = TRUE + +/// log admin chat messages +/datum/config_entry/flag/log_adminchat protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/log_shuttle // log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console +/// log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console +/datum/config_entry/flag/log_shuttle config_entry_value = TRUE -/datum/config_entry/flag/log_pda // log pda messages +/// log pda messages +/datum/config_entry/flag/log_pda config_entry_value = TRUE -/datum/config_entry/flag/log_telecomms // log telecomms messages +/// log telecomms messages +/datum/config_entry/flag/log_telecomms config_entry_value = TRUE -/datum/config_entry/flag/log_twitter // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. +/// log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. +/datum/config_entry/flag/log_twitter config_entry_value = TRUE -/datum/config_entry/flag/log_world_topic // log all world.Topic() calls +/// log all world.Topic() calls +/datum/config_entry/flag/log_world_topic config_entry_value = TRUE -/datum/config_entry/flag/log_manifest // log crew manifest to seperate file +/// log crew manifest to seperate file +/datum/config_entry/flag/log_manifest config_entry_value = TRUE -/datum/config_entry/flag/log_job_debug // log roundstart divide occupations debug information to a file +/// log roundstart divide occupations debug information to a file +/datum/config_entry/flag/log_job_debug config_entry_value = TRUE +/// log photos taken by players with a camera /datum/config_entry/flag/log_pictures +/// This is... shitcode, literally same as above, if one of them is inactive, won't log at all, PLEASE FUCKING REMOVE THIS. /datum/config_entry/flag/picture_logging_camera /// forces log_href for tgui /datum/config_entry/flag/emergency_tgui_logging config_entry_value = FALSE -/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error +/// The "cooldown" time for each occurrence of a unique error +/datum/config_entry/number/error_cooldown config_entry_value = 600 min_val = 0 -/datum/config_entry/number/error_limit // How many occurrences before the next will silence them +/// How many occurrences before the next will silence them +/datum/config_entry/number/error_limit config_entry_value = 50 -/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for +/// How long a unique error will be silenced for +/datum/config_entry/number/error_silence_time config_entry_value = 6000 -/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error +/// How long to wait between messaging admins about occurrences of a unique error +/datum/config_entry/number/error_msg_delay config_entry_value = 50 diff --git a/config/entries/logging.txt b/config/entries/logging.txt index 31692afccb..6483a371f0 100644 --- a/config/entries/logging.txt +++ b/config/entries/logging.txt @@ -34,6 +34,9 @@ LOG_EMOTE ## log attack messages LOG_ATTACK +## log victim messages +LOG_VICTIM + ## log pda messages LOG_PDA From baee52349b156c8f77b4b49671f43b1429fbbb24 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 16 Mar 2022 15:41:07 -0300 Subject: [PATCH 42/52] Upload files --- code/datums/status_effects/debuffs.dm | 3 +++ code/game/atoms.dm | 2 +- code/game/objects/items/implants/implantchair.dm | 2 ++ code/modules/antagonists/brainwashing/brainwashing.dm | 2 +- code/modules/surgery/advanced/brainwashing.dm | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index dbec6c6ee2..2d0a095f5b 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1010,6 +1010,9 @@ var/mob/living/carbon/C = owner var/hypnomsg = uncostumize_say(hearing_args[HEARING_RAW_MESSAGE], hearing_args[HEARING_MESSAGE_MODE]) C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis + // The brain trauma itself does its own set of logging, but this is the only place the source of the hypnosis phrase can be found. + hearing_speaker.log_message("has hypnotised [key_name(C)] with the phrase '[hearing_args[HEARING_RAW_MESSAGE]]'", LOG_ATTACK) + C.log_message("has been hypnotised by the phrase '[hearing_args[HEARING_RAW_MESSAGE]]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, log_globally = FALSE) addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hypnomsg), 10) addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 925ac41a0b..6d600eefa1 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1215,7 +1215,7 @@ if(user != target) var/reverse_message = "has been [what_done] by [ssource][postfix]" - target.log_message(reverse_message, LOG_ATTACK, color="orange", log_globally=FALSE) + target.log_message(reverse_message, LOG_VICTIM, color="orange", log_globally=FALSE) /** * log_wound() is for when someone is *attacked* and suffers a wound. Note that this only captures wounds from damage, so smites/forced wounds aren't logged, as well as demotions like cuts scabbing over diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 7b05cf302e..e32acd105e 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -189,5 +189,7 @@ return FALSE brainwash(C, objective) message_admins("[ADMIN_LOOKUPFLW(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.") + user.log_message("has brainwashed [key_name(C)] with the objective '[objective]' using \the [src]", LOG_ATTACK) + C.log_message("has been brainwashed with the objective '[objective]' by [key_name(user)] using \the [src]", LOG_VICTIM, log_globally = FALSE) log_game("[key_name(user)] brainwashed [key_name(C)] with objective '[objective]'.") return TRUE diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index bd7a9a43cb..65c58611cb 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -73,7 +73,7 @@ brainwash(C, objectives) var/obj_list = english_list(objectives) message_admins("[key_name_admin(admin)] has brainwashed [key_name_admin(C)] with the following objectives: [obj_list].") - C.log_message("has been force-brainwashed with the objective '[obj_list]' by admin [key_name(admin)]", LOG_ATTACK, log_globally = FALSE) + C.log_message("has been force-brainwashed with the objective '[obj_list]' by admin [key_name(admin)]", LOG_VICTIM) log_admin("[key_name(admin)] has brainwashed [key_name(C)] with the following objectives: [obj_list].") /datum/objective/brainwashing diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 28103f7f97..2a09fd2b93 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -49,6 +49,8 @@ to_chat(target, "A new compulsion fills your mind... you feel forced to obey it!") brainwash(target, objective) message_admins("[ADMIN_LOOKUPFLW(user)] surgically brainwashed [ADMIN_LOOKUPFLW(target)] with the objective '[objective]'.") + user.log_message("has brainwashed [key_name(target)] with the objective '[objective]' using brainwashing surgery.", LOG_ATTACK) + target.log_message("has been brainwashed with the objective '[objective]' by [key_name(user)] using brainwashing surgery.", LOG_VICTIM, log_globally=FALSE) log_game("[key_name(user)] surgically brainwashed [key_name(target)] with the objective '[objective]'.") return TRUE From 4da5a57688ba1786d60b03dd6113073201a3abc4 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 16 Mar 2022 18:33:32 -0300 Subject: [PATCH 43/52] global --- code/__HELPERS/_logging.dm | 4 ++-- code/_globalvars/logging.dm | 2 ++ code/datums/status_effects/debuffs.dm | 7 ++++--- code/game/world.dm | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 44e877dbf4..25b5334a2b 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -110,8 +110,8 @@ WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]") /proc/log_victim(text) - if (CONFIG_GET(flag/victim)) - WRITE_LOG(GLOB.world_attack_log, "VICTIM: [text]") + if (CONFIG_GET(flag/log_victim)) + WRITE_LOG(GLOB.world_victim_log, "VICTIM: [text]") /proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE) if (CONFIG_GET(flag/log_manifest)) diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 843eab6fb0..f445843364 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -11,6 +11,8 @@ GLOBAL_VAR(world_qdel_log) GLOBAL_PROTECT(world_qdel_log) GLOBAL_VAR(world_attack_log) GLOBAL_PROTECT(world_attack_log) +GLOBAL_VAR(world_victim_log) +GLOBAL_PROTECT(world_victim_log) // GLOBAL_VAR(world_econ_log) // GLOBAL_PROTECT(world_econ_log) GLOBAL_VAR(world_href_log) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 2d0a095f5b..b5a7a38915 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1005,14 +1005,15 @@ /datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args) if(!owner.can_hear()) return - if(hearing_args[HEARING_SPEAKER] == owner) + var/mob/hearing_speaker = hearing_args[HEARING_SPEAKER] + if(hearing_speaker == owner) return var/mob/living/carbon/C = owner var/hypnomsg = uncostumize_say(hearing_args[HEARING_RAW_MESSAGE], hearing_args[HEARING_MESSAGE_MODE]) C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis // The brain trauma itself does its own set of logging, but this is the only place the source of the hypnosis phrase can be found. - hearing_speaker.log_message("has hypnotised [key_name(C)] with the phrase '[hearing_args[HEARING_RAW_MESSAGE]]'", LOG_ATTACK) - C.log_message("has been hypnotised by the phrase '[hearing_args[HEARING_RAW_MESSAGE]]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, log_globally = FALSE) + hearing_speaker.log_message("has hypnotised [key_name(C)] with the phrase '[hypnomsg]'", LOG_ATTACK) + C.log_message("has been hypnotised by the phrase '[hypnomsg]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, log_globally = FALSE) addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hypnomsg), 10) addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) diff --git a/code/game/world.dm b/code/game/world.dm index af11b7c93e..75f145b048 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -115,6 +115,7 @@ GLOBAL_LIST(topic_status_cache) GLOB.world_virus_log = "[GLOB.log_directory]/virus.log" GLOB.world_asset_log = "[GLOB.log_directory]/asset.log" GLOB.world_attack_log = "[GLOB.log_directory]/attack.log" + GLOB.world_victim_log = "[GLOB.log_directory]/victim.log" GLOB.world_pda_log = "[GLOB.log_directory]/pda.log" GLOB.world_telecomms_log = "[GLOB.log_directory]/telecomms.log" GLOB.world_manifest_log = "[GLOB.log_directory]/manifest.log" From 043f6ddf5e1239cf88ff40160a780cf9cbcd66ed Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 17 Mar 2022 19:00:29 -0500 Subject: [PATCH 44/52] Automatic changelog generation for PR #15559 [ci skip] --- html/changelogs/AutoChangeLog-pr-15559.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15559.yml diff --git a/html/changelogs/AutoChangeLog-pr-15559.yml b/html/changelogs/AutoChangeLog-pr-15559.yml new file mode 100644 index 0000000000..530b44d2b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15559.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Fixed LOG_VICTIM." From fe59c7c2be8ab20f8af0b91970e5e31e16a71de5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 18 Mar 2022 00:37:38 +0000 Subject: [PATCH 45/52] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15559.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15559.yml diff --git a/html/changelogs/AutoChangeLog-pr-15559.yml b/html/changelogs/AutoChangeLog-pr-15559.yml deleted file mode 100644 index 530b44d2b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15559.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "Fixed LOG_VICTIM." From 164c4837964ca6d834171b2443e7ca77547cc7be Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Mar 2022 00:53:09 -0400 Subject: [PATCH 46/52] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index f2454479b1..7cec756ccf 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -16359,6 +16359,10 @@ /area/hallway/secondary/exit) "aEg" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ + dir = 4; + name = "air mixer" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "aEh" = ( From 90c42624b33f4aff9d599e54ca1eec7bfa74c2fa Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Mar 2022 00:56:17 -0400 Subject: [PATCH 47/52] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 7cec756ccf..cc00aa16ff 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -16363,6 +16363,9 @@ dir = 4; name = "air mixer" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "aEh" = ( From f01338c0e7d9908de023d4e2477a3ef33b4e2d8a Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Mar 2022 01:06:43 -0400 Subject: [PATCH 48/52] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index cc00aa16ff..c874934ed6 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -24309,9 +24309,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = -32 - }, +/obj/machinery/vending/tool, /turf/open/floor/engine, /area/engineering/main) "aSQ" = ( From bcf5be78f077a8d1e543ab9ff7aaf98073310267 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Mar 2022 01:12:00 -0400 Subject: [PATCH 49/52] 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 c874934ed6..18f234f0d6 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -41360,7 +41360,7 @@ /area/maintenance/port/aft) "wkG" = ( /obj/structure/lattice/catwalk, -/turf/open/floor/plating/airless, +/turf/open/space/basic, /area/space/nearstation) "wkO" = ( /obj/structure/cable/white{ From 90d1025fbb39e968a1f5e66bf22a779059620dcf Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Mar 2022 16:56:04 -0400 Subject: [PATCH 50/52] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 18f234f0d6..5178dbdc8e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -23466,7 +23466,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/engine, /area/engineering/main) "aQU" = ( @@ -24309,7 +24308,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/vending/tool, +/obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/engine, /area/engineering/main) "aSQ" = ( From c23c4a7624f88c8bc9926df89138a6c81dd519f6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 18 Mar 2022 16:15:25 -0500 Subject: [PATCH 51/52] Automatic changelog generation for PR #15561 [ci skip] --- html/changelogs/AutoChangeLog-pr-15561.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15561.yml diff --git a/html/changelogs/AutoChangeLog-pr-15561.yml b/html/changelogs/AutoChangeLog-pr-15561.yml new file mode 100644 index 0000000000..3613f795a0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15561.yml @@ -0,0 +1,5 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "[Omega] Aix Mixer pipe" + - rscadd: "[Omega] Wire to Turbine" From 1efe80dfed0eaf20a251973bd4722f3a5c676c52 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 19 Mar 2022 00:36:19 +0000 Subject: [PATCH 52/52] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15561.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15561.yml diff --git a/html/changelogs/AutoChangeLog-pr-15561.yml b/html/changelogs/AutoChangeLog-pr-15561.yml deleted file mode 100644 index 3613f795a0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15561.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscadd: "[Omega] Aix Mixer pipe" - - rscadd: "[Omega] Wire to Turbine"