diff --git a/aurorastation.dme b/aurorastation.dme index 342d9ece4ee..1142acaf889 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3150,6 +3150,7 @@ #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" #include "code\modules\power\gravitygenerator.dm" +#include "code\modules\power\outlet.dm" #include "code\modules\power\portgen.dm" #include "code\modules\power\power.dm" #include "code\modules\power\power_usage.dm" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 081648ba9f6..7931c28da42 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -169,7 +169,7 @@ can_label = 0 /obj/machinery/portable_atmospherics/canister/air/airlock - start_pressure = 3 * ONE_ATMOSPHERE + start_pressure = 6 * ONE_ATMOSPHERE /obj/machinery/portable_atmospherics/canister/empty start_pressure = 0 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index eb6ee65bebc..d579c7d5810 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -583,6 +583,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) icon_off = "pipeoff" w_class = WEIGHT_CLASS_TINY chem_volume = 30 + burn_rate = 0.003 matchmes = SPAN_NOTICE("USER lights their NAME with their FLAME.") lightermes = SPAN_NOTICE("USER manages to light their NAME with FLAME.") zippomes = SPAN_NOTICE("With much care, USER lights their NAME with their FLAME.") diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 902879659b5..10c907f88fc 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -1,5 +1,6 @@ /obj/random/belt name = "random belt" + icon_state = "toolbelt" problist = list( /obj/item/storage/belt/utility = 1, /obj/item/storage/belt/medical = 0.4, @@ -14,6 +15,7 @@ // Novelty and rare backpacks have lower weights. /obj/random/backpack name = "random backpack" + icon_state = "backpack" problist = list( /obj/item/storage/backpack = 3, /obj/item/storage/backpack/cultpack = 2, @@ -63,8 +65,7 @@ /obj/random/colored_jumpsuit name = "random colored jumpsuit" desc = "This is a random colored jumpsuit." - icon = 'icons/obj/clothing/uniforms.dmi' - icon_state = "black" + icon_state = "uniform" spawnlist = list( /obj/item/clothing/under/color/black, /obj/item/clothing/under/color/blue, @@ -91,8 +92,7 @@ /obj/random/suit name = "random suit" desc = "This is a random suit." - icon = 'icons/obj/clothing/uniforms.dmi' - icon_state = "checkered_suit" + icon_state = "uniform" spawnlist = list( /obj/item/clothing/under/suit_jacket/charcoal, /obj/item/clothing/under/suit_jacket/navy, @@ -109,8 +109,7 @@ /obj/random/chameleon name = "random possible chameleon item" desc = "A random possible chameleon item. What could possibly go wrong?" - icon = 'icons/obj/clothing/gloves.dmi' - icon_state = "yellow" + icon_state = "uniform" problist = list( /obj/item/clothing/gloves/chameleon = 1, @@ -143,8 +142,7 @@ /obj/random/gloves name = "random gloves" desc = "Random gloves, assorted usefulness." - icon = 'icons/obj/clothing/gloves.dmi' - icon_state = "yellow" + icon_state = "gloves" problist = list( /obj/item/clothing/gloves/black = 1, /obj/item/clothing/gloves/black_leather = 0.5, @@ -162,7 +160,6 @@ /obj/random/watches name = "random watches" desc = "Random watches, probably able to tell the time." - icon = 'icons/obj/clothing/gloves.dmi' icon_state = "watch" problist = list( /obj/item/clothing/wrists/watch = 1, @@ -174,8 +171,7 @@ /obj/random/hoodie name = "random winter coat" desc = "This is a random winter coat." - icon = 'icons/obj/clothing/hoodies.dmi' - icon_state = "coatwinter" + icon_state = "wintercoat" problist = list( /obj/item/clothing/suit/storage/hooded/wintercoat = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3, @@ -192,7 +188,6 @@ /obj/random/bandana name = "random bandana" desc = "This is a random bandana." - icon = 'icons/obj/clothing/hats/bandanas.dmi' icon_state = "bandana" problist = list( /obj/item/clothing/head/bandana/colorable/random = 5, @@ -210,7 +205,6 @@ /obj/random/softcap name = "random softcap" desc = "This is a random softcap." - icon = 'icons/obj/clothing/hats/soft_caps.dmi' icon_state = "softcap" problist = list( /obj/item/clothing/head/softcap/colorable/random = 5, @@ -228,7 +222,6 @@ /obj/random/beret name = "random beret" desc = "This is a random beret." - icon = 'icons/obj/clothing/hats/berets.dmi' icon_state = "beret" problist = list( /obj/item/clothing/head/beret/colorable/random = 5, @@ -247,8 +240,7 @@ /obj/random/hardhat name = "random hardhat" desc = "This is a random hardhat." - icon = 'icons/obj/clothing/hats/hardhats.dmi' - icon_state = "hardhat_yellow" + icon_state = "hardhat" problist = list( /obj/item/clothing/head/hardhat = 1, /obj/item/clothing/head/hardhat/orange = 1, @@ -264,8 +256,7 @@ /obj/random/wizard_dressup name = "random wizard clothes" desc = "This is a random piece of fake wizard clothing." - icon = 'icons/obj/wizard.dmi' - icon_state = "staff" + icon_state = "wizardstaff" has_postspawn = TRUE /obj/random/wizard_dressup/spawn_item() diff --git a/code/game/objects/random/food.dm b/code/game/objects/random/food.dm index ff9f8d247d0..3068aba02e2 100644 --- a/code/game/objects/random/food.dm +++ b/code/game/objects/random/food.dm @@ -1,8 +1,7 @@ /obj/random/mre name = "random MRE" desc = "This is a random single MRE." - icon = 'icons/obj/storage/fancy/mre.dmi' - icon_state = "mre" + icon_state = "mre_bag" spawnlist = list( /obj/item/storage/box/fancy/mre, /obj/item/storage/box/fancy/mre/menu2, @@ -19,7 +18,7 @@ /obj/random/mre/main name = "random MRE main course" desc = "This is a random main course for MREs." - icon_state = "pouch_medium" + icon_state = "mre_meal" spawnlist = list( /obj/item/storage/box/fancy/mrebag, /obj/item/storage/box/fancy/mrebag/menu2, @@ -34,7 +33,7 @@ /obj/random/mre/dessert name = "random MRE dessert" desc = "This is a random dessert for MREs." - icon_state = "pouch_medium" + icon_state = "mre_desert" spawnlist = list( /obj/item/reagent_containers/food/snacks/candy, /obj/item/reagent_containers/food/snacks/cb01, @@ -93,7 +92,7 @@ /obj/random/mre/spread name = "random MRE spread" desc = "This is a random spread packet for MREs." - icon_state = "packet_small" + icon_state = "packet_medium" spawnlist = list( /obj/item/reagent_containers/food/condiment/small/packet/jelly, /obj/item/reagent_containers/food/condiment/small/packet/honey @@ -107,7 +106,7 @@ /obj/random/mre/sauce name = "random MRE sauce" desc = "This is a random sauce packet for MREs." - icon_state = "packet_small" + icon_state = "packet_medium" spawnlist = list( /obj/item/reagent_containers/food/condiment/small/packet/salt, /obj/item/reagent_containers/food/condiment/small/packet/pepper, @@ -152,7 +151,6 @@ /obj/random/booze name = "random alcohol bottle" desc = "This is a random alcohol bottle." - icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" spawnlist = list( /obj/item/reagent_containers/food/drinks/bottle/gin, @@ -190,8 +188,7 @@ /obj/random/keg name = "random alcohol keg" desc = "Contains a random alcohol keg." - icon = 'icons/obj/reagent_dispensers.dmi' - icon_state = "beertankTEMP" + icon_state = "keg" spawnlist = list( /obj/structure/reagent_dispensers/keg/beerkeg = 2, /obj/structure/reagent_dispensers/keg/beerkeg/rice = 0.5, @@ -203,8 +200,7 @@ /obj/random/pizzabox name = "random pizzabox" desc = "Contains a random pizzabox." - icon = 'icons/obj/storage/fancy/pizzabox.dmi' - icon_state = "pizzabox1" + icon_state = "pizzabox" spawnlist = list( /obj/item/pizzabox/margherita, /obj/item/pizzabox/vegetable, diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index cc90c748a40..296d07478a7 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -1,8 +1,7 @@ /obj/random/loot name = "random maintenance loot" desc = "Stuff for the maint-dwellers." - icon = 'icons/holidays/christmas/presents.dmi' - icon_state = "gift1" + icon_state = "gasmask" problist = list( /obj/item/bluespace_crystal/artificial = 0.1, /obj/item/bodybag = 0.7, @@ -169,8 +168,7 @@ /obj/random/highvalue name = "random high value item" desc = "This is a random high value item." - icon = 'icons/obj/coins.dmi' - icon_state = "coin_diamond_heads" + icon_state = "coin" problist = list( /obj/random/telecrystals = 0.1, /obj/item/gun/projectile/automatic/rifle/shotgun = 0.1, @@ -229,8 +227,7 @@ /obj/random/highvalue/safe name = "random corporate safe high value item" desc = "This is a random corporate safe high value item." - icon = 'icons/obj/coins.dmi' - icon_state = "coin_diamond_heads" + icon_state = "coin" problist = list( /obj/item/device/personal_shield = 0.4, /obj/random/safe_rig = 0.4, @@ -247,8 +244,7 @@ /obj/random/custom_ka name = "random custom kinetic accelerator" desc = "Contains random assemblies. The parts may not always be compatible with eachother." - icon = 'icons/obj/kinetic_accelerators.dmi' - icon_state = "frame01" + icon_state = "kinetic" spawnlist = list( /obj/item/toy/mech/honk ) @@ -298,8 +294,7 @@ /obj/random/prebuilt_ka name = "random prebuilt kinetic accelerator" desc = "Contains working kinetic accelerators that were prebuilt in code." - icon = 'icons/obj/kinetic_accelerators.dmi' - icon_state = "frameA" + icon_state = "kinetic" spawnlist = list( /obj/item/gun/custom_ka/frame01/prebuilt = 2.5, /obj/item/gun/custom_ka/frame02/prebuilt = 5, @@ -317,8 +312,7 @@ /obj/random/telecrystals name = "random telecrystals" desc = "Contains a random amount of telecrystals." - icon = 'icons/obj/telescience.dmi' - icon_state = "telecrystal" + icon_state = "crystal" spawnlist = list( /obj/item/stack/telecrystal{amount = 10} = 0.5, /obj/item/stack/telecrystal{amount = 15} = 0.4, @@ -329,8 +323,7 @@ /obj/random/contraband name = "random contraband" desc = "This is some random contraband." - icon = 'icons/obj/cosmetics.dmi' - icon_state = "purplecomb" + icon_state = "knife" problist = list( /obj/item/storage/pill_bottle/mortaphenyl = 3, /obj/item/storage/pill_bottle/happy = 2, @@ -369,8 +362,7 @@ /obj/random/coin name = "random coin" desc = "This is a random coin." - icon = 'icons/obj/coins.dmi' - icon_state = "coin__heads" + icon_state = "coin" problist = list( /obj/item/coin/iron = 5, /obj/item/coin/silver = 3, @@ -384,8 +376,7 @@ /obj/random/spacecash name = "random credit chips" desc = "This is a random credit chip." - icon = 'icons/obj/cash.dmi' - icon_state = "spacecash1" + icon_state = "cash" problist = list( /obj/item/spacecash/c1 = 6, /obj/item/spacecash/c10 = 3, @@ -399,6 +390,7 @@ /obj/random/finances name = "random valued item" desc = "Contains raw valued items like phoron, gold, and money." + icon_state = "valuable" spawnlist = list( /obj/item/spacecash/bundle{worth = 5000} = 0.25, /obj/item/spacecash/bundle{worth = 10000} = 0.5, @@ -414,6 +406,7 @@ /obj/random/barricade_materials name = "random barricade materials" + icon_state = "barricade" spawnlist = list( /obj/item/stack/material/steel = 0.75, /obj/item/stack/material/plasteel = 0.25, @@ -428,6 +421,7 @@ /obj/random/barbed_wire name = "barbed wire" + icon_state = "barbed_wire" spawnlist = list( /obj/item/stack/barbed_wire = 1 ) @@ -440,6 +434,7 @@ /obj/random/tool_konyang name = "tool" + icon_state = "tool" spawnlist = list( /obj/item/screwdriver = 1, /obj/item/crowbar = 1, @@ -451,6 +446,7 @@ /obj/random/survival_weapon name = "survival weapon" + icon_state = "melee" problist = list( /obj/item/crowbar = 1, /obj/item/shovel = 1, @@ -472,6 +468,7 @@ /obj/random/high_grade_weapon name = "high grade weapon" + icon_state = "melee" problist = list( /obj/item/material/sword/axe = 0.5, /obj/item/material/sword/longsword = 0.25, @@ -484,6 +481,7 @@ /obj/random/light name = "random light" + icon_state = "flashlight" problist = list( /obj/item/device/flashlight = 1, /obj/item/device/flashlight/flare = 2, @@ -497,6 +495,7 @@ /obj/random/med_stack name = "medical supplies" + icon_state = "med" problist = list( /obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, @@ -512,6 +511,7 @@ /obj/random/splints name = "splints" + icon_state = "med" problist = list( /obj/item/stack/medical/splint = 1 ) @@ -523,6 +523,7 @@ M.update_icon() /obj/random/gun_with_ammo + icon_state = "blast_carbine" has_postspawn = TRUE /obj/random/gun_with_ammo/post_spawn(obj/thing) @@ -575,6 +576,7 @@ /obj/random/shotgun name = "shotgun" + icon_state = "shotgun" problist = list( /obj/item/gun/projectile/shotgun/foldable = 1, /obj/item/gun/projectile/shotgun/doublebarrel = 1, @@ -596,6 +598,7 @@ /obj/random/semiautos name = "semiautos" + icon_state = "shotgun" problist = list( /obj/item/gun/projectile/shotgun/pump/rifle/scope = 0.05, /obj/item/gun/projectile/shotgun/pump/rifle/obrez = 1, @@ -612,6 +615,7 @@ /obj/random/barricade_kit name = "barricade kits" + icon_state = "barricade" problist = list( /obj/item/stack/barricade/random = 1, /obj/item/stack/barricade/wood/random = 0.5, diff --git a/code/game/objects/random/medical.dm b/code/game/objects/random/medical.dm index 4d6c06ef506..4ea548abc5d 100644 --- a/code/game/objects/random/medical.dm +++ b/code/game/objects/random/medical.dm @@ -1,8 +1,7 @@ /obj/random/medical name = "random medical item" desc = "This is a random medical item." - icon = 'icons/obj/item/stacks/medical.dmi' - icon_state = "brutepack" + icon_state = "medpack" spawn_nothing_percentage = 25 problist = list( /obj/item/stack/medical/bruise_pack = 4, @@ -36,7 +35,6 @@ /obj/random/firstaid name = "random first aid kit" desc = "This is a random first aid kit." - icon = 'icons/obj/storage/firstaid.dmi' icon_state = "firstaid" problist = list( /obj/item/storage/firstaid/regular = 4, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 2448f5d7171..deae873ef64 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1,8 +1,7 @@ /obj/random/smokable name = "random smokable" desc = "This is a random smoking item." - icon = 'icons/obj/cigs_lighters.dmi' - icon_state = "cigpacket" + icon_state = "cigarettes" problist = list( /obj/item/storage/box/fancy/cigarettes = 30, /obj/item/storage/box/fancy/cigarettes/blank = 5, @@ -21,8 +20,7 @@ /obj/random/action_figure name = "random action figure" desc = "This is a random action figure." - icon = 'icons/obj/toy.dmi' - icon_state = "assistant" + icon_state = "toy" spawnlist = list( /obj/item/toy/figure/cmo, /obj/item/toy/figure/assistant, @@ -67,8 +65,7 @@ /obj/random/plushie name = "random plushie" desc = "This is a random plushie." - icon = 'icons/obj/toy.dmi' - icon_state = "nymphplushie" + icon_state = "plushie" spawnlist = list( /obj/item/toy/plushie/ian, /obj/item/toy/plushie/drone, @@ -91,8 +88,7 @@ /obj/random/balloon name = "random balloon" desc = "This is a random balloon." - icon = 'icons/obj/toy.dmi' - icon_state = "balloon" + icon_state = "bloon" spawnlist = list( /obj/item/toy/balloon/color = 7, /obj/item/toy/balloon/latex = 1, @@ -112,8 +108,7 @@ /obj/random/desktoy name = "random desk toy" desc = "This is a random desk toy." - icon = 'icons/obj/toy.dmi' - icon_state = "dippybird" + icon_state = "desktoy" spawnlist = list( /obj/item/toy/desk/newtoncradle, /obj/item/toy/desk/fan, @@ -124,7 +119,6 @@ /obj/random/lavalamp name = "random lava lamp" desc = "This is a random lava lamp." - icon = 'icons/obj/lighting.dmi' icon_state = "lavalamp" spawnlist = list( /obj/item/device/flashlight/lamp/lava, @@ -141,7 +135,6 @@ /obj/random/glowstick name = "random glowstick" desc = "This is a random glowstick." - icon = 'icons/obj/lighting.dmi' icon_state = "glowstick" spawnlist = list( /obj/item/device/flashlight/flare/glowstick, @@ -154,8 +147,7 @@ /obj/random/arcade name = "random arcade loot" desc = "Arcade loot!" - icon = 'icons/obj/items.dmi' - icon_state = "gift3" + icon_state = "toy" spawnlist = list( /obj/item/storage/box/snappops = 11, /obj/item/clothing/under/syndicate/tacticool = 5, @@ -204,8 +196,7 @@ /obj/random/arcade/orion name = "random arcade loot for orion trails" desc = "Arcade loot for orion trails aracde machine!" - icon = 'icons/obj/items.dmi' - icon_state = "gift3" + icon_state = "toy" spawnlist = list( /obj/item/clothing/under/syndicate/tacticool = 7, /obj/item/toy/sword = 22, @@ -232,8 +223,7 @@ /obj/random/animal_crate name = "random animal" desc = "Contains a random crate with an animal." - icon = 'icons/obj/structures.dmi' - icon_state = "densecrate" + icon_state = "woodcrate" spawnlist = list( /obj/structure/largecrate/animal/corgi = 3, /obj/structure/largecrate/animal/cow = 4, @@ -254,8 +244,7 @@ /obj/random/random_flag name = "random flag" desc = "Contains a random boxed flag or banner." - icon = 'icons/obj/decals.dmi' - icon_state = "flag_boxed" + icon_state = "flagbox" spawnlist = list( /obj/item/flag/biesel, /obj/item/flag/biesel/l, @@ -292,8 +281,7 @@ /obj/random/gift name = "random gift" desc = "Contains a randomly sized gift." - icon = 'icons/holidays/christmas/presents.dmi' - icon_state = "gift1" + icon_state = "present" spawnlist = list( /obj/item/xmasgift = 0.5, /obj/item/xmasgift/medium = 0.3, @@ -303,7 +291,6 @@ /obj/random/junk name = "random trash" desc = "This is toss." - icon = 'icons/obj/random.dmi' icon_state = "junk" spawn_nothing_percentage = 5 problist = list( @@ -375,6 +362,7 @@ /obj/random/vendor name = "random vendor" + icon_state = "vendor" var/depleted = FALSE var/scan_id = TRUE // Should the spawned vendor check IDs problist = list( @@ -427,6 +415,7 @@ /obj/random/smalltank name = "random small tank" + icon_state = "airtank" /obj/random/smalltank/item_to_spawn() if (prob(40)) @@ -439,8 +428,7 @@ /obj/random/pottedplant name = "random potted plant, big" desc = "Spawns a random potted plant." - icon = 'icons/obj/pottedplants_big.dmi' - icon_state = "plant-26" + icon_state = "potted_plant_big" spawn_nothing_percentage = 1 /obj/random/pottedplant/spawn_item() @@ -463,8 +451,7 @@ /obj/random/pottedplant_small name = "random potted plant, small" desc = "Spawns a random potted plant." - icon = 'icons/obj/pottedplants_small.dmi' - icon_state = "plant-01" + icon_state = "potted_plant_small" spawn_nothing_percentage = 1 /obj/random/pottedplant_small/spawn_item() @@ -485,6 +472,7 @@ /obj/random/syrup name = "random syrup" desc = "Contains random bottles of flavored syrup." + icon_state = "syrup" problist = list( /obj/item/reagent_containers/food/condiment/syrup_chocolate = 2, /obj/item/reagent_containers/food/condiment/syrup_strawberry = 1, @@ -502,6 +490,7 @@ /obj/random/condiment name = "random condiments and sauces" desc = "Contains random condiments for use in the kitchen." + icon_state = "condiment" spawn_nothing_percentage = 10 problist = list( /obj/item/reagent_containers/food/condiment/ketchup = 2, @@ -521,6 +510,7 @@ /obj/random/kitchen_staples name = "random kitchen staples" desc = "Contains random ingredients that are handy in the kitchen" + icon_state = "ingredient_bag" spawn_nothing_percentage = 20 problist = list( /obj/item/reagent_containers/food/condiment/gelatin = 1, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 2216b37f3f0..a7bfb72ff94 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1,8 +1,8 @@ /obj/random name = "random object" desc = "This item type is used to spawn random objects at round-start" - icon = 'icons/misc/mark.dmi' - icon_state = "rup" + icon = 'icons/obj/random.dmi' + icon_state = "need-sprite" var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything var/list/spawnlist var/list/problist diff --git a/code/game/objects/random/tech.dm b/code/game/objects/random/tech.dm index 6db7875c047..236102d06d6 100644 --- a/code/game/objects/random/tech.dm +++ b/code/game/objects/random/tech.dm @@ -1,7 +1,6 @@ /obj/random/tool name = "random tool" desc = "This is a random tool" - icon = 'icons/obj/random.dmi' icon_state = "tool" spawnlist = list( /obj/item/screwdriver, @@ -27,7 +26,6 @@ /obj/random/powercell name = "random powercell" desc = "This is a random powercell." - icon = 'icons/obj/random.dmi' icon_state = "cell" problist = list( /obj/item/cell = 40, @@ -55,7 +53,6 @@ /obj/random/toolbox name = "random toolbox" desc = "This is a random toolbox." - icon = 'icons/obj/random.dmi' icon_state = "toolbox" spawnlist = list( /obj/item/storage/toolbox/mechanical = 3, @@ -66,7 +63,6 @@ /obj/random/tech_supply name = "random tech supply" desc = "This is a random piece of technology supplies." - icon = 'icons/obj/random.dmi' icon_state = "tech_supply" problist = list( /obj/random/powercell = 3, diff --git a/code/modules/modular_computers/computers/modular_computer/power.dm b/code/modules/modular_computers/computers/modular_computer/power.dm index 74f7542d5cc..fb25e226004 100644 --- a/code/modules/modular_computers/computers/modular_computer/power.dm +++ b/code/modules/modular_computers/computers/modular_computer/power.dm @@ -37,8 +37,12 @@ // At this point, we know that APC can power us for this tick. Check if we also need to charge our battery, and then actually use the power. if(battery_module && (battery_module.battery.charge < battery_module.battery.maxcharge)) - power_usage += tesla_link.passive_charging_rate - battery_module.battery.give(tesla_link.passive_charging_rate * CELLRATE) + var/power_to_get = tesla_link.passive_charging_rate + if(istype(tesla_link, /obj/item/computer_hardware/tesla_link/charging_cable)) + var/obj/item/computer_hardware/tesla_link/charging_cable/cable = tesla_link + power_to_get += cable.source.active_power_usage + power_usage += power_to_get + battery_module.battery.give(power_to_get * CELLRATE) A.use_power_oneoff(power_usage, EQUIP) return TRUE diff --git a/code/modules/power/outlet.dm b/code/modules/power/outlet.dm new file mode 100644 index 00000000000..a201780ba57 --- /dev/null +++ b/code/modules/power/outlet.dm @@ -0,0 +1,65 @@ +// A simple power outlet that lets people charge modular computers + +/obj/machinery/power/outlet + name = "power outlet" + desc = "A simple power outlet. You can charge your PDA or other modular computer device here." + icon = 'icons/obj/power.dmi' + icon_state = "outlet" + density = TRUE + anchored = TRUE + use_power = POWER_USE_OFF // doesn't use power by default, only when drawing power + + active_power_usage = 200 // this variable serves to indicate the extra amount of juice this outlet will provide the tesla charger, since it's a dedicated machine + + component_types = list( + /obj/item/stack/cable_coil{amount = 5}, + /obj/item/stock_parts/capacitor, + /obj/item/circuitboard/outlet + ) + +/obj/machinery/power/outlet/Initialize() + . = ..() + connect_to_network() + +/obj/machinery/power/outlet/update_icon() + icon_state = panel_open ? "[initial(icon_state)]-open" : initial(icon_state) + +/obj/machinery/power/outlet/RefreshParts() + var/part_level = 0 + for(var/obj/item/stock_parts/SP in component_parts) + part_level += SP.rating + active_power_usage = initial(active_power_usage) * part_level + +/obj/machinery/power/outlet/attackby(obj/item/attacking_item, mob/user, params) + if(istype(attacking_item, /obj/item/modular_computer)) + var/obj/item/modular_computer/C = attacking_item + if(istype(C.tesla_link, /obj/item/computer_hardware/tesla_link/charging_cable)) + var/obj/item/computer_hardware/tesla_link/charging_cable/CC = C.tesla_link + CC.toggle(src, user) + return + else if(default_part_replacement(user, attacking_item)) + return + else if(default_deconstruction_screwdriver(user, attacking_item)) + return + else if(default_deconstruction_crowbar(user, attacking_item)) + return + + // since we'll mostly be on tables, don't block putting things on them if it's not a computer + var/obj/structure/table/table_underneath = locate() in loc + if(table_underneath) + return table_underneath.attackby(attacking_item, user, params) + + return ..() + +/obj/item/circuitboard/outlet + name = T_BOARD("power outlet") + build_path = /obj/machinery/power/outlet + board_type = BOARD_MACHINE + origin_tech = list( + TECH_ENGINEERING = 1, + TECH_POWER = 1 + ) + req_components = list( + "/obj/item/stack/cable_coil" = 5, + "/obj/item/stock_parts/capacitor" = 1 + ) diff --git a/code/modules/power/portgen.dm b/code/modules/power/portgen.dm index 61d28761f93..944fb339359 100644 --- a/code/modules/power/portgen.dm +++ b/code/modules/power/portgen.dm @@ -411,6 +411,7 @@ board_path = "/obj/item/circuitboard/portgen/advanced" power_gen = 50000 // 200 kW = safe max, 250 kW = unsafe max. + max_temperature = 340 temperature_gain = 60 /obj/machinery/power/portgen/basic/advanced/UseFuel() diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 81d64d4137d..88d46f396de 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -394,11 +394,11 @@ //Cooking oil tank /obj/structure/reagent_dispensers/cookingoil name = "cooking oil tank" - desc = "A fifty-litre tank of commercial-grade corn oil, intended for use in large scale deep fryers. Store in a cool, dark place" + desc = "A tank of commercial-grade corn oil, intended for use in large scale deep fryers. Store in a cool, dark place" icon_state = "oiltank" amount_per_transfer_from_this = 120 - capacity = 5000 - reagents_to_add = list(/singleton/reagent/nutriment/triglyceride/oil/corn = 5000) + capacity = 1000 + reagents_to_add = list(/singleton/reagent/nutriment/triglyceride/oil/corn = 1000) /obj/structure/reagent_dispensers/cookingoil/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) . = ..() diff --git a/code/modules/research/designs/circuit/machine_circuits.dm b/code/modules/research/designs/circuit/machine_circuits.dm index 90976f4f112..20ba0aead96 100644 --- a/code/modules/research/designs/circuit/machine_circuits.dm +++ b/code/modules/research/designs/circuit/machine_circuits.dm @@ -241,3 +241,8 @@ name = "oxygen regenerator" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/circuitboard/oxyregenerator + +/datum/design/circuit/power_outlet + name = "Power Outlet" + req_tech = list(TECH_ENGINEERING = 1, TECH_POWER = 1) + build_path = /obj/item/circuitboard/outlet diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml index 672ad633e10..a521b4f0f3d 100644 --- a/html/changelogs/archive/2024-10.yml +++ b/html/changelogs/archive/2024-10.yml @@ -17,3 +17,40 @@ - rscadd: Adds a variety of Tau Ceti Armed Forces uniform assets to the codebase, including assets for officers and non-combatants, sprited by NobleRow. - bugfix: The TCAF jacket is no longer invisible when worn. +2024-10-03: + Crozarius: + - qol: Ethanol no longer automatically makes Unathi vomit. + FabianK3: + - qol: 'Added cameras to missing angles or completely uncovered areas: Central ring + (locker room entrance), bridge conference room, XO office, gym, telescience, + secure artifact storage, deck two tool storage.' + - qol: Added lights and lightswitch to research secure artifact storage. + - bugfix: Fixed unrealistic power readings throughout the combustion turbine power + grid. + - rscadd: Added a powernet sensor to the combustion turbine power grid. + hazelmouse: + - rscadd: Added a paintgun to the Jockey Workshop, so you can paint your exosuits + as a Jockey. Bonus points if they're an eye-sore. + - rscadd: Adds the new Vaurca Attendant subspecies to a number of ghostroles. + - bugfix: Vaurca Attendants can now take species-specific items from the loadout, + including clothing and augments. + - bugfix: Vaurca Attendants can no longer join as consulars. + - bugfix: Vaurca Attendants now work smoothly with a number of event outfits. + - balance: Overloaders now cost fewer credits and last substantially longer. +2024-10-04: + Furrycactus: + - rscadd: Updated and fixed some small bugs with the IAC Rescue Ship. + - bugfix: Fixes the uranium-fueled advanced portable generator exploding when running + at level 4. +2024-10-05: + Ben10083: + - qol: Doubles the starting pressure of airlock air canisters to lessen occurances + of canisters not having enough air to work. + - bugfix: TCAF shuttle should now dock and undock with Hangar properly. + Geeves: + - rscadd: Added power outlets to the service area. More can be printed at RnD. The + capacitor can be upgraded to improve charging speed for connected devices. + hazelmouse: + - bugfix: Coaliton Rangers now spawn with appropriate access. You can unlock your + suit cyclers now! + - bugfix: Resolves a bug preventing characters from lighting smoking pipes. diff --git a/html/changelogs/hazelmouse-overloaderebalance.yml b/html/changelogs/courierbravo-randoms_and_corn.yml similarity index 76% rename from html/changelogs/hazelmouse-overloaderebalance.yml rename to html/changelogs/courierbravo-randoms_and_corn.yml index ff4c30f4332..962b1a1cd59 100644 --- a/html/changelogs/hazelmouse-overloaderebalance.yml +++ b/html/changelogs/courierbravo-randoms_and_corn.yml @@ -44,7 +44,7 @@ ################################# # Your name. -author: hazelmouse +author: CourierBravo # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True @@ -55,4 +55,7 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - balance: "Overloaders now cost fewer credits and last substantially longer." + - rscadd: "Redid random object sprites, assigning unique sprites to each random object. With the expectation that in the future, random objects have unique icons. You'll only ever see this when you do map making stuff." + - rscadd: "Created a new sprite for the cooking oil tank, a modified reagent tank sprite." + - imageadd: "Added rainbow sprites for random objects, and replaced the oil tank sprite." + - balance: "Reduced the amount of cooking oil in oil tanks to be in line with other reagent tanks." diff --git a/html/changelogs/crozarius-unathialcoholpuke.yml b/html/changelogs/crozarius-unathialcoholpuke.yml deleted file mode 100644 index d7206312771..00000000000 --- a/html/changelogs/crozarius-unathialcoholpuke.yml +++ /dev/null @@ -1,6 +0,0 @@ - -author: Crozarius - -delete-after: True -changes: - - qol: "Ethanol no longer automatically makes Unathi vomit." diff --git a/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml b/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml deleted file mode 100644 index 514dcb6e227..00000000000 --- a/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: FabianK3 - -delete-after: True - -changes: - - bugfix: "Fixed unrealistic power readings throughout the combustion turbine power grid." - - rscadd: "Added a powernet sensor to the combustion turbine power grid." diff --git a/html/changelogs/fabiank3-refactoring-camera-coverage.yml b/html/changelogs/fabiank3-refactoring-camera-coverage.yml deleted file mode 100644 index 61bd88bf232..00000000000 --- a/html/changelogs/fabiank3-refactoring-camera-coverage.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: FabianK3 - -delete-after: True - -changes: - - qol: "Added cameras to missing angles or completely uncovered areas: Central ring (locker room entrance), bridge conference room, XO office, gym, telescience, secure artifact storage, deck two tool storage." - - qol: "Added lights and lightswitch to research secure artifact storage." diff --git a/html/changelogs/hazelmouse-attendantstuff.yml b/html/changelogs/hazelmouse-attendantstuff.yml deleted file mode 100644 index 26e564c278b..00000000000 --- a/html/changelogs/hazelmouse-attendantstuff.yml +++ /dev/null @@ -1,62 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. -author: hazelmouse - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Adds the new Vaurca Attendant subspecies to a number of ghostroles." - - bugfix: "Vaurca Attendants can now take species-specific items from the loadout, including clothing and augments." - - bugfix: "Vaurca Attendants can no longer join as consulars." - - bugfix: "Vaurca Attendants now work smoothly with a number of event outfits." - diff --git a/html/changelogs/hazelmouse-paintgun.yml b/html/changelogs/hazelmouse-paintgun.yml deleted file mode 100644 index 0f1db52b13f..00000000000 --- a/html/changelogs/hazelmouse-paintgun.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. -author: hazelmouse - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Added a paintgun to the Jockey Workshop, so you can paint your exosuits as a Jockey. Bonus points if they're an eye-sore." diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index db06702b0eb..6f1b6910412 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/random.dmi b/icons/obj/random.dmi index 95340e00e91..c91320e8cf0 100644 Binary files a/icons/obj/random.dmi and b/icons/obj/random.dmi differ diff --git a/icons/obj/reagent_dispensers.dmi b/icons/obj/reagent_dispensers.dmi index d65f46ed8f5..6b299ad2b7c 100644 Binary files a/icons/obj/reagent_dispensers.dmi and b/icons/obj/reagent_dispensers.dmi differ diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm index 2c941c82e55..526b5d32962 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm @@ -113,7 +113,7 @@ /obj/effect/shuttle_landmark/tcaf_shuttle/hangar name = "Gunship Hangar" landmark_tag = "nav_hangar_tcaf" - docking_controller = "tcaf_dock" + docking_controller = "tcaf_shuttle_dock" base_area = /area/tcaf_corvette/hangar base_turf = /turf/simulated/floor/plating movable_flags = MOVABLE_FLAG_EFFECTMOVE @@ -123,8 +123,19 @@ landmark_tag = "nav_transit_tcaf_shuttle" base_turf = /turf/space/transit/north -// So people know how to use the engine. There's also a pre-wired spare PACMAN. +/// So people know how to use the engine. There's also a pre-wired spare PACMAN. /obj/item/paper/fluff/tcaf_corvette_engine_guide name = "Antlion-class engine operational notes" desc = "This is a handwritten list of steps to operating the combustion engine of an Antlion-class scout corvette." - info = "Obey these instructions! I swear to god, if we have one single more 'mishap' I am going to see you all assigned to the Zoleth line while I pray for another Solarian invasion.

