From 4e47b16949662428d06e21729e1c38427b87ae2c Mon Sep 17 00:00:00 2001 From: Neonvolt <83385197+Neonvolt@users.noreply.github.com> Date: Sat, 2 Nov 2024 19:24:52 +0300 Subject: [PATCH] Fixes some Ascent bugs (#2727) --- .../code/ascent_caulship_jobs.dm | 21 +++++-- .../code/ascent_caulship_props.dm | 2 +- .../ascent_caulship/maps/ascent_caulship.dmm | 58 +++++++++--------- .../code/ascent_seedship_jobs.dm | 21 +++++-- mods/ascent/code/ascent_atoms.dm | 8 ++- mods/ascent/code/ascent_doodads.dm | 27 ++++---- mods/ascent/code/ascent_effects.dm | 4 +- mods/ascent/code/ascent_id.dm | 4 +- mods/ascent/code/ascent_outfits.dm | 2 +- mods/ascent/code/ascent_rigs.dm | 16 ++--- mods/ascent/code/ascent_species.dm | 6 +- mods/ascent/code/ascent_tools.dm | 4 +- mods/ascent/icons/items/ascent.dmi | Bin 2457 -> 0 bytes .../icons/{misc => obj}/ascent_doodads.dmi | Bin mods/ascent/icons/obj/items/ascent.dmi | Bin 0 -> 2293 bytes mods/ascent/icons/obj/{ => items}/egg.dmi | Bin mods/ascent/icons/{ => obj}/items/organs.dmi | Bin mods/ascent/icons/{misc => obj}/razorweb.dmi | Bin 18 files changed, 100 insertions(+), 73 deletions(-) delete mode 100644 mods/ascent/icons/items/ascent.dmi rename mods/ascent/icons/{misc => obj}/ascent_doodads.dmi (100%) create mode 100644 mods/ascent/icons/obj/items/ascent.dmi rename mods/ascent/icons/obj/{ => items}/egg.dmi (100%) rename mods/ascent/icons/{ => obj}/items/organs.dmi (100%) rename mods/ascent/icons/{misc => obj}/razorweb.dmi (100%) diff --git a/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm b/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm index 35dcfbe2d8fda..aa27c9111b148 100644 --- a/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm +++ b/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm @@ -108,8 +108,8 @@ if(!cutter.gyne_name) cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name) -/* if(set_species_on_join) - H.set_species(set_species_on_join)*/ + if(set_species_on_join) + H.set_species(set_species_on_join) switch(H.species.name) if(SPECIES_MANTID_GYNE) @@ -129,6 +129,17 @@ H.mind.name = H.real_name return H +/datum/job/submap/ascent/is_position_available() + . = ..() + if(. && requires_supervisor) + for(var/mob/M in GLOB.player_list) + if(!M.client || !M.mind || !M.mind.assigned_job || M.mind.assigned_job.title != requires_supervisor) + continue + var/datum/job/submap/ascent/ascent_job = M.mind.assigned_job + if(istype(ascent_job) && ascent_job.owner == owner) + return TRUE + return FALSE + /datum/job/submap/ascent/alate title = "Ascent Alate" total_positions = 2 @@ -159,7 +170,8 @@ supervisors = "the Serpentid Queen and the Gyne" total_positions = 2 info = "You are a Monarch Serpentid Worker serving as an attendant to your Queen on this vessel. Serve her however she requires." - whitelisted_species = list(SPECIES_MONARCH_WORKER) + set_species_on_join = SPECIES_MONARCH_WORKER + whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_ALATE) outfit_type = /singleton/hierarchy/outfit/job/ascent/worker min_skill = list(SKILL_EVA = SKILL_TRAINED, SKILL_HAULING = SKILL_TRAINED, @@ -176,7 +188,8 @@ total_positions = 1 info = "You are a Monarch Serpentid Queen living on an independant Ascent vessel. Assist the Gyne in her duties and tend to your Workers." outfit_type = /singleton/hierarchy/outfit/job/ascent/queen - whitelisted_species = list(SPECIES_MONARCH_QUEEN) + set_species_on_join = SPECIES_MONARCH_QUEEN + whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_GYNE) min_skill = list(SKILL_EVA = SKILL_TRAINED, SKILL_HAULING = SKILL_TRAINED, SKILL_COMBAT = SKILL_TRAINED, diff --git a/mods/_maps/ascent_caulship/code/ascent_caulship_props.dm b/mods/_maps/ascent_caulship/code/ascent_caulship_props.dm index 2331edec7329a..8def3f3c57a85 100644 --- a/mods/_maps/ascent_caulship/code/ascent_caulship_props.dm +++ b/mods/_maps/ascent_caulship/code/ascent_caulship_props.dm @@ -1,7 +1,7 @@ /obj/item/kharmaan_egg name = "crystalline egg" desc = "A lumpy, gooey egg with a thin crystalline exterior." - icon = 'mods/ascent/icons/obj/egg.dmi' + icon = 'mods/ascent/icons/obj/items/egg.dmi' icon_state = "egg_single" var/moved = FALSE diff --git a/mods/_maps/ascent_caulship/maps/ascent_caulship.dmm b/mods/_maps/ascent_caulship/maps/ascent_caulship.dmm index 0aee6ffd8bb6f..b0fcf836b4a6c 100644 --- a/mods/_maps/ascent_caulship/maps/ascent_caulship.dmm +++ b/mods/_maps/ascent_caulship/maps/ascent_caulship.dmm @@ -9,9 +9,9 @@ "ai" = (/obj/wallframe_spawn/reinforced_phoron/titanium/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aj" = (/obj/machinery/pipedispenser,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "ak" = (/obj/machinery/atmospherics/pipe/manifold/visible/red,/turf/simulated/wall/r_wall/ascent,/area/ship/ascent_caulship) -"al" = (/mob/living/simple_animal/hostile/retaliate/alate_nymph,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"al" = (/obj/structure/bed,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "am" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"an" = (/obj/machinery/computer/ship/sensors/ascent,/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 2; icon_state = "map_universal"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"an" = (/obj/machinery/computer/ship/sensors/ascent,/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 2; icon_state = "map_universal"},/obj/item/device/radio/intercom/hailing{dir = 4; pixel_x = -24},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "ao" = (/obj/machinery/computer/ship/navigation/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aq" = (/obj/machinery/atmospherics/omni/filter{tag_east = 9; tag_north = 2; tag_south = 3; tag_west = 1; use_power = 2},/obj/machinery/portable_atmospherics/canister/methyl_bromide{start_pressure = 10000},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "ar" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10},/turf/simulated/wall/r_wall/ascent,/area/ship/ascent_caulship) @@ -33,12 +33,12 @@ "aI" = (/obj/machinery/bodyscanner/ascent{dir = 4},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "aJ" = (/obj/item/storage/firstaid/surgery,/obj/structure/table/steel_reinforced,/obj/machinery/light/ascent{dir = 1},/obj/item/reagent_containers/spray/sterilizine/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "aK" = (/obj/machinery/optable/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) -"aL" = (/obj/item/device/radio/intercom/hailing{dir = 4; pixel_x = -24},/obj/machinery/atmospherics/binary/pump/high_power/on{dir = 1; target_pressure = 5000},/obj/structure/bed/chair/padded/purple/ascent{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"aM" = (/obj/machinery/atmospherics/binary/pump/high_power/on{target_pressure = 150},/obj/structure/bed/chair/padded/purple/ascent{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"aL" = (/obj/machinery/atmospherics/binary/pump/high_power/on{dir = 1; target_pressure = 5000},/obj/structure/bed/chair/padded/purple/ascent{dir = 1},/obj/machinery/light/ascent{dir = 8},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"aM" = (/obj/machinery/atmospherics/binary/pump/high_power/on{target_pressure = 150},/obj/structure/bed/chair/padded/purple/ascent{dir = 1},/obj/machinery/light/ascent{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aN" = (/obj/machinery/atmospherics/omni/mixer{tag_east = 1; tag_east_con = 0.5; tag_west = 2; use_power = 2; tag_north = 1; tag_north_con = 0.5},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aO" = (/obj/machinery/atmospherics/unary/tank/oxygen{dir = 8},/obj/machinery/light/ascent{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aP" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"aQ" = (/obj/machinery/light/ascent{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 2; icon_state = "map_universal"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"aQ" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 2; icon_state = "map_universal"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aR" = (/obj/machinery/mineral/stacking_machine{color = "PURPLE"; input_turf = 4; name = "materials distributor"; output_turf = 2},/obj/machinery/conveyor{dir = 10; id = "ascent"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aS" = (/obj/structure/railing/mapped,/obj/machinery/light/ascent{dir = 1},/obj/machinery/conveyor{dir = 4; id = "ascent"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "aT" = (/obj/machinery/mineral/processing_unit{color = "PURPLE"; input_turf = 4; name = "compression dynamo"; output_turf = 8},/obj/structure/railing/mapped,/obj/machinery/conveyor{dir = 4; id = "ascent"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -51,16 +51,16 @@ "ba" = (/obj/structure/mopbucket/ascent,/obj/item/mop/advanced/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bb" = (/obj/structure/table/steel_reinforced,/obj/machinery/computer/mining{color = "PURPLE"; name = "compression dynamo control"},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bc" = (/obj/structure/ore_box{color = "PURPLE"; name = "heavy duty box"},/obj/structure/railing/mapped{dir = 8; icon_state = "railing0-1"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bd" = (/obj/structure/table/rack/dark,/obj/item/storage/bag/trash/purple/ascent,/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/item/pickaxe/diamonddrill/ascent,/obj/item/storage/ore{color = "PURPLE"; name = "mineral carrier"},/obj/item/stack/material/rods/fifty,/obj/item/stack/material/rods/fifty,/obj/item/storage/bag/trash/purple/ascent,/obj/item/storage/bag/trash/purple/ascent,/obj/item/storage/bag/trash/purple/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) +"bd" = (/obj/structure/table/rack/dark,/obj/item/storage/bag/trash/purple/ascent,/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/item/pickaxe/diamonddrill/ascent,/obj/item/storage/ore{color = "PURPLE"; name = "mineral carrier"},/obj/item/stack/material/rods/fifty,/obj/item/stack/material/rods/fifty,/obj/item/storage/bag/trash/purple/ascent,/obj/item/storage/bag/trash/purple/ascent,/obj/item/storage/bag/trash/purple/ascent,/obj/machinery/light/ascent{dir = 4},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "be" = (/obj/machinery/biogenerator,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bf" = (/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 6; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 6; icon_state = "intact-scrubbers"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bg" = (/obj/machinery/light/ascent{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 2; icon_state = "map_universal"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"bg" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bi" = (/obj/machinery/botany/editor,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bj" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 4; icon_state = "intact-scrubbers"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bk" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; dir = 8; icon_state = "4-8"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"bk" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; dir = 8; icon_state = "4-8"},/obj/machinery/light/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bl" = (/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/window/boron_reinforced{dir = 8},/obj/structure/window/boron_reinforced{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bm" = (/obj/machinery/power/ascent_reactor,/obj/structure/cable/cyan{icon_state = "0-8"},/obj/submap_landmark/joinable_submap/ascent_caulship,/obj/overmap/visitable/ship/landable/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bo" = (/obj/structure/table/steel_reinforced,/obj/item/storage/box/botanydisk,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) +"bo" = (/obj/structure/table/steel_reinforced,/obj/item/storage/box/botanydisk,/obj/item/device/scanner/plant/ascent,/obj/item/device/scanner/xenobio/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bp" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 2; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bq" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/window/boron_reinforced,/obj/structure/window/boron_reinforced{dir = 8},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bs" = (/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/window/boron_reinforced,/obj/structure/window/boron_reinforced{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -69,7 +69,7 @@ "bv" = (/obj/structure/cable/cyan{icon_state = "0-8"},/obj/machinery/power/smes/buildable/preset/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bw" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable/cyan,/obj/structure/window/boron_reinforced{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bx" = (/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 9; icon_state = "intact-scrubbers"},/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 10; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"by" = (/obj/structure/bed/chair/padded/purple/ascent,/obj/machinery/light/ascent{dir = 8},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) +"by" = (/obj/item/kharmaan_egg{pixel_x = 7; pixel_y = -4},/obj/item/kharmaan_egg{pixel_x = 7; pixel_y = -4},/obj/item/kharmaan_egg{pixel_y = -5},/obj/item/kharmaan_egg{pixel_x = -7},/obj/item/kharmaan_egg{pixel_x = -5; pixel_y = -8},/obj/item/kharmaan_egg,/obj/machinery/light/ascent{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bz" = (/obj/structure/bed/chair/padded/purple/ascent/gyne{dir = 1},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bA" = (/obj/structure/bed/chair/padded/purple/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bB" = (/obj/machinery/cryopod/ascent_spawn,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) @@ -78,7 +78,7 @@ "bE" = (/obj/submap_landmark/spawnpoint/ascent_caulship/alate,/obj/machinery/computer/cryopod/ascent_spawn{pixel_y = -24},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bF" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/obj/machinery/meter,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bG" = (/obj/machinery/door/airlock/ascent,/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bH" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) +"bH" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/machinery/light/ascent{dir = 8},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bI" = (/obj/structure/table/steel_reinforced,/obj/item/storage/box/water/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bJ" = (/obj/submap_landmark/spawnpoint/ascent_caulship/queen,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "bK" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 2; icon_state = "intact-supply"},/obj/machinery/sleeper/ascent{dir = 8},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -91,16 +91,16 @@ "bS" = (/obj/machinery/ion_engine{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bT" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bU" = (/turf/simulated/wall/r_wall/ascent,/area/space) -"bV" = (/obj/item/kharmaan_egg,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bW" = (/obj/machinery/light/ascent{dir = 1},/obj/item/kharmaan_egg,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"bX" = (/obj/machinery/door/window/eastright,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"bV" = (/obj/machinery/light/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"bW" = (/mob/living/simple_animal/hostile/retaliate/alate_nymph,/obj/machinery/door/window/brigdoor/eastleft,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"bX" = (/obj/machinery/door/window/brigdoor/eastright,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bY" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "bZ" = (/obj/structure/cable/cyan{icon_state = "0-2"},/obj/machinery/power/apc/hyper/ascent/east,/obj/machinery/portable_atmospherics/canister/methyl_bromide{start_pressure = 10000},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "ca" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cb" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/recharge_station/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cc" = (/obj/machinery/light/ascent,/obj/machinery/power/terminal{dir = 4},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "ascent_caulship_interior_sensor"; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cd" = (/obj/structure/cable/cyan,/obj/machinery/power/smes/buildable/preset/ascent,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"ce" = (/obj/item/kharmaan_egg,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"ce" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cf" = (/obj/machinery/door/airlock/external/bolted/ascent{airlock_type = "Internal"; frequency = 1331; id_tag = "ascent_caulship_inner"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cg" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden,/obj/machinery/door/airlock/external/bolted/ascent{airlock_type = "Internal"; frequency = 1331; id_tag = "ascent_caulship_inner"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "ch" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10},/obj/machinery/door/airlock/external/bolted/ascent{airlock_type = "Internal"; frequency = 1331; id_tag = "ascent_caulship_inner"},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "ascent_caulship"; pixel_x = 24},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -114,12 +114,12 @@ "cq" = (/obj/machinery/door/airlock/external/bolted/ascent{frequency = 1331; id_tag = "ascent_caulship_outer"},/obj/machinery/atmospherics/pipe/manifold/hidden/black,/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1331; master_tag = "ascent_caulship"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cr" = (/obj/machinery/atmospherics/pipe/manifold/hidden/black,/obj/machinery/door/airlock/external/bolted/ascent{frequency = 1331; id_tag = "ascent_caulship_outer"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cs" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{dir = 8; id_tag = "ascent_caulship_pump_out_external"},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "ascent_caulship_exterior_sensor"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"ct" = (/obj/machinery/light/ascent,/obj/item/kharmaan_egg,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"ct" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 2; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/light/ascent{dir = 8},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cu" = (/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/window/boron_reinforced{dir = 8},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cv" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/structure/table/rack/dark,/obj/item/device/scanner/gas,/obj/item/device/lightreplacer,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cw" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cx" = (/obj/machinery/atmospherics/pipe/manifold/visible/supply{dir = 8; icon_state = "map-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"cy" = (/obj/machinery/alarm/ascent{pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"cy" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 2; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/alarm/ascent{dir = 4; pixel_x = -24},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cz" = (/obj/machinery/light/ascent{dir = 4},/obj/machinery/fabricator/ascent,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cA" = (/obj/structure/table/rack/dark,/obj/machinery/atmospherics/pipe/simple/hidden,/obj/item/stack/material/glass/fifty,/obj/item/stack/material/plasteel/ten,/obj/item/stack/material/plastic/fifty,/obj/item/stack/material/steel/fifty,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cB" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/ascent{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 2; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -143,9 +143,9 @@ "cT" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cU" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 5; icon_state = "intact-supply"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 9; icon_state = "intact-scrubbers"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cV" = (/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 9; icon_state = "intact-scrubbers"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"cW" = (/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"cW" = (/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/light/ascent{dir = 4},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "cX" = (/obj/structure/table/steel_reinforced,/obj/item/clustertool,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) -"cY" = (/obj/structure/table/steel_reinforced,/obj/item/mop/advanced/ascent,/obj/item/material/knife/kitchen/cleaver/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) +"cY" = (/obj/structure/table/steel_reinforced,/obj/item/mop/advanced/ascent,/obj/item/material/knife/kitchen/cleaver/ascent,/obj/machinery/light/ascent{dir = 4},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "cZ" = (/obj/submap_landmark/spawnpoint/ascent_caulship/drone,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "da" = (/turf/simulated/floor/ascent/tiled,/area/space) "db" = (/obj/machinery/door/airlock/ascent,/turf/simulated/floor/ascent/tiled,/area/space) @@ -159,13 +159,13 @@ "sH" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 9; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "uK" = (/obj/structure/closet/crate/freezer/meat/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "uV" = (/obj/structure/reagent_dispensers/water_cooler/ascent{dir = 8},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) -"vq" = (/obj/item/reagent_containers/food/snacks/meat/beef,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) +"vq" = (/obj/item/reagent_containers/food/snacks/meat/beef,/obj/structure/window/reinforced,/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "vT" = (/obj/machinery/ion_engine{dir = 1},/turf/space,/area/ship/ascent_caulship) "wE" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; dir = 8; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 4; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) "wR" = (/obj/machinery/computer/ship/helm/ascent,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "Au" = (/obj/machinery/portable_atmospherics/canister/methyl_bromide{start_pressure = 10000},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "En" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{id_tag = "ascent_caulship_pump_out_internal"},/obj/structure/hygiene/shower/ascent{dir = 8; icon_state = "shower"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) -"Fb" = (/obj/structure/showcase{color = "#800080"; desc = "A large, complex chunk of machinery similar to the bluespace drive found on some SCG ships. This one is definitely not Skrell design, and seems to have been destroyed in its last jump."; icon = 'icons/obj/power.dmi'; icon_state = "tracker"; name = "burned-out bluespace drive"},/obj/overmap/visitable/sector/ascent_caulship_ring,/turf/simulated/floor/ascent/tiled,/area/space) +"Fb" = (/obj/structure/showcase{color = "#800080"; desc = "A large, complex chunk of machinery similar to the bluespace drive found on some SCG ships. This one is definitely not Skrell design, and seems to have been destroyed in its last jump."; icon = 'icons/obj/machines/power/solar_panels.dmi'; icon_state = "tracker"; name = "burned-out bluespace drive"},/obj/overmap/visitable/sector/ascent_caulship_ring,/turf/simulated/floor/ascent/tiled,/area/space) "Fe" = (/obj/structure/table/rack/dark,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/splint,/obj/item/stack/medical/splint,/obj/item/stack/medical/splint,/obj/item/clothing/mask/gas/ascent_captive,/obj/item/clothing/mask/gas/ascent_captive,/obj/item/clothing/mask/gas/ascent_captive,/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "Gk" = (/obj/structure/hygiene/sink/ascent{dir = 4; icon_state = "sink"; pixel_x = 24},/turf/simulated/floor/ascent/tiled,/area/ship/ascent_caulship) "Ri" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 5; icon_state = "intact-supply"},/turf/simulated/floor/ascent,/area/ship/ascent_caulship) @@ -269,21 +269,21 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUbUaaaaaaabababagakahaiaiaiababababababaaaaaaaaaaaaaabUdabUbUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaaaaaaabajamaqaranaoayatavarawaPaCabaaaaaaaaaadcdcdbdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUbUdabUaaaaaaaaaiabaAaBaEaGaLaxazaxaMasaPaNaOabaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdadadbdcdcabaiaiabababaDabaQinaYwRbgabbGabababaiaiabaaaaaaaaaaaabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUaaaaabaHaIaJaKabbfbjbxazbzazcxcycGaRaSaTaUaVabaaaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaababazazazGkabbpazRibTwEcwsHazcHaZbabbcXbcababaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaabaWazbtbFoxabbpazazazbkazazazcJazazazazazbdabaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdadadbdcdcabaiaiabababaDabaQinaYwRaQabbGabababaiaiabaaaaaaaaaaaabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUaaaaabaHaIaJaKabbfbjbxazbzazcxcwcGaRaSaTaUaVabaaaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaababazazazGkabcyazRibTwEcwsHazcHaZbabbcXbcababaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaabaWazbtbFoxabctazazazbkazazazcJazazazazazbdabaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaibeazbCFebKabbpazazblbOrDazazcJazazazazazAuaiaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaibiazazazbPbMbNcKazcubmswazcIcLazazazazazuKaiaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaiboazazazcWabbpazazbqdWbsazazaXazazazazazuVaiaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaiazbJbRaFcVabcBazazbubvbwazazczabbybzbAazTsaiaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaiazbJbRaFcVabcBazazbubvbwazazczabbAbzbAazTsaiaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaabbBYybDbEbBabcEazazafafafazazcAabbHYJbIbAcYaeaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaababaiababaiabcNdFcQcOcRcCcDcvcFabaiababaiaeaeaaaaaaaaaabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaabafbSabafbSabababababcSabababababbSafabvTafabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUaaabafaaabafaaaaabbVbWaxcTaxbQbZabaaaaafabaaafabaabUbUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdadadbdcabafaaabafaaaaaivqbXazcTazcZcbaiaaaaafabaaafabaadbdadabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUaaabafaaabafaaaaabbybWazcTaxbQbZabaaaaafabaaafabaabUbUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdadadbdcabafaaabafaaaaaivqbgazcTazcZcbaiaaaaafabaaafabaadbdadabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUbUdabUaaaaabaaaaabaaaaaialcecMcUcPcZcbaiaaaaabaaaaabaaaabUdabUbUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaaaaaaaaaaaaabbVctazbYcacccdabaaaaaaaaaaaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUaaaaaaaaaaaaaaaaabbVbXazbYcacccdabaaaaaaaaaaaaaaaabUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdabUbUaaaaaaaabUaaababababcfcgchababababaaaaaabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUdadabUbUaaaaaabUaaababbSabcjckclabbSababaaaaaabUaaaaaabUbUdabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUbUdadabUbUaabUbUaaabbSafabcicnEnabafbSabaaaaaaaabUaabUbUdadabUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm b/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm index 8585ad47ee393..85e38e2db4b9e 100644 --- a/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm +++ b/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm @@ -112,8 +112,8 @@ if(!cutter.gyne_name) cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name) -/* if(set_species_on_join) - H.set_species(set_species_on_join)*/ + if(set_species_on_join) + H.set_species(set_species_on_join) switch(H.species.name) if(SPECIES_MANTID_GYNE) @@ -133,6 +133,17 @@ H.mind.name = H.real_name return H +/datum/job/submap/ascent_inf/is_position_available() + . = ..() + if(. && requires_supervisor) + for(var/mob/M in GLOB.player_list) + if(!M.client || !M.mind || !M.mind.assigned_job || M.mind.assigned_job.title != requires_supervisor) + continue + var/datum/job/submap/ascent_inf/ascent_job = M.mind.assigned_job + if(istype(ascent_job) && ascent_job.owner == owner) + return TRUE + return FALSE + /datum/job/submap/ascent_inf/alate title = "Ascent alate" total_positions = 3 @@ -161,7 +172,8 @@ supervisors = "вашей Королевой" total_positions = 3 info = "You are a Monarch Serpentid Worker serving as an attendant to your Queen on this vessel. Serve her however she requires." - whitelisted_species = list(SPECIES_MONARCH_WORKER) + whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_ALATE) + set_species_on_join = SPECIES_MONARCH_WORKER outfit_type = /singleton/hierarchy/outfit/job/ascent/worker min_skill = list(SKILL_EVA = SKILL_TRAINED, SKILL_HAULING = SKILL_TRAINED, @@ -175,7 +187,8 @@ supervisors = "другими Королевами и Гииной" total_positions = 1 info = "You are a Monarch Serpentid Queen living on an independant Ascent vessel. Assist the Gyne in her duties and tend to your Workers." - whitelisted_species = list(SPECIES_MONARCH_QUEEN) + whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_GYNE) + set_species_on_join = SPECIES_MONARCH_QUEEN min_skill = list(SKILL_EVA = SKILL_TRAINED, SKILL_HAULING = SKILL_TRAINED, SKILL_COMBAT = SKILL_TRAINED, diff --git a/mods/ascent/code/ascent_atoms.dm b/mods/ascent/code/ascent_atoms.dm index 493305d4bad88..dd4cf4406eb89 100644 --- a/mods/ascent/code/ascent_atoms.dm +++ b/mods/ascent/code/ascent_atoms.dm @@ -4,11 +4,15 @@ MANTIDIFY(/obj/item/storage/bag/trash/purple, "sample collection carrier", "m MANTIDIFY(/obj/structure/bed/chair/padded/purple,"mantid nest", "resting place") MANTIDIFY(/obj/item/pickaxe/diamonddrill, "lithobliterator", "drilling") MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "propulsion") +MANTIDIFY(/obj/item/device/scanner/plant, "gazefloranotator", "plant scanning") +MANTIDIFY(/obj/item/device/scanner/xenobio, "xenonascerator", "xenolife scanning") +MANTIDIFY(/obj/item/device/scanner/health, "healthoseefer", "medicine") +MANTIDIFY(/obj/item/reagent_containers/spray/sterilizine, "cleaning agent sprayer", "sterilizing") /obj/structure/bed/chair/padded/purple/ascent icon_state = "nest_chair" base_icon = "nest_chair" - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' buckle_pixel_shift = list(0,5,0) pixel_z = 0 @@ -37,7 +41,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "p /obj/item/cell/mantid name = "mantid microfusion plant" desc = "An impossibly tiny fusion reactor of mantid design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "plant" maxcharge = 1500 w_class = ITEM_SIZE_NORMAL diff --git a/mods/ascent/code/ascent_doodads.dm b/mods/ascent/code/ascent_doodads.dm index 64c81ba48e641..7f7f18d6fe760 100644 --- a/mods/ascent/code/ascent_doodads.dm +++ b/mods/ascent/code/ascent_doodads.dm @@ -17,24 +17,24 @@ /obj/item/mop/advanced/ascent name = "deck detritus delaminator" desc = "An alien staff with spongy filaments on one end." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' item_state = "advmop" /obj/item/reagent_containers/glass/bucket/ascent name = "portable liquid cleaning agent carrier" desc = "An alien container of some sort." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' item_state = "bucket" /obj/structure/mopbucket/ascent name = "portable liquid cleaning agent holder" desc = "An alien container of some sort." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' /obj/item/material/knife/kitchen/cleaver/ascent name = "xenobiological flenser" desc = "A mindboggingly alien tool for flensing flesh." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' icon_state = "xenobutch" slot_flags = SLOT_DENYPOCKET | SLOT_HOLSTER | SLOT_BELT @@ -42,22 +42,22 @@ /obj/structure/closet/crate/freezer/meat/ascent name = "cryogenic stasis unit" desc = "A bizarre alien stasis unit." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' closet_appearance = /singleton/closet_appearance/crate/freezer/ascent /singleton/closet_appearance/crate/freezer/ascent color = COLOR_PURPLE - base_icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + base_icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' /obj/item/reagent_containers/food/drinks/cans/waterbottle/ascent name = "hydration cylinder" desc = "An alien portable long term storage device for potable water." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' /obj/item/reagent_containers/food/snacks/hydration name = "hydration ration" desc = "Approximately ten units of liquid hydration in a edible membrane. Unflavored." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' icon_state = "h2o_ration" bitesize = 10 /obj/item/reagent_containers/food/snacks/hydration/Initialize() @@ -67,24 +67,24 @@ /obj/item/storage/box/water/ascent name = "box of hydration cylinders" desc = "A box full of bottled water." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' icon_state = "box" startswith = list(/obj/item/reagent_containers/food/drinks/cans/waterbottle/ascent = 7) /obj/structure/hygiene/shower/ascent name = "hydrating decontamination armature" desc = "An alien vertical squirt bath." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' /obj/structure/hygiene/sink/ascent name = "hydration outlet" desc = "An alien wall mounted basin with mysterious protrusions." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' /obj/structure/reagent_dispensers/water_cooler/ascent name = "hydration dispensator" desc = "An alien device housing liquid for alien purposes." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' cups = 50 cup_type = /obj/item/reagent_containers/food/snacks/hydration @@ -93,6 +93,3 @@ /obj/structure/reagent_dispensers/water_cooler/ascent/RejectionMessage(mob/user) return "\The [src]'s orb supply is empty. Notify a control mind." - -MANTIDIFY(/obj/item/device/scanner/health, "healthorrebator", "medicine") -MANTIDIFY(/obj/item/reagent_containers/spray/sterilizine, "cleaning agent sprayer", "sterilizing") diff --git a/mods/ascent/code/ascent_effects.dm b/mods/ascent/code/ascent_effects.dm index 574138d7206ad..40fb9761f8b1f 100644 --- a/mods/ascent/code/ascent_effects.dm +++ b/mods/ascent/code/ascent_effects.dm @@ -20,7 +20,7 @@ /obj/item/razorweb name = "razorweb wad" desc = "A wad of crystalline monofilament." - icon = 'mods/ascent/icons/misc/razorweb.dmi' + icon = 'mods/ascent/icons/obj/razorweb.dmi' icon_state = "wad" var/web_type = /obj/effect/razorweb @@ -38,7 +38,7 @@ /obj/effect/razorweb name = "razorweb" desc = "A glimmering web of razor-sharp crystalline strands. Probably not something you want to sprint through." - icon = 'mods/ascent/icons/misc/razorweb.dmi' + icon = 'mods/ascent/icons/obj/razorweb.dmi' icon_state = "razorweb" anchored = TRUE diff --git a/mods/ascent/code/ascent_id.dm b/mods/ascent/code/ascent_id.dm index 68b2edcf928f8..a928c9c5e0f6b 100644 --- a/mods/ascent/code/ascent_id.dm +++ b/mods/ascent/code/ascent_id.dm @@ -7,7 +7,7 @@ var/global/const/access_ascent = "ACCESS_ASCENT" // ID 'card' /obj/item/card/id/ascent name = "alien chip" - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "access_card" desc = "A slender, complex chip of alien circuitry." access = list(access_ascent) @@ -35,7 +35,7 @@ var/global/const/access_ascent = "ACCESS_ASCENT" /obj/item/organ/internal/controller name = "system controller" desc = "A fist-sized lump of complex circuitry." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "plant" parent_organ = BP_CHEST organ_tag = BP_SYSTEM_CONTROLLER diff --git a/mods/ascent/code/ascent_outfits.dm b/mods/ascent/code/ascent_outfits.dm index 8067a606d4483..9a990fd45cfa3 100644 --- a/mods/ascent/code/ascent_outfits.dm +++ b/mods/ascent/code/ascent_outfits.dm @@ -64,7 +64,7 @@ /obj/item/clothing/shoes/magboots/ascent name = "mantid mag-claws" desc = "A set of powerful gripping claws." - icon = 'mods/ascent/icons/misc/ascent_doodads.dmi' + icon = 'mods/ascent/icons/obj/ascent_doodads.dmi' icon_state = "ascent_boots0" icon_base = "ascent_boots" species_restricted = list(SPECIES_MANTID_ALATE, SPECIES_MANTID_GYNE) diff --git a/mods/ascent/code/ascent_rigs.dm b/mods/ascent/code/ascent_rigs.dm index e47973a4c7494..785cb4fd6b8a9 100644 --- a/mods/ascent/code/ascent_rigs.dm +++ b/mods/ascent/code/ascent_rigs.dm @@ -64,7 +64,7 @@ desc = "A flechette nanofabricator and launch system of Ascent design." interface_name = "flechette rifle" interface_desc = "A flechette nanofabricator and launch system of Ascent design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "rifle" laser = /obj/item/gun/energy/particle/flechette @@ -73,7 +73,7 @@ desc = "A mounted particle rifle of Ascent design." interface_name = "particle rifle" interface_desc = "A mounted particle rifle of Ascent design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "rifle" laser = /obj/item/gun/energy/particle @@ -83,7 +83,7 @@ interface_name = "multitool" interface_desc = "A limited-sentience integrated multitool capable of interfacing with any number of systems." device = /obj/item/device/multitool/mantid - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "multitool" usable = FALSE selectable = TRUE @@ -98,7 +98,7 @@ interface_name = "cable fabricator" interface_desc = "A cable nanofabricator of Ascent design." device = /obj/item/stack/cable_coil/fabricator - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "cablecoil" usable = FALSE selectable = TRUE @@ -108,7 +108,7 @@ desc = "An electrical cutting torch of Ascent design." interface_name = "welding arm" interface_desc = "An electrical cutting torch of Ascent design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "welder1" engage_string = "Toggle Welder" device = /obj/item/weldingtool/electric/mantid @@ -120,7 +120,7 @@ desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." interface_name = "modular clustertool" interface_desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "clustertool" engage_string = "Select Mode" device = /obj/item/clustertool @@ -205,7 +205,7 @@ desc = "A compact chemical dispenser of mantid design." interface_name = "mantid chemical injector" interface_desc = "A compact chemical dispenser of mantid design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "injector" charges = list( list("bromide", "bromide", /datum/reagent/toxin/bromide, 30), @@ -219,7 +219,7 @@ desc = "A compact chemical dispenser of mantid design." interface_name = "serpentid chemical injector" interface_desc = "A compact chemical dispenser of mantid design." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "injector" charges = list( list("tramadol", "tramadol", /datum/reagent/tramadol, 30), diff --git a/mods/ascent/code/ascent_species.dm b/mods/ascent/code/ascent_species.dm index 7ceae4dbf3d6c..716008ee75142 100644 --- a/mods/ascent/code/ascent_species.dm +++ b/mods/ascent/code/ascent_species.dm @@ -12,7 +12,7 @@ deform = 'mods/ascent/icons/mob/alate/body.dmi' damage_overlays = 'mods/ascent/icons/mob/alate/damage_mask.dmi' blood_mask = 'mods/ascent/icons/mob/alate/blood_mask.dmi' - organs_icon = 'mods/ascent/icons/items/organs.dmi' + organs_icon = 'mods/ascent/icons/obj/items/organs.dmi' blood_color = "#660066" flesh_color = "#009999" @@ -251,7 +251,7 @@ years ago and now allies and peers within the Ascent." icobase = 'icons/mob/human_races/species/nabber/body_msw.dmi' deform = 'icons/mob/human_races/species/nabber/body_msw.dmi' - spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED + spawn_flags = SPECIES_IS_RESTRICTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED appearance_flags = 0 base_skin_colours = null hud_type = /datum/hud_data/mantid @@ -304,7 +304,7 @@ hud_type = /datum/hud_data/mantid appearance_flags = 0 base_skin_colours = null - spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED + spawn_flags = SPECIES_IS_RESTRICTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED has_organ = list( BP_BRAIN = /obj/item/organ/internal/brain/insectoid/nabber, BP_EYES = /obj/item/organ/internal/eyes/insectoid/msq, diff --git a/mods/ascent/code/ascent_tools.dm b/mods/ascent/code/ascent_tools.dm index 12faf1625813a..514b6ff3d1010 100644 --- a/mods/ascent/code/ascent_tools.dm +++ b/mods/ascent/code/ascent_tools.dm @@ -1,12 +1,12 @@ /obj/item/weldingtool/electric/mantid name = "alien welding tool" desc = "An oddly shaped alien welding tool." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' /obj/item/device/multitool/mantid name = "alien multitool" desc = "An alien microcomputer of some kind." - icon = 'mods/ascent/icons/items/ascent.dmi' + icon = 'mods/ascent/icons/obj/items/ascent.dmi' icon_state = "multitool" /obj/item/clothing/gloves/anomaly_detector/mantid diff --git a/mods/ascent/icons/items/ascent.dmi b/mods/ascent/icons/items/ascent.dmi deleted file mode 100644 index 0b2bb06535f7690a2fa0f01524b1d08f8f1bb2c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2457 zcmai0eLT}^8~@GbCBohww?9q`Qz!I^Zaq&*ZsM#`?^2Zbzk4__j6x5 zaI4(ULhOA4w3*p-o!MacJqZZu1+C|0Hd6!ua@lT94!-ybevtQRO+O9sKLh2hwhx+GZEO7Oy#&u_szcOHaodt zi*{PtlzhFK7g3{+C(P-Z{L(+e6zSJoitvaZ?{{5mpV(<*%2*j+Nt;-o8k{Yj|2%|} z6MR&TR>l^ZI05~-QX%<8Y8`7mf0Qh%%WOp%la{U=oL#OjKQJ<>9uAuEA>GpQqB_p{ zcn;F@;ik+?qgK%PNiA_ZLym1}*A4GsDRd+v z23z>~I_!_P9(_B=cEWqQWs(`gu_1Nuu(UCIKiGa_pf_I9Tk8#ii&=$+4Ev^RYr2$;wXaSWBGdv~jx$%Qign z+}jwdmx_3GcPZ+a^Cv@2u6%D|Th^Njs zH~QkYHz`F81XE~e2rJBIj$>^_r;lm9ZHfCuAtK(;Zp*rqWHERnSOy5U*wZGM^)?WF zYwVG9rFA&A`($R-Q}MKShKHpfR5Uh0%#OY>TOp)V8&M>AV|fw(g!PqvPo<}h?@p8k zbvp1Kql|klbkz_L+WeYFtyzD1lpGeW$_WqB}N%s=AG5HZUof%SAPNe!O)-gSWsfs(2Uwv-r--Dg)tL`nqs*K*GG6)h7ux#6we)}~IK(tZ zj4J*&4Pn|jVtuw zH5cf+TE}wWRcvm;774l+R`=c*h`c+gQ**b0M=|2DuSO8=@=^m}@Yq+Ta*jIX0tpV? zn!T|$1H7+?aT`|cxx7xxnnTQr;VpsK5lq6IaaC?%;Zj-FAjo{ z>~0>LT#KQLwmnZmMUfJUW!BO(%5>_vv z$@^|l;l4Yb3D+^0J}w))gcigH9VOZbBnZ*(y_JY>ZghsZyI|i|DYeCAskT~U`n_8g zErqMtsDf;6B3wF3x(bABBj5gf0thAA0tkjUFIa(8Sqcn76M3!5g z&qH#b6N|vp><zvRu*yP!)!5QUSEhndd+#|-Sh8xpT{c&eyxZDC{xacf37W+;X&(pRa z69RMbzzX`gl-juTmd7v4ibM9ppj@BV8^-NQ@^qh8=EyUheQkxdVX`x|MRnegfaW z;4hW6p{lPeu@9qUzU8Z*}P8?V< zx1+Z)9ad;@ede&+SJ($mZ{s##EpX&UuvdiSB$8M=+Of8*(dphiRkCSxLnpE__&9Ln zomu+w)7{w=Ih~?P9WYgpwx#1ZBZNL2%dI0)Ui$v$t211L7o@f16uZ5eb$4Kd5Jt*S z{-tnv>-N_^S_;H;aNlTGpK8Padh+SRphBsv0i9>&Me4X+59 ze|v!~rWn1*Gta*b9#)xNTe${FO?vi9xHGBwl?rG8Zhx_WyS$$gtoAWb+&)lEw+YX? z@StQ0ovT2c1qloV*HPVFVCw2qt$xIUGyG@v|62q8s~JK_={FA|Fa^FslJ+nbWkX(~ z|KAodRtV{?!XUt=Wm)dmL8Oexe;t~zGOY~#Ild50{vRd!ITsLlaA?PI)lxQ9^49{~ MoV}bH97D+e0DUg1EC2ui diff --git a/mods/ascent/icons/misc/ascent_doodads.dmi b/mods/ascent/icons/obj/ascent_doodads.dmi similarity index 100% rename from mods/ascent/icons/misc/ascent_doodads.dmi rename to mods/ascent/icons/obj/ascent_doodads.dmi diff --git a/mods/ascent/icons/obj/items/ascent.dmi b/mods/ascent/icons/obj/items/ascent.dmi new file mode 100644 index 0000000000000000000000000000000000000000..44945e58ce2884474f67240d1fa65ac156e98d23 GIT binary patch literal 2293 zcma)8c{tQv8~)kG7&OYBy^@`>ysxzxTef81BV>v!5!uohV{0g+jI5(X8f#LC82g$f z@{*pJH=&wZZfe(vkw?9W^9!;ZoL0N}T>G;?HG z3~Ts8A*^{SKHiFD`s1D5qs&l|m#zneM+IFA1Ay4#yz%F-u2TXKP%kdS)J-_}#=B#} ztG*YFzbrK+HRTOYfpZ2z#VLjBXgV6*EH7!d(vtMuks=!L%M=dTE~<4MGzjWMzL_M- z?+2n_4mAQ|?(Sw88yWZo6O|P`Y?4W}!CY45-@&KvINU~wnPhn@R7%g)z<%b0;WsZE z3T7SaIbAJ!Pf2fEqmWGLlV#R(8z!%#T;*X|^sC}pfg5vpPd(T+KP1EDx&Al#;zAhF zrWVl&DfhTdQoarV+^be*#?G)u9z5?92~b?T|J$=uT?jDEd%*pzvfS1zMt!#FdY z^FC5G6WIy|@>C^v@!LWU!*!zc#?@&#h=$XHzDJJr%MJ@&U8_*@QN;ygzjr2kLmyIn zNh_1)jTNob9|5<>TH^4X1oF-q>fdcUn+ds}+Hdi)p*K8cI0T@gCP1+%6chQY4G_u4 zk2Lg;4}S}0Q&m?hiU}LD_RB8M--w&xpz#VZc4Uq&FWHpOMSDKEk*4$ksMP@MWM4fzY4(g2+-}wu%Y=MQBiNsl<08d7P=0!Y8w_iv|kuH&^ z`G+z}EG?oEs@?=>+iIaaAmK-&yr)MjwX+(w(caUx-KT1nwFaz_o%PevY?ArRgfklA zY44*Yn#bA823K3ch(zU&$@@&x<1_$h&l~Y=F7wvY`4p$MCOJ34zkQ4!2-*X2gf_S*X1s+Ue=D@;*ZWR`o9ioLR ztzJIYl}4Q}&08y=x(N?FiL^a9zQOn?_;oW*3Hli|p;!GeN-zP)nQ!N7jF~B{EHG9q zLGmK>{zx7v5uShh=av;s2|zouDePN@03Twxo*$}Rrs7*w*v9=GX`-xD$A^j%iPi;C zqmnp&dON^cIG=O`FzzR^)=7yL%lR@-dMi+o<&N8J9M^jHw_^6WjwUE1t}jXqG%^N1 zk$GBX*{j|^2FY)XRLmbo1Wf2fUJrrXoGPzu{3f~$mzY6>lzEbS>3P+PhVh~8@hu`V z>-qQh35fO{pRIvwv#%KMHQM{P<42}mw)|kTej=7idwGmW2_?JG`q9c7L&-6 za~&oT=O07HHD(lKGJ77$rcUf(b^J&}>Kcqv0;fnuWbQ2u|Brm{UnVUMx>5Sanv+AC z_euzZ<-V;@_j3E<`_^8(e|=pSKg_vTLUw|KDdfLDf1TlD#dVnVq_zF}*)`@2pu6po zHii-(amsc`i|*ZMz{Eh=!Vk#-qjH=bdMSWzx&W{uzz$0O+fDy&cHRZnE{h~Nh09@l zbdSqcGp6pdul={X+64a7PzkF=rG`(i1wfafz$4)(?>_}`oXUCDRg1Fa%GDH<@X}dV zhp>hgX+gFbc+fX4xg1-@?hA#aQbAC4vt~?DpNHWM#CYI3HpPucO^X-MVp9?0Q%8Bjt_u$;+fR4k>4LS_QCur0_37e_ z!RO+Nf=ZG-xz#=@NeXN%N=>3IIesImtjC84G6A$8X3v%VBA00@U%TeLE*hxFs@gd- z@G5Wk-el6`C40v9vcc{kUb+$?6L{u$XS-CaaW!}!fiVMxy?HxU?YJ@J^~|Ptw%J4T zu~Q2_(^tp13zMno-=3{;G@NS=fJ%|1Q%~!>EcEs&f?&dKvb%X>lr~}wxuafJy#&L*+F>t2{v2XY;-hqnyzh{#a8SB0`J)u$J31v1nV-b6c z8b=Zh>|axtN6K_%Skk?v;K#mlAmaZICl3gFfwzNc5A3;X-l7;Q63+6V zqZxH79ZWxt-u!G+FV4=fH1Za=+_v2l_x%gSAUun_C4wAvZ?xbl;K354NGvT|nHVxt zeqb)ZSfd*)K=7|bKETW620+*81lFoa0Hy1IZ8y zMDSr%ol?IPJ1dS_ss3={B9RzUp=<=*06R#;Co5TPXuUXyPptAhyRmfX=Lpvj!9_@G zZ8xTiJSE~AGvKJ#cyZn%&D}^WVi@79cB$R@ry-<%b4)p76(xzTOSBL!b4piTAWYy~ zYd}1~oYqFWBHSBr`VeB86dW0-aOmSX{VQp^ykD@SNM;?GD`h=Lm=Us@YVa`fwg&cp eh`>R@ncM~V(x+WI0%X=d2Cy@m``K? literal 0 HcmV?d00001 diff --git a/mods/ascent/icons/obj/egg.dmi b/mods/ascent/icons/obj/items/egg.dmi similarity index 100% rename from mods/ascent/icons/obj/egg.dmi rename to mods/ascent/icons/obj/items/egg.dmi diff --git a/mods/ascent/icons/items/organs.dmi b/mods/ascent/icons/obj/items/organs.dmi similarity index 100% rename from mods/ascent/icons/items/organs.dmi rename to mods/ascent/icons/obj/items/organs.dmi diff --git a/mods/ascent/icons/misc/razorweb.dmi b/mods/ascent/icons/obj/razorweb.dmi similarity index 100% rename from mods/ascent/icons/misc/razorweb.dmi rename to mods/ascent/icons/obj/razorweb.dmi