From 0b9a7fcfd83068e470c32d03b78141f8695b2782 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:11:22 -0400 Subject: [PATCH 01/16] wow this works? who knew --- .../eldritch_cult/eldritch_transmutations.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index cc5242b0d960..41de860dd6a2 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -175,17 +175,22 @@ /datum/eldritch_transmutation/basic/on_finished_recipe(mob/living/user, list/atoms, loc) . = TRUE var/mob/living/carbon/carbon_user = user + var/list/datum/mind/valid_targets = list() for(var/obj/item/living_heart/LH in atoms) - if(LH.target && LH.target.stat == DEAD) + if(LH.target && (LH.target.stat == DEAD || LH.target.stat == SOFT_CRIT)) to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) LH.target = null var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic) - EC.total_sacrifices++ - EC.charge += 2 + valid_targets += LH.target + + + if(valid_targets.assigned_role in GLOB.command_positions) + EC.total_sacrifices++ + EC.charge += 2 if(QDELETED(LH.target)) From cef493b22a8ba91219345ef7821e7e95e31f05cb Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:14:22 -0400 Subject: [PATCH 02/16] we're so back gojo bros --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 41de860dd6a2..99b4381c0b88 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -188,7 +188,7 @@ valid_targets += LH.target - if(valid_targets.assigned_role in GLOB.command_positions) + if(LH.target.mind.assigned_role in GLOB.command_positions) EC.total_sacrifices++ EC.charge += 2 From c9e6a0b05cd15cf104aa7876ab3bc38ce869fea4 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:37:22 -0400 Subject: [PATCH 03/16] this is ognna need some code review fuck me --- code/__DEFINES/stat.dm | 2 +- .../eldritch_cult/eldritch_transmutations.dm | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 2dade0825ff6..25882c66705a 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -5,7 +5,7 @@ //mob/var/stat things #define CONSCIOUS 0 #define SOFT_CRIT 1 -#define UNCONSCIOUS 2 +#define UNCONSCIOUS 2 ///THIS MEANS HARD CRIT #define DEAD 3 //Maximum healthiness an individual can have diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 99b4381c0b88..bdc002050864 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -175,23 +175,30 @@ /datum/eldritch_transmutation/basic/on_finished_recipe(mob/living/user, list/atoms, loc) . = TRUE var/mob/living/carbon/carbon_user = user - var/list/datum/mind/valid_targets = list() for(var/obj/item/living_heart/LH in atoms) - if(LH.target && (LH.target.stat == DEAD || LH.target.stat == SOFT_CRIT)) + if(LH.target && (LH.target.stat == DEAD || LH.target.stat == SOFT_CRIT || LH.target.stat == UNCONSCIOUS)) to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) LH.target = null var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic) - valid_targets += LH.target + if(LH.target.mind.has_antag_datum(/datum/antagonist/heretic)) + EC.total_sacrifices++ + EC.charge += 4 - if(LH.target.mind.assigned_role in GLOB.command_positions) EC.total_sacrifices++ - EC.charge += 2 + EC.charge += 3 + + if(LH.target.mind.assigned_role in GLOB.security_positions) + EC.total_sacrifices++ + EC.charge += 3 + else + EC.total_sacrifices++ + EC.charge += 2 if(QDELETED(LH.target)) var/datum/objective/A = new From cb5cc964524a383b3b237389f4a38af6218da4c4 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:47:33 -0400 Subject: [PATCH 04/16] Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index bdc002050864..0ab818c27ecf 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -177,7 +177,7 @@ var/mob/living/carbon/carbon_user = user for(var/obj/item/living_heart/LH in atoms) - if(LH.target && (LH.target.stat == DEAD || LH.target.stat == SOFT_CRIT || LH.target.stat == UNCONSCIOUS)) + if(LH.target && LH.target.stat) to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) From 2220ad4995c27d960a899c271fbfe3d30203f7f4 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:48:13 -0400 Subject: [PATCH 05/16] Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 0ab818c27ecf..37c6c9a93594 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -192,7 +192,7 @@ EC.total_sacrifices++ EC.charge += 3 - if(LH.target.mind.assigned_role in GLOB.security_positions) + else if(LH.target.mind.assigned_role in GLOB.security_positions) EC.total_sacrifices++ EC.charge += 3 From 518d18168b9bf26fce63cd5d744ed2c4b9ad2dcb Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:48:20 -0400 Subject: [PATCH 06/16] Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 37c6c9a93594..348821e5e0c9 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -188,7 +188,7 @@ EC.total_sacrifices++ EC.charge += 4 - if(LH.target.mind.assigned_role in GLOB.command_positions) + else if(LH.target.mind.assigned_role in GLOB.command_positions) EC.total_sacrifices++ EC.charge += 3 From 0c05db1a5646905bbd9a9f31f339200c56ec17b9 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:53:23 -0400 Subject: [PATCH 07/16] I think I did this right probably --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 348821e5e0c9..8a41d7614c21 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -185,20 +185,18 @@ var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic) if(LH.target.mind.has_antag_datum(/datum/antagonist/heretic)) - EC.total_sacrifices++ EC.charge += 4 else if(LH.target.mind.assigned_role in GLOB.command_positions) - EC.total_sacrifices++ + EC.charge += 3 else if(LH.target.mind.assigned_role in GLOB.security_positions) - EC.total_sacrifices++ EC.charge += 3 else - EC.total_sacrifices++ EC.charge += 2 + EC.total_sacrifices++ if(QDELETED(LH.target)) var/datum/objective/A = new From 7ffecf55f796784a8e457649642e5f2d82c65730 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 03:11:08 -0400 Subject: [PATCH 08/16] baiomu recommended changeq we're getting big brained now --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 8a41d7614c21..15b3d7d1ef85 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -177,7 +177,7 @@ var/mob/living/carbon/carbon_user = user for(var/obj/item/living_heart/LH in atoms) - if(LH.target && LH.target.stat) + if(LH.target?.stat) to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) From d3382029baacdae391b67d494629dd8403bddec4 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 13:33:56 -0400 Subject: [PATCH 09/16] Update code/__DEFINES/stat.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/__DEFINES/stat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 25882c66705a..36d6698d1aa5 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -5,7 +5,7 @@ //mob/var/stat things #define CONSCIOUS 0 #define SOFT_CRIT 1 -#define UNCONSCIOUS 2 ///THIS MEANS HARD CRIT +#define UNCONSCIOUS 2 //THIS MEANS HARD CRIT #define DEAD 3 //Maximum healthiness an individual can have From 780169e4903f8eb5a4078caf2a097b459e0f09ca Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 13:36:02 -0400 Subject: [PATCH 10/16] Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 15b3d7d1ef85..7defdb5c0110 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -177,7 +177,7 @@ var/mob/living/carbon/carbon_user = user for(var/obj/item/living_heart/LH in atoms) - if(LH.target?.stat) + if(LH.target && LH.target.stat != CONSCIOUS) to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) From bbfb66d9c35a4b9be06364cdac3e9cb03c3d3461 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:22:41 -0400 Subject: [PATCH 11/16] I forgot to change this 1 billion years ago sorry --- code/modules/antagonists/eldritch_cult/eldritch_magic.dm | 2 +- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index a8d0ac4c9f1f..04ab94719cc0 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -1018,7 +1018,7 @@ name = "Void Phase" desc = "Let's you blink to your pointed destination, causes 3x3 aoe damage bubble \ around your pointed destination and your current location. \ - It has a minimum range of 3 tiles and a maximum range of 9 tiles." + It has a minimum range of 3 tiles and a maximum range of 5 tiles." background_icon_state = "bg_heretic" overlay_icon_state = "bg_heretic_border" button_icon = 'icons/mob/actions/actions_ecult.dmi' diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index 7defdb5c0110..f2a5c21d016b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -177,7 +177,7 @@ var/mob/living/carbon/carbon_user = user for(var/obj/item/living_heart/LH in atoms) - if(LH.target && LH.target.stat != CONSCIOUS) + if(LH.target && LH.target.stat != CONSCIOUS) ///wow this works to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) From 427f2e131d563765bceaf08d5b08e8bef365e09d Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 7 Oct 2023 23:14:49 -0400 Subject: [PATCH 12/16] I like baiomu's ting better sorry --- .../antagonists/eldritch_cult/eldritch_transmutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index f2a5c21d016b..56a3f5e46154 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -177,7 +177,7 @@ var/mob/living/carbon/carbon_user = user for(var/obj/item/living_heart/LH in atoms) - if(LH.target && LH.target.stat != CONSCIOUS) ///wow this works + if(LH.target?.stat) ///wow this works to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE) From 1af222e551dcca82f4f9b909189d1f8ce5339af3 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:32:15 -0400 Subject: [PATCH 13/16] ok ok --- yogstation.dme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation.dme b/yogstation.dme index f768ffdadfe3..27d1e5ba3f88 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -257,6 +257,7 @@ #include "code\_globalvars\lists\client.dm" #include "code\_globalvars\lists\flavor_misc.dm" #include "code\_globalvars\lists\keybindings.dm" +#include "code\_globalvars\lists\maintenance_loot.dm" #include "code\_globalvars\lists\mapping.dm" #include "code\_globalvars\lists\medals.dm" #include "code\_globalvars\lists\mobs.dm" @@ -264,7 +265,6 @@ #include "code\_globalvars\lists\objects.dm" #include "code\_globalvars\lists\poll_ignore.dm" #include "code\_globalvars\lists\typecache.dm" -#include "code\_globalvars\lists\maintenance_loot.dm" #include "code\_js\byjax.dm" #include "code\_js\menus.dm" #include "code\_onclick\adjacent.dm" @@ -721,8 +721,8 @@ #include "code\datums\mutations\radiantburst.dm" #include "code\datums\mutations\radioactive.dm" #include "code\datums\mutations\radproof.dm" -#include "code\datums\mutations\sapblood.dm" #include "code\datums\mutations\ravenous.dm" +#include "code\datums\mutations\sapblood.dm" #include "code\datums\mutations\sight.dm" #include "code\datums\mutations\space_adaptation.dm" #include "code\datums\mutations\speech.dm" From f3024323e544ca4c24ea710dc2ec09b57715855b Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:56:35 -0400 Subject: [PATCH 14/16] minor mistake accidentally forgot to update this --- code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm index bf7ae7cce42c..893512f9c9a9 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm @@ -86,7 +86,7 @@ tier = TIER_2 /datum/eldritch_knowledge/spell/famished_roar - name = "T2 - Famished Roar" + name = "T3 - Famished Roar" gain_text = "Beasts all over the shop. You'll be one of them... Sooner or later... What's that smell? The sweet blood, oh, it sings to me. It's enough to make a man sick..." desc = "An AOE roar spell that freezes all nearby people with sheer terror." cost = 1 @@ -125,7 +125,7 @@ ADD_TRAIT(user, TRAIT_REDUCED_DAMAGE_SLOWDOWN, type) /datum/eldritch_knowledge/spell/eldritchbolt - name = "T3 - Eldritch Bolt" + name = "T2 - Eldritch Bolt" gain_text = "Remain wary of the frailty of men. Their wills are weak, minds young. Were it not for fear, death would go unlamented. Seek the old blood. Let us pray, let us wish... to partake in communion." desc = "A strong single target spell, shoot a target with raw energy from another dimension." cost = 1 From 19c173e9e5ffbe215549f44520953579983b9c4f Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:02:42 -0400 Subject: [PATCH 15/16] I totally updated this already there was another PR about it, how did I fuck this up so much --- code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm index 893512f9c9a9..a9906948b6c2 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/mind_lore.dm @@ -91,7 +91,7 @@ desc = "An AOE roar spell that freezes all nearby people with sheer terror." cost = 1 spell_to_add = /datum/action/cooldown/spell/aoe/immobilize/famished_roar - tier = TIER_2 + tier = TIER_3 /datum/eldritch_knowledge/mind_blade_upgrade name = "Blade Upgrade - Spine of The Infinite Beast" From b6a235c00a1de8e0e685c5b3ec786bbb44cd5b2d Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:33:41 -0400 Subject: [PATCH 16/16] Does all this first map yay --- ...lavaland_surface_cafe_of_broken_dreams.dmm | 2 +- .../lavaland_surface_syndicate_base1.dmm | 140 ++-- _maps/map_files/generic/CentCom.dmm | 636 +++++++++--------- _maps/shuttles/ferry_kilo.dmm | 16 +- 4 files changed, 417 insertions(+), 377 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm index a5eb5f15499a..2659ff90456d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm @@ -59,7 +59,7 @@ /area/ruin/powered) "aF" = ( /obj/item/reagent_containers/glass/bottle/radscrub{ - desc = "War. War never changes. But this can clean your radiation contamination problems!"; + desc = "War. War never changes. But this can clean your radiation contamination problems!" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 6b8e10afbd8c..9030ed97dc3e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -455,9 +455,9 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/cryo_cell{ + dir = 4; radio_channel = "Syndicate"; - radio_key = /obj/item/encryptionkey/syndicate; - dir = 4 + radio_key = /obj/item/encryptionkey/syndicate }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -481,6 +481,7 @@ /obj/item/pen, /obj/structure/cable, /obj/machinery/power/apc/auto_name/south{ + pixel_y = -23; req_access = list(150) }, /obj/effect/turf_decal/siding/purple, @@ -745,8 +746,8 @@ /area/ruin/powered/syndicate_lava_base/virology) "eT" = ( /obj/item/paper{ - name = "WARNING"; - info = "All explosives are to be THROWN OVER THE MOAT in order to avoid setting off the self-destruct." + info = "All explosives are to be THROWN OVER THE MOAT in order to avoid setting off the self-destruct."; + name = "WARNING" }, /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/purple{ @@ -1381,6 +1382,7 @@ /obj/effect/turf_decal/siding/blue, /obj/machinery/vending/medical/syndicate_access, /obj/machinery/power/apc/auto_name/south{ + pixel_y = -23; req_access = list(150) }, /obj/structure/cable, @@ -1417,6 +1419,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/south{ + pixel_y = -23; req_access = list(150) }, /turf/open/floor/plasteel/dark, @@ -1650,6 +1653,7 @@ /area/ruin/powered/syndicate_lava_base/main) "hJ" = ( /obj/machinery/power/apc/auto_name/east{ + pixel_x = 24; req_access = list(150) }, /obj/structure/cable{ @@ -1800,10 +1804,10 @@ dir = 10 }, /obj/machinery/button/door{ - pixel_y = -24; - req_access_txt = "150"; + id = "syndicate_lavaland_vault_windows"; name = "Vault Window Shutters"; - id = "syndicate_lavaland_vault_windows" + pixel_y = -24; + req_access_txt = "150" }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) @@ -1819,9 +1823,9 @@ desc = "While at first glance it looks like the real deal, the station number stamped on the bottom reads '12'. Huh." }, /obj/item/toy/plush/carpplushie/dehy_carp{ - name = "cayenne plushie"; + break_message = "%SRC vanishes in a small explosion."; desc = "An adorable stuffed toy that resembles Cayenne. Faintly smells of explosives."; - break_message = "%SRC vanishes in a small explosion." + name = "cayenne plushie" }, /obj/machinery/button/door{ id = "syndie_lavaland_vault"; @@ -1857,6 +1861,7 @@ dir = 6 }, /obj/machinery/power/apc/auto_name/east{ + pixel_x = 24; req_access = list(150) }, /obj/structure/cable{ @@ -1974,8 +1979,8 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "iA" = ( /obj/machinery/door/airlock/mining/glass{ - req_access_txt = "150"; - name = "Cargo Office" + name = "Cargo Office"; + req_access_txt = "150" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2015,8 +2020,8 @@ /obj/machinery/button/door{ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; - req_access_txt = "150"; - pixel_y = 26 + pixel_y = 26; + req_access_txt = "150" }, /obj/effect/turf_decal/siding/red{ dir = 1 @@ -2396,9 +2401,9 @@ light_color = "#c1caff" }, /obj/structure/statue/gold/hos{ - name = "statue of a syndicate officer"; desc = "An expensive, golden statue of a Syndicate commander. The name is worn off."; - layer = 2.89 + layer = 2.89; + name = "statue of a syndicate officer" }, /obj/structure/railing, /turf/open/floor/mineral/plastitanium, @@ -2601,8 +2606,8 @@ dir = 8 }, /obj/machinery/conveyor{ - id = "syndielavaland_disposals"; - dir = 1 + dir = 1; + id = "syndielavaland_disposals" }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) @@ -2821,6 +2826,7 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe/antiviral, /obj/machinery/power/apc/auto_name/south{ + pixel_y = -23; req_access = list(150) }, /obj/structure/cable, @@ -3325,6 +3331,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/north{ + pixel_y = 23; req_access = list(150) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -3337,15 +3344,15 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "mc" = ( /obj/item/clothing/suit/armor/vest/capcarapace/syndicate{ - name = "old syndicate vest"; - desc = "A sinister-looking gold-trimmed vest covered in dust." + desc = "A sinister-looking gold-trimmed vest covered in dust."; + name = "old syndicate vest" }, /obj/item/clothing/head/HoS/syndicate{ desc = "An old black cap that may have once been fit for a high-ranking Syndicate officer." }, /obj/item/clothing/gloves/color/captain/centcom/admiral{ - name = "syndicate commander's gloves"; - desc = "One-of-a-kind gold and black gloves used by some Syndicate officers." + desc = "One-of-a-kind gold and black gloves used by some Syndicate officers."; + name = "syndicate commander's gloves" }, /obj/structure/closet/crate/secure/gear{ req_access_txt = "150" @@ -3551,8 +3558,8 @@ /obj/item/circuitboard/machine/clonepod/experimental, /obj/item/circuitboard/machine/clonescanner, /obj/structure/closet/crate/secure/medical{ - req_access_txt = "151"; - desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years." + desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years."; + req_access_txt = "151" }, /obj/item/paper{ info = "You have been assigned to test an old cloner system provided to us by one of our research stations. Your monkeys should make excellent DNA sources. Do not clone too many crew, and be prepared to treat genetic defects and cellular damage." @@ -3851,10 +3858,10 @@ dir = 4 }, /obj/machinery/button/door{ - pixel_y = 24; - req_access_txt = "150"; + id = "lavalandsyndi_medsci"; name = "Medical Bay Shutters"; - id = "lavalandsyndi_medsci" + pixel_y = 24; + req_access_txt = "150" }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -4068,6 +4075,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/north{ + pixel_y = 23; req_access = list(150) }, /obj/effect/decal/cleanable/dirt, @@ -4122,9 +4130,9 @@ /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine{ department = "Unidentified"; + desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150); - desc = "Used to send black pages to Nanotrasen stations." + req_one_access = list(150) }, /obj/item/paper{ info = "You have been entrusted with the Nuclear Authentication Disk of Space Station 12. Keep it secure until Nanotrasen finishes repairs."; @@ -4205,9 +4213,9 @@ "qB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8; external_pressure_bound = 120; - name = "server vent"; - dir = 8 + name = "server vent" }, /turf/open/floor/circuit/red/anim{ initial_gas_mix = "n2=100;TEMP=80" @@ -4272,12 +4280,12 @@ /area/ruin/powered/syndicate_lava_base/main) "rF" = ( /obj/machinery/conveyor{ - id = "syndielavaland_disposals"; - dir = 1 + dir = 1; + id = "syndielavaland_disposals" }, /obj/machinery/door/window/brigdoor/westleft{ - req_access_txt = "150"; - name = "Disposals Conveyor" + name = "Disposals Conveyor"; + req_access_txt = "150" }, /obj/structure/sign/warning/deathsposal{ pixel_x = 32 @@ -4375,8 +4383,8 @@ /area/ruin/powered/syndicate_lava_base/medbay) "tZ" = ( /obj/machinery/door/window/brigdoor{ - req_access_txt = "150"; - name = "Isolation Pen" + name = "Isolation Pen"; + req_access_txt = "150" }, /obj/machinery/light{ dir = 1; @@ -4464,8 +4472,8 @@ /area/ruin/powered/syndicate_lava_base/main) "uT" = ( /obj/machinery/door/window/northleft{ - req_access_txt = "150"; - name = "Bar" + name = "Bar"; + req_access_txt = "150" }, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4490,8 +4498,8 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/suit_storage_unit/syndicate{ - suit_type = /obj/item/clothing/suit/space/syndicate/black/engie; - helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/engie + helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/engie; + suit_type = /obj/item/clothing/suit/space/syndicate/black/engie }, /obj/structure/sign/warning/fire{ pixel_y = 32 @@ -4621,8 +4629,8 @@ /area/ruin/powered/syndicate_lava_base/bar) "wL" = ( /obj/machinery/door/airlock/mining/glass{ - req_access_txt = "150"; - name = "Cargo Bay" + name = "Cargo Bay"; + req_access_txt = "150" }, /obj/structure/cable{ icon_state = "4-8" @@ -4767,8 +4775,8 @@ /obj/item/pizzabox/seafood, /obj/item/pizzabox/sassysage, /obj/structure/closet/crate/freezer{ - name = "pizza crate"; - desc = "Despite looking like a freezer, this crate is actually an advanced temperature-regulating crate to keep the pizza hot and ready to eat." + desc = "Despite looking like a freezer, this crate is actually an advanced temperature-regulating crate to keep the pizza hot and ready to eat."; + name = "pizza crate" }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) @@ -5009,6 +5017,7 @@ dir = 8 }, /obj/machinery/power/apc/auto_name/east{ + pixel_x = 24; req_access = list(150) }, /obj/structure/cable{ @@ -5102,8 +5111,8 @@ /area/ruin/powered/syndicate_lava_base/cargo) "DA" = ( /obj/structure/statue/resin/ashwalker{ - name = "ancient statue"; - desc = "An ancient statue, made of resin and covered in a thin coat of ash and debris. It'd probably fetch a good price with the right buyer." + desc = "An ancient statue, made of resin and covered in a thin coat of ash and debris. It'd probably fetch a good price with the right buyer."; + name = "ancient statue" }, /obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -5225,8 +5234,8 @@ /area/ruin/powered/syndicate_lava_base/bar) "Fc" = ( /obj/item/pickaxe/mini{ - pixel_y = 3; - pixel_x = 19 + pixel_x = 19; + pixel_y = 3 }, /obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -5409,8 +5418,8 @@ /area/ruin/powered/syndicate_lava_base/main) "Hi" = ( /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "150"; - name = "Telecommunications" + name = "Telecommunications"; + req_access_txt = "150" }, /obj/structure/cable{ icon_state = "4-8" @@ -5520,8 +5529,8 @@ "IC" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - req_access_txt = "150"; - name = "Vault Access" + name = "Vault Access"; + req_access_txt = "150" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5926,8 +5935,8 @@ /area/ruin/powered/syndicate_lava_base/virology) "Om" = ( /obj/machinery/door/airlock/research{ - req_access_txt = "150"; - name = "Chemistry" + name = "Chemistry"; + req_access_txt = "150" }, /obj/structure/cable{ icon_state = "4-8" @@ -6047,6 +6056,7 @@ "Qg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/north{ + pixel_y = 23; req_access = list(150) }, /obj/effect/turf_decal/siding/red{ @@ -6156,6 +6166,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/east{ + pixel_x = 24; req_access = list(150) }, /obj/structure/table/reinforced, @@ -6209,8 +6220,8 @@ /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner, /obj/machinery/conveyor{ - id = "syndielavaland_disposals"; - dir = 1 + dir = 1; + id = "syndielavaland_disposals" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6480,8 +6491,8 @@ dir = 4 }, /obj/machinery/door/window/eastright{ - req_access_txt = "150"; - name = "Kitchen" + name = "Kitchen"; + req_access_txt = "150" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -6526,6 +6537,7 @@ dir = 4 }, /obj/machinery/power/apc/auto_name/east{ + pixel_x = 24; req_access = list(150) }, /obj/structure/cable, @@ -6571,8 +6583,8 @@ /area/ruin/powered/syndicate_lava_base/main) "XA" = ( /obj/effect/decal/remains/human{ - name = "ancient remains"; - desc = "Remains covered in ash. There's a visible bullet hole in the skull." + desc = "Remains covered in ash. There's a visible bullet hole in the skull."; + name = "ancient remains" }, /turf/closed/mineral/random/high_chance/volcanic, /area/lavaland/surface/outdoors) @@ -6659,8 +6671,8 @@ dir = 8 }, /obj/structure/closet/crate/hydroponics{ - name = "janitorial crate"; - desc = "All you need to destroy dirt." + desc = "All you need to destroy dirt."; + name = "janitorial crate" }, /obj/item/soap/syndie, /obj/item/soap/syndie, @@ -6669,8 +6681,8 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/spray/cleaner, /obj/item/mop/advanced{ - name = "syndicate mop"; - desc = "A Syndicate-brand advanced mop." + desc = "A Syndicate-brand advanced mop."; + name = "syndicate mop" }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4fcca222067a..3c7d51a9d766 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -25745,6 +25745,10 @@ "dbb" = ( /turf/open/indestructible/wiki/greenscreen, /area/centcom/testchamber) +"ddv" = ( +/obj/item/flashlight/lantern, +/turf/open/indestructible/brazil/narsie, +/area/brazil) "dgc" = ( /obj/machinery/vending/snack/green, /turf/open/floor/plasteel/bluespace, @@ -25885,6 +25889,10 @@ /obj/item/kirbyplants/photosynthetic, /turf/open/floor/wood, /area/centcom/holding) +"gnr" = ( +/obj/item/flashlight/lantern, +/turf/open/indestructible/brazil/necropolis, +/area/brazil) "gxx" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -25978,6 +25986,10 @@ /obj/machinery/vending/wardrobe/sig_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"hYq" = ( +/obj/item/flashlight/lantern, +/turf/open/indestructible/brazil/lostit, +/area/brazil) "iih" = ( /obj/machinery/vending/cola/blue, /turf/open/floor/plasteel/bluespace, @@ -26333,6 +26345,10 @@ "pCa" = ( /turf/closed/indestructible/riveted, /area/centcom) +"pFv" = ( +/mob/living/simple_animal/shade, +/turf/open/indestructible/brazil/narsie, +/area/brazil) "pGs" = ( /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/plasteel/bluespace, @@ -26364,6 +26380,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/ctf) +"qct" = ( +/mob/living/simple_animal/shade, +/turf/open/indestructible/brazil/necropolis, +/area/brazil) "qhc" = ( /obj/machinery/vending/engineering, /turf/open/floor/plasteel/bluespace, @@ -26508,6 +26528,10 @@ icon_state = "info6" }, /area/centcom/testchamber) +"tIF" = ( +/mob/living/simple_animal/shade, +/turf/open/indestructible/brazil/lostit, +/area/brazil) "tLI" = ( /obj/machinery/vending/autodrobe/all_access, /turf/open/floor/plasteel/bluespace, @@ -26596,6 +26620,10 @@ }, /turf/open/floor/plasteel/dark, /area/ctf) +"vbA" = ( +/obj/item/flashlight/lantern, +/turf/open/indestructible/brazil/space, +/area/brazil) "vbC" = ( /obj/machinery/vending/games, /turf/open/floor/plasteel/bluespace, @@ -27407,7 +27435,7 @@ azH azH azH azH -aZC +pFv aZC azH azH @@ -27678,13 +27706,13 @@ azH azH azH azH -bab +hYq bab azH azH azH azH -bab +tIF azH azH azH @@ -27894,7 +27922,7 @@ azH azH azH azH -aZC +ddv aZC azH aZC @@ -28154,7 +28182,7 @@ azH azH azH azH -aZC +ddv aZC azH azH @@ -28163,7 +28191,7 @@ azH azH azH azH -aZC +pFv azH azH azH @@ -28210,7 +28238,7 @@ bab bab bab azH -bab +hYq azH bab azH @@ -28431,7 +28459,7 @@ azH azH aZC azH -aZC +ddv azH azH azH @@ -28457,6 +28485,7 @@ bab bab bab bab +hYq bab bab bab @@ -28466,8 +28495,7 @@ bab bab bab bab -bab -bab +hYq azH bab bab @@ -28675,7 +28703,7 @@ azH azH aYe azH -aZC +ddv azH aZC azH @@ -28683,7 +28711,7 @@ azH azH aYe aZC -aZC +ddv aZC azH aZC @@ -28921,9 +28949,9 @@ azH azH azH azH -aZC +ddv azH -aZC +pFv aZC azH aZC @@ -28953,7 +28981,7 @@ azH azH azH azH -azH +vbA azH bab bab @@ -28961,11 +28989,11 @@ azH azH azH bab -bab +hYq azH azH azH -bab +hYq azH bab bab @@ -28976,7 +29004,7 @@ bab bab bab bab -bab +hYq bab bab bab @@ -29202,7 +29230,7 @@ aZC azH azH azH -aZC +ddv azH azH azH @@ -29225,7 +29253,7 @@ azH bab azH bab -bab +hYq bab bab bab @@ -29495,7 +29523,7 @@ bab bab bab bab -bab +tIF bab azH azH @@ -30214,7 +30242,7 @@ azH azH azH aZC -aZC +ddv aZC azH azH @@ -30229,7 +30257,7 @@ azH azH aZC azH -aZC +ddv azH azH azH @@ -30253,7 +30281,7 @@ azH azH bab bab -bab +hYq bab bab bab @@ -30467,7 +30495,7 @@ azH aZC azH azH -aZC +ddv azH azH aZC @@ -30755,7 +30783,7 @@ aZC azH aYe azH -aZC +ddv aZC azH azH @@ -30978,6 +31006,7 @@ azH azH azH azH +ddv aZC aZC aZC @@ -30995,10 +31024,9 @@ aZC aZC aZC aZC +pFv aZC -aZC -aZC -aZC +ddv azH aZC azH @@ -31238,7 +31266,7 @@ azH azH aZC aZC -aZC +ddv aZC aZC aZC @@ -31260,7 +31288,7 @@ azH azH aZC aZC -aZC +ddv aZC aZC aZC @@ -31268,7 +31296,7 @@ azH azH azH azH -bab +hYq bab azH aZC @@ -31277,8 +31305,6 @@ azH azH azH azH -azH -azH bab bab bab @@ -31295,6 +31321,8 @@ bab bab bab bab +hYq +bab azH azH azH @@ -31532,18 +31560,18 @@ aZC azH bab bab -azH -azH -azH bab bab bab +tIF bab bab bab bab bab bab +hYq +bab bab bab bab @@ -31782,18 +31810,15 @@ azH azH azH azH -azH +bab azH azH azH azH azH bab -azH bab bab -azH -azH bab bab bab @@ -31808,6 +31833,9 @@ bab bab bab bab +hYq +bab +bab bab azH azH @@ -32040,17 +32068,17 @@ azH azH aZC aZC -azH -azH -azH +bab +bab +bab azH aZC -azH -azH -azH bab -azH -azH +bab +bab +bab +bab +bab bab bab bab @@ -32262,15 +32290,17 @@ azH azH azH azH -aZC +ddv azH azH aZC aZC aZC aZC +ddv aZC aZC +ddv aZC aZC aZC @@ -32279,16 +32309,14 @@ aZC aZC aZC aZC -aZC -aZC -aZC +ddv aZC aZC azH aZC azH azH -aZC +ddv azH azH azH @@ -32298,17 +32326,17 @@ azH aZC aZC aZC -azH -azH -azH +bab +bab +bab aZC +bab aZC -azH -azH -azH -azH -azH -azH +bab +bab +bab +bab +bab bab bab bab @@ -32555,14 +32583,15 @@ azH aZC azH aZC -azH -azH -azH -azH -azH -azH bab azH +bab +bab +bab +bab +bab +bab +bab azH azH azH @@ -32570,8 +32599,7 @@ azH azH azH azH -azH -bab +hYq azH azH azH @@ -32800,7 +32828,7 @@ aZC azH azH aZC -aZC +ddv bac azH azH @@ -32812,15 +32840,15 @@ azH aYe azH aZC -azH -azH +bab +bab aZC +bab azH -azH -aYe -azH -azH -azH +bae +bab +bab +bab azH azH azH @@ -33032,7 +33060,7 @@ azH azH azH azH -aZC +ddv azH azH azH @@ -33065,17 +33093,17 @@ azH azH azH azH -azH -azH -azH -azH -azH -azH +aZC +aZC aZC azH azH -azH -azH +bab +aZC +bab +bab +bab +bab azH bab bab @@ -33292,11 +33320,12 @@ azH azH azH azH -aZC +ddv aZC azH aZC aZC +ddv aZC aZC aZC @@ -33307,30 +33336,29 @@ aZC aZC aZC aZC +ddv aZC aZC aZC aZC aZC -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -azH aZC -azH -azH +aZC +aZC +aZC +aZC +aZC +aZC +aZC +aZC +aZC +aZC +aZC +bab +bab +aZC +bab +bab azH azH azH @@ -33340,16 +33368,16 @@ azH azH azH azH -bab +hYq azH azH azH azH +hYq bab bab bab -bab -bab +hYq azH azH azH @@ -33573,24 +33601,24 @@ aZC aZC aZC aZC -azH -azH -azH -azH aZC -azH -azH -azH aZC aZC -azH -azH -azH -azH +aZC +aZC +aZC +aZC +aZC +aZC +aZC bab bab bab azH +bab +bab +aZC +azH azH azH azH @@ -33826,26 +33854,26 @@ aZC aZC aZC aZC -azH -azH -azH -azH -azH -azH -azH -azH aZC aZC -azH -azH -azH aZC aZC +aZC +aZC +aZC +aZC +aZC +aZC +aZC +baa +aZC +aZC +aZC +aZC +bab azH -azH -azH -azH -azH +baa +bab azH azH azH @@ -34092,16 +34120,16 @@ azH azH azH azH +baa +baa +baa +aZC +aZC +aZC +bab +baa azH -azH -azH -azH -azH -azH -azH -azH -azH -azH +baa baa azH bab @@ -34316,7 +34344,7 @@ azH azH azH azH -aZC +pFv azH aZC azH @@ -34326,46 +34354,46 @@ azH aZC aZC aZC +ddv aZC aZC aZC aZC aZC aZC +pFv aZC aZC aZC aZC -aZC -aZC -aZC +ddv aZC aZC azH aZC azH aZC -aZC -azH -azH -azH +ddv azH azH azH azH azH +baa azH -bab -azH +aZC azH +aZC azH +baa +baa azH azH azH azH azH bab -bab +hYq azH azH azH @@ -34577,7 +34605,7 @@ aZC azH aZC azH -aZC +ddv aZC azH azH @@ -34610,11 +34638,12 @@ azH azH azH azH -azH -azH -azH -azH +bab +bab +baa +aZC aZC +baa azH azH azH @@ -34625,8 +34654,7 @@ azH azH azH azH -azH -baa +gnr azH azH azH @@ -34843,7 +34871,7 @@ aZC azH bac azH -aZC +ddv azH aZC aZC @@ -34868,11 +34896,11 @@ aZC aYe azH azH -azH -azH -azH -aZC -azH +bab +baa +baa +baa +baa aYe azH azH @@ -34892,7 +34920,7 @@ azH aYe azH azH -bab +tIF bab azH azH @@ -35088,7 +35116,7 @@ azH azH azH azH -aZC +ddv azH azH azH @@ -35120,16 +35148,16 @@ azH aZC azH azH -aZC +ddv aZC azH azH azH -azH -azH -azH -azH -azH +bab +baa +aZC +baa +baa azH azH azH @@ -35349,12 +35377,12 @@ azH azH azH azH -aZC +ddv azH azH aZC azH -aZC +ddv aZC aZC aZC @@ -35365,13 +35393,13 @@ azH azH azH aZC -aZC +ddv azH azH aZC aZC aZC -aZC +ddv azH azH aZC @@ -35379,14 +35407,14 @@ azH azH aZC azH -azH -azH -azH -aZC -azH -azH -azH -azH +baa +baa +baa +baa +baa +baa +baa +baa azH azH azH @@ -35638,13 +35666,13 @@ azH azH azH azH -azH +baa aZC -azH -azH -azH -azH -azH +baa +baa +baa +baa +baa azH baa azH @@ -35898,17 +35926,17 @@ azH azH aZC azH +baa +baa +baa +baa +baa azH azH azH -azH -azH -azH -azH -azH -baa -baa +qct baa +gnr azH azH azH @@ -36139,7 +36167,7 @@ azH aZC aZC azH -aZC +ddv azH azH aZC @@ -36157,10 +36185,10 @@ azH azH azH aZC -azH -azH -azH -azH +baa +baa +baa +baa baa azH azH @@ -36375,16 +36403,16 @@ azH azH azH azH -aZC +ddv aZC aZC aZC azH azH azH -aZC -azH +ddv azH +vbA aZC azH azH @@ -36408,15 +36436,15 @@ azH azH azH azH -azH +vbA azH azH azH azH aZC aZC -azH -azH +baa +baa baa baa azH @@ -36425,7 +36453,7 @@ azH azH azH azH -baa +gnr azH azH azH @@ -36633,7 +36661,7 @@ azH azH azH azH -aZC +ddv azH aZC aZC @@ -36646,7 +36674,7 @@ azH aZC aZC aZC -aZC +ddv aZC aZC aZC @@ -36669,13 +36697,13 @@ azH azH azH azH -azH -azH -azH -azH -azH -azH -azH +baa +baa +baa +baa +baa +qct +baa baa azH azH @@ -36930,8 +36958,8 @@ azH azH azH aYe -azH -azH +baa +baa baa baa azH @@ -37155,7 +37183,7 @@ aZC aZC azH azH -azH +vbA azH azH azH @@ -37190,11 +37218,11 @@ baa azH azH baa +baa +baa azH azH -azH -azH -baa +gnr azH azH azH @@ -37420,21 +37448,21 @@ azH azH azH azH -aZC +ddv aZC azH azH azH azH azH -aZC +ddv azH azH azH azH azH azH -aZC +ddv aZC azH azH @@ -37445,19 +37473,19 @@ aZC azH azH azH -azH -azH -azH -azH -azH +baa baa baa azH azH +baa +baa azH azH azH azH +baa +baa azH azH azH @@ -37660,7 +37688,7 @@ azH azH azH azH -aZC +ddv azH azH azH @@ -37704,8 +37732,8 @@ azH azH azH azH -azH -azH +baa +baa azH azH azH @@ -37960,9 +37988,9 @@ azH azH azH baa -azH -azH -azH +baa +baa +baa azH azH baa @@ -38218,9 +38246,9 @@ azH azH baa azH -azH -azH -azH +baa +baa +baa azH azH azH @@ -38234,7 +38262,7 @@ baa baa azH azH -azH +baa azH azH azH @@ -38476,8 +38504,8 @@ azH baa azH azH -azH -azH +baa +baa azH azH baa @@ -38687,7 +38715,7 @@ azH azH azH azH -aZC +ddv azH azH azH @@ -38717,29 +38745,28 @@ azH azH azH azH -aZC +pFv azH azH aZC -aZC +ddv azH azH azH azH aZC azH -baa +gnr azH baa azH -azH -baa baa baa baa baa baa baa +gnr baa baa baa @@ -38748,6 +38775,7 @@ baa baa baa baa +gnr baa azH azH @@ -38953,13 +38981,13 @@ azH azH azH azH -aZC +ddv aZC azH azH azH aZC -aZC +ddv azH azH azH @@ -38973,8 +39001,8 @@ azH azH azH azH -azH -aZC +vbA +ddv azH azH aZC @@ -39212,7 +39240,7 @@ azH azH aYe azH -aZC +ddv azH azH azH @@ -39220,7 +39248,7 @@ azH azH aYe azH -aZC +ddv azH azH azH @@ -39249,7 +39277,7 @@ azH azH baa baa -baa +qct baf baa baa @@ -39459,8 +39487,8 @@ azH azH azH azH -aZC -aZC +ddv +ddv azH azH azH @@ -39519,7 +39547,7 @@ baa baa baa baa -baa +qct azH azH azH @@ -39756,12 +39784,13 @@ azH aZC azH azH -baa +gnr azH azH baa baa baa +gnr baa baa baa @@ -39769,8 +39798,7 @@ baa baa baa baa -baa -baa +gnr baa baa baa @@ -39982,12 +40010,12 @@ azH azH azH azH -aZC +ddv azH azH aZC -aZC -aZC +pFv +ddv azH azH azH @@ -40493,6 +40521,7 @@ azH azH aZC azH +vbA azH azH azH @@ -40500,8 +40529,7 @@ azH azH azH azH -azH -azH +vbA azH azH azH @@ -40745,7 +40773,7 @@ azH azH azH azH -azH +vbA azH azH aZC @@ -40775,11 +40803,11 @@ azH azH azH aZC -aZC +pFv azH azH azH -baa +gnr azH azH azH @@ -40791,6 +40819,7 @@ azH azH baa baa +gnr baa baa baa @@ -40800,8 +40829,7 @@ baa baa baa baa -baa -baa +gnr baa baa azH @@ -41026,7 +41054,7 @@ aZC azH azH aZC -aZC +ddv azH azH azH @@ -41040,7 +41068,7 @@ azH azH azH azH -baa +gnr azH azH azH @@ -41514,6 +41542,7 @@ azH azH azH azH +vbA azH azH azH @@ -41525,8 +41554,7 @@ azH azH azH azH -azH -aZC +ddv azH azH azH @@ -41568,7 +41596,7 @@ baa baa baa baa -baa +qct baa baa baa @@ -41802,7 +41830,7 @@ azH azH azH azH -azH +vbA azH azH azH @@ -41821,7 +41849,7 @@ baa baa baa baa -baa +gnr baa baa baa @@ -42031,6 +42059,7 @@ azH azH azH azH +vbA azH azH azH @@ -42054,6 +42083,7 @@ azH azH azH azH +vbA azH azH azH @@ -42072,9 +42102,6 @@ azH azH azH azH -azH -azH -baa baa baa baa @@ -42089,6 +42116,7 @@ baa baa baa baa +gnr azH azH azH @@ -42292,7 +42320,7 @@ azH azH azH azH -azH +vbA azH azH azH @@ -42541,6 +42569,7 @@ azH azH azH azH +vbA azH azH azH @@ -42559,8 +42588,7 @@ azH azH azH azH -azH -azH +vbA azH azH azH @@ -42583,7 +42611,7 @@ azH azH azH baa -baa +gnr azH azH azH @@ -42811,7 +42839,7 @@ azH azH azH azH -azH +vbA azH azH azH @@ -43059,7 +43087,7 @@ azH azH aYe azH -azH +vbA azH azH azH @@ -43091,7 +43119,7 @@ azH azH aYe azH -azH +vbA azH azH azH @@ -43104,10 +43132,10 @@ azH azH azH baa -baa +gnr baf baa -baa +gnr baa baa baa @@ -43312,6 +43340,7 @@ azH azH azH azH +vbA azH azH azH @@ -43334,8 +43363,7 @@ azH azH azH azH -azH -azH +vbA azH azH azH @@ -43596,7 +43624,7 @@ azH azH azH azH -azH +vbA azH azH azH @@ -43834,6 +43862,7 @@ azH azH azH azH +vbA azH azH azH @@ -43841,6 +43870,7 @@ azH azH azH azH +vbA azH azH azH @@ -43864,10 +43894,8 @@ azH azH azH azH -azH -azH -azH -baa +vbA +gnr azH azH azH diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry_kilo.dmm index 708cf5696d59..e7e9b2665153 100644 --- a/_maps/shuttles/ferry_kilo.dmm +++ b/_maps/shuttles/ferry_kilo.dmm @@ -32,8 +32,8 @@ /area/shuttle/transport) "h" = ( /obj/structure/shuttle/engine/propulsion/left{ - icon_state = "propulsion_l"; - dir = 8 + dir = 8; + icon_state = "propulsion_l" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -44,8 +44,8 @@ /obj/structure/window/shuttle, /obj/structure/grille, /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 8 + dir = 8; + icon_state = "heater" }, /turf/open/floor/plating, /area/shuttle/transport) @@ -99,8 +99,8 @@ /area/shuttle/transport) "p" = ( /obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 8 + dir = 8; + icon_state = "propulsion" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -170,8 +170,8 @@ /area/shuttle/transport) "u" = ( /obj/structure/shuttle/engine/propulsion/right{ - icon_state = "propulsion_r"; - dir = 8 + dir = 8; + icon_state = "propulsion_r" }, /obj/effect/turf_decal/stripes/line{ dir = 8