STEP 1: Enable the connectors to cold loop pump, and the cooling array to generator pump, to get the cold loop circulating.

STEP 2: Configure the gas mixer to output north, and inject the contents of as many hydrogen and oxygen tanks into the combustion chamber as you wish, at the pre-set ratio of 60% oxygen and 40% hydrogen.

STEP 3: Disable injection! Do not leave injection on!

STEP 4: Ignite the mix inside the combustion chamber, and wait for it to fully burn out. Some strain on the glass at this step is expected.

STEP 5: Once the fire has stopped and the contents of the tank are 100% CO2, enable circulation: I recommend 700L/s input and 500kpa output. Higher you put the output, more power it generates.

WARNING: If you feel it's going to break the glass, lower the blast doors and vent the chamber immediately! We have a portable generator in the back if we run out of fuel or suffer another mishap." + info = "Obey these instructions! I swear to god, \ + if we have one single more 'mishap' I am going to see you all assigned to the Zoleth line while I pray for another Solarian invasion.
\ +
STEP 1: Enable the connectors to cold loop pump, and the cooling array to generator pump, to get the cold loop circulating.
\ +
STEP 2: Configure the gas mixer to output north, and inject the contents of as many hydrogen and oxygen tanks into the combustion chamber as you wish, \ + at the pre-set ratio of 60% oxygen and 40% hydrogen.
\ +
STEP 3: Disable injection! Do not leave injection on!
\ +
STEP 4: Ignite the mix inside the combustion chamber, and wait for it to fully burn out. \ + Some strain on the glass at this step is expected.
\ +
STEP 5: Once the fire has stopped and the contents of the tank are 100% CO2, \ + enable circulation: I recommend 700L/s input and 500kpa output. Higher you put the output, more power it generates.
\ +
WARNING: If you feel it's going to break the glass, lower the blast doors and vent the chamber immediately! \ + We have a portable generator in the back if we run out of fuel or suffer another mishap." diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 7b23d727d60..758b727afd7 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -13069,6 +13069,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + name = "TCAF Gunship Hangar Docking Controller"; + id_tag = "tcaf_shuttle_dock"; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "ZZ" = ( diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_landmarks.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_landmarks.dm index 35c8f44db27..80f5857bdb8 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_landmarks.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_landmarks.dm @@ -84,20 +84,20 @@ // Docking airlock markers, for deck one. /obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/aft_dock name = "Aft" - master_tag = "tcaf_aft_dock" - landmark_tag = "airlock_tcaf_fore_dock" + master_tag = "airlock_tcaf_aft_dock" + landmark_tag = "tcaf_corvette_aft_dock" /obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/fore_dock name = "Fore" - master_tag = "tcaf_fore_dock" - landmark_tag = "airlock_tcaf_fore_dock" + master_tag = "airlock_tcaf_fore_dock" + landmark_tag = "tcaf_corvette_fore_dock" /obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/port_dock name = "Port" - master_tag = "tcaf_port_dock" - landmark_tag = "airlock_tcaf_port_dock" + master_tag = "airlock_tcaf_port_dock" + landmark_tag = "tcaf_corvette_port_dock" /obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/starboard_dock name = "Starboard" - master_tag = "tcaf_starboard_dock" - landmark_tag = "airlock_tcaf_starboard_dock" + master_tag = "airlock_tcaf_starboard_dock" + landmark_tag = "tcaf_corvette_starboard_dock" diff --git a/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm b/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm index f796007cb8e..2065b304cf6 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm +++ b/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm @@ -32,7 +32,7 @@ backpack_contents = list(/obj/item/storage/box/survival = 1) /obj/outfit/admin/ranger/get_id_access() - return list(ACCESS_EXTERNAL_AIRLOCKS) + return list(ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY) // Only one role, to represent that synthetics are uncommon in the Rangers. As of 13/09/2024, Tajara or Skrell being available here isn't wanted by lore. /datum/ghostspawner/human/ranger/ranger_synthetic diff --git a/maps/away/ships/iac/iac_rescue_ship.dm b/maps/away/ships/iac/iac_rescue_ship.dm index 050d2804a92..91c73ead0fd 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dm +++ b/maps/away/ships/iac/iac_rescue_ship.dm @@ -265,3 +265,51 @@ landmark_tag = "nav_transit_iac_shuttle" base_turf = /turf/space/transit/north + +// airlocks + +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port + name = "Port Airlock" + master_tag = "airlock_iac_rescue_port" + +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard + name = "Starboard Airlock" + master_tag = "airlock_iac_rescue_stbd" + +// docks + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth + name = "Dock, Port Berth" + landmark_tag = "nav_iac_rescue_port_berth" + master_tag = "airlock_iac_rescue_dock_port_berth" + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore + name = "Dock, Port Fore" + landmark_tag = "nav_iac_rescue_port_fore" + master_tag = "airlock_iac_rescue_dock_port_fore" + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft + name = "Dock, Port Aft" + landmark_tag = "nav_iac_rescue_port_aft" + master_tag = "airlock_iac_rescue_dock_port_aft" + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth + name = "Dock, Starboard Berth" + landmark_tag = "nav_iac_rescue_stbd_berth" + master_tag = "airlock_iac_rescue_dock_stbd_berth" + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore + name = "Dock, Starboard Fore" + landmark_tag = "nav_iac_rescue_stbd_fore" + master_tag = "airlock_iac_rescue_dock_stbd_fore" + +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft + name = "Dock, Starboard Aft" + landmark_tag = "nav_iac_rescue_stbd_aft" + master_tag = "airlock_iac_rescue_dock_stbd_aft" + +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle + name = "IAC Ambulance Shuttle" + shuttle_tag = "IAC Ambulance Shuttle" + master_tag = "airlock_iac_rescue_shuttle" + cycle_to_external_air = TRUE diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index 0823a75ff15..51b0cb446fe 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -43,6 +43,7 @@ /obj/machinery/atmospherics/unary/freezer{ icon_state = "freezer" }, +/obj/effect/floor_decal/industrial/outline/blue, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -67,11 +68,11 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/machinist) "ado" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor, /area/ship/iac_rescue_ship/hangar) "adW" = ( @@ -133,12 +134,11 @@ /obj/effect/shuttle_landmark/iac_rescue_ship/port_fore{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "aha" = ( @@ -149,12 +149,11 @@ /obj/machinery/access_button{ pixel_x = -28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "ahn" = ( @@ -212,10 +211,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -314,20 +311,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "auL" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "auY" = ( @@ -354,11 +351,11 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, +/obj/structure/closet/radiation, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/closet/radiation, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "aAY" = ( @@ -422,12 +419,13 @@ pixel_x = -12; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "aHt" = ( @@ -450,7 +448,9 @@ req_access = list(211); dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/pharmacy) "aHw" = ( @@ -496,7 +496,7 @@ dir = 1; name = "Pressure Tank (Scrubbers)" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "aIu" = ( @@ -551,7 +551,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/coord) "aLC" = ( @@ -630,13 +632,15 @@ "aXh" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; - name = "Port Docks"; + name = "EVA Preparation"; req_access = list(211) }, /obj/machinery/door/firedoor/multi_tile{ dir = 2 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/emergency_closet{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/evaprep) "bci" = ( @@ -702,12 +706,11 @@ /obj/machinery/access_button{ pixel_x = 28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "bfF" = ( @@ -834,12 +837,10 @@ dir = 8; pixel_x = 20 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "bsr" = ( @@ -862,10 +863,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -911,12 +910,11 @@ /area/ship/iac_rescue_ship/kitchen) "bFk" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "bHV" = ( @@ -927,7 +925,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "bIn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -1064,7 +1062,6 @@ dir = 4; name = "Propellant Merge Valve" }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1073,6 +1070,7 @@ dir = 9; pixel_y = 0 }, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1252,7 +1250,7 @@ req_access = list(211); name = "Engineering" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "cqy" = ( @@ -1263,7 +1261,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "csk" = ( /obj/structure/closet/walllocker{ @@ -1302,10 +1300,8 @@ /obj/structure/bed/handrail{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -1319,10 +1315,8 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -1351,15 +1345,16 @@ /area/ship/iac_rescue_ship/bridge) "cxf" = ( /obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hydro) "czD" = ( -/obj/effect/floor_decal/industrial/warning, /obj/machinery/floodlight, +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/ship/iac_rescue_ship/hangar) "cAV" = ( @@ -1577,10 +1572,8 @@ dir = 4; pixel_x = -22 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -1675,7 +1668,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/bridge) "dey" = ( @@ -1694,8 +1687,8 @@ dir = 9 }, /obj/structure/dispenser/oxygen, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "dgo" = ( @@ -1703,7 +1696,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "dkD" = ( @@ -1733,14 +1726,14 @@ pixel_x = -12; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portengine) "dmm" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -1783,7 +1776,9 @@ name = "Docking Arm Lockdown Blast Door"; id = "iac_docking_lockdown" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/centralhallway) "dsu" = ( @@ -1894,7 +1889,7 @@ /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/pharmacy) "dAj" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/machinist) "dEO" = ( @@ -1949,13 +1944,8 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/ship/iac_rescue_ship/engineering) "dOF" = ( /obj/machinery/alarm/east{ @@ -1980,12 +1970,12 @@ /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/medical) "dZw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/aux, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/door/window/northleft{ dir = 2 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "ebN" = ( @@ -2038,20 +2028,21 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/dorms) "ecX" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "egU" = ( @@ -2103,8 +2094,8 @@ /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/portdocking) "eji" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/computer/ship/helm/terminal, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "ejl" = ( @@ -2112,12 +2103,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "ekU" = ( @@ -2191,7 +2181,7 @@ /obj/machinery/door/window/northright{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/centralhallway) "eoK" = ( @@ -2223,12 +2213,13 @@ /obj/effect/shuttle_landmark/iac_rescue_ship/port_berth{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "etL" = ( @@ -2331,7 +2322,7 @@ /obj/machinery/vending/engineering{ req_access = list(211) }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "eCV" = ( @@ -2375,11 +2366,11 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/forehallway) "eIH" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "eKS" = ( @@ -2430,7 +2421,7 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/bridge) "eRf" = ( @@ -2708,7 +2699,7 @@ /area/ship/iac_rescue_ship/dorms) "fty" = ( /obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "fuA" = ( @@ -2726,7 +2717,6 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/engineering) "fwm" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/power/smes/buildable/horizon_shuttle, /obj/structure/cable/cyan{ d2 = 2; @@ -2735,6 +2725,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/engineering) "fwM" = ( @@ -2859,7 +2850,7 @@ "fHY" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, -/turf/template_noop, +/turf/space/dynamic, /area/space) "fKv" = ( /obj/structure/railing/mapped{ @@ -2942,7 +2933,7 @@ /area/ship/iac_rescue_ship/forehallway) "fUw" = ( /obj/structure/lattice/catwalk, -/turf/template_noop, +/turf/space/dynamic, /area/space) "fVz" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -2997,7 +2988,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "gcq" = ( @@ -3054,7 +3045,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/machinist) "gik" = ( @@ -3105,7 +3098,7 @@ dir = 4 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "gqT" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -3139,7 +3132,6 @@ }, /obj/structure/railing/mapped, /obj/structure/closet/crate/freezer/kois/rations, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/spline/plain/black{ dir = 10 }, @@ -3147,6 +3139,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/hydro) "gwf" = ( @@ -3162,7 +3155,6 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "gxW" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/valve{ dir = 4; @@ -3174,6 +3166,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -3293,7 +3286,7 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "gJb" = ( @@ -3314,7 +3307,7 @@ dir = 4 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "gLu" = ( /turf/simulated/wall/shuttle/space_ship, @@ -3402,6 +3395,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "gTy" = ( @@ -3410,7 +3404,7 @@ dir = 4; icon_state = "tube_empty" }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "gVm" = ( @@ -3461,14 +3455,12 @@ /obj/structure/bed/handrail{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "haO" = ( @@ -3495,12 +3487,10 @@ dir = 4; pixel_x = -20 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "hbN" = ( @@ -3535,7 +3525,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "heW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -3577,7 +3567,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/greengrid, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/engineering) "hns" = ( /obj/machinery/firealarm/north, @@ -3604,10 +3595,10 @@ /area/ship/iac_rescue_ship/afthallway) "hpp" = ( /obj/machinery/vending/hydronutrients, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hydro) "hqB" = ( @@ -3655,11 +3646,11 @@ /obj/structure/lattice/catwalk, /obj/item/hullbeacon/green, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "hvh" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/hydro) "hvk" = ( @@ -3739,12 +3730,8 @@ pixel_x = 6; pixel_y = 24 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -3865,7 +3852,9 @@ name = "Docking Arm Lockdown Blast Door"; id = "iac_docking_lockdown" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/centralhallway) "hOz" = ( @@ -3920,14 +3909,12 @@ pixel_y = 10; dir = 1 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboardengine) "hRD" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -3944,21 +3931,22 @@ pixel_x = 12; pixel_y = -28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "hVh" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/aux, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/door/window/northright{ dir = 2 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "hVP" = ( @@ -3971,10 +3959,8 @@ pixel_y = 28; pixel_x = -6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -4067,12 +4053,11 @@ pixel_y = -26; dir = 4 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -4096,12 +4081,11 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -4111,7 +4095,7 @@ dir = 1 }, /obj/item/hullbeacon/green, -/turf/template_noop, +/turf/space/dynamic, /area/space) "iwK" = ( /obj/machinery/vending/boozeomat{ @@ -4127,13 +4111,13 @@ /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/fuel_port/hydrogen{ pixel_y = 32 }, /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "iyf" = ( @@ -4178,7 +4162,7 @@ /obj/structure/closet/secure_closet/engineering_welding{ req_access = list(211) }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "iDd" = ( @@ -4289,12 +4273,11 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -4326,8 +4309,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/afthallway) "iMZ" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/computer/shuttle_control/explore/terminal/iac_shuttle, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "iNm" = ( @@ -4350,7 +4333,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/hydro) "iOh" = ( @@ -4383,12 +4368,8 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/out, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -4438,12 +4419,11 @@ /obj/effect/shuttle_landmark/iac_rescue_ship/starboard_fore{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "iZS" = ( @@ -4474,12 +4454,10 @@ dir = 8; pixel_x = 20 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "jeT" = ( @@ -4514,12 +4492,8 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -4569,12 +4543,11 @@ pixel_x = 28; pixel_y = 12 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "jqj" = ( @@ -4600,7 +4573,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/bridge) "jys" = ( @@ -4783,7 +4756,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "jTd" = ( @@ -4868,7 +4843,8 @@ name = "Bathroom"; req_access = list(211) }, -/turf/simulated/floor/tiled/freezer, +/obj/effect/floor_decal/industrial/hatch_door/service, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bathroom) "kak" = ( /obj/machinery/door/blast/regular/open{ @@ -5145,7 +5121,7 @@ /obj/effect/map_effect/map_helper/ruler_tiles_3, /obj/structure/lattice/catwalk, /obj/item/hullbeacon/green, -/turf/template_noop, +/turf/space/dynamic, /area/space) "kSj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5170,7 +5146,9 @@ /obj/machinery/holosign/surgery{ id = 3 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/surgery) "kVk" = ( @@ -5217,10 +5195,8 @@ /area/ship/iac_rescue_ship/portengine) "laz" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -5272,7 +5248,7 @@ /obj/machinery/computer/ship/navigation/terminal{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "lgo" = ( @@ -5280,12 +5256,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "lgv" = ( @@ -5366,13 +5341,13 @@ /obj/machinery/computer/ship/sensors/terminal{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "lqf" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "lxs" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -5427,12 +5402,11 @@ pixel_x = 28; pixel_y = 12 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "lIW" = ( @@ -5441,7 +5415,7 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "lJs" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -5459,10 +5433,8 @@ /area/ship/iac_rescue_ship/starboarddocking) "lLX" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -5569,7 +5541,7 @@ /area/ship/iac_rescue_ship/evaprep) "mfr" = ( /obj/machinery/computer/ship/sensors/terminal, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "mfV" = ( @@ -5702,10 +5674,11 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "mvQ" = ( /obj/machinery/telecomms/allinone/ship, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -5826,7 +5799,7 @@ /obj/machinery/door/window/northright{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/centralhallway) "mQn" = ( @@ -5901,12 +5874,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "neA" = ( @@ -6017,19 +5991,18 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "nxu" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3, /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "nyj" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -6055,14 +6028,12 @@ pixel_x = 26; pixel_y = -10 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portengine) "nCS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -6104,12 +6075,12 @@ /turf/simulated/floor/wood, /area/ship/iac_rescue_ship/dorms) "nJc" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/aux, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/door/window/northleft{ dir = 2 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "nMu" = ( @@ -6136,10 +6107,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -6184,14 +6153,14 @@ pixel_x = 12; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboardengine) "nSP" = ( /obj/machinery/door/airlock/glass_service{ @@ -6200,6 +6169,7 @@ req_access = list(211) }, /obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/service, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/hydro) "nTV" = ( @@ -6313,9 +6283,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/centralhallway) "okx" = ( /turf/simulated/wall/shuttle/space_ship, @@ -6400,11 +6369,11 @@ }, /area/ship/iac_rescue_ship/bridge) "oyw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/machinery/atmospherics/portables_connector{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "oyE" = ( @@ -6463,7 +6432,6 @@ /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hydro) "oCG" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable/green{ icon_state = "0-2" @@ -6471,6 +6439,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "oEh" = ( @@ -6519,14 +6488,12 @@ pixel_y = 10; dir = 1 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portengine) "oLN" = ( /obj/effect/landmark/entry_point/south{ @@ -6670,12 +6637,11 @@ pixel_y = 12 }, /obj/effect/shuttle_landmark/iac_rescue_ship/starboard_aft, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "pfz" = ( @@ -6722,7 +6688,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/atmospherics) "phz" = ( @@ -6806,14 +6774,12 @@ pixel_x = -26; pixel_y = -10 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboardengine) "pvy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ @@ -6897,11 +6863,10 @@ /obj/machinery/door/window/northleft{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/centralhallway) "pEN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/autolathe, /obj/machinery/power/apc/super/east{ req_access = list(211) @@ -6910,6 +6875,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/machinist) "pFS" = ( @@ -6937,14 +6903,10 @@ pixel_y = 6; dir = 8 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, /turf/simulated/floor/tiled/white, /area/shuttle/iac_shuttle) "pGN" = ( @@ -6968,14 +6930,12 @@ frequency = 1337 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "pIr" = ( @@ -7001,11 +6961,12 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/afthallway) "pKG" = ( -/obj/effect/floor_decal/industrial/warning, /obj/machinery/floodlight, /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/ship/iac_rescue_ship/hangar) "pPY" = ( @@ -7030,12 +6991,13 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "pUZ" = ( @@ -7118,7 +7080,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "qfd" = ( /turf/simulated/floor/tiled/white, @@ -7143,12 +7105,11 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -7170,8 +7131,8 @@ dir = 4 }, /obj/structure/closet/crate/freezer/rations, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/spline/plain/black, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hydro) "qkm" = ( @@ -7274,7 +7235,7 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "qAL" = ( /obj/machinery/recharger/wallcharger{ @@ -7297,12 +7258,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "qDv" = ( @@ -7327,13 +7289,14 @@ "qEu" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/light{ dir = 1; icon_state = "tube_empty" }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/iac_rescue_ship/medical) "qFX" = ( @@ -7413,12 +7376,8 @@ pixel_x = 12; pixel_y = 40 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) }, /turf/simulated/floor, /area/shuttle/iac_shuttle) @@ -7426,17 +7385,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "qMU" = ( /obj/machinery/door/airlock/glass_service{ dir = 4; - name = "Hydroponics"; + name = "Kitchen"; req_access = list(211) }, /obj/machinery/door/firedoor/noid{ @@ -7453,7 +7410,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/kitchen) "qPm" = ( @@ -7557,17 +7516,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark/full, -/area/ship/iac_rescue_ship/custodial) -"qZx" = ( -/obj/machinery/door/airlock/maintenance{ +/obj/effect/floor_decal/industrial/hatch_door/custodial{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, -/area/ship/iac_rescue_ship/centralhallway) +/turf/simulated/floor/tiled/dark/full, +/area/ship/iac_rescue_ship/custodial) "rbr" = ( /obj/machinery/optable, /obj/effect/floor_decal/corner_wide/paleblue{ @@ -7652,12 +7605,11 @@ /area/ship/iac_rescue_ship/portdocking) "roZ" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "rpg" = ( @@ -7704,7 +7656,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/engineering, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/hangar) "rtZ" = ( @@ -7782,7 +7734,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "rGp" = ( @@ -7828,7 +7780,7 @@ /obj/machinery/computer/ship/navigation/terminal{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "rMI" = ( @@ -7897,12 +7849,11 @@ pixel_x = -28; pixel_y = 12 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "rRY" = ( @@ -7910,27 +7861,24 @@ /obj/machinery/access_button{ pixel_x = -28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "rTH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_stbd" - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency{ dir = 8 }, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/starboard{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) "rUD" = ( @@ -7960,14 +7908,12 @@ pixel_x = -20; dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "rXX" = ( @@ -7975,7 +7921,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "sah" = ( /turf/simulated/floor/wood, @@ -8019,6 +7965,13 @@ /obj/structure/closet/crate/rad{ name = "radioactive fuel crate" }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 32 + }, /obj/item/stack/material/tritium/full{ pixel_y = 3; pixel_x = 5 @@ -8027,18 +7980,19 @@ pixel_y = 3; pixel_x = 5 }, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 32 +/obj/item/stack/material/tritium/full{ + pixel_y = 3; + pixel_x = 5 }, -/obj/item/stack/material/graphite/full{ +/obj/item/stack/material/uranium/full{ pixel_x = -5; pixel_y = 3 }, -/obj/item/stack/material/graphite/full{ +/obj/item/stack/material/uranium/full{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/material/uranium/full{ pixel_x = -5; pixel_y = 3 }, @@ -8047,7 +8001,7 @@ "seG" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/green, -/turf/template_noop, +/turf/space/dynamic, /area/space) "shf" = ( /obj/machinery/power/portgen/basic/fusion, @@ -8055,7 +8009,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/floor_decal/industrial/outline/service, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/engineering) "shz" = ( @@ -8137,10 +8091,8 @@ pixel_y = 10; dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -8191,7 +8143,7 @@ "sDF" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, -/turf/template_noop, +/turf/space/dynamic, /area/ship/iac_rescue_ship/bridge) "sFD" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -8268,10 +8220,8 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -8295,13 +8245,10 @@ }, /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/shuttle/iac_shuttle) "sXB" = ( @@ -8312,7 +8259,7 @@ /obj/machinery/door/window/northleft{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/centralhallway) "sXO" = ( @@ -8429,12 +8376,12 @@ /obj/structure/closet/secure_closet/engineering_electrical{ req_access = list(211) }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light_switch{ pixel_y = -20; pixel_x = 6 }, /obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/engineering) "tns" = ( @@ -8530,7 +8477,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/medical) "tyj" = ( @@ -8548,12 +8495,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/centralhallway) -"tzA" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/tiled/dark/full, -/area/ship/iac_rescue_ship/hydro) "tCo" = ( /obj/machinery/smartfridge/secure, /turf/simulated/floor, @@ -8668,12 +8609,10 @@ dir = 4; pixel_x = -20 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "tWD" = ( @@ -8799,7 +8738,7 @@ dir = 8 }, /obj/structure/closet/crate/freezer/rations, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "umh" = ( @@ -8809,7 +8748,7 @@ req_access = list(211); dir = 1 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/medical) "uoC" = ( @@ -8839,12 +8778,10 @@ /obj/structure/bed/handrail{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/machinery/light/small, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "utA" = ( @@ -8888,10 +8825,8 @@ dir = 4; pixel_x = -22 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -9092,7 +9027,7 @@ /obj/machinery/computer/ship/engines/terminal{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "uTA" = ( @@ -9111,10 +9046,8 @@ pixel_y = 10; dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_fore"; - master_tag = "airlock_iac_rescue_dock_port_fore"; - landmark_tag = "nav_iac_rescue_port_fore" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_fore{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -9154,8 +9087,8 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/power/portgen/basic{ +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/machinery/power/portgen/basic/advanced{ anchored = 1 }, /turf/simulated/floor, @@ -9229,21 +9162,20 @@ /obj/machinery/alarm/north{ req_one_access = list(211) }, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hydro) "vjw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_horizon_deck_1_fore_1"; - name = "airlock_iac_rescue_aft_port" - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/iac_rescue_ship/port{ + req_one_access = list(211) + }, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "vkV" = ( @@ -9254,7 +9186,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "vkY" = ( /obj/machinery/power/apc/south{ @@ -9393,10 +9325,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) @@ -9418,14 +9348,12 @@ frequency = 1337 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_fore"; - master_tag = "airlock_iac_rescue_dock_stbd_fore"; - landmark_tag = "nav_iac_rescue_stbd_fore" - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_fore{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "vCZ" = ( @@ -9438,7 +9366,7 @@ name = "EVA Preparation"; req_access = list(211) }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/emergency_closet, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/evaprep) "vFx" = ( @@ -9455,10 +9383,10 @@ /area/ship/iac_rescue_ship/hangar) "vKv" = ( /obj/structure/closet/crate/freezer/kois/rations, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "vKH" = ( @@ -9532,6 +9460,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/afthallway) "vSL" = ( @@ -9550,6 +9479,7 @@ /area/ship/iac_rescue_ship/mainstorage) "vTl" = ( /obj/machinery/atmospherics/unary/cryo_cell, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/ship/iac_rescue_ship/medical) "vTI" = ( @@ -9602,12 +9532,8 @@ frequency = 1337 }, /obj/machinery/light/small/emergency, -/obj/effect/map_effect/marker/airlock/shuttle{ - name = "airlock_iac_rescue_shuttle"; - req_one_access = list(211); - master_tag = "airlock_iac_rescue_shuttle"; - shuttle_tag = "IAC Ambulance Shuttle"; - cycle_to_external_air = 1 +/obj/effect/map_effect/marker/airlock/shuttle/iac_rescue_ship/shuttle{ + req_one_access = list(211) }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) @@ -9694,14 +9620,12 @@ "wvf" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_aft"; - landmark_tag = "nav_iac_rescue_stbd_aft"; - master_tag = "airlock_iac_rescue_dock_stbd_aft" - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_aft{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "wwQ" = ( @@ -9716,10 +9640,10 @@ /obj/machinery/door/window/northleft{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark/full, /area/shuttle/iac_shuttle) "wzg" = ( @@ -9736,7 +9660,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "wEW" = ( /obj/machinery/vending/tool{ @@ -9765,7 +9689,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/emergency_closet{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/evaprep) "wMq" = ( @@ -9802,7 +9728,7 @@ dir = 1; req_access = list(211) }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) "wUA" = ( @@ -9817,10 +9743,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) @@ -9850,6 +9774,9 @@ req_access = list(211); dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/mainstorage) "wZf" = ( @@ -9965,6 +9892,9 @@ req_access = list(211); dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -10000,21 +9930,21 @@ /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/bridge) "xxN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/aux, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/door/window/northright{ dir = 2 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "xzk" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/light/small/emergency, /turf/simulated/floor, /area/ship/iac_rescue_ship/hangar) "xBq" = ( @@ -10051,7 +9981,9 @@ name = "Docking Arm Lockdown Blast Door"; id = "iac_docking_lockdown" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/centralhallway) "xFK" = ( @@ -10131,12 +10063,13 @@ /obj/effect/shuttle_landmark/iac_rescue_ship/starboard_berth{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "xXK" = ( @@ -10160,12 +10093,13 @@ pixel_x = 12; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_stbd_berth"; - master_tag = "airlock_iac_rescue_dock_stbd_berth"; - landmark_tag = "nav_iac_rescue_stbd_berth" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/starboard_berth{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/starboarddocking) "ybH" = ( @@ -10193,23 +10127,20 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_berth"; - master_tag = "airlock_iac_rescue_dock_port_berth"; - landmark_tag = "nav_iac_rescue_port_berth" - }, /obj/machinery/light/small, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_berth{ + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "yhq" = ( /obj/machinery/door/airlock/external, /obj/effect/shuttle_landmark/iac_rescue_ship/port_aft, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_iac_rescue_dock_port_aft"; - master_tag = "airlock_iac_rescue_dock_port_aft"; - landmark_tag = "nav_iac_rescue_port_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/iac_rescue_ship/dock/port_aft{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "yiM" = ( @@ -10253,7 +10184,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/blue, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/medical) "yjO" = ( @@ -40995,7 +40926,7 @@ eoU nbZ cxf hPn -tzA +hvh hvh wjC tzl @@ -44341,7 +44272,7 @@ nCS okx eww gVm -qZx +ojY sVX bLX bVq diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index f57c1029295..48dabc4993c 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -26451,6 +26451,7 @@ pixel_x = -6; pixel_y = 16 }, +/obj/machinery/power/outlet, /turf/simulated/floor/wood/mahogany, /area/horizon/crew_quarters/lounge/bar) "dRu" = ( @@ -33375,6 +33376,16 @@ /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"eTZ" = ( +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" + }, +/obj/machinery/power/outlet, +/turf/simulated/floor/tiled/dark, +/area/horizon/kitchen) "eUe" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -36655,6 +36666,17 @@ /obj/structure/table/stone/marble, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) +"fsr" = ( +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" + }, +/obj/machinery/power/outlet, +/turf/simulated/floor/tiled/dark, +/area/horizon/kitchen) "fst" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -38826,6 +38848,7 @@ /obj/item/flame/candle{ pixel_y = 16 }, +/obj/machinery/power/outlet, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "fKB" = ( @@ -93581,6 +93604,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "nRQ" = ( @@ -108036,6 +108060,7 @@ pixel_x = 7; pixel_y = 9 }, +/obj/machinery/power/outlet, /turf/simulated/floor/carpet/red, /area/horizon/library) "pZC" = ( @@ -121860,6 +121885,7 @@ /obj/random/pottedplant_small{ pixel_x = 6 }, +/obj/machinery/power/outlet, /turf/simulated/floor/carpet/red, /area/horizon/library) "sdV" = ( @@ -122338,6 +122364,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "shJ" = ( @@ -125293,6 +125320,7 @@ "sEW" = ( /obj/structure/table/wood, /obj/item/toy/desk/newtoncradle, +/obj/machinery/power/outlet, /turf/simulated/floor/carpet/red, /area/horizon/library) "sFd" = ( @@ -128158,6 +128186,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "taS" = ( @@ -138860,6 +138889,7 @@ name = "random potted plant, small (25% nothing)"; pixel_y = -2 }, +/obj/machinery/power/outlet, /turf/simulated/floor/carpet/red, /area/horizon/crew_quarters/lounge/bar) "uDs" = ( @@ -139019,6 +139049,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "uEF" = ( @@ -144161,6 +144192,7 @@ pixel_x = -7; pixel_y = 3 }, +/obj/machinery/power/outlet, /turf/simulated/floor/carpet/red, /area/horizon/bar) "vsi" = ( @@ -148448,6 +148480,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "wan" = ( @@ -157772,6 +157805,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/power/outlet, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "xpP" = ( @@ -159480,6 +159514,7 @@ pixel_x = -4; pixel_y = -2 }, +/obj/machinery/power/outlet, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "xBf" = ( @@ -164387,6 +164422,7 @@ pixel_x = -9; pixel_y = 8 }, +/obj/machinery/power/outlet, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "ykQ" = ( @@ -263986,7 +264022,7 @@ ooh hEG txd cJn -nsT +fsr nsT wav wav @@ -264242,7 +264278,7 @@ wZO cpI eeA jBV -woe +eTZ vAQ wpe acK