diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm index 86a7363f07ea..73b0f4e1c6a9 100644 --- a/code/datums/ASRS.dm +++ b/code/datums/ASRS.dm @@ -132,3 +132,8 @@ buyable = 0 group = "ASRS" cost = ASRS_VERY_LOW_WEIGHT + +/datum/supply_packs/ingredient/asrs + buyable = 0 + group = "ASRS" + cost = ASRS_LOW_WEIGHT diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm index 9e0527aed6cf..f74567c78a89 100644 --- a/code/datums/supply_packs/food.dm +++ b/code/datums/supply_packs/food.dm @@ -1,144 +1,47 @@ //Food.Regrouping all the ASRS crate related to food here. - -//All the ingredients that you can grown. - -/datum/supply_packs/potato - name = "Potatoes(x20)" - contains = list( - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper Potato crate" - group = "Food" - -/datum/supply_packs/tomato - name = "tomato (x20)" - contains = list( - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper Tomato crate" - group = "Food" - -/datum/supply_packs/wheat - name = "wheat (x20)" - contains = list( - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - /obj/item/reagent_container/food/snacks/grown/wheat, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper Wheat crate" - group = "Food" - -//All the meats - -/datum/supply_packs/meat - name = "meat(x5)" - contains = list( - /obj/item/reagent_container/food/snacks/meat, - /obj/item/reagent_container/food/snacks/meat, - /obj/item/reagent_container/food/snacks/meat, - /obj/item/reagent_container/food/snacks/meat, - /obj/item/reagent_container/food/snacks/meat, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper meat crate" - group = "Food" - -/datum/supply_packs/carp_fillet - name = "carp fillet (x5)" - contains = list( - /obj/item/reagent_container/food/snacks/carpmeat, - /obj/item/reagent_container/food/snacks/carpmeat, - /obj/item/reagent_container/food/snacks/carpmeat, - /obj/item/reagent_container/food/snacks/carpmeat, - /obj/item/reagent_container/food/snacks/carpmeat, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper carp filet crate" - group = "Food" - -//all the condiment type items - -/datum/supply_packs/condiment - name = "crate of condiments" +// crate of random ingredient that you can buy in vendor in kitchen +/datum/supply_packs/ingredient + name = "surplus boxes of ingredients(x6 boxes)" + randomised_num_contained = 6 contains = list( - /obj/item/reagent_container/food/condiment/enzyme, - /obj/item/reagent_container/food/condiment/sugar, - /obj/item/reagent_container/food/condiment/saltshaker, - /obj/item/reagent_container/food/condiment/peppermill, + /obj/item/storage/fancy/egg_box, + /obj/item/storage/box/fish, + /obj/item/storage/box/meat, + /obj/item/storage/box/milk, + /obj/item/storage/box/soymilk, + /obj/item/storage/box/enzyme, + /obj/item/storage/box/flour, + /obj/item/storage/box/sugar, + /obj/item/storage/box/apple, + /obj/item/storage/box/banana, + /obj/item/storage/box/chanterelle, + /obj/item/storage/box/cherries, + /obj/item/storage/box/chili, + /obj/item/storage/box/cabbage, + /obj/item/storage/box/carrot, + /obj/item/storage/box/corn, + /obj/item/storage/box/eggplant, + /obj/item/storage/box/lemon, + /obj/item/storage/box/lime, + /obj/item/storage/box/orange, + /obj/item/storage/box/potato, + /obj/item/storage/box/tomato, + /obj/item/storage/box/whitebeet, /obj/item/reagent_container/food/condiment/hotsauce/cholula, /obj/item/reagent_container/food/condiment/hotsauce/franks, /obj/item/reagent_container/food/condiment/hotsauce/sriracha, /obj/item/reagent_container/food/condiment/hotsauce/tabasco, + /obj/item/reagent_container/food/drinks/bottle/whiskey, + /obj/item/reagent_container/food/drinks/bottle/tequila, + /obj/item/reagent_container/food/drinks/bottle/rum, + /obj/item/reagent_container/food/drinks/bottle/wine, ) cost = 10 containertype = /obj/structure/closet/crate/freezer - containername = "\improper crate of condiment" + containername = "\improper surplus of ingredients crate" group = "Food" - //all the finish snacks. +//all the finish snacks. /datum/supply_packs/donuts name = "box of donuts (x5)" @@ -165,47 +68,6 @@ containername = "\improper USCM MRE crate(x2)" group = "Food" -/datum/supply_packs/funfood - name = "special ingredients crate (x6)" - randomised_num_contained = 6 - contains = list( - /obj/item/reagent_container/food/condiment/enzyme, - /obj/item/reagent_container/food/condiment/saltshaker, - /obj/item/reagent_container/food/condiment/saltshaker, - /obj/item/reagent_container/food/condiment/saltshaker, - /obj/item/reagent_container/food/condiment/peppermill, - /obj/item/reagent_container/food/condiment/peppermill, - /obj/item/reagent_container/food/condiment/peppermill, - /obj/item/reagent_container/food/condiment/sugar, - /obj/item/reagent_container/food/condiment/sugar, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/grown/potato, - /obj/item/reagent_container/food/snacks/mint, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/tomato, - /obj/item/reagent_container/food/snacks/grown/carrot, - /obj/item/reagent_container/food/snacks/grown/carrot, - /obj/item/reagent_container/food/snacks/grown/lemon, - /obj/item/reagent_container/food/snacks/grown/lemon, - /obj/item/reagent_container/food/snacks/grown/orange, - /obj/item/reagent_container/food/snacks/grown/orange, - /obj/item/reagent_container/food/snacks/grown/lime, - /obj/item/reagent_container/food/snacks/grown/lime, - /obj/item/reagent_container/food/drinks/bottle/whiskey, - /obj/item/reagent_container/food/drinks/bottle/tequila, - /obj/item/reagent_container/food/drinks/bottle/rum, - /obj/item/reagent_container/food/drinks/bottle/wine, - /obj/item/reagent_container/food/drinks/bottle/wine, - /obj/item/reagent_container/food/drinks/bottle/wine, - ) - cost = 10 - containertype = /obj/structure/closet/crate/freezer - containername = "\improper Special ingredients crate" - group = "Food" - /datum/supply_packs/pizzas name = "pizza ready-to-eat (x3)" contains = list( diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm index 422017c0a46b..a5a12cd5b999 100644 --- a/code/game/area/kutjevo.dm +++ b/code/game/area/kutjevo.dm @@ -67,6 +67,10 @@ name = "Kutjevo - Power Station River" icon_state = "lz_river" +/area/kutjevo/exterior/spring + name = "Kutjevo - Southern Spring" + icon_state = "lz_river" + /area/kutjevo/exterior/scrubland name = "Kutjevo - Scrubland" icon_state = "scrubland" diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index 8829bf983c25..8deadbeba32e 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -262,7 +262,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou if(istype(CO_surv_job)) CO_surv_job.set_spawn_positions(GLOB.players_preassigned) - if(SSnightmare.get_scenario_value("predator_round")) + if(SSnightmare.get_scenario_value("predator_round") && !Check_WO()) SSticker.mode.flags_round_type |= MODE_PREDATOR // Set predators starting amount based on marines assigned var/datum/job/PJ = temp_roles_for_mode[JOB_PREDATOR] diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a57bbfe7d29f..36b0b6e44df6 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -447,3 +447,69 @@ /obj/item/tool/pen/fountain = 30, ) product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL + +//vendor of ingredients for kitchen +/obj/structure/machinery/vending/ingredients + name = "\improper Galley Auxiliary Storage Requisition System" + desc = "A vending machine meant to be use for cooks." + product_ads = "If your out of ingredients i am here for you;all my organic produce are fresh;don't let my potatoes go stale time for you to cook some fries" + icon_state = "snack" + hacking_safety = TRUE + products = list( + /obj/item/storage/fancy/egg_box = 12, + /obj/item/storage/box/fish = 12, + /obj/item/storage/box/meat = 12, + /obj/item/storage/box/milk = 12, + /obj/item/storage/box/soymilk = 12, + /obj/item/storage/box/enzyme = 12, + /obj/item/storage/box/flour = 12, + /obj/item/storage/box/sugar = 12, + /obj/item/storage/box/saltshaker = 12, + /obj/item/storage/box/peppermill = 12, + /obj/item/storage/box/mint = 12, + /obj/item/storage/box/apple = 12, + /obj/item/storage/box/banana = 12, + /obj/item/storage/box/chanterelle = 12, + /obj/item/storage/box/cherries = 12, + /obj/item/storage/box/chili = 12, + /obj/item/storage/box/cabbage = 12, + /obj/item/storage/box/carrot = 12, + /obj/item/storage/box/corn = 12, + /obj/item/storage/box/eggplant = 12, + /obj/item/storage/box/lemon = 12, + /obj/item/storage/box/lime = 12, + /obj/item/storage/box/orange = 12, + /obj/item/storage/box/potato = 12, + /obj/item/storage/box/tomato = 12, + /obj/item/storage/box/whitebeet = 12, + ) + + prices = list( + /obj/item/storage/fancy/egg_box = 1, + /obj/item/storage/box/fish = 1, + /obj/item/storage/box/meat = 1, + /obj/item/storage/box/milk =1, + /obj/item/storage/box/soymilk = 1, + /obj/item/storage/box/enzyme = 1, + /obj/item/storage/box/flour = 1, + /obj/item/storage/box/sugar = 1, + /obj/item/storage/box/saltshaker = 1, + /obj/item/storage/box/peppermill = 1, + /obj/item/storage/box/mint = 1, + /obj/item/storage/box/apple = 1, + /obj/item/storage/box/banana = 2, + /obj/item/storage/box/chanterelle = 2, + /obj/item/storage/box/cherries = 2, + /obj/item/storage/box/chili = 2, + /obj/item/storage/box/cabbage = 2, + /obj/item/storage/box/carrot = 2, + /obj/item/storage/box/corn = 2, + /obj/item/storage/box/eggplant = 2, + /obj/item/storage/box/lemon = 2, + /obj/item/storage/box/lime = 2, + /obj/item/storage/box/orange = 2, + /obj/item/storage/box/potato = 2, + /obj/item/storage/box/tomato = 2, + /obj/item/storage/box/whitebeet = 2, + ) + product_type = VENDOR_PRODUCT_TYPE_FOOD diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 4a3afa00f368..8e4ffb90d2bd 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -761,3 +761,211 @@ else if(!isopened) isopened = 1 icon_state = "mealpackopened" + +//food boxes for storage in bulk + +//meat +/obj/item/storage/box/meat + name = "box of meat" + +/obj/item/storage/box/meat/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/meat/monkey(src) + +//fish +/obj/item/storage/box/fish + name = "box of fish" + +/obj/item/storage/box/fish/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/carpmeat(src) + +//grocery + +//milk +/obj/item/storage/box/milk + name = "box of milk" + +/obj/item/storage/box/milk/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/drinks/milk(src) + +//soymilk +/obj/item/storage/box/soymilk + name = "box of soymilk" + +/obj/item/storage/box/soymilk/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/drinks/soymilk(src) + +//enzyme +/obj/item/storage/box/enzyme + name = "box of enzyme" + +/obj/item/storage/box/enzyme/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/condiment/enzyme(src) + +//dry storage + +//flour +/obj/item/storage/box/flour + name = "box of flour" + +/obj/item/storage/box/flour/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/flour(src) + +//sugar +/obj/item/storage/box/sugar + name = "box of sugar" + +/obj/item/storage/box/sugar/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/condiment/sugar(src) + +//saltshaker +/obj/item/storage/box/saltshaker + name = "box of saltshakers" + +/obj/item/storage/box/saltshaker/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/condiment/saltshaker(src) + +//peppermill +/obj/item/storage/box/peppermill + name = "box of peppermills" + +/obj/item/storage/box/peppermill/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/condiment/peppermill(src) + +//mint +/obj/item/storage/box/mint + name = "box of mints" + +/obj/item/storage/box/mint/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/mint(src) + +// ORGANICS + +//apple +/obj/item/storage/box/apple + name = "box of apples" + +/obj/item/storage/box/apple/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/apple(src) + +//banana +/obj/item/storage/box/banana + name = "box of bananas" + +/obj/item/storage/box/banana/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/banana(src) + +//chanterelle +/obj/item/storage/box/chanterelles + name = "box of chanterelle" + +/obj/item/storage/box/chanterelle/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src) + +//cherries +/obj/item/storage/box/cherries + name = "box of cherries" + +/obj/item/storage/box/cherries/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/cherries(src) + +//chili +/obj/item/storage/box/chili + name = "box of chili" + +/obj/item/storage/box/chili/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/chili(src) + +//cabbage +/obj/item/storage/box/cabbage + name = "box of cabbages" + +/obj/item/storage/box/cabbage/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/cabbage(src) + +//carrot +/obj/item/storage/box/carrot + name = "box of carrots" + +/obj/item/storage/box/carrot/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/carrot(src) + +//corn +/obj/item/storage/box/corn + name = "box of corn" + +/obj/item/storage/box/corn/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/corn(src) + +//eggplant +/obj/item/storage/box/eggplant + name = "box of eggplants" + +/obj/item/storage/box/eggplant/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/eggplant(src) + +//lemon +/obj/item/storage/box/lemon + name = "box of lemons" + +/obj/item/storage/box/lemon/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/lemon(src) + +//lime +/obj/item/storage/box/lime + name = "box of limes" + +/obj/item/storage/box/lime/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/lime(src) + +//orange +/obj/item/storage/box/orange + name = "box of oranges" + +/obj/item/storage/box/orange/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/orange(src) + +//potato +/obj/item/storage/box/potato + name = "box of potatoes" + +/obj/item/storage/box/potato/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/potato(src) + +//tomato +/obj/item/storage/box/tomato + name = "box of tomatoes" + +/obj/item/storage/box/tomato/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/tomato(src) + +//whitebeet +/obj/item/storage/box/whitebeet + name = "box of whitebeet" + +/obj/item/storage/box/whitebeet/fill_preset_inventory() + for(var/i in 1 to 7) + new /obj/item/reagent_container/food/snacks/grown/whitebeet(src) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index d6148b23b7f0..2efd8e4e81e9 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -158,10 +158,15 @@ /obj/structure/closet/proc/take_damage(damage) + if(health <= 0) + return + health = max(health - damage, 0) if(health <= 0) - for(var/atom/movable/A as anything in src) - A.forceMove(src.loc) + for(var/atom/movable/movable as anything in src) + if(!loc) + break + movable.forceMove(loc) playsound(loc, 'sound/effects/meteorimpact.ogg', 25, 1) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm new file mode 100644 index 000000000000..d8b0c984d4b1 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm @@ -0,0 +1,143 @@ +//standart fridge + +/obj/structure/closet/secure_closet/fridge + name = "Refrigerator" + icon = 'icons/obj/structures/machinery/kitchen.dmi' + icon_state = "fridge1" + icon_closed = "fridge" + icon_locked = "fridge1" + icon_opened = "fridgeopen" + icon_broken = "fridgebroken" + icon_off = "fridge1" + storage_capacity = 60 //give extra storage capacity so that everything can fit. + +/obj/structure/closet/secure_closet/fridge/update_icon() + if(broken) + icon_state = icon_broken + else + if(!opened) + if(locked) + icon_state = icon_locked + else + icon_state = icon_closed + else + icon_state = icon_opened + +// for almayer. + +// Kitchen preparation room small quantity out of boxes... + +//standart organic storage. + +/obj/structure/closet/secure_closet/fridge/organic + name = "Organic" + +/obj/structure/closet/secure_closet/fridge/organic/Initialize() + . = ..() + for(var/i in 1 to 2) + new /obj/item/reagent_container/food/snacks/grown/apple(src) + new /obj/item/reagent_container/food/snacks/grown/cabbage(src) + new /obj/item/reagent_container/food/snacks/grown/carrot(src) + new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src) + new /obj/item/reagent_container/food/snacks/grown/chili(src) + new /obj/item/reagent_container/food/snacks/grown/corn(src) + new /obj/item/reagent_container/food/snacks/grown/eggplant(src) + new /obj/item/reagent_container/food/snacks/grown/potato(src) + new /obj/item/reagent_container/food/snacks/grown/tomato(src) + new /obj/item/reagent_container/food/snacks/grown/whitebeet(src) + new /obj/item/reagent_container/food/snacks/grown/cherries(src) + new /obj/item/reagent_container/food/snacks/grown/lime(src) + new /obj/item/reagent_container/food/snacks/grown/lemon(src) + new /obj/item/reagent_container/food/snacks/grown/orange(src) + new /obj/item/reagent_container/food/snacks/grown/banana(src) + +//DRy + +/obj/structure/closet/secure_closet/fridge/dry + name = "dry" + +/obj/structure/closet/secure_closet/fridge/dry/Initialize() + . = ..() + for(var/i in 1 to 6) + new /obj/item/reagent_container/food/snacks/flour(src) + for(var/i in 1 to 2) + new /obj/item/reagent_container/food/condiment/sugar(src) + +//grocery + +/obj/structure/closet/secure_closet/fridge/groceries + name = "Groceries" + +/obj/structure/closet/secure_closet/fridge/groceries/Initialize() + . = ..() + for(var/i in 1 to 2) + new /obj/item/reagent_container/food/drinks/milk(src) + new /obj/item/reagent_container/food/drinks/soymilk(src) + new /obj/item/storage/fancy/egg_box(src) + new /obj/item/reagent_container/food/condiment/enzyme(src) + +// Kitchen Reserve big quantity stored in boxes + +//meat surplus +/obj/structure/closet/secure_closet/fridge/meat/stock + name = "meat" + +/obj/structure/closet/secure_closet/fridge/meat/stock/Initialize() + . = ..() + for(var/i in 1 to 2) + new /obj/item/storage/box/meat(src) + +//fish surplus +/obj/structure/closet/secure_closet/fridge/fish/stock + name = "fish" + +/obj/structure/closet/secure_closet/fridge/fish/stock/Initialize() + . = ..() + for(var/i in 1 to 2) + new /obj/item/storage/box/fish(src) + +//groceries to hold milk in bulk +/obj/structure/closet/secure_closet/fridge/groceries/stock + name = "Groceries" + +/obj/structure/closet/secure_closet/fridge/groceries/stock/Initialize() + . = ..() + for(var/i in 1 to 2) + new /obj/item/storage/box/milk(src) + new /obj/item/storage/box/soymilk(src) + for(var/i in 1 to 7) + new /obj/item/storage/fancy/egg_box(src) + new /obj/item/storage/box/enzyme(src) + +//dry storage for dry food only... not a fridge +/obj/structure/closet/secure_closet/fridge/dry/stock + name = "dry" + +/obj/structure/closet/secure_closet/fridge/dry/stock/Initialize() + . = ..() + for(var/i in 1 to 4) + new /obj/item/storage/box/flour(src) + new /obj/item/storage/box/sugar(src) + +// organic storage in bulk + +/obj/structure/closet/secure_closet/fridge/organic/stock + name = "Organic" + +/obj/structure/closet/secure_closet/fridge/organic/stock/Initialize() + . = ..() + new /obj/item/storage/box/apple(src) + new /obj/item/storage/box/banana(src) + new /obj/item/storage/box/chanterelle(src) + new /obj/item/storage/box/cherries(src) + new /obj/item/storage/box/chili(src) + new /obj/item/storage/box/cabbage(src) + new /obj/item/storage/box/carrot(src) + new /obj/item/storage/box/corn(src) + new /obj/item/storage/box/eggplant(src) + new /obj/item/storage/box/lemon(src) + new /obj/item/storage/box/lime(src) + new /obj/item/storage/box/orange(src) + new /obj/item/storage/box/potato(src) + new /obj/item/storage/box/tomato(src) + new /obj/item/storage/box/whitebeet(src) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 06e404a43555..5fe27c5e5167 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -65,7 +65,7 @@ var/is_admin = FALSE if(user && user.client) - is_admin = check_other_rights(user.client, R_ADMIN, FALSE) + is_admin = check_client_rights(user.client, R_ADMIN, FALSE) var/list/pois = getpois(skip_mindless = !is_admin, specify_dead_role = FALSE) for(var/name in pois) var/list/serialized = list() diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index cf3be6de9086..645ade04ea4f 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -347,157 +347,158 @@ var/atom/movable/vis_obj/xeno_wounds/wound_icon_holder var/atom/movable/vis_obj/xeno_pack/backpack_icon_holder -/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/oldXeno, h_number) - var/area/A = get_area(src) - if(A && A.statistic_exempt) - statistic_exempt = TRUE +/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, hivenumber) + + if(old_xeno && old_xeno.hivenumber) + src.hivenumber = old_xeno.hivenumber + else if(hivenumber) + src.hivenumber = hivenumber + + var/datum/hive_status/hive = GLOB.hive_datum[src.hivenumber] + + if(hive) + hive.add_xeno(src) wound_icon_holder = new(null, src) vis_contents += wound_icon_holder - if(oldXeno) - set_movement_intent(oldXeno.m_intent) - hivenumber = oldXeno.hivenumber - nicknumber = oldXeno.nicknumber - life_kills_total = oldXeno.life_kills_total - life_damage_taken_total = oldXeno.life_damage_taken_total - evolution_stored = oldXeno.evolution_stored - if(oldXeno.iff_tag) - iff_tag = oldXeno.iff_tag - iff_tag.forceMove(src) - oldXeno.iff_tag = null - else if (h_number) - hivenumber = h_number - set_languages(list(LANGUAGE_XENOMORPH, LANGUAGE_HIVEMIND)) - if(oldXeno) - for(var/datum/language/L in oldXeno.languages) - add_language(L.name)//Make sure to keep languages (mostly for event Queens that know English) - // Well, not yet, technically - var/datum/hive_status/in_hive = GLOB.hive_datum[hivenumber] - if(in_hive) - in_hive.add_xeno(src) - // But now we are! + ///Handle transferring things from the old Xeno if we have one in the case of evolve, devolve etc. + if(old_xeno) + src.nicknumber = old_xeno.nicknumber + src.life_kills_total = old_xeno.life_kills_total + src.life_damage_taken_total = old_xeno.life_damage_taken_total + src.evolution_stored = old_xeno.evolution_stored - for(var/T in in_hive.hive_inherant_traits) - ADD_TRAIT(src, T, TRAIT_SOURCE_HIVE) + for(var/datum/language/language as anything in old_xeno.languages) + add_language(language.name)//Make sure to keep languages (mostly for event Queens that know English) + + //Carry over intents & targeted limb to the new Xeno + set_movement_intent(old_xeno.m_intent) + a_intent_change(old_xeno.a_intent) + + //We are hiding, let's keep hiding if we can! + if(old_xeno.layer == XENO_HIDING_LAYER) + for(var/datum/action/xeno_action/onclick/xenohide/hide in actions) + layer = XENO_HIDING_LAYER + hide.button.icon_state = "template_active" + + //If we're holding things drop them + for(var/obj/item/item in old_xeno.contents) //Drop stuff + old_xeno.drop_inv_item_on_ground(item) + old_xeno.empty_gut() + + if(old_xeno.iff_tag) + iff_tag = old_xeno.iff_tag + iff_tag.forceMove(src) + old_xeno.iff_tag = null + + if(hive) + for(var/trait in hive.hive_inherant_traits) + ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE) mutators.xeno = src + //Set caste stuff if(caste_type && GLOB.xeno_datum_list[caste_type]) caste = GLOB.xeno_datum_list[caste_type] - else - to_world("something went very wrong") - return - update_icon_source() + //Fire immunity signals + if (caste.fire_immunity != FIRE_IMMUNITY_NONE) + if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) + RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) - acid_splash_cooldown = caste.acid_splash_cooldown + RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_crossed_immune)) + else + UnregisterSignal(src, list( + COMSIG_LIVING_PREIGNITION, + COMSIG_LIVING_FLAMER_CROSSED, + COMSIG_LIVING_FLAMER_FLAMED + )) - if (caste.fire_immunity != FIRE_IMMUNITY_NONE) - if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) - RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) - RegisterSignal(src, list( - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED, - ), PROC_REF(flamer_crossed_immune)) - else - UnregisterSignal(src, list( - COMSIG_LIVING_PREIGNITION, - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED, - )) + if(caste.spit_types && length(caste.spit_types)) + ammo = GLOB.ammo_list[caste.spit_types[1]] - recalculate_everything() + acid_splash_cooldown = caste.acid_splash_cooldown + + if(caste.adjust_size_x != 1) + var/matrix/matrix = matrix() + matrix.Scale(caste.adjust_size_x, caste.adjust_size_y) + apply_transform(matrix) + + behavior_delegate = new caste.behavior_delegate_type() + behavior_delegate.bound_xeno = src + behavior_delegate.add_to_xeno() + resin_build_order = caste.resin_build_order + + job = caste.caste_type // Used for tracking the caste playtime + + else + CRASH("Attempted to create a new xenomorph [src] without caste datum.") if(mob_size < MOB_SIZE_BIG) mob_flags |= SQUEEZE_UNDER_VEHICLES + // More setup stuff for names, abilities etc + update_icon_source() generate_name() + add_inherent_verbs() + add_abilities() + create_reagents(100) + regenerate_icons() - if(isqueen(src)) - SStracking.set_leader("hive_[hivenumber]", src) - SStracking.start_tracking("hive_[hivenumber]", src) + toggle_xeno_hostilehud() + recalculate_everything() + toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks . = ..() + + //Set leader to the new mob + if(old_xeno && hive && IS_XENO_LEADER(old_xeno)) + hive.replace_hive_leader(old_xeno, src) + + //Begin SStracking + SStracking.start_tracking("hive_[src.hivenumber]", src) + + GLOB.living_xeno_list += src + GLOB.xeno_mob_list += src + //WO GAMEMODE if(SSticker?.mode?.hardcore) hardcore = 1 //Prevents healing and queen evolution time_of_birth = world.time - add_inherent_verbs() - add_abilities() - recalculate_actions() - + //Minimap if(z) INVOKE_NEXT_TICK(src, PROC_REF(add_minimap_marker)) + //Sight sight |= SEE_MOBS see_invisible = SEE_INVISIBLE_LIVING see_in_dark = 12 + if(client) set_lighting_alpha_from_prefs(client) else lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - if(caste && caste.spit_types && caste.spit_types.len) - ammo = GLOB.ammo_list[caste.spit_types[1]] - - create_reagents(100) - - GLOB.living_xeno_list += src - GLOB.xeno_mob_list += src - - if(caste && caste.adjust_size_x != 1) - var/matrix/M = matrix() - M.Scale(caste.adjust_size_x, caste.adjust_size_y) - apply_transform(M) - - if(caste) - behavior_delegate = new caste.behavior_delegate_type() - behavior_delegate.bound_xeno = src - behavior_delegate.add_to_xeno() - resin_build_order = caste.resin_build_order - else - CRASH("Xenomorph [src] has no caste datum! Tell the devs!") - - regenerate_icons() - toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks - toggle_xeno_hostilehud() - - if(oldXeno) - a_intent_change(oldXeno.a_intent)//Keep intent - - if(oldXeno.layer == XENO_HIDING_LAYER) - //We are hiding, let's keep hiding if we can! - for(var/datum/action/xeno_action/onclick/xenohide/hide in actions) - if(istype(hide)) - layer = XENO_HIDING_LAYER - hide.button.icon_state = "template_active" - - for(var/obj/item/W in oldXeno.contents) //Drop stuff - oldXeno.drop_inv_item_on_ground(W) - - oldXeno.empty_gut() - - if(IS_XENO_LEADER(oldXeno)) - hive.replace_hive_leader(oldXeno, src) - // Only handle free slots if the xeno is not in tdome - if(!is_admin_level(z)) + if(hive && !is_admin_level(z)) var/selected_caste = GLOB.xeno_datum_list[caste_type]?.type hive.used_slots[selected_caste]++ + //Statistics + var/area/current_area = get_area(src) + if(current_area && current_area.statistic_exempt) + statistic_exempt = TRUE if(GLOB.round_statistics && !statistic_exempt) GLOB.round_statistics.track_new_participant(faction, 1) - generate_name() // This can happen if a xeno gets made before the game starts if (hive && hive.hive_ui) hive.hive_ui.update_all_xeno_data() - job = caste.caste_type // Used for tracking the caste playtime Decorate() RegisterSignal(src, COMSIG_MOB_SCREECH_ACT, PROC_REF(handle_screech_act)) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index e6f4dfae8a44..ceedff03f2aa 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -389,6 +389,7 @@ /mob/living/carbon/xenomorph/queen/Initialize() . = ..() + SStracking.set_leader("hive_[hivenumber]", src) if(!is_admin_level(z))//so admins can safely spawn Queens in Thunderdome for tests. xeno_message(SPAN_XENOANNOUNCE("A new Queen has risen to lead the Hive! Rejoice!"),3,hivenumber) notify_ghosts(header = "New Queen", message = "A new Queen has risen.", source = src, action = NOTIFY_ORBIT) diff --git a/colonialmarines.dme b/colonialmarines.dme index 8656c70d6f18..76ddc86a43d3 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1290,6 +1290,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\kitchen.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" diff --git a/html/changelogs/AutoChangeLog-pr-4586.yml b/html/changelogs/AutoChangeLog-pr-4586.yml new file mode 100644 index 000000000000..248e91aee714 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4586.yml @@ -0,0 +1,8 @@ +author: "Huffie56" +delete-after: True +changes: + - rscadd: "Added a lot's of food boxes for that hold the basic ingredients for cooking." + - rscadd: "Added a file to handle the fridges in almayer kitchen." + - rscadd: "Added a vendor in the kitchen that sell boxes of ingredients." + - rscadd: "Added a a food crate called surplus boxes ingredient containing random boxes of ingredients." + - rscadd: "Added a version of this crate that will be freely given via the ASR system." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4716.yml b/html/changelogs/AutoChangeLog-pr-4716.yml deleted file mode 100644 index 76dacd7a72ca..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4716.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - rscadd: "Eggsac carrier can now place eggs on normal weeds to a maximum of 4 eggs." - - rscadd: "Eggsac carrier eggs on normal weeds have an expiry date." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4828.yml b/html/changelogs/AutoChangeLog-pr-4828.yml deleted file mode 100644 index 133404e587a6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4828.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "fira" -delete-after: True -changes: - - code_imp: "Ported basic /tg/ Status Backend." - - rscadd: "Human transform changes such as lying down, knock down, buckling, are now animated." - - bugfix: "Some statuses will now take effect immediately instead of waiting for a life tick, notably Resting." - - balance: "Many interaction requirements were changed to eg. fail upon stuns rather than if lying down." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4991.yml b/html/changelogs/AutoChangeLog-pr-4991.yml new file mode 100644 index 000000000000..857c9c0894d2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4991.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - code_imp: "Refactiors xenomorph initialize & removes some duplicate proc calls" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5032.yml b/html/changelogs/AutoChangeLog-pr-5032.yml new file mode 100644 index 000000000000..c355c467a42b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5032.yml @@ -0,0 +1,5 @@ +author: "harryob" +delete-after: True +changes: + - bugfix: "the health indicator in the tooltip and colorbox is still present when a POI has 0 health" + - bugfix: "admins can refresh the orbit menu without runtimes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5039.yml b/html/changelogs/AutoChangeLog-pr-5039.yml new file mode 100644 index 000000000000..c16d44141a92 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5039.yml @@ -0,0 +1,4 @@ +author: "HeresKozmos" +delete-after: True +changes: + - mapadd: "added a new spring area to kutjevo's south caves" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5042.yml b/html/changelogs/AutoChangeLog-pr-5042.yml deleted file mode 100644 index ff4fbf2ac464..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5042.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "stalkerino" -delete-after: True -changes: - - rscadd: "readds skull facepaint and skull balaclava (blue and black)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5050.yml b/html/changelogs/AutoChangeLog-pr-5050.yml new file mode 100644 index 000000000000..c78f4bdeb197 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5050.yml @@ -0,0 +1,4 @@ +author: "SabreML" +delete-after: True +changes: + - bugfix: "Fixed a few space tiles under a window in Kutjevo Refinery." \ No newline at end of file diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index 8fc0ce518efb..7b16c3526888 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -388,3 +388,20 @@ gone off. hislittlecuzingames: - bugfix: Disables launch announcment alarm if it's sounding when queen hijacks +2023-11-28: + Birdtalon: + - rscadd: Eggsac carrier can now place eggs on normal weeds to a maximum of 4 eggs. + - rscadd: Eggsac carrier eggs on normal weeds have an expiry date. + fira: + - code_imp: Ported basic /tg/ Status Backend. + - rscadd: Human transform changes such as lying down, knock down, buckling, are + now animated. + - bugfix: Some statuses will now take effect immediately instead of waiting for + a life tick, notably Resting. + - balance: Many interaction requirements were changed to eg. fail upon stuns rather + than if lying down. + stalkerino: + - rscadd: readds skull facepaint and skull balaclava (blue and black) +2023-11-29: + realforest2001: + - rscdel: Whiskey Outpost no longer rolls pred rounds naturally. diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 676bd49576f0..4eb4d6fd77e9 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -62,6 +62,10 @@ "adD" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/lz_dunes) +"adG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "adX" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light, @@ -362,6 +366,15 @@ dir = 4 }, /area/kutjevo/interior/complex/Northwest_Dorms) +"axi" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_x = -4; + pixel_y = 10 + }, +/turf/open/gm/river/desert/shallow_edge{ + dir = 9 + }, +/area/kutjevo/exterior/spring) "axK" = ( /obj/item/trash/cigbutt/bcigbutt, /obj/structure/stairs/perspective/kutjevo{ @@ -679,6 +692,13 @@ icon = 'icons/turf/floors/desert_water_toxic.dmi' }, /area/kutjevo/interior/oob) +"aXU" = ( +/obj/structure/barricade/wooden{ + dir = 1; + pixel_y = 13 + }, +/turf/open/desert/desert_shore/shore_edge1, +/area/kutjevo/exterior/spring) "aXV" = ( /obj/structure/machinery/colony_floodlight_switch, /turf/closed/wall/kutjevo/colony/reinforced, @@ -1958,6 +1978,14 @@ }, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/interior/power) +"cKY" = ( +/obj/structure/prop/brazier/frame/full/campfire, +/obj/item/tool/match/paper{ + pixel_y = -2; + pixel_x = -11 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "cLn" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -2286,6 +2314,11 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) +"dcC" = ( +/turf/open/desert/desert_shore/shore_edge1{ + dir = 1 + }, +/area/kutjevo/exterior/spring) "ddi" = ( /obj/structure/platform/kutjevo, /obj/structure/blocker/invisible_wall, @@ -2418,6 +2451,11 @@ dir = 10 }, /area/kutjevo/interior/colony_South/power2) +"dnd" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 8 + }, +/area/kutjevo/exterior/spring) "dnl" = ( /obj/structure/platform/kutjevo/rock, /turf/open/auto_turf/sand/layer1, @@ -2676,6 +2714,15 @@ dir = 8 }, /area/kutjevo/exterior/runoff_river) +"dBt" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_x = -8; + pixel_y = 10 + }, +/turf/open/gm/river/desert/shallow_edge{ + dir = 5 + }, +/area/kutjevo/exterior/spring) "dBO" = ( /obj/structure/ladder, /obj/structure/blocker/invisible_wall, @@ -2744,6 +2791,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) +"dGi" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 1 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "dGx" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/kutjevo/tan, @@ -2867,6 +2920,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) +"dOj" = ( +/turf/open/gm/river/desert/shallow_corner{ + dir = 1 + }, +/area/kutjevo/exterior/spring) "dOJ" = ( /obj/structure/barricade/deployable, /turf/open/floor/kutjevo/colors/purple/edge, @@ -2957,6 +3015,10 @@ }, /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/runoff_river) +"dUc" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/spring) "dUy" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/floor/kutjevo/multi_tiles{ @@ -3046,6 +3108,15 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_dunes) +"eaT" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_South) +"ebv" = ( +/turf/open/desert/desert_shore/shore_corner2{ + dir = 8 + }, +/area/kutjevo/exterior/spring) "ebB" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) @@ -3427,6 +3498,9 @@ "evZ" = ( /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/power) +"ewl" = ( +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/spring) "ewF" = ( /obj/item/phone{ pixel_x = 1; @@ -3548,6 +3622,20 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) +"eCE" = ( +/obj/item/clipboard{ + pixel_y = 4; + pixel_x = -4 + }, +/obj/item/tool/pen{ + name = "stained pen"; + desc = "It's a seemingly normal pen... aside from the faint red fingerprints on the side..."; + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/paper/crumpled/bloody, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "eCY" = ( /obj/structure/machinery/cryo_cell, /turf/open/floor/kutjevo/grey/plate, @@ -3604,6 +3692,10 @@ "eHX" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/telecomm/lz1_south) +"eIq" = ( +/obj/item/tool/hatchet, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "eIL" = ( /turf/open/floor/kutjevo/colors/cyan/edge{ dir = 4 @@ -3859,6 +3951,9 @@ dir = 4 }, /area/kutjevo/interior/colony_South/power2) +"eVR" = ( +/turf/open/gm/river/desert/deep, +/area/kutjevo/exterior/spring) "eWP" = ( /obj/effect/landmark/corpsespawner/colonist/kutjevo, /turf/open/floor/kutjevo/multi_tiles, @@ -3943,6 +4038,10 @@ icon = 'icons/turf/floors/desert_water_toxic.dmi' }, /area/kutjevo/interior/power) +"fdH" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "fdS" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib1" @@ -4114,6 +4213,10 @@ dir = 4 }, /area/kutjevo/interior/construction) +"fne" = ( +/obj/item/trash/barcardine, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "foE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/barricade/handrail/kutjevo{ @@ -4411,6 +4514,12 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) +"fMB" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 5 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "fNc" = ( /obj/structure/platform/kutjevo{ dir = 4 @@ -4589,6 +4698,14 @@ /obj/structure/prop/dam/gravestone, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) +"fYr" = ( +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 8; + health = 25000 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "fYE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2, @@ -4711,6 +4828,10 @@ dir = 8 }, /area/kutjevo/interior/power/comms) +"giY" = ( +/obj/item/device/flashlight/lamp/tripod/grey, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "giZ" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 28 @@ -4782,6 +4903,13 @@ dir = 10 }, /area/kutjevo/exterior/runoff_dunes) +"gok" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_y = 14 + }, +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/spring) "goT" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/exterior/runoff_dunes) @@ -4813,6 +4941,15 @@ /obj/item/clipboard, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"gsn" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_y = 14 + }, +/turf/open/desert/desert_shore/desert_shore1{ + dir = 1 + }, +/area/kutjevo/exterior/spring) "gsq" = ( /obj/structure/filingcabinet, /obj/structure/window/reinforced/tinted{ @@ -4956,6 +5093,13 @@ "gBl" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob) +"gBu" = ( +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 + }, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/spring) "gBI" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -5053,6 +5197,9 @@ dir = 8 }, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"gFA" = ( +/turf/open/desert/desert_shore/shore_edge1, +/area/kutjevo/exterior/spring) "gHh" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer0, @@ -5072,6 +5219,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/foremans_office) +"gHV" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) +"gJx" = ( +/turf/open/gm/river/desert/shallow_corner{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "gJB" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -5720,6 +5876,11 @@ }, /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/colony_central) +"hET" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 10 + }, +/area/kutjevo/exterior/spring) "hFi" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -5848,6 +6009,10 @@ icon_state = "platingdmg3" }, /area/kutjevo/interior/complex/Northwest_Dorms) +"hRG" = ( +/obj/structure/prop/dam/boulder/boulder2, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "hSo" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 10 @@ -5961,6 +6126,11 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/construction) +"hZx" = ( +/obj/structure/flora/grass/tallgrass/desert, +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "iaj" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/exterior/lz_river) @@ -6108,6 +6278,12 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/triage) +"irb" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 8 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "ird" = ( /obj/structure/blocker/invisible_wall, /obj/structure/platform/kutjevo{ @@ -6381,6 +6557,9 @@ /obj/item/storage/box/trackimp, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany/east_tech) +"iNI" = ( +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "iNY" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -6541,6 +6720,13 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) +"jac" = ( +/obj/item/device/radio{ + name = "damp shortwave radio"; + desc = "A regular shortwave radio, this one has experienced minor water damage but is still functional." + }, +/turf/open/desert/desert_shore/shore_corner2, +/area/kutjevo/exterior/spring) "jav" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/item/ammo_box/magazine/nailgun, @@ -6712,6 +6898,16 @@ /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/power/comms) +"jnD" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/obj/structure/barricade/wooden{ + dir = 1; + pixel_y = 13 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "jnS" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -7282,6 +7478,10 @@ /obj/structure/platform/kutjevo, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/colony_north) +"kgx" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "khI" = ( /obj/structure/window/framed/kutjevo/reinforced/hull, /turf/open/floor/kutjevo/grey/plate, @@ -7668,6 +7868,9 @@ "kDS" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) +"kEh" = ( +/turf/open/gm/river/desert/shallow_edge, +/area/kutjevo/exterior/spring) "kEG" = ( /obj/structure/sign/poster{ pixel_y = -32 @@ -7724,6 +7927,10 @@ "kIn" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/scrubland) +"kIQ" = ( +/obj/structure/prop/dam/large_boulder/boulder2, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "kKb" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -7837,10 +8044,20 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) +"kQa" = ( +/obj/structure/bed/bedroll, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "kQo" = ( /obj/structure/girder, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/construction) +"kQD" = ( +/turf/open/desert/desert_shore/desert_shore1{ + dir = 8 + }, +/area/kutjevo/exterior/spring) "kQU" = ( /obj/structure/platform/kutjevo{ dir = 8 @@ -8361,6 +8578,11 @@ /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/complex/med/locks) +"lEf" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 6 + }, +/area/kutjevo/exterior/spring) "lEA" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/colony_central) @@ -8682,6 +8904,11 @@ "mbS" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/botany) +"mct" = ( +/turf/open/gm/river/desert/shallow_corner{ + dir = 8 + }, +/area/kutjevo/exterior/spring) "mcv" = ( /obj/structure/window/framed/kutjevo/reinforced/hull, /obj/structure/blocker/invisible_wall, @@ -8977,6 +9204,10 @@ dir = 6 }, /area/kutjevo/interior/complex/med/locks) +"mvX" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "mwh" = ( /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/kutjevo/colors/green/tile, @@ -8996,6 +9227,11 @@ /obj/item/frame/rack, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) +"myk" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "mzn" = ( /obj/structure/platform/kutjevo{ dir = 1 @@ -9015,6 +9251,18 @@ /obj/item/storage/pill_bottle/dexalin/skillless, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med) +"mAD" = ( +/obj/structure/barricade/wooden{ + dir = 1; + pixel_y = 13 + }, +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 8; + health = 25000 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "mAH" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/kutjevo_decals/catwalk, @@ -9308,6 +9556,11 @@ color = "#990000" }, /area/kutjevo/interior/oob) +"mNv" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 5 + }, +/area/kutjevo/exterior/spring) "mNM" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/exterior/runoff_bridge) @@ -10083,6 +10336,12 @@ /obj/structure/platform/kutjevo/rock, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_central) +"nPq" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 6 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "nPs" = ( /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, @@ -10096,6 +10355,11 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/triage) +"nPX" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 9 + }, +/area/kutjevo/exterior/spring) "nQc" = ( /obj/structure/platform_decoration/kutjevo/rock, /obj/structure/platform_decoration/kutjevo/rock{ @@ -10234,6 +10498,12 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/operating) +"nZC" = ( +/obj/structure/bed/bedroll, +/obj/effect/landmark/corpsespawner/colonist/kutjevo, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "nZK" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) @@ -10251,6 +10521,12 @@ }, /turf/open/floor/kutjevo/tan/alt_inner_edge, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"obv" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 10 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "oca" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -10787,6 +11063,10 @@ /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/carpet, /area/kutjevo/interior/oob) +"oQb" = ( +/obj/structure/flora/grass/tallgrass/desert/corner, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "oQc" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/power_pt2_electric_boogaloo) @@ -10990,6 +11270,13 @@ icon_state = "0,5" }, /area/kutjevo/interior/construction) +"pfK" = ( +/obj/structure/barricade/wooden{ + dir = 1; + pixel_y = 13 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "pfR" = ( /obj/structure/platform/kutjevo/rock{ dir = 4 @@ -11116,6 +11403,15 @@ "pmv" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/complex_border/med_rec) +"pmD" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/gm/river/desert/shallow_edge{ + dir = 6 + }, +/area/kutjevo/exterior/spring) "pmR" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/auto_turf/sand/layer1, @@ -11733,6 +12029,11 @@ dir = 4 }, /area/kutjevo/interior/complex/botany/east_tech) +"qaU" = ( +/turf/open/desert/desert_shore/shore_corner2{ + dir = 1 + }, +/area/kutjevo/exterior/spring) "qaY" = ( /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/shore_corner2{ @@ -12102,6 +12403,12 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_S_East) +"qFh" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 4 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "qFU" = ( /turf/open/desert/desert_shore/shore_corner2{ dir = 8 @@ -12493,6 +12800,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) +"riT" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "rjS" = ( /obj/structure/blocker/invisible_wall, /obj/structure/platform/kutjevo{ @@ -12661,6 +12972,10 @@ /obj/structure/window/framed/kutjevo/reinforced/hull, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) +"rwC" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/interior/colony_South) "rwL" = ( /obj/item/frame/table/almayer, /turf/open/floor/kutjevo/tan, @@ -12739,6 +13054,10 @@ "rCp" = ( /turf/open/desert/desert_shore/desert_shore1, /area/kutjevo/exterior/runoff_bridge) +"rDe" = ( +/obj/structure/prop/dam/boulder/boulder2, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "rDO" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomright" @@ -12998,6 +13317,13 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/botany_medical_cave) +"rUE" = ( +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "rUM" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/girder, @@ -13212,6 +13538,9 @@ /obj/effect/spawner/random/tool, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/construction) +"skx" = ( +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "slb" = ( /obj/structure/machinery/light{ dir = 4 @@ -13299,6 +13628,10 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) +"soL" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "soP" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -13544,6 +13877,11 @@ }, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) +"sGS" = ( +/turf/open/desert/desert_shore/shore_edge1{ + dir = 8 + }, +/area/kutjevo/exterior/spring) "sHg" = ( /obj/structure/bed/chair{ dir = 4 @@ -13859,6 +14197,12 @@ "tax" = ( /turf/open/gm/river/desert/shallow_edge, /area/kutjevo/exterior/runoff_dunes) +"tbx" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "tdC" = ( /obj/structure/bed/chair{ dir = 4 @@ -14531,6 +14875,11 @@ /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/deep, /area/kutjevo/interior/oob) +"uaz" = ( +/turf/open/desert/desert_shore/desert_shore1{ + dir = 1 + }, +/area/kutjevo/exterior/spring) "ubm" = ( /obj/structure/machinery/light{ dir = 8 @@ -14558,6 +14907,11 @@ /obj/structure/platform/kutjevo/rock, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) +"ueM" = ( +/turf/open/desert/desert_shore/shore_corner2{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "ueO" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -14899,6 +15253,9 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) +"uzJ" = ( +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/spring) "uAh" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/floor/kutjevo/multi_tiles, @@ -15150,6 +15507,10 @@ icon = 'icons/turf/floors/desert_water_toxic.dmi' }, /area/kutjevo/interior/oob) +"uNW" = ( +/obj/structure/prop/dam/boulder/boulder2, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "uNZ" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/platform/kutjevo/smooth{ @@ -15424,6 +15785,10 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) +"vdK" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/spring) "vdV" = ( /obj/structure/blocker/invisible_wall, /obj/structure/filtration/machine_96x96/indestructible{ @@ -15498,6 +15863,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"vhC" = ( +/obj/structure/flora/grass/desert/lightgrass_11, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/spring) "vhQ" = ( /obj/structure/platform_decoration/kutjevo/rock{ dir = 8 @@ -16316,6 +16685,16 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) +"wrO" = ( +/turf/open/gm/river/desert/shallow_edge{ + dir = 1 + }, +/area/kutjevo/exterior/spring) +"wrV" = ( +/turf/open/desert/desert_shore/desert_shore1{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "wsf" = ( /obj/structure/platform_decoration/kutjevo/rock{ dir = 8 @@ -16343,6 +16722,13 @@ dir = 1 }, /area/kutjevo/interior/foremans_office) +"wtk" = ( +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/spring) "wtu" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 @@ -17014,6 +17400,11 @@ dir = 8 }, /area/kutjevo/interior/complex/med/operating) +"xuN" = ( +/turf/open/desert/desert_shore/shore_edge1{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "xuY" = ( /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/multi_tiles{ @@ -17034,6 +17425,9 @@ /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/pano) +"xxf" = ( +/turf/open/gm/river/desert/shallow_corner, +/area/kutjevo/exterior/spring) "xxz" = ( /obj/structure/prop/dam/gravestone{ icon_state = "gravestone3" @@ -17487,6 +17881,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/alt_inner_edge, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"yic" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_y = 14 + }, +/turf/open/desert/desert_shore/desert_shore1{ + dir = 4 + }, +/area/kutjevo/exterior/spring) "yir" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/botany/east) @@ -43246,11 +43649,11 @@ bpj bpj bpj bpj -dxF -dxF -dxF -dxF -dxF +bpj +bpj +uzJ +skx +hRG dxF dxF dxF @@ -43413,12 +43816,12 @@ bpj bpj bpj bpj -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +skx +skx +skx +skx dxF dxF dxF @@ -43580,14 +43983,14 @@ bpj bpj oXH bpj -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +skx +skx +skx +skx +iNI +iNI dxF dxF dxF @@ -43748,14 +44151,14 @@ npL bpj bpj bpj -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +skx +skx +skx +uzJ +skx +skx +iNI dxF dxF dxF @@ -43915,16 +44318,16 @@ npL bpj bpj bpj +bpj dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +skx +skx +skx +skx +iNI dxF dxF dxF @@ -44086,13 +44489,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +hRG +skx +mvX +uzJ +skx +skx +hRG dxF dxF dxF @@ -44254,14 +44657,14 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +skx +skx +skx +skx +iNI dxF dxF dxF @@ -44421,15 +44824,15 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +iNI +skx +skx +skx +skx +skx +skx +skx +skx dxF dxF dxF @@ -44589,15 +44992,15 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +iNI +skx +skx +uzJ +skx +skx +skx +skx +iNI dxF dxF dxF @@ -44757,14 +45160,14 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +skx +skx +uzJ +uzJ +skx dxF dxF dxF @@ -44926,13 +45329,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +iNI +skx +skx +skx +mvX +skx +iNI dxF dxF dxF @@ -45095,12 +45498,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +rDe +skx +skx +skx +skx +iNI dxF dxF dxF @@ -45263,12 +45666,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +iNI +skx +uzJ +skx +skx +iNI dxF dxF dxF @@ -45430,12 +45833,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +iNI +skx +uzJ +uzJ +skx +skx dxF dxF dxF @@ -45598,15 +46001,15 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +mAD +fYr +riT +fYr +skx +skx +skx +pfK dxF dxF dxF @@ -45766,16 +46169,16 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +eIq +skx +gHV +skx +uzJ +kIQ +skx +skx +skx dxF dxF dxF @@ -45933,17 +46336,17 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +giY +skx +skx +skx +mvX +skx +skx +skx +skx +kQa +vhC dxF dxF dxF @@ -46099,19 +46502,19 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +uzJ +skx +skx +iNI +iNI +fdH +iNI +soL +uzJ +cKY +mvX +hRG dxF dxF dxF @@ -46265,21 +46668,21 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +hRG +skx +skx +skx +iNI +dcC +kQD +kQD +kQD +aXU +nZC +gHV +eCE +skx +fne dxF dxF dxF @@ -46432,21 +46835,21 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +uzJ +skx +iNI +dcC +qaU +axi +dnd +hET +vdK +wtk +riT +rUE +gBu +rUE dxF dxF dxF @@ -46599,21 +47002,21 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +fMB +mvX +iNI +dcC +qaU +nPX +dOj +eVR +kEh +jac +gFA +iNI +skx +nPq +qFh dxF dxF dxF @@ -46765,23 +47168,23 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +kgx +dGi +uzJ +iNI +gsn +nPX +dOj +eVR +eVR +mct +hET +ewl +iNI +skx +oQb +kgx +dUc dxF dxF dxF @@ -46932,23 +47335,23 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +kgx +dGi +skx +iNI +uaz +wrO +eVR +eVR +eVR +eVR +kEh +gok +iNI +giY +oQb +kgx +kgx dxF dxF dxF @@ -47099,23 +47502,23 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +irb +tbx +skx +iNI +uaz +wrO +eVR +eVR +eVR +eVR +kEh +ewl +iNI +skx +oQb +kgx +kgx dxF dxF dxF @@ -47266,23 +47669,23 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +iNI +uaz +dBt +xxf +eVR +eVR +gJx +pmD +ewl +iNI +skx +obv +dUc +kgx dxF dxF dxF @@ -47433,22 +47836,22 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +vhC +uzJ +skx +iNI +xuN +ebv +mNv +myk +myk +lEf +ueM +sGS +iNI +kIQ +skx +obv dxF dxF dxF @@ -47601,21 +48004,21 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +iNI +xuN +wrV +wrV +yic +wrV +sGS +iNI +skx +skx +skx +skx dxF dxF dxF @@ -47768,21 +48171,21 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +skx +skx +mvX +iNI +iNI +iNI +iNI +iNI +iNI +skx +uzJ +skx +skx +uzJ dxF dxF dxF @@ -47921,24 +48324,8 @@ npL bpj bpj bpj -mMH -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +gBl dxF dxF dxF @@ -47949,6 +48336,22 @@ dxF dxF dxF dxF +iNI +iNI +jnD +skx +skx +uzJ +skx +kIQ +skx +skx +skx +skx +skx +mvX +skx +hRG dxF dxF dxF @@ -48088,6 +48491,8 @@ tCm bpj bpj bpj +bpj +bpj dxF dxF dxF @@ -48097,24 +48502,22 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +rDe +iNI +uzJ +skx +riT +skx +giY +skx +skx +skx +nPq +qFh +qFh +fMB +uzJ +vhC dxF dxF dxF @@ -48254,26 +48657,10 @@ mMH bpj bpj bpj -mMH -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +bpj dxF dxF dxF @@ -48281,6 +48668,22 @@ dxF dxF dxF dxF +iNI +skx +skx +skx +skx +jnD +skx +skx +skx +skx +uzJ +oQb +dUc +kgx +dGi +skx dxF dxF dxF @@ -48421,31 +48824,31 @@ wXd npL bpj bpj +bpj +bpj +bpj +bpj +mMH mMH dxF dxF dxF dxF +iNI +skx +mvX +skx +skx +iNI +iNI dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +skx +oQb +kgx +hZx dxF dxF dxF @@ -48588,21 +48991,21 @@ wXd bpj npL bpj -qOP -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +oXH +bpj +bpj +bpj +bpj +bpj +mMH dxF dxF +skx +skx +uzJ +skx +iNI +iNI dxF dxF dxF @@ -48757,18 +49160,18 @@ bpj bpj mMH dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +npL +bpj +bpj +mMH +bpj +bpj +skx +skx +skx +iNI dxF dxF dxF @@ -48925,16 +49328,16 @@ bpj dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +oXH +bpj +bpj +bpj +uzJ +skx +iNI dxF dxF dxF @@ -49093,14 +49496,14 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +bpj +bpj +bpj +skx +skx dxF dxF dxF @@ -49260,12 +49663,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +npL +bpj +mMH dxF dxF dxF @@ -49429,10 +49832,10 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +mMH dxF dxF dxF @@ -49596,11 +49999,11 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +bpj +mMH dxF dxF dxF @@ -49763,11 +50166,11 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF +uNW +bpj +bpj +bpj +mMH dxF dxF dxF @@ -49931,10 +50334,10 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF +adG +eaT +rwC +eaT dxF dxF dxF @@ -50098,10 +50501,10 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF +mMH +oXH +bpj +bpj dxF dxF dxF @@ -50265,10 +50668,10 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +bpj dxF dxF dxF @@ -50431,11 +50834,11 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +bpj +mMH dxF dxF dxF @@ -50597,12 +51000,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +npL +bpj +mMH dxF dxF dxF @@ -50762,13 +51165,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +bpj +bpj +bpj +mMH dxF dxF dxF @@ -50929,13 +51332,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +npL +bpj +bpj +bpj +mMH dxF dxF dxF @@ -51095,13 +51498,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +bpj +bpj +bpj +npL dxF dxF dxF @@ -51262,12 +51665,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +oXH +bpj +bpj +bpj dxF dxF dxF @@ -51428,13 +51831,13 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +npL +bpj +bpj +bpj +bpj dxF dxF dxF @@ -51595,12 +51998,12 @@ dxF dxF dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF +mMH +bpj +bpj +bpj +bpj +mMH dxF dxF dxF @@ -51760,13 +52163,13 @@ bpj bpj dxF dxF -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +bpj +npL +bpj +mMH dxF dxF dxF @@ -51926,13 +52329,13 @@ bpj bpj bpj mMH -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +npL +bpj +bpj +bpj +bpj +bpj dxF dxF dxF @@ -52093,13 +52496,13 @@ bpj oXH bpj bpj -dxF -dxF -dxF -dxF -dxF -dxF -dxF +bpj +bpj +oXH +bpj +bpj +mMH +mMH dxF dxF dxF @@ -52260,11 +52663,11 @@ bpj bpj bpj bpj -dxF -dxF -dxF -dxF -dxF +bpj +bpj +bpj +npL +mMH dxF dxF dxF @@ -52428,9 +52831,9 @@ bpj bpj bpj mMH -dxF -dxF -dxF +bpj +bpj +bpj dxF dxF dxF diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm index 235f370b4321..bc89cfab0105 100644 --- a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm +++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm @@ -108,10 +108,6 @@ dir = 1 }, /area/template_noop) -"qI" = ( -/obj/structure/window/framed/kutjevo, -/turf/open/space/basic, -/area/template_noop) "qM" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/blood/oil, @@ -492,7 +488,7 @@ Re EK "} (5,1,1) = {" -qI +EK wC rG LO @@ -506,7 +502,7 @@ cm YO "} (6,1,1) = {" -qI +EK rm lZ nn diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 42e343e1b713..25926395d624 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -529,17 +529,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"abQ" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "abR" = ( /obj/item/tank/phoron, /turf/open/floor/almayer{ @@ -798,6 +787,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"acE" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/north2) "acF" = ( /obj/structure/machinery/light{ dir = 1 @@ -920,20 +915,12 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"acS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -29 - }, +"acT" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "silver" + icon_state = "cargo" }, -/area/almayer/command/cichallway) +/area/almayer/lifeboat_pumps/north2) "acU" = ( /obj/structure/closet/basketball, /turf/open/floor/almayer{ @@ -1183,6 +1170,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"adQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "adR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ access_modified = 1; @@ -1211,6 +1207,13 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"adZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "aea" = ( /obj/structure/machinery/light{ dir = 1 @@ -1560,6 +1563,17 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) +"afc" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "afd" = ( /obj/structure/largecrate/random/barrel/white, /obj/structure/sign/safety/bulkhead_door{ @@ -2559,14 +2573,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"aiQ" = ( -/obj/structure/machinery/faxmachine, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "aiR" = ( /obj/structure/stairs{ dir = 8; @@ -2614,16 +2620,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"aiW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "aiX" = ( /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) @@ -2667,12 +2663,6 @@ "ajl" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/upper_medical) -"ajm" = ( -/obj/structure/closet/secure_closet/securecom, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ajp" = ( /obj/structure/surface/table/almayer, /obj/structure/dropship_equipment/fuel/cooling_system{ @@ -2973,14 +2963,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"ako" = ( +"akr" = ( /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 + dir = 8; + icon_state = "pipe-c" }, -/turf/open/floor/carpet, +/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "akt" = ( /obj/structure/cable/heavyduty{ @@ -3516,15 +3504,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"amE" = ( -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "amF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -3727,6 +3706,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"anl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "anm" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -3747,47 +3732,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) -"anp" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anq" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anr" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "ans" = ( /turf/open/floor/almayer{ dir = 8; @@ -5410,16 +5354,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"asu" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "asv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light{ @@ -5837,12 +5771,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"atx" = ( -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "aty" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -6018,6 +5946,14 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"atY" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "atZ" = ( /obj/structure/machinery/door_control{ id = "OTStore"; @@ -7339,16 +7275,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"axR" = ( -/obj/structure/machinery/shower, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "axV" = ( /obj/structure/machinery/telecomms/server/presets/command, /turf/open/floor/almayer{ @@ -7795,33 +7721,6 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"azm" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/paper_bin/uscm{ - pixel_y = 7; - pixel_x = -17 - }, -/obj/item/tool/pen/clicky{ - pixel_x = -13; - pixel_y = -1 - }, -/obj/item/tool/pen/clicky{ - pixel_y = 5; - pixel_x = -13 - }, -/obj/structure/machinery/door_control{ - id = "CO-Office"; - name = "Door Control"; - normaldoorcontrol = 1; - req_access_txt = "31"; - pixel_y = 7 - }, -/obj/item/ashtray/bronze{ - pixel_y = 1; - pixel_x = 12 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "azn" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -7837,12 +7736,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"azp" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "azq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -8853,6 +8746,14 @@ icon_state = "orangecorner" }, /area/almayer/command/telecomms) +"aDc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "aDe" = ( /obj/structure/machinery/light{ dir = 8 @@ -9646,6 +9547,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"aGi" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "aGj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -9824,6 +9731,24 @@ "aHe" = ( /turf/closed/wall/almayer, /area/almayer/command/lifeboat) +"aHk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sink{ + pixel_y = 16 + }, +/obj/structure/mirror{ + pixel_y = 21 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/numbertwobunks) "aHl" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine, @@ -9978,6 +9903,12 @@ }, /turf/open/floor/engine, /area/almayer/engineering/airmix) +"aHT" = ( +/obj/structure/bed/chair/wood/normal, +/obj/item/bedsheet/brown, +/obj/item/toy/plush/farwa, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/cells) "aHU" = ( /obj/structure/platform{ dir = 1 @@ -10204,12 +10135,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aIV" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "aIX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -10472,11 +10397,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aKk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "aKn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -10768,6 +10688,16 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"aLt" = ( +/obj/structure/surface/rack, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/numbertwobunks) "aLB" = ( /turf/closed/wall/almayer, /area/almayer/hallways/starboard_hallway) @@ -11109,6 +11039,14 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"aNe" = ( +/obj/structure/closet/firecloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "aNi" = ( /turf/closed/wall/almayer, /area/almayer/living/chapel) @@ -11264,18 +11202,6 @@ /obj/effect/landmark/start/nurse, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"aOj" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom"; - dir = 2 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "aOq" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -12352,11 +12278,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"aTl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/command/cichallway) "aTm" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) @@ -12530,6 +12451,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"aTV" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "aTW" = ( /obj/structure/bed/chair{ dir = 8 @@ -12714,6 +12641,12 @@ icon_state = "green" }, /area/almayer/living/offices) +"aUP" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "aUY" = ( /obj/structure/machinery/light{ dir = 4 @@ -13053,6 +12986,23 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) +"aWA" = ( +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/item/prop/magazine/dirty{ + pixel_x = -6; + pixel_y = -10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/captain_mess) "aWD" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -14653,6 +14603,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"bfe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -15172,10 +15132,6 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"bhM" = ( -/obj/structure/safe/cl_office, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "bhT" = ( /obj/structure/cargo_container/lockmart/mid{ layer = 3.1; @@ -15270,22 +15226,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"biJ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "biL" = ( /obj/structure/platform{ dir = 4 @@ -15449,13 +15389,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_umbilical) -"bjQ" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "bjR" = ( /obj/structure/cargo_container/arious/right, /turf/open/floor/almayer, @@ -16276,16 +16209,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"boc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "bof" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -16541,15 +16464,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"bpw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "bpz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -17986,16 +17900,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"bxA" = ( -/obj/structure/machinery/power/apc/almayer/hardened, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "bxB" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -19957,16 +19861,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bGz" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "bGF" = ( /obj/structure/machinery/landinglight/ds2{ dir = 1 @@ -20438,6 +20332,25 @@ }, /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) +"bIA" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/auxiliary_officer_office) "bII" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -22323,23 +22236,6 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) -"bQl" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/prop/magazine/boots/n160{ - pixel_y = -8; - pixel_x = 4; - layer = 2.8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/commandbunks) "bQm" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -22442,12 +22338,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"bQS" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/squads/req) "bQU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -22541,6 +22431,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"bRo" = ( +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "bRr" = ( /obj/structure/machinery/fuelcell_recycler, /turf/open/floor/almayer{ @@ -23207,19 +23105,6 @@ icon_state = "blue" }, /area/almayer/squads/charlie_delta_shared) -"bUo" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "bUp" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -23432,6 +23317,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"bVg" = ( +/obj/structure/machinery/status_display{ + pixel_x = 32; + pixel_y = 16 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "bVi" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -23465,12 +23357,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bVs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "bVw" = ( /turf/open/floor/almayer{ dir = 4; @@ -24036,13 +23922,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/squads/req) "bYc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -24997,6 +24876,15 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"ccm" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/fridge/organic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "ccq" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -25359,13 +25247,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/hangar) -"cdB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "cdE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -26016,6 +25897,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) +"cij" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -26402,6 +26289,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) +"ckE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "ckI" = ( /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -26881,16 +26777,6 @@ icon_state = "plating" }, /area/almayer/shipboard/port_point_defense) -"cmo" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/tool, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/squads/req) "cmp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/engineering_workshop/hangar) @@ -27219,10 +27105,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"com" = ( -/obj/structure/largecrate/supply/weapons/pistols, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) @@ -27244,14 +27126,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) -"coD" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 12 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "coG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -27437,21 +27311,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"crw" = ( -/obj/structure/bed/bedroll{ - name = "cat bed"; - desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; - pixel_y = 0 - }, -/mob/living/simple_animal/cat/Jones{ - dir = 8 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28; - pixel_x = -1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "crD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -27778,6 +27637,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"czG" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "czJ" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -28202,6 +28067,17 @@ "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) +"cHA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "cHE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -28529,15 +28405,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) -"cNK" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "cNX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28625,6 +28492,23 @@ "cQv" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/general_equipment) +"cQD" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + pixel_x = -29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) "cQF" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -28663,6 +28547,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"cRg" = ( +/obj/item/tool/weldpack{ + pixel_y = 15 + }, +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/welding, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "cRi" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -28785,12 +28679,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) -"cVb" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "cVs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -28900,16 +28788,6 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"cWE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "cWI" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -29270,6 +29148,12 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"ddN" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "deb" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -29375,6 +29259,17 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dfP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "dgg" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -29415,11 +29310,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"dha" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dhQ" = ( /obj/structure/sign/safety/terminal{ pixel_x = -17 @@ -29513,6 +29403,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"diM" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "djm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -29567,6 +29465,14 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) +"djN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "djQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -29604,6 +29510,25 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"dkn" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/door_control{ + id = "bot_uniforms"; + name = "Uniform Vendor Lockdown"; + pixel_x = -24; + pixel_y = 18; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/cic) "dkq" = ( /obj/structure/machinery/door_control{ id = "hangarentrancenorth"; @@ -29646,6 +29571,17 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) +"dkS" = ( +/obj/structure/machinery/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 2 + }, +/obj/item/clothing/mask/cigarette/weed, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "dll" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -29667,6 +29603,15 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dlN" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "dmg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -29762,6 +29707,22 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"dnJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "dnS" = ( /obj/structure/safe, /turf/open/floor/almayer{ @@ -29825,28 +29786,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"doU" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) -"dpn" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/structure/transmitter{ - name = "Kitchen Telephone"; - phone_category = "Almayer"; - phone_id = "Kitchen"; - pixel_x = -8; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "dpo" = ( /obj/structure/machinery/light{ dir = 1 @@ -29959,6 +29898,12 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"dqQ" = ( +/obj/structure/closet/secure_closet/fridge/groceries, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "dqV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30001,6 +29946,18 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) +"drp" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8; + layer = 2.9 + }, +/obj/structure/window{ + pixel_y = -2; + layer = 2.95 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) "drt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -30058,6 +30015,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"dtv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -30141,15 +30104,6 @@ icon_state = "mono" }, /area/almayer/living/starboard_garden) -"duz" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "duF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -30344,15 +30298,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"dyj" = ( -/obj/structure/closet/secure_closet/commander, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/device/whistle, -/obj/item/device/megaphone, -/obj/item/device/radio, -/obj/item/clothing/shoes/laceup, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "dyp" = ( /obj/structure/machinery/ares/cpu, /turf/open/floor/almayer/no_build{ @@ -30418,6 +30363,17 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"dAi" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "dAq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -30685,12 +30641,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"dEJ" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/north2) "dEQ" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco, @@ -30705,24 +30655,6 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"dFb" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/bible{ - desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; - name = "Holy Bible"; - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/prop/helmetgarb/rosary{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/device/flashlight/lamp{ - pixel_y = 1; - pixel_x = 3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "dFk" = ( /turf/open/floor/almayer{ dir = 8; @@ -30938,16 +30870,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"dID" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "dII" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, /obj/effect/decal/warning_stripes{ @@ -30970,12 +30892,6 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) -"dKa" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_s) "dKm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -31018,16 +30934,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"dLe" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/command/cichallway) "dLt" = ( /obj/structure/sign/safety/hazard{ pixel_x = -17; @@ -31052,20 +30958,6 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"dMf" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/photo_album{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/folder/black{ - pixel_x = 7; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dMB" = ( /turf/open/floor/almayer{ dir = 8; @@ -31195,25 +31087,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"dQp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/cells) "dQs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -31257,12 +31130,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"dRs" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "dRv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31326,6 +31193,19 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"dSn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/cells) "dSp" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -31573,13 +31453,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"dXo" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dXr" = ( /obj/structure/bed/chair{ dir = 8; @@ -31732,6 +31605,12 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"eaX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/starboard) "ebd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -31745,6 +31624,26 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ebt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) +"ebz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "ebD" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -31874,6 +31773,26 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) +"edx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) +"edM" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/vehiclehangar) "eed" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -32163,6 +32082,15 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"eiH" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "eiK" = ( /obj/structure/bed/chair{ dir = 4 @@ -32323,15 +32251,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"elM" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "elR" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 1 @@ -32513,6 +32432,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"epK" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/smg/m39{ + pixel_y = 6 + }, +/obj/item/weapon/gun/smg/m39{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "eqb" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp/denied{ @@ -32635,6 +32566,14 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"erz" = ( +/obj/structure/closet/crate, +/obj/item/ammo_box/magazine/l42a, +/obj/item/ammo_box/magazine/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "erG" = ( /obj/structure/disposalpipe/junction{ dir = 2; @@ -32678,23 +32617,20 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) -"esC" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = -3 +"esy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light/small{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/prop/magazine/dirty{ - pixel_x = -6; - pixel_y = -10 +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -29 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/captain_mess) +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "esF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -32728,14 +32664,6 @@ icon_state = "plating_striped" }, /area/almayer/command/lifeboat) -"etn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "ets" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -32791,6 +32719,33 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) +"euM" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = -17 + }, +/obj/item/tool/pen/clicky{ + pixel_x = -13; + pixel_y = -1 + }, +/obj/item/tool/pen/clicky{ + pixel_y = 5; + pixel_x = -13 + }, +/obj/structure/machinery/door_control{ + id = "CO-Office"; + name = "Door Control"; + normaldoorcontrol = 1; + req_access_txt = "31"; + pixel_y = 7 + }, +/obj/item/ashtray/bronze{ + pixel_y = 1; + pixel_x = 12 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "euN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -32822,6 +32777,12 @@ icon_state = "logo_c" }, /area/almayer/command/cic) +"euY" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/port) "eva" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -32964,6 +32925,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"eyv" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33112,12 +33079,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_umbilical) -"eBE" = ( -/obj/structure/machinery/photocopier{ - anchored = 0 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "eBO" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -33286,17 +33247,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"eFG" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/chemistry) "eFH" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) @@ -33774,6 +33724,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"eRt" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "eRu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -33841,6 +33804,27 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) +"eTh" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "eTo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -33854,6 +33838,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"eTx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "eTO" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -34015,14 +34006,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"eXk" = ( -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) "eXo" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -34034,17 +34017,15 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/offices) -"eXS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +"eXU" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 2 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/hull/upper_hull/u_m_s) "eYr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34177,25 +34158,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"faE" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "law and engineering manuals bookcase"; - opacity = 0 - }, -/obj/item/book/manual/marine_law, -/obj/item/book/manual/detective, -/obj/item/book/manual/security_space_law, -/obj/item/book/manual/engineering_guide, -/obj/item/book/manual/engineering_construction, -/obj/item/book/manual/orbital_cannon_manual, -/obj/item/book/manual/ripley_build_and_repair, -/obj/item/book/manual/engineering_hacking, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "faO" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/plating_catwalk, @@ -34580,14 +34542,6 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"fhQ" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/structure/machinery/light, -/obj/item/reagent_container/food/condiment/sugar, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "fiq" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_m_p) @@ -34602,6 +34556,27 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"fiP" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/fancy/cigar{ + pixel_y = 2; + layer = 3.04; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -11; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_y = 16; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 7; + pixel_y = 16 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "fjO" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, @@ -34706,12 +34681,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"fnv" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "fnx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ @@ -34753,6 +34722,18 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"fnQ" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "fnZ" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /obj/structure/machinery/light/small{ @@ -34873,6 +34854,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"fqg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "fqu" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, @@ -34929,20 +34916,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"frJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -34956,19 +34929,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"frY" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = -6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "fsd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -35105,6 +35065,21 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"fuR" = ( +/obj/structure/bed/bedroll{ + name = "cat bed"; + desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; + pixel_y = 0 + }, +/mob/living/simple_animal/cat/Jones{ + dir = 8 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28; + pixel_x = -1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "fuS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35556,6 +35531,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"fFq" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -35591,16 +35576,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"fGa" = ( -/obj/structure/surface/rack, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/numbertwobunks) "fGg" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, @@ -36011,21 +35986,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fOh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"fOv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "fOz" = ( /obj/structure/target{ name = "punching bag" @@ -36131,20 +36104,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) -"fQY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/weapons/m39{ - pixel_x = 2 - }, -/obj/structure/largecrate/supply/weapons/m41a{ - layer = 3.1; - pixel_x = 6; - pixel_y = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "fRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -36271,18 +36230,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"fWi" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "fWT" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -36311,6 +36258,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"fXt" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/squads/req) "fXx" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -36331,33 +36288,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"fXE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"fXM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/command/combat_correspondent) +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"fXP" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/command/cichallway) "fYb" = ( /turf/open/floor/almayer{ dir = 8; @@ -36752,6 +36693,10 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/plating, /area/almayer/command/airoom) +"gfK" = ( +/obj/structure/bed/chair/comfy/blue, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "gfS" = ( /obj/structure/sign/safety/cryo{ pixel_y = -26 @@ -36816,6 +36761,14 @@ /obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"ghX" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/item/toy/inflatable_duck, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "gio" = ( /obj/structure/closet/emcloset, /obj/structure/sign/safety/restrictedarea{ @@ -36952,12 +36905,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"gka" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "gks" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -37173,6 +37120,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"gqF" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "gqK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -37392,12 +37348,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"gvW" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_p) "gwm" = ( /obj/structure/largecrate/random/case/small, /obj/item/device/taperecorder{ @@ -37424,6 +37374,15 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"gwu" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "gww" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -37564,6 +37523,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"gye" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) "gyt" = ( /obj/item/storage/firstaid/regular, /obj/structure/surface/rack, @@ -37623,13 +37588,6 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"gyU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "gzn" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -37823,19 +37781,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"gCB" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "gCI" = ( /obj/structure/machinery/light{ dir = 4 @@ -37855,14 +37800,16 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"gDP" = ( -/obj/structure/closet/crate, -/obj/item/ammo_box/magazine/l42a, -/obj/item/ammo_box/magazine/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" +"gDq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/hull/upper_hull/u_m_s) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37896,6 +37843,36 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"gEI" = ( +/obj/item/device/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/machinery/door_control{ + id = "cl_shutters"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 8; + req_access_txt = "200" + }, +/obj/structure/machinery/door_control{ + id = "RoomDivider"; + name = "Room Divider"; + pixel_x = -5; + pixel_y = -4; + req_access_txt = "200" + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control{ + id = "cl_evac"; + name = "Evac Pod Door Control"; + normaldoorcontrol = 1; + pixel_x = -5; + pixel_y = 2; + req_access_txt = "200" + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliason) "gEK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37943,22 +37920,31 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"gGp" = ( +"gGl" = ( /obj/structure/surface/table/almayer, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_x = 8 +/obj/item/device/taperecorder, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/transmitter/rotary{ - name = "Reporter Telephone"; - phone_category = "Almayer"; - phone_id = "Reporter"; - pixel_x = -4; - pixel_y = 6 +/area/almayer/command/combat_correspondent) +"gGo" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item{ + pixel_x = -8 + }, +/obj/item/toy/plush/therapy/red{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_x = 7; + pixel_y = -1; + throwforce = 15 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/combat_correspondent) +/area/almayer/living/briefing) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -38091,6 +38077,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"gJs" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/squads/req) "gJP" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -38546,6 +38538,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"gUr" = ( +/obj/item/stack/folding_barricade/three, +/obj/item/stack/folding_barricade/three, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "gUv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -38605,18 +38605,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"gVd" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/black{ - pixel_y = 8 - }, -/obj/item/folder/yellow, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 8; - pixel_x = -16 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "gVq" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -38898,16 +38886,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hbI" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "hbZ" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -38993,16 +38971,6 @@ "hcZ" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"hdb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "hdd" = ( /turf/open/floor/almayer{ dir = 9; @@ -39083,6 +39051,13 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) +"hey" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -39138,6 +39113,22 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"hfw" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "hfy" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -39283,14 +39274,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"hiy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "hiB" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -39304,6 +39287,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"hiN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "hiQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -39526,19 +39516,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"hnI" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/pilotbunks) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -39729,18 +39706,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"htG" = ( -/obj/item/tool/soap, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "htI" = ( /obj/structure/platform_decoration{ dir = 1 @@ -39772,6 +39737,18 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"huR" = ( +/obj/structure/sign/prop1{ + pixel_y = 32 + }, +/obj/structure/filingcabinet/security{ + pixel_x = -8 + }, +/obj/structure/filingcabinet/medical{ + pixel_x = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "huU" = ( /obj/structure/machinery/door/airlock/almayer/security{ access_modified = 1; @@ -39982,13 +39959,6 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) -"hzb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "hzc" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/notunnel) @@ -40156,12 +40126,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"hBL" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "hBU" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -40171,6 +40135,25 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"hBW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 20; + pixel_x = -7 + }, +/obj/item/ashtray/bronze{ + pixel_y = 19; + pixel_x = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/map_item{ + pixel_y = 3; + pixel_x = -1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "hCo" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -40309,14 +40292,14 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"hGB" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - pixel_y = 3; - pixel_x = -1 +"hGa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "hGD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -40438,6 +40421,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"hJh" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "hJk" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -40511,61 +40507,6 @@ icon_state = "cargo_arrow" }, /area/almayer/engineering/engineering_workshop/hangar) -"hLB" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "hLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -40752,6 +40693,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"hQh" = ( +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/fridge/groceries/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "hQU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -41114,12 +41062,24 @@ icon_state = "blue" }, /area/almayer/command/cichallway) +"hWS" = ( +/obj/structure/closet/secure_closet/fridge/organic/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "hWU" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"hWX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -41157,18 +41117,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"hXG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"hXD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "SW-out"; + pixel_x = -1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/lifeboat_pumps/south1) "hXS" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -41259,12 +41216,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"iaa" = ( -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "iag" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -41315,6 +41266,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"iaE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "iaF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -41502,6 +41459,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"ift" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "ifR" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -41517,6 +41483,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"ign" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "igp" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -41604,6 +41576,19 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"iii" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "iit" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -41808,13 +41793,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"imJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +"imW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "ina" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -42066,6 +42052,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"isu" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/bedsheet/hop{ + pixel_y = 0 + }, +/obj/structure/bed{ + pixel_y = 0 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "isC" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -42093,17 +42091,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) -"isI" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "isN" = ( /obj/structure/sink{ dir = 8; @@ -42115,6 +42102,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"isS" = ( +/obj/item/stack/sheet/cardboard{ + amount = 50 + }, +/obj/structure/surface/rack, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/squads/req) "isW" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -42204,6 +42202,16 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iuw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "iuz" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/warhead, @@ -42221,6 +42229,16 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"iuT" = ( +/obj/structure/closet/emcloset, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_s) "ivf" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/camera, @@ -42313,15 +42331,6 @@ /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"iwZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "ixj" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt, @@ -42657,12 +42666,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) -"iEz" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 3 +"iET" = ( +/obj/structure/machinery/light{ + dir = 1 }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "iFc" = ( @@ -42799,6 +42808,18 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"iIm" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom"; + dir = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -43009,13 +43030,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"iNY" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "iNZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -43040,18 +43054,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iPu" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/bedsheet/hop{ - pixel_y = 0 - }, -/obj/structure/bed{ - pixel_y = 0 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -43251,25 +43253,6 @@ /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"iTd" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) -"iTe" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "iTf" = ( /obj/structure/closet/crate/trashcart, /obj/item/clothing/gloves/yellow, @@ -43366,6 +43349,14 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"iUC" = ( +/obj/structure/machinery/faxmachine, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43414,6 +43405,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"iWb" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "iWc" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -43577,6 +43578,15 @@ icon_state = "plate" }, /area/almayer/living/gym) +"iYR" = ( +/obj/structure/closet/secure_closet/bar{ + name = "Success Cabinet"; + req_access_txt = "1" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/captain_mess) "iZg" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -43672,15 +43682,6 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"jaK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "jaP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -43798,6 +43799,19 @@ icon_state = "plating_striped" }, /area/almayer/engineering/upper_engineering/starboard) +"jcZ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "jdk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -44026,28 +44040,22 @@ icon_state = "test_floor4" }, /area/almayer/living/auxiliary_officer_office) -"jgr" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/paper_bin/uscm{ - pixel_x = 6; - pixel_y = 6 +"jgu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = -4 +/obj/structure/mirror{ + pixel_x = 29 }, -/obj/item/storage/box/donkpockets{ - pixel_x = -8; - pixel_y = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, -/area/almayer/command/combat_correspondent) +/area/almayer/living/captain_mess) "jgw" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -44130,21 +44138,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"jhB" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "medical manuals bookcase"; - opacity = 0 - }, -/obj/item/book/manual/surgery, -/obj/item/book/manual/research_and_development, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/book/manual/medical_cloning, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "jhD" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -44314,6 +44307,11 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"jkL" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "jkS" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -44498,12 +44496,36 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) +"jog" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/photo_album{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/folder/black{ + pixel_x = 7; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "jox" = ( /obj/structure/machinery/brig_cell/cell_3{ pixel_x = -32 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"joE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "joG" = ( /obj/structure/machinery/washing_machine, /obj/structure/sign/poster{ @@ -44613,6 +44635,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"jrV" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "jss" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -44662,6 +44694,12 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) +"juf" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jup" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -44827,13 +44865,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"jxP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "jyi" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer{ @@ -44861,15 +44892,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) -"jzE" = ( -/obj/structure/closet/secure_closet/bar{ - name = "Success Cabinet"; - req_access_txt = "1" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/captain_mess) "jzZ" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -44964,6 +44986,36 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"jBY" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = -3 + }, +/obj/structure/noticeboard{ + desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "jCa" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -44972,6 +45024,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"jCn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -45017,6 +45078,18 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"jEX" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/black{ + pixel_y = 8 + }, +/obj/item/folder/yellow, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 8; + pixel_x = -16 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "jFe" = ( /obj/structure/prop/holidays/string_lights{ pixel_y = 27 @@ -45074,12 +45147,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"jFY" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -45372,16 +45439,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"jMx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 11; - pixel_y = -26 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "jMG" = ( /obj/structure/largecrate/random/case/small, /obj/structure/largecrate/random/mini/wooden{ @@ -45465,12 +45522,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"jND" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +"jNY" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18"; + pixel_y = 12 }, -/turf/open/floor/wood/ship, +/turf/open/floor/carpet, /area/almayer/living/commandbunks) "jOi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -45559,6 +45617,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) +"jPn" = ( +/obj/structure/machinery/photocopier{ + anchored = 0 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "jPq" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ @@ -45610,6 +45674,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"jRZ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "jSo" = ( /obj/item/tool/warning_cone, /turf/open/floor/almayer{ @@ -45871,6 +45944,29 @@ icon_state = "plate" }, /area/almayer/living/offices) +"jWC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) +"jWH" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jWU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45899,54 +45995,18 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"jXW" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "jXY" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"jYc" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_y = 15; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.1; - pixel_x = -1; - pixel_y = 22 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "jYd" = ( /obj/structure/machinery/gear{ id = "vehicle_elevator_gears" @@ -46131,20 +46191,20 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"kaJ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "kaN" = ( /obj/structure/platform{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"kaS" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "kbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -46257,14 +46317,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"kdv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "kdB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -46276,27 +46328,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"keT" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/fancy/cigar{ - pixel_y = 2; - layer = 3.04; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = -11; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_y = 16; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 7; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kff" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -46336,17 +46367,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"kfR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) @@ -46448,6 +46468,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"khX" = ( +/obj/structure/closet/secure_closet/fridge/dry/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "kif" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -46552,6 +46578,15 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"klG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -46569,12 +46604,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"kmk" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) "kmp" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46627,6 +46656,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"kmY" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "kng" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -46651,12 +46686,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"knL" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/south2) +"knT" = ( +/obj/structure/safe/cl_office, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "koc" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -46910,15 +46943,12 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) -"ksA" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, -/obj/structure/machinery/light{ - dir = 8 - }, +"ksv" = ( +/obj/structure/closet/secure_closet/securecom, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/living/grunt_rnr) +/area/almayer/command/cic) "ksN" = ( /turf/open/floor/almayer/uscm/directional{ dir = 6 @@ -46955,17 +46985,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/evidence_storage) -"ktn" = ( +"ktc" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "S" }, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -47422,10 +47447,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"kDK" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kDR" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -47645,12 +47666,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"kJm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kJC" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -47692,19 +47707,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"kJW" = ( -/obj/structure/machinery/door/window/westright, -/obj/structure/machinery/shower{ - dir = 8; - layer = 3.10; - plane = -4 - }, -/obj/item/tool/soap{ - pixel_x = 2; - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/commandbunks) "kKb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47873,18 +47875,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) -"kNq" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/faxmachine/uscm/command/capt{ - name = "Commanding Officer's Fax Machine"; - pixel_y = 3; - pixel_x = -4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kNx" = ( /obj/structure/sign/safety/ref_bio_storage{ pixel_x = -17; @@ -48035,12 +48025,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"kPH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "kPJ" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -48109,12 +48093,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"kRg" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "kRu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48166,18 +48144,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"kSH" = ( -/obj/structure/sign/prop1{ - pixel_y = 32 - }, -/obj/structure/filingcabinet/security{ - pixel_x = -8 - }, -/obj/structure/filingcabinet/medical{ - pixel_x = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kSJ" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -48207,16 +48173,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"kTc" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "kTq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -48272,18 +48228,23 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"kUh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - dir = 1; - name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" - }, +"kUb" = ( +/obj/structure/closet/secure_closet, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/storage/box/tapes, +/obj/item/clothing/head/fedora, +/obj/item/clothing/suit/storage/marine/light/reporter, +/obj/item/clothing/head/helmet/marine/reporter, +/obj/item/clothing/head/cmcap/reporter, +/obj/item/device/flashlight, +/obj/item/device/toner, +/obj/item/device/toner, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/living/pilotbunks) +/area/almayer/command/combat_correspondent) "kUt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -48328,27 +48289,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"kVT" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/stamp/hop{ - name = "Commanding Officer's rubber stamp"; - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 6; - pixel_x = 7 - }, -/obj/item/tool/pen/red/clicky{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/tool/pen/blue/clicky{ - pixel_x = -6; - pixel_y = -3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kVX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -48528,12 +48468,6 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"kZH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "kZN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -48584,6 +48518,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"laG" = ( +/obj/structure/safe/co_office, +/obj/item/weapon/pole/fancy_cane, +/obj/item/tool/lighter/zippo/gold{ + pixel_y = 3; + layer = 3.05 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "laO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48627,16 +48570,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) -"laY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "lbb" = ( /obj/structure/surface/table/almayer, /obj/item/organ/heart/prosthetic{ @@ -48846,6 +48779,14 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"lfT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/card{ + dir = 4; + pixel_x = 2 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "lfW" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -49083,12 +49024,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lkm" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/starboard) "lkM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -49113,6 +49048,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"llt" = ( +/obj/structure/machinery/conveyor{ + id = "req_belt" + }, +/obj/structure/plasticflaps, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/squads/req) +"llD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "llM" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -49209,6 +49160,11 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"lnZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lok" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie{ density = 0; @@ -49496,11 +49452,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"ltc" = ( -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) "lto" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ @@ -49527,14 +49478,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) -"ltU" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "ltX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -49550,17 +49493,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"lul" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - name = "\improper Commanding Officer's Quarters"; - req_access = null; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "lut" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/almayer{ @@ -49853,6 +49785,61 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"lAj" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "lAl" = ( /turf/open/floor/almayer{ dir = 4; @@ -49975,6 +49962,20 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) +"lCn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "lCt" = ( /turf/open/floor/almayer{ dir = 10; @@ -50027,22 +50028,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"lDn" = ( +"lDj" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "NW-out"; + pixel_y = 2 }, /turf/open/floor/almayer, -/area/almayer/command/lifeboat) -"lDD" = ( -/obj/structure/safe/co_office, -/obj/item/weapon/pole/fancy_cane, -/obj/item/tool/lighter/zippo/gold{ - pixel_y = 3; - layer = 3.05 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/area/almayer/hull/upper_hull/u_f_p) "lDJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -50052,6 +50044,20 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) +"lDK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/weapons/m39{ + pixel_x = 2 + }, +/obj/structure/largecrate/supply/weapons/m41a{ + layer = 3.1; + pixel_x = 6; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -50323,15 +50329,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"lIl" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - name = "\improper Armourer's Workshop"; - req_access = null - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/upper_hull/u_m_s) "lIp" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -50424,19 +50421,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"lJL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/cells) "lJO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50485,6 +50469,20 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"lLN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -30 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50525,12 +50523,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"lMx" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/starboard) "lMM" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -50680,6 +50672,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"lPG" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/command/cichallway) "lPO" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -50687,14 +50688,6 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"lQi" = ( -/obj/structure/machinery/cm_vending/clothing/commanding_officer{ - pixel_y = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "lQj" = ( /obj/structure/machinery/door_control{ id = "InnerShutter"; @@ -50836,16 +50829,20 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"lUA" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, +"lUv" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/hull/lower_hull/l_f_s) +"lUw" = ( +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lVl" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, @@ -50898,6 +50895,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"lWD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = 11; + pixel_y = -26 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lXg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -51093,6 +51100,25 @@ icon_state = "greencorner" }, /area/almayer/hallways/aft_hallway) +"mcl" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = -16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/vehiclehangar) +"mcK" = ( +/obj/structure/closet/secure_closet/commander, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/device/whistle, +/obj/item/device/megaphone, +/obj/item/device/radio, +/obj/item/clothing/shoes/laceup, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -51352,13 +51378,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"mje" = ( -/obj/structure/machinery/light, -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "mji" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51439,16 +51458,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) -"mko" = ( -/obj/item/tool/weldpack{ - pixel_y = 15 - }, -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/welding, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "mkx" = ( /obj/structure/machinery/door_control{ id = "cl_shutters 2"; @@ -51673,12 +51682,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/squads/req) -"mqb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -51864,17 +51867,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"mts" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51919,6 +51911,48 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"mus" = ( +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/obj/item/toy/plush/therapy/red{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/living/port_emb) "mux" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -51938,6 +51972,18 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"muQ" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/cic) "mvl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51951,6 +51997,15 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"mvH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -52025,19 +52080,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"myl" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "myn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52124,6 +52166,25 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"mzG" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "law and engineering manuals bookcase"; + opacity = 0 + }, +/obj/item/book/manual/marine_law, +/obj/item/book/manual/detective, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/orbital_cannon_manual, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/engineering_hacking, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mzO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -52151,13 +52212,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mAr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "mAT" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; @@ -52302,23 +52356,6 @@ icon_state = "emerald" }, /area/almayer/living/briefing) -"mDX" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - dir = 1; - id_tag = "CO-Office"; - name = "\improper Commanding Officer's Office"; - req_access = null; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "mEb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52346,6 +52383,10 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mES" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mFq" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -52499,6 +52540,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mIA" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/south2) "mIB" = ( /obj/structure/machinery/cm_vending/sorted/medical/marinemed, /obj/structure/sign/safety/medical{ @@ -52509,26 +52556,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"mIJ" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = -16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"mIP" = ( -/obj/structure/pipes/vents/pump, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "mIW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -52658,15 +52685,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"mKy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "mKJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -53021,33 +53039,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"mRp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) -"mRQ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "mRS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53058,6 +53049,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"mRU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -53123,14 +53121,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"mTc" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/emails{ - dir = 4; - pixel_y = 2 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "mTd" = ( /obj/structure/machinery/smartfridge/chemistry{ pixel_x = -3; @@ -53353,6 +53343,19 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"mXa" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "mXj" = ( /turf/closed/wall/almayer, /area/almayer/living/commandbunks) @@ -53390,6 +53393,17 @@ icon_state = "blue" }, /area/almayer/hallways/port_hallway) +"mYX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/m41a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -53477,6 +53491,17 @@ "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) +"naQ" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "naR" = ( /obj/structure/machinery/iv_drip, /obj/effect/decal/warning_stripes{ @@ -53504,12 +53529,15 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) -"nbB" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, +"nbr" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/living/grunt_rnr) +/area/almayer/command/cic) "ncp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -53616,15 +53644,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"neG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"neF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/transmitter{ + name = "Kitchen Telephone"; + phone_category = "Almayer"; + phone_id = "Kitchen"; + pixel_x = -8; + pixel_y = 29 }, +/obj/structure/machinery/vending/ingredients, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/command/lifeboat) +/area/almayer/living/grunt_rnr) "neO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -54038,6 +54073,12 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"nna" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_s) "nnc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -54103,12 +54144,16 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"nnX" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" +"nnG" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/area/almayer/lifeboat_pumps/south1) +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "noj" = ( /obj/structure/largecrate, /obj/structure/prop/server_equipment/laptop{ @@ -54171,6 +54216,21 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"npB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) +"npK" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails{ + dir = 4; + pixel_y = 2 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54283,22 +54343,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) -"nsQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/captain_mess) "nsY" = ( /turf/closed/wall/almayer, /area/almayer/living/port_emb) @@ -54421,6 +54465,17 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) +"nuI" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/chemistry) "nuK" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -54442,24 +54497,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"nvG" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/sink{ - pixel_y = 16 - }, -/obj/structure/mirror{ - pixel_y = 21 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/numbertwobunks) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -54507,6 +54544,17 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"nww" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -54670,6 +54718,18 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"nzI" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "nzO" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/warning_stripes{ @@ -54771,46 +54831,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"nCx" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself."; - pixel_x = 3; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = 11; - pixel_y = 16 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"nCR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/auxiliary_officer_office) "nCT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54819,33 +54839,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"nCU" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/coatrack{ - pixel_y = 1; - pixel_x = -5 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"nDd" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "nDh" = ( /obj/structure/transmitter/rotary{ name = "CL Office Telephone"; @@ -54885,6 +54878,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"nDV" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/command/cichallway) "nEo" = ( /obj/structure/surface/table/almayer, /obj/item/storage/donut_box{ @@ -55051,12 +55049,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"nGY" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/north2) "nHg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -55202,6 +55194,15 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"nKs" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + req_access = list(1); + pixel_y = 0 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/commandbunks) "nLa" = ( /obj/structure/bed/chair{ dir = 4 @@ -55324,6 +55325,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"nMM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -55501,18 +55512,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"nPY" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "nQg" = ( /obj/structure/sink{ pixel_y = 24 @@ -55532,6 +55531,13 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"nQH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "nRq" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -55547,6 +55553,17 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"nRQ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + name = "\improper Commanding Officer's Quarters"; + req_access = null; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "nRR" = ( /turf/open/floor/almayer{ dir = 1; @@ -55557,6 +55574,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"nSj" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/squads/req) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -55613,10 +55637,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"nTA" = ( -/obj/structure/bed/chair/comfy/blue, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "nTH" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -56041,6 +56061,23 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) +"odC" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/prop/magazine/boots/n160{ + pixel_y = -8; + pixel_x = 4; + layer = 2.8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) "odD" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -56160,6 +56197,16 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"ohl" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56207,18 +56254,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"ohS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/captain_mess) "oih" = ( /obj/structure/bed{ icon_state = "abed" @@ -56409,6 +56444,21 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/execution) +"olk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/port) "olv" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler{ @@ -56478,13 +56528,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"omu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -56558,17 +56601,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"ooo" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) "oos" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) @@ -56606,6 +56638,16 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) +"opj" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/tool, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -56617,23 +56659,6 @@ "opD" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) -"opI" = ( -/obj/structure/closet/secure_closet, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/storage/box/tapes, -/obj/item/clothing/head/fedora, -/obj/item/clothing/suit/storage/marine/light/reporter, -/obj/item/clothing/head/helmet/marine/reporter, -/obj/item/clothing/head/cmcap/reporter, -/obj/item/device/flashlight, -/obj/item/device/toner, -/obj/item/device/toner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "opJ" = ( /obj/docking_port/stationary/emergency_response/external/port4, /turf/open/space/basic, @@ -56710,16 +56735,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"oqY" = ( -/obj/structure/machinery/conveyor{ - id = "req_belt" - }, -/obj/structure/plasticflaps, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/req) "oqZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/microwave{ @@ -56870,6 +56885,18 @@ "otu" = ( /turf/closed/wall/almayer/research/containment/wall/connect_w, /area/almayer/medical/containment/cell) +"otK" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + dir = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "otX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56928,6 +56955,23 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"ouT" = ( +/obj/item/trash/plate{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3; + pixel_y = 11; + pixel_x = 8 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3; + pixel_y = 11; + pixel_x = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "ouV" = ( /obj/structure/sign/safety/cryo{ pixel_x = 1; @@ -57069,6 +57113,23 @@ icon_state = "orangecorner" }, /area/almayer/hull/upper_hull/u_a_s) +"oys" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + dir = 1; + id_tag = "CO-Office"; + name = "\improper Commanding Officer's Office"; + req_access = null; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "oyw" = ( /obj/structure/platform_decoration{ dir = 8 @@ -57223,6 +57284,24 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oBW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/bible{ + desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; + name = "Holy Bible"; + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/prop/helmetgarb/rosary{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/device/flashlight/lamp{ + pixel_y = 1; + pixel_x = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "oCf" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -57315,6 +57394,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"oDO" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "oDR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -57536,15 +57621,18 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"oIt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oIY" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "oJp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -57683,12 +57771,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"oMd" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "oMe" = ( /obj/structure/machinery/light{ dir = 8 @@ -57739,14 +57821,6 @@ icon_state = "mono" }, /area/almayer/engineering/ce_room) -"oNf" = ( -/obj/item/stack/folding_barricade/three, -/obj/item/stack/folding_barricade/three, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "oNj" = ( /obj/structure/sign/prop1{ pixel_x = -32; @@ -58060,40 +58134,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"oTM" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_y = -7; - layer = 2.8 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -4; - pixel_y = 7; - layer = 3.04 - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - pixel_x = -12; - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown" - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown Override"; - pixel_x = -2 - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - pixel_x = 8; - name = "ARES Emergency Lockdown Override"; - id = "ARES Emergency" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -58300,6 +58340,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"pbl" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa{ + pixel_x = 5 + }, +/obj/item/clothing/under/redpyjamas, +/obj/item/bedsheet/orange, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "pbp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -58433,12 +58482,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) -"pdt" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "pdG" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -58516,6 +58559,18 @@ allow_construction = 0 }, /area/almayer/stair_clone) +"pfA" = ( +/obj/item/tool/soap, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "pfH" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -58544,15 +58599,6 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) -"pgw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "pgD" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) @@ -58588,15 +58634,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"phj" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -58672,16 +58709,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"pjR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "pky" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -58768,16 +58795,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"pmI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "pmV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; @@ -58802,23 +58819,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"pnL" = ( -/obj/structure/machinery/constructable_frame{ - icon_state = "box_2" - }, -/obj/item/weapon/baseballbat/metal{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "pop" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -59204,6 +59204,20 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"pxL" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/coatrack{ + pixel_y = 1; + pixel_x = -5 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pyc" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -59683,15 +59697,16 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"pIZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"pJe" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/prop/tableflag/uscm{ + pixel_x = -5 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/item/prop/tableflag/uscm2{ + pixel_x = 5 }, -/area/almayer/lifeboat_pumps/north1) +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "pJi" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -59699,6 +59714,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"pJn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/secure{ + pixel_x = -5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "pJD" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -59745,6 +59772,21 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"pJK" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "medical manuals bookcase"; + opacity = 0 + }, +/obj/item/book/manual/surgery, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/medical_cloning, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pJR" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -59816,15 +59858,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"pMk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "pMp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -59871,6 +59904,14 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"pNK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/auxiliary_officer_office) "pNM" = ( /obj/structure/platform{ dir = 4 @@ -59977,6 +60018,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"pPF" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "pPM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -59991,6 +60042,28 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"pPV" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "Alpha_2"; + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_x = 23; + specialfunctions = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "pQq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -60117,6 +60190,12 @@ icon_state = "test_floor5" }, /area/almayer/medical/hydroponics) +"pSH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pSL" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -60172,6 +60251,16 @@ icon_state = "mono" }, /area/almayer/command/computerlab) +"pUe" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "pUf" = ( /obj/structure/bed/chair{ dir = 4 @@ -60195,6 +60284,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"pUl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/vehiclehangar) "pUp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -60250,12 +60348,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"pVx" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "pVA" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_x = 2; @@ -60452,6 +60544,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"pYp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pYu" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -60579,6 +60677,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"qbh" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "qbt" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -60835,12 +60942,6 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"qfD" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "qfR" = ( /obj/structure/machinery/light{ dir = 1 @@ -60905,16 +61006,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"qgU" = ( -/obj/structure/machinery/power/apc/almayer/hardened, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "qhb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -61069,19 +61160,15 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"qkm" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/obj/structure/sign/poster/io{ - pixel_y = 32; - name = "propaganda poster" +"qkj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) +/area/almayer/command/lifeboat) "qkn" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -61116,16 +61203,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/starboard_umbilical) -"qlp" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/prop/tableflag/uscm{ - pixel_x = -5 - }, -/obj/item/prop/tableflag/uscm2{ - pixel_x = 5 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "qlz" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -61135,14 +61212,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"qlI" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "qmk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61157,6 +61226,21 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"qmr" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/weapon/gun/rifle/l42a{ + pixel_x = 17; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "qmt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -61267,17 +61351,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"qmZ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ - name = "Commanding Officer's Office"; - phone_category = "Offices"; - phone_id = "Commanding Officer's Office"; - pixel_y = 8; - pixel_x = 16 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "qnd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -61404,6 +61477,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) +"qpU" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 12 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "qqn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -61411,15 +61494,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"qqr" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qqu" = ( /turf/open/floor/almayer{ dir = 1; @@ -61528,6 +61602,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"qtR" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "qtS" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, @@ -61553,20 +61633,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/cryo_tubes) -"quy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "quI" = ( /obj/structure/machinery/door_control{ id = "laddersouthwest"; @@ -61812,6 +61878,35 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"qyH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) +"qyJ" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) +"qyM" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 8 + }, +/obj/structure/transmitter/rotary{ + name = "Reporter Telephone"; + phone_category = "Almayer"; + phone_id = "Reporter"; + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "qyW" = ( /obj/structure/bed/chair{ dir = 4 @@ -61897,12 +61992,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"qCi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +"qCg" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +/area/almayer/engineering/upper_engineering/port) "qCo" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -62083,12 +62181,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"qGU" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/south2) "qHb" = ( /obj/structure/bed/chair{ dir = 8 @@ -62172,15 +62264,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"qJf" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qJj" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -62236,15 +62319,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"qJU" = ( -/obj/structure/bed, -/obj/item/toy/plush/farwa{ - pixel_x = 5 - }, -/obj/item/clothing/under/redpyjamas, -/obj/item/bedsheet/orange, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "qJY" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/bottle/orangejuice{ @@ -62290,16 +62364,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"qKt" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_s) "qKz" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -62328,16 +62392,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"qKY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "qLi" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -62580,15 +62634,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"qPX" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "qQc" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -62606,6 +62651,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"qQL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "qQM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -62667,6 +62722,19 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"qRL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "qRT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -63094,15 +63162,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"rbE" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - req_access = list(1); - pixel_y = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "rbF" = ( /obj/effect/landmark/late_join, /obj/effect/landmark/ert_spawns/distress_cryo, @@ -63175,6 +63234,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"rcW" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "rde" = ( /obj/structure/sign/prop1, /turf/closed/wall/almayer, @@ -63290,6 +63357,18 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_s) +"rfv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/command/capt{ + name = "Commanding Officer's Fax Machine"; + pixel_y = 3; + pixel_x = -4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "rfI" = ( /obj/structure/sign/safety/airlock{ pixel_y = -32 @@ -63376,6 +63455,17 @@ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) +"rhD" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -63670,17 +63760,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"rmE" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "rmN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -63851,6 +63930,17 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rqH" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/rotary{ + name = "Commanding Officer's Office"; + phone_category = "Offices"; + phone_id = "Commanding Officer's Office"; + pixel_y = 8; + pixel_x = 16 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "rra" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 8; @@ -63958,6 +64048,16 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"rsW" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "rsY" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -64037,22 +64137,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"rur" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/port_emb) "rux" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -64103,6 +64187,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"rwT" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "rwY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -64163,12 +64253,11 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"ryR" = ( -/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) +"rzf" = ( +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "rzj" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -64210,6 +64299,13 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) +"rAv" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "rAx" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -64515,6 +64611,14 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rEJ" = ( +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + pixel_y = 3; + pixel_x = -1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "rEL" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer, /turf/open/floor/almayer{ @@ -64752,6 +64856,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rJg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "rJh" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -64876,28 +64985,6 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) -"rNb" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "Alpha_2"; - name = "Door Lock"; - normaldoorcontrol = 1; - pixel_x = 23; - specialfunctions = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/port_emb) "rNF" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -64949,6 +65036,17 @@ icon_state = "plate" }, /area/almayer/living/gym) +"rOZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "rPh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65193,6 +65291,27 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"rUB" = ( +/obj/structure/pipes/vents/pump, +/obj/item/tool/soap, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/cells) "rUU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_access = null; @@ -65228,6 +65347,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"rWF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "rWL" = ( /obj/structure/barricade/metal, /turf/open/floor/almayer{ @@ -65334,6 +65461,14 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) +"rYZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "rZz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -65804,6 +65939,18 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"skg" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "skl" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -65955,6 +66102,25 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"soa" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) "soq" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -66157,6 +66323,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/repair_bay) +"ssn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "ssD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -66185,15 +66357,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ssW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ssX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -66228,12 +66391,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"stu" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "stY" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -66292,18 +66449,16 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"svC" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/smg/m39{ - pixel_y = 6 - }, -/obj/item/weapon/gun/smg/m39{ - pixel_y = -6 +"svp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "swn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -66404,28 +66559,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"sxT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/m41a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) -"sxW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/command/cichallway) "syH" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -67008,25 +67141,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"sLZ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 20; - pixel_x = -7 - }, -/obj/item/ashtray/bronze{ - pixel_y = 19; - pixel_x = 4 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/landmark/map_item{ - pixel_y = 3; - pixel_x = -1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "sMs" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -67132,15 +67246,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"sOZ" = ( -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "sPc" = ( /obj/structure/machinery/light{ dir = 1 @@ -67445,27 +67550,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"sWs" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_p) -"sWC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/port) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -67586,14 +67670,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"sYB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "sYC" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -67723,12 +67799,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"tan" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "tat" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -67807,14 +67877,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) -"tcZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "tda" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -67925,15 +67987,6 @@ /obj/effect/landmark/late_join, /turf/open/floor/almayer, /area/almayer/living/cryo_cells) -"teE" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "teH" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -68074,18 +68127,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"thR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/secure{ - pixel_x = -5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "thT" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -68146,6 +68187,23 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"tiw" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/obj/item/weapon/baseballbat/metal{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "tiE" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -68462,6 +68520,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) +"tpt" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "tpD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68488,21 +68552,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"tqd" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/weapon/gun/rifle/l42a{ - pixel_x = 17; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "tqe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68554,6 +68603,32 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"tqB" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) +"tqI" = ( +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/shower{ + dir = 8; + layer = 3.10; + plane = -4 + }, +/obj/item/tool/soap{ + pixel_x = 2; + pixel_y = 7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) "tqV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -68838,25 +68913,6 @@ icon_state = "outerhull_dir" }, /area/space) -"twI" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/door_control{ - id = "bot_uniforms"; - name = "Uniform Vendor Lockdown"; - pixel_x = -24; - pixel_y = 18; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/cic) "twT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69008,6 +69064,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tAh" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/port) "tAi" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -69031,6 +69093,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"tAJ" = ( +/obj/structure/closet/secure_closet/fridge/dry, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -69075,13 +69143,6 @@ /obj/item/tool/crowbar, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"tBu" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "tBz" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -69267,15 +69328,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"tGj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "tGq" = ( /obj/effect/projector{ name = "Almayer_Up4"; @@ -69352,12 +69404,18 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"tId" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/almayer{ - icon_state = "cargo" +"tHU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/command/airoom) +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/item/storage/briefcase{ + pixel_y = 15 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -69423,6 +69481,17 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"tJo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "tJp" = ( /obj/structure/surface/table/almayer, /obj/item/tool/crowbar/red, @@ -69454,15 +69523,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"tJN" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/airoom) "tJR" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/sign/safety/medical{ @@ -69548,6 +69608,14 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"tMu" = ( +/obj/structure/machinery/cm_vending/clothing/commanding_officer{ + pixel_y = 0 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/commandbunks) "tMW" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -69783,12 +69851,28 @@ icon_state = "orangecorner" }, /area/almayer/living/briefing) -"tTk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"tSF" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera{ + pixel_x = -8; + pixel_y = 12 }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) +/obj/item/paper_bin/uscm{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -8; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "tTp" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -69955,6 +70039,13 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"tXz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -70013,6 +70104,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tYv" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "tYw" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -70034,12 +70131,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"tYM" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "tYX" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -70189,13 +70280,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"uaX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) "uaZ" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/rifle/m41a, @@ -70219,6 +70303,17 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"uck" = ( +/obj/structure/surface/rack, +/obj/item/stack/cable_coil, +/obj/item/attachable/flashlight/grip, +/obj/item/ammo_box/magazine/l42a{ + pixel_y = 14 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70251,36 +70346,15 @@ icon_state = "plate" }, /area/almayer/command/cic) -"ucI" = ( -/obj/item/device/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/structure/machinery/door_control{ - id = "cl_shutters"; - name = "Privacy Shutters"; - pixel_x = -5; - pixel_y = 8; - req_access_txt = "200" - }, -/obj/structure/machinery/door_control{ - id = "RoomDivider"; - name = "Room Divider"; - pixel_x = -5; - pixel_y = -4; - req_access_txt = "200" +"udb" = ( +/obj/structure/sign/safety/ammunition{ + pixel_y = 32 }, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/door_control{ - id = "cl_evac"; - name = "Evac Pod Door Control"; - normaldoorcontrol = 1; - pixel_x = -5; - pixel_y = 2; - req_access_txt = "200" +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliason) +/area/almayer/medical/upper_medical) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -70381,6 +70455,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/evidence_storage) +"ueD" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/gear/commanding_officer{ + pixel_y = 0 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/commandbunks) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -70447,12 +70530,16 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"ufL" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, +"ufS" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 29 + }, +/obj/structure/filingcabinet, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/command/cic) +/area/almayer/command/combat_correspondent) "ugs" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law{ @@ -70728,6 +70815,19 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) +"umR" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "umS" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -70745,6 +70845,17 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"umY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -70795,6 +70906,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"uoh" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/yellow{ + layer = 3.2 + }, +/obj/item/bedsheet/yellow{ + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plush/barricade, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "uoi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -71039,6 +71184,27 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) +"utw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself."; + pixel_x = 3; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = 11; + pixel_y = 16 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "utK" = ( /obj/structure/machinery/light{ dir = 4 @@ -71150,24 +71316,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"uva" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - pixel_x = -8 - }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_x = 7; - pixel_y = -1; - throwforce = 15 +"uvk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, -/area/almayer/living/briefing) +/area/almayer/engineering/upper_engineering/starboard) "uvs" = ( /obj/structure/machinery/conveyor{ id = "lower_garbage" @@ -71450,16 +71606,6 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) -"uAl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "uAs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -71498,12 +71644,6 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) -"uAL" = ( -/obj/structure/bed/chair/wood/normal, -/obj/item/bedsheet/brown, -/obj/item/toy/plush/farwa, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) "uAW" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -71543,12 +71683,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"uBM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "uBN" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -71728,6 +71862,12 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"uGa" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/south2) "uGc" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -72201,19 +72341,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) -"uRs" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "uRt" = ( /obj/structure/machinery/light{ dir = 8 @@ -72408,6 +72535,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"uUV" = ( +/obj/structure/machinery/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "uVb" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ @@ -72573,16 +72710,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"uYd" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 12 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "uYg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -72610,16 +72737,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) -"uZY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -72638,6 +72755,15 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) +"vba" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "vbf" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -72667,23 +72793,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"vbP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) -"vbR" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/squads/req) "vbS" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -73162,16 +73271,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"vjd" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "vjg" = ( /obj/structure/prop/almayer/missile_tube{ icon_state = "missiletubesouth" @@ -73182,6 +73281,19 @@ icon_state = "plating" }, /area/almayer/shipboard/port_missiles) +"vjn" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/obj/structure/sign/poster/io{ + pixel_y = 32; + name = "propaganda poster" + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = -17 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "vjx" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ @@ -73302,14 +73414,6 @@ icon_state = "orange" }, /area/almayer/shipboard/brig/processing) -"vlk" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "vln" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73327,40 +73431,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"vlO" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/obj/item/toy/plush/barricade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "vlR" = ( /obj/structure/machinery/light{ dir = 4 @@ -73496,17 +73566,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"vpv" = ( -/obj/structure/machinery/shower, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 2 - }, -/obj/item/clothing/mask/cigarette/weed, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "vpI" = ( /obj/effect/landmark/start/police, /turf/open/floor/plating/plating_catwalk, @@ -73699,16 +73758,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vsI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "vsJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -73766,6 +73815,12 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"vtt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "vtx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" @@ -74233,6 +74288,14 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) +"vCz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "vCG" = ( /obj/structure/toilet{ dir = 8 @@ -74257,14 +74320,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"vEf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "vEj" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -74395,6 +74450,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHl" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "vHq" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -74712,6 +74777,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"vMC" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "vME" = ( /turf/open/floor/almayer{ dir = 9; @@ -75109,14 +75182,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"vUk" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "vUI" = ( /obj/structure/largecrate/random/barrel/white, /obj/structure/sign/safety/security{ @@ -75183,13 +75248,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"vVu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "vVw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -75292,27 +75350,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"vWG" = ( -/obj/structure/pipes/vents/pump, -/obj/item/tool/soap, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/cells) "vWJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -75475,6 +75512,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) +"vZJ" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -75552,6 +75599,40 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"wbw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_y = -7; + layer = 2.8 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -4; + pixel_y = 7; + layer = 3.04 + }, +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 26; + pixel_x = -12; + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown" + }, +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 26; + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown Override"; + pixel_x = -2 + }, +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 26; + pixel_x = 8; + name = "ARES Emergency Lockdown Override"; + id = "ARES Emergency" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "wbx" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -75687,6 +75768,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"wdv" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "wdz" = ( /obj/effect/landmark/start/marine/engineer/charlie, /obj/effect/landmark/late_join/charlie, @@ -75765,6 +75855,27 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"wfd" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/stamp/hop{ + name = "Commanding Officer's rubber stamp"; + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/tool/pen/blue/clicky{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "wft" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75913,6 +76024,19 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"wiF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/photocopier{ + anchored = 0 + }, +/obj/structure/sign/poster/io{ + pixel_y = 32; + name = "propaganda poster" + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "wiG" = ( /obj/structure/sign/poster{ pixel_x = -30; @@ -76021,12 +76145,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wkA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "wkH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/whistle{ @@ -76039,17 +76157,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"wkL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "wkM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsLower"; @@ -76291,6 +76398,13 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wpj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wpw" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -76344,16 +76458,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/stern_hallway) -"wqr" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = 29 - }, -/obj/structure/filingcabinet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "wqu" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -76541,18 +76645,6 @@ /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"wuT" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "wvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76729,6 +76821,18 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wyv" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "Working Joe Cryogenics Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "wyO" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -76780,6 +76884,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_medbay) +"wAd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -77013,18 +77124,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"wFJ" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8; - layer = 2.9 - }, -/obj/structure/window{ - pixel_y = -2; - layer = 2.95 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/commandbunks) "wFR" = ( /turf/open/floor/almayer, /area/almayer/living/gym) @@ -77065,13 +77164,6 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"wGI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "wGX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -77178,12 +77270,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"wJB" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/airoom) "wJD" = ( /obj/structure/bed/chair{ dir = 8; @@ -77205,23 +77291,6 @@ "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) -"wJQ" = ( -/obj/item/trash/plate{ - pixel_x = 9; - pixel_y = 11 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3; - pixel_y = 11; - pixel_x = 8 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3; - pixel_y = 11; - pixel_x = 8 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "wKn" = ( /obj/structure/surface/rack, /obj/item/facepaint/sniper, @@ -77253,6 +77322,15 @@ }, /turf/open/floor/plating, /area/almayer/medical/containment) +"wKS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "wLi" = ( /obj/structure/machinery/door_control/airlock{ id = "s_engi"; @@ -77365,14 +77443,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"wMv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/auxiliary_officer_office) "wMG" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -77422,14 +77492,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) -"wNS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "wNT" = ( /obj/structure/platform, /turf/open/floor/almayer, @@ -77511,6 +77573,16 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wQa" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "wQg" = ( /turf/open/floor/almayer{ dir = 1; @@ -77772,17 +77844,6 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) -"wVw" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "wVy" = ( /obj/structure/window/reinforced{ dir = 8 @@ -77894,6 +77955,22 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"wWJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "wWL" = ( /obj/item/tool/screwdriver, /obj/structure/platform_decoration{ @@ -78013,18 +78090,14 @@ /turf/open/floor/plating, /area/almayer/engineering/ce_room) "wYZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/photocopier{ - anchored = 0 +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + name = "\improper Armourer's Workshop"; + req_access = null }, -/obj/structure/sign/poster/io{ - pixel_y = 32; - name = "propaganda poster" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) +/area/almayer/hull/upper_hull/u_m_s) "wZa" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -78273,22 +78346,20 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) -"xfk" = ( -/obj/structure/surface/rack, -/obj/item/stack/cable_coil, -/obj/item/attachable/flashlight/grip, -/obj/item/ammo_box/magazine/l42a{ - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "xfm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) +"xfw" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "xfO" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -78357,6 +78428,16 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"xgE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "xgJ" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -78450,14 +78531,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"xik" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/item/toy/inflatable_duck, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "xiz" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -78485,14 +78558,18 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"xjt" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/card{ - dir = 4; - pixel_x = 2 +"xjw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "xjz" = ( /turf/open/floor/almayer{ icon_state = "plating_striped" @@ -78671,32 +78748,16 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_a_p) -"xns" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) -"xnz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "xnI" = ( /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"xnQ" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "xnR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -78749,20 +78810,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"xoS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/brig/armory) "xpd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -78780,23 +78827,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"xpi" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -29 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/commandbunks) "xpo" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -78908,14 +78938,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"xrq" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "xrr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78966,6 +78988,12 @@ icon_state = "cargo" }, /area/almayer/hallways/vehiclehangar) +"xtg" = ( +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "xtD" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -78983,36 +79011,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"xtQ" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = -3 - }, -/obj/structure/noticeboard{ - desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; - pixel_y = 29 +"xub" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/shipboard/brig/armory) "xuc" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -79195,17 +79204,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"xxa" = ( -/obj/item/stack/sheet/cardboard{ - amount = 50 - }, -/obj/structure/surface/rack, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/squads/req) "xxe" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -79367,15 +79365,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) -"xyL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "xyY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -79453,6 +79442,10 @@ icon_state = "green" }, /area/almayer/squads/req) +"xAC" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "xAI" = ( /obj/structure/platform{ dir = 1 @@ -79478,6 +79471,12 @@ "xBe" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/upper_engineering) +"xBg" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "xBn" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D3"; @@ -79553,13 +79552,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) -"xDj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "xDn" = ( /turf/open/floor/almayer{ dir = 1; @@ -79857,6 +79849,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"xJn" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/starboard) "xJC" = ( /obj/structure/machinery/door/airlock/almayer/generic/corporate{ name = "Corporate Liaison's Closet" @@ -79880,12 +79878,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"xJT" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "xKM" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -80075,14 +80067,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"xNL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "xOL" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -80447,14 +80431,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"xUV" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "xVc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -80593,11 +80569,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"xYe" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "xYf" = ( /obj/structure/machinery/cm_vending/clothing/sea, /turf/open/floor/almayer{ @@ -80621,15 +80592,6 @@ icon_state = "orange" }, /area/almayer/shipboard/brig/cells) -"xYr" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/gear/commanding_officer{ - pixel_y = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "xYB" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -80663,6 +80625,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) +"xZf" = ( +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "xZI" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -80856,6 +80825,10 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"ydr" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "ydx" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -80953,6 +80926,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"yeO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "yeP" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -80968,18 +80951,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"yff" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" +"yeX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/command/cic) +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "yfm" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -81024,18 +81002,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"yfG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/obj/item/storage/briefcase{ - pixel_y = 15 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "yfS" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -81052,6 +81018,18 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ygs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/captain_mess) "ygy" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -81067,6 +81045,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"ygM" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "yhI" = ( /turf/open/floor/almayer{ dir = 4; @@ -81114,6 +81102,17 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"yiL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "yiW" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -81188,6 +81187,16 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"ykD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "ykF" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/almayer{ @@ -81238,6 +81247,12 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"ylg" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "ylJ" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -89857,8 +89872,8 @@ mLJ eiO xFs xkd -teE -xJT +eiH +aTV xkd xkd xkd @@ -90060,9 +90075,9 @@ iqn eRL tmy xkd -vWG -lJL -dQp +rUB +dSn +soa xzu xkd xkd @@ -90263,8 +90278,8 @@ aJz dXy nHg xkd -xik -bjQ +ghX +rAv xkd eTo iHG @@ -92097,7 +92112,7 @@ eZH ohJ thL thL -uAL +aHT liZ rUk jVa @@ -92679,9 +92694,9 @@ pCi rPC rwS lrq -kTc +fFq uqo -wVw +rhD cqn gTx eRL @@ -92882,9 +92897,9 @@ ahE rPC nfI lrq -omu +eTx uqo -sYB +hGa cqn ldu eRL @@ -93085,9 +93100,9 @@ ahE rPC heV lrq -frJ +lCn uqo -ktn +xub cqn nBb mdS @@ -93288,9 +93303,9 @@ ahE wcn nBc lrq -vsI +ebt uqo -xoS +lLN lrq mAT lrq @@ -93491,7 +93506,7 @@ pCi wcn wcn lrq -mAr +yeX uqo fsT jnA @@ -93694,7 +93709,7 @@ pCi oCL wcn lrq -uZY +ebz uqo uqo uqo @@ -93897,7 +93912,7 @@ pCi rPC aou lrq -mAr +yeX uqo uvy tfO @@ -94210,8 +94225,8 @@ poR mGL pNp kcp -wMv -nCR +pNK +bIA alU uDn bKf @@ -94618,9 +94633,9 @@ bTS lxo qcy kcp -kmk -kmk -mIJ +edM +edM +mcl bLt bXX bKh @@ -94821,9 +94836,9 @@ oQM aqI aqI kcp -jaK -jxP -xNL +pUl +tXz +rYZ bLu bBB bBB @@ -98053,7 +98068,7 @@ aaa nXP ndx uNL -nDd +eRt soS sgy nsu @@ -98256,9 +98271,9 @@ aaa nXP hJp uNL -gka +lUv bwQ -oNf +gUr uNL aNw kXJ @@ -98600,7 +98615,7 @@ ukU bfP fvv vcK -wGI +wAd tuA tuA tuA @@ -99614,9 +99629,9 @@ vCO vCO vCO jxB -xDj -boc -eXS +wpj +gDq +tJo bGr hnV xEF @@ -99817,9 +99832,9 @@ wmT jhW mWD jxB -gvW -sWs -imJ +hWX +tYv +mRU xuB gpe xEF @@ -99980,7 +99995,7 @@ aad aai aai pCi -pmI +nMM avl avl agj @@ -100022,7 +100037,7 @@ aES aES aES aES -vbP +lDj uEv gpe xEF @@ -100181,20 +100196,20 @@ aaa aaa aad ahE -qKt -dKa -hdb +iuT +nna +svp avl agj agj -oTM -mTc -sLZ -yfG -lQi +wbw +npK +hBW +tHU +tMu kcN -twI -ufL +dkn +gye aic aov wVW @@ -100384,20 +100399,20 @@ aaa aaa aad ahE -ooo -uaX -kfR +afc +npB +umY avl agj -lDD +laG agc -qfD +aUP agc -kJm -xYr +ktc +ueD kcN cod -ufL +gye aic aov wVW @@ -100590,17 +100605,17 @@ ahE aiV wBY hJJ -qCi +anl agj -crw -wJQ +fuR +ouT agc agc -kJm -rbE +ktc +nKs kcN -yff -ufL +muQ +gye aic aKq luZ @@ -100793,13 +100808,13 @@ pCi kwS avl avl -mRp +yiL agj -nCx -tYM -mqb -kDK -jMx +utw +kmY +pSH +mES +lWD mXj kcN kcN @@ -100998,14 +101013,14 @@ avl hCo lIh agj -keT +fiP hvH -bVs +pYp hvH hvH -aOj -bQl -xpi +iIm +odC +cQD agj bFA aov @@ -101201,14 +101216,14 @@ avl hMI lFb agj -dyj -fnv -bVs -iPu -dFb +mcK +xBg +pYp +isu +oBW mXj -wFJ -kJW +drp +tqI agj aic aoA @@ -101406,7 +101421,7 @@ tDx agj mXj mXj -lul +nRQ mXj mXj mXj @@ -101608,12 +101623,12 @@ jgM lFb agj mXj -pjR -jND -aKk -aKk -nCU -faE +yeO +nQH +lnZ +lnZ +pxL +mzG mXj agj amI @@ -101810,17 +101825,17 @@ avl jpJ lzH agj -qlI -cdB -xjt -coD +iET +akr +lfT +jNY agc -ako -tYM -hGB +jCn +kmY +rEJ agj aic -acS +esy wVW asQ awG @@ -102013,19 +102028,19 @@ avl llM lGL agj -eBE +jPn hvH agc -azm +euM pxG -fOv +klG agc agc agj aic -sxW +cHA wVW -abQ +nww atN cEl sOi @@ -102216,21 +102231,21 @@ avl avl mrc agj -kSH +huR hvH -nTA -qmZ +gfK +rqH agc -aiW +nnG xyk xyk -mDX -aTl -dLe +oys +nDV +joE wVW -atx +qyJ qEk -ajm +ksv wVW arP alX @@ -102242,7 +102257,7 @@ hkG wVW fvB qEk -iaa +aGi wVW aKn aKz @@ -102419,19 +102434,19 @@ pCi jTi nRq agj -kVT +wfd hvH agc -qlp +pJe pxG -tTk +vtt agc agc agj -fXP +lPG aov wVW -atx +qyJ qEk ato wVW @@ -102445,7 +102460,7 @@ aEB wVW fvB qEk -iaa +aGi wVW aKn aKz @@ -102622,19 +102637,19 @@ pCi avl myn agj -kNq +rfv hvH qck -gVd +jEX agc -tan -kDK -iEz +ssn +mES +lUw agj aic aov wVW -ssW +nbr qEk hrm wVW @@ -102648,7 +102663,7 @@ aEC wVW dNZ qEk -mje +xZf wVW aKn aKz @@ -102826,18 +102841,18 @@ cnX lIh agj mXj -fnv +xBg hvH hvH -iNY +bVg hvH -jhB +pJK mXj agj aic aoA wVW -atx +qyJ jvX ato wVW @@ -102849,9 +102864,9 @@ alX aIf aED wVW -ryR +xtg jvX -iaa +aGi wVW aKn aKy @@ -103872,7 +103887,7 @@ aJc ecr ecr ecr -ohS +ygs aET nUv aJU @@ -104074,8 +104089,8 @@ cST aTz aUl aET -esC -nsQ +aWA +jgu aET mSi wHp @@ -104273,7 +104288,7 @@ aGV rvA aKE awF -jzE +iYR aUw aUm aET @@ -104648,7 +104663,7 @@ awW add add add -stu +juf add add add @@ -104694,7 +104709,7 @@ baw aJU aJU aJU -tBu +hey aJU aJU aJU @@ -105048,7 +105063,7 @@ bdH aaC abs adq -myl +jWH ajI add fsU @@ -105106,7 +105121,7 @@ qys gBW aJU tiW -qgU +pUe pgD tQV aaC @@ -105278,13 +105293,13 @@ umS yjM qbO aqw -hnI +qRL bYe amO wZM aPm awF -nvG +aHk vGI aLp awF @@ -105489,7 +105504,7 @@ ejp awF aHn szU -fGa +aLt awF aRC aUw @@ -105657,7 +105672,7 @@ aaa aaY abs adq -tGj +ckE ajI add fsU @@ -105715,7 +105730,7 @@ qys gBW aJU tiW -bpw +hXD pgD tQV aaY @@ -106069,7 +106084,7 @@ aoC add add add -stu +juf add add add @@ -106115,7 +106130,7 @@ baw aJU aJU aJU -nnX +eyv aJU aJU aJU @@ -106793,7 +106808,7 @@ bsk sxu cBI bkA -eFG +nuI bej arX vSG @@ -106898,7 +106913,7 @@ aiX aiX aiX sHM -kUh +otK aiX aiX aiX @@ -107094,7 +107109,7 @@ awW awW awW fSm -hiy +vCz apl bbL bbL @@ -107297,7 +107312,7 @@ ajf ajf ajf oAO -pIZ +dlN aod qgG amC @@ -107500,7 +107515,7 @@ awW awW awW aSJ -isI +dAi dtM aii mce @@ -109535,7 +109550,7 @@ dtM akU ajC sqf -anp +wQa wjz fnA jZY @@ -109738,7 +109753,7 @@ dtM aii ajC sqf -sOZ +udb oNJ eDo eDo @@ -109941,7 +109956,7 @@ dtM ajt aik sqf -anq +eTh awn xsz jTj @@ -110144,11 +110159,11 @@ dtM aii ajC sqf -anr +vZJ awn tEi -asu -hbI +iWb +ygM sqf ajl vtx @@ -111895,8 +111910,8 @@ bJt xOL gGI eeu -nbB -ksA +dqQ +ccm gAz fiq uaa @@ -112298,7 +112313,7 @@ buH bHL buH lhB -nbB +tAJ bDs bIJ bDs @@ -112603,7 +112618,7 @@ kSJ avj cGr awE -qkm +vjn wQv rne guC @@ -112918,7 +112933,7 @@ jFE jFE idx hAz -fhQ +hQh bJt vhI oed @@ -113117,11 +113132,11 @@ vzP bJt hjB bJt -dpn +neF bDs gSk bDs -pdt +khX bJt kTq oed @@ -113215,7 +113230,7 @@ awE bqy bYj eUR -ucI +gEI nDh bYj xne @@ -113730,7 +113745,7 @@ rBj bDs gSk bDs -oMd +hWS bJt oDf uqH @@ -113933,7 +113948,7 @@ bJt oKb gSk bDs -pdt +ign bJt sIx bxX @@ -114538,7 +114553,7 @@ qBM wXI nUd lkd -oMd +xnQ bDs gSk oDE @@ -115038,12 +115053,12 @@ ajr aii avm awE -wYZ +wiF rne rne fAo awE -bhM +knT wQv bBi awE @@ -115450,7 +115465,7 @@ rne wft awE hpf -qJU +pbl igp awE hoX @@ -115908,7 +115923,7 @@ kxd jgk nsY rSG -rur +wWJ oqS nsY lhu @@ -116313,7 +116328,7 @@ gsg vHq vvY nsY -rNb +pPV bxC jiU nsY @@ -116721,7 +116736,7 @@ wNl nGh fPp lqN -vlO +uoh nsY xCN pOB @@ -117388,7 +117403,7 @@ uVh nsY kzK lFh -jYc +mus pVA mzV pML @@ -117540,7 +117555,7 @@ aLf tRc qEW bdd -uva +gGo mLb wmz vpt @@ -118457,7 +118472,7 @@ abg caF aar aar -lIl +wYZ aar aar ael @@ -118659,10 +118674,10 @@ bWs abg caF aar -vUk +rcW sTB -lUA -tqd +jrV +qmr ael afE agT @@ -118862,9 +118877,9 @@ acO aJs cbN aar -fQY +lDK aap -elM +eXU vFb ael afH @@ -119065,10 +119080,10 @@ pNQ abx hTy aar -thR +pJn aao aao -gDP +erz ael afI agY @@ -119268,10 +119283,10 @@ acP bUE qFQ aar -xtQ +jBY aap aao -sxT +mYX ael afJ agY @@ -119471,10 +119486,10 @@ acG abx caF aar -com +ydr aap aao -sxT +mYX ael afK ahc @@ -119676,7 +119691,7 @@ lCz aar tAV sTB -xfk +uck wKn ael afL @@ -119877,7 +119892,7 @@ acG abx caF aar -lIl +wYZ aar aar aar @@ -120082,8 +120097,8 @@ arJ aar aao aao -wkL -mts +rOZ +dfP adO afM fpR @@ -120283,10 +120298,10 @@ jSY abx hTy aar -hLB +lAj aao aao -laY +xgE adO afN ahh @@ -120486,10 +120501,10 @@ acP bUE qFQ aar -xYe -kZH +jkL +iaE aao -frY +mXa adO afO ahh @@ -120689,10 +120704,10 @@ aJa abg ccf aar -mko +cRg uaZ aap -svC +epK adO jkj ahh @@ -121621,7 +121636,7 @@ rbY gwD bOK bPD -bYa +nSj bPD jOk bNB @@ -121824,7 +121839,7 @@ rbY bEc bKA bCA -bQS +gJs bCA bKA bEc @@ -121902,7 +121917,7 @@ aeA aeC aeC aeC -cVb +tpt aeC aeC aeC @@ -121950,7 +121965,7 @@ lJY vcE vcE vcE -iTd +oDO vcE vcE vcE @@ -122237,7 +122252,7 @@ bmD mYv doP jac -xxa +isS cai bdl bII @@ -122302,7 +122317,7 @@ aag aag abh acx -pMk +adQ ajs aeC wXh @@ -122362,7 +122377,7 @@ eyG kpo vcE kUV -xyL +mvH rRq uOi aag @@ -122504,8 +122519,8 @@ aah aah aah abi -nGY -gyU +acE +adZ ajk aeA asY @@ -122565,8 +122580,8 @@ deg wLu lJY xVS -kPH -knL +fqg +uGa uyC aah aah @@ -122628,7 +122643,7 @@ aYW bzV beB mCo -iwZ +xfw lBF bKA sbM @@ -122643,7 +122658,7 @@ bmD lyk bOR eHa -cmo +opj xAB mCo bJz @@ -122707,8 +122722,8 @@ bdH bdH bdH abi -dEJ -gyU +acT +adZ ajk aeA atp @@ -122768,8 +122783,8 @@ pfH wlF lJY xVS -kPH -qGU +fqg +mIA uyC bdH aaa @@ -122911,7 +122926,7 @@ aaa bdH abh acx -gCB +umR ajs aeC wXh @@ -122971,7 +122986,7 @@ eyG kpo vcE kUV -bxA +pPF rRq uOi bdH @@ -123323,7 +123338,7 @@ amH aeC aeC aeC -cVb +tpt aeC aeC aeC @@ -123371,7 +123386,7 @@ kKR vcE vcE vcE -iTd +oDO vcE vcE vcE @@ -123456,7 +123471,7 @@ bZr bNQ bNQ bNQ -bGz +ohl hMs cbw iEb @@ -123659,7 +123674,7 @@ bZr krN krN krN -oqY +llt can buH iEb @@ -123765,9 +123780,9 @@ alG anG apf oIB -jgr -gGp -dMf +tSF +qyM +jog oIB sFR vuv @@ -123862,7 +123877,7 @@ bZr ibc uly bNN -vbR +fXt pky cbv cbS @@ -123968,9 +123983,9 @@ alG aYD uPI oIB -fXE -kaS -aiQ +hJh +vMC +iUC oIB sFR vuv @@ -124171,9 +124186,9 @@ sUF anG apd oIB -wqr +ufS bZw -xUV +kaJ oIB sFR hPo @@ -124268,7 +124283,7 @@ bZr bKA dyx eYr -bUo +iii uys cbz cbU @@ -124375,8 +124390,8 @@ aYD aTS qgK tEB -uBM -dXo +llD +gGl oIB lBR nVu @@ -124471,7 +124486,7 @@ bmD bKA dyx hGN -pVx +ddN uys ttM iEb @@ -124578,8 +124593,8 @@ anG mPX oIB wKF -hzb -ltU +fOh +diM oIB fbx cFA @@ -124780,9 +124795,9 @@ aSC aZH iAB oIB -phj -vEf -cNK +gqF +imW +qbh oIB fbx cxo @@ -124983,8 +124998,8 @@ rFY ctC gPF oIB -opI -dha +kUb +rJg pxj oIB fbx @@ -127005,8 +127020,8 @@ auu aoT aFm xBe -aIV -qqr +cij +jRZ arH xBe alG @@ -127413,7 +127428,7 @@ anO nFX atv auV -amE +ift xBe alG aDZ @@ -127616,7 +127631,7 @@ atc nFX atv auV -amE +ift xBe alG aYj @@ -128020,8 +128035,8 @@ atq aDr aFu xBe -azp -qJf +rwT +wdv anV xBe alG @@ -131277,7 +131292,7 @@ vuv vuv jWh jWh -sWC +olk jWh jWh jWh @@ -131479,10 +131494,10 @@ vuv nfS emx jWh -duz -hXG -htG -doU +qCg +xjw +pfA +xAC jWh lbB uIv @@ -131682,10 +131697,10 @@ iEs cxo cxo jWh -axR -mIP -tcZ -fWi +uUV +rsW +djN +fnQ jWh lbB cKL @@ -131885,10 +131900,10 @@ vuv xct cxo jWh -vpv -pgw -rmE -fWi +dkS +vba +naQ +fnQ jWh xPZ pcv @@ -132069,7 +132084,7 @@ ptK dmQ psm psm -lDn +qyH arV wZX eky @@ -132083,7 +132098,7 @@ aDQ eky wZX arV -wkA +dtv vuv vuv cxo @@ -132271,8 +132286,8 @@ hWU dmQ aeq psm -xrq -vVu +aNe +hiN arV wZX eky @@ -132286,8 +132301,8 @@ aHe eky wZX arV -oIt -xrq +fXM +aNe vuv ahb cxo @@ -132474,8 +132489,8 @@ rwb dmQ jXY psm -vlk -mKy +atY +qkj aMT svl pzJ @@ -132489,8 +132504,8 @@ qDt pzJ sQO aMT -wNS -vlk +rWF +atY vuv woM nqD @@ -132678,7 +132693,7 @@ dmQ atD psm psm -vjd +vHl aRp jBX akS @@ -132692,7 +132707,7 @@ aHe tKf jBX aRp -quy +edx vuv vuv myC @@ -133074,8 +133089,8 @@ cuC bNM tgK tfb -wuT -lMx +skg +eaX pVZ pVZ pVZ @@ -133107,8 +133122,8 @@ qMu qMu qMu qMu -jFY -qKY +euY +iuw jHL wOK uIv @@ -133277,8 +133292,8 @@ cuC riJ kHY uhM -kdv -lkm +uvk +xJn cuC aag aag @@ -133310,8 +133325,8 @@ aag aag aag bYn -dRs -uAl +tAh +bfe rDb qjV rID @@ -133480,7 +133495,7 @@ cuC cuC umy iKZ -pnL +tiw cuC cuC mNX @@ -133514,7 +133529,7 @@ mNX qOk bYn bYn -cWE +qQL kHS rID bYn @@ -134507,8 +134522,8 @@ xVk xVk aad jbq -kRg -uRs +jXW +jcZ aDO qqu eky @@ -134516,8 +134531,8 @@ aNl eky dFk aDO -nPY -kRg +nzI +jXW jbq ajZ xVk @@ -134710,8 +134725,8 @@ xVk xVk aad jbq -hBL -dID +qtR +jWC eky eky nJu @@ -134719,8 +134734,8 @@ aNl eky eky eky -etn -hBL +aDc +qtR jbq ajZ xVk @@ -134914,7 +134929,7 @@ xVk eJQ aPw aHe -mRQ +dnJ eky eky eky @@ -134922,7 +134937,7 @@ aNl eky eky eky -biJ +hfw aHe aPw eJQ @@ -136741,7 +136756,7 @@ xVk oee aPw aHe -iTe +tqB eky eky atg @@ -136749,7 +136764,7 @@ aBE ouB eky eky -qPX +gwu aHe aPw oee @@ -136943,8 +136958,8 @@ xVk xVk aad jbq -xrq -dID +aNe +jWC eky eky esT @@ -136952,8 +136967,8 @@ nYE orH eky eky -etn -xrq +aDc +aNe jbq ajZ xVk @@ -137146,8 +137161,8 @@ xVk xVk aad jbq -vlk -dID +atY +jWC eky eky bAe @@ -137155,8 +137170,8 @@ aBG sGh eky eky -etn -vlk +aDc +atY jbq ajZ xVk @@ -137349,8 +137364,8 @@ xVk xVk aad aPw -uYd -xnz +qpU +ykD dqj eky xaS @@ -137358,8 +137373,8 @@ ejt mPf eky gUV -neG -uYd +wKS +qpU aPw ajZ xVk @@ -140446,9 +140461,9 @@ lmz lmz lmz daz -ltc -eXk -xns +rzf +bRo +wyv pTt gAe rCi @@ -140649,9 +140664,9 @@ lmz lmz lmz daz -tId -wJB -tJN +czG +ylg +oIY daz daz daz diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index 36c8e9abe717..917759783a2a 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -2220,9 +2220,6 @@ icon_state = "floor_plate" }, /area/whiskey_outpost/inside/living) -"hP" = ( -/turf/open/space/basic, -/area/whiskey_outpost/inside/caves) "hQ" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -22778,7 +22775,7 @@ mT mT mT mT -hP +mT mT mT dl @@ -23177,12 +23174,12 @@ mT mT mT mT -hP mT mT mT mT -hP +mT +mT mT mT qz diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts index a43aaf1ff0b0..9facaf339b29 100644 --- a/tgui/packages/tgui/interfaces/Orbit/helpers.ts +++ b/tgui/packages/tgui/interfaces/Orbit/helpers.ts @@ -31,7 +31,9 @@ export const getDisplayName = (full_name: string, nickname?: string) => { }; /** Returns the display color for certain health percentages */ -export const getHealthColor = (health: number) => { +export const getHealthColor = (health?: number) => { + if (!health) return 'bad'; + switch (true) { case health > HEALTH.Good: return 'good'; diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index e9e345995271..83dfe3b361b2 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -215,6 +215,8 @@ const ObservableItem = ( const [autoObserve] = useLocalState(context, 'autoObserve', false); + const displayHealth = typeof health === 'number'; + return (