From d8d497c0f82345667195af4733481e263b6747f8 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:14:22 +0100 Subject: [PATCH] TCAF Corvette improvements & tweaks (#20024) Makes a few tweaks and fixes to the TCAF ghostrole now I've gotten some feedback. Includes adding the new autocannon ship gun to replace the old rotary, replacing the hardsuit with the equipped variant (mostly so IPCs can use the integrated suit cooler without sacrificing being able to sling a gun), adding species-specific insulated gloves, adding a toolbox to the ready room, and making the engine room APC stronger + editing the guide to make using the engine more user-friendly. Balance-wise, will make the ship slightly stronger in ship combat. --- html/changelogs/hazelmouse-tcafstuff.yml | 59 + .../biesel/tcaf_corvette/tcaf_corvette.dm | 2 +- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 1568 ++++++++++------- .../tcaf_corvette/tcaf_corvette_areas.dm | 14 +- 4 files changed, 995 insertions(+), 648 deletions(-) create mode 100644 html/changelogs/hazelmouse-tcafstuff.yml diff --git a/html/changelogs/hazelmouse-tcafstuff.yml b/html/changelogs/hazelmouse-tcafstuff.yml new file mode 100644 index 00000000000..0614bb25ef6 --- /dev/null +++ b/html/changelogs/hazelmouse-tcafstuff.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Made several QoL improvements to the TCAF Corvette ghostrole." + - rscadd: "Added the Heavy Autocannon ship weapon to the TCAF Corvette ghostrole." diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm index 526b5d32962..9ff97c9d9c9 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm @@ -136,6 +136,6 @@
STEP 4: Ignite the mix inside the combustion chamber, and wait for it to fully burn out. \ Some strain on the glass at this step is expected.
\
STEP 5: Once the fire has stopped and the contents of the tank are 100% CO2, \ - enable circulation: I recommend 700L/s input and 500kpa output. Higher you put the output, more power it generates.
\ + enable circulation: I recommend 700L/s input and 1000kpa output. The higher you put the output, more power it generates, raise as necessary.
\
WARNING: If you feel it's going to break the glass, lower the blast doors and vent the chamber immediately! \ We have a portable generator in the back if we run out of fuel or suffer another mishap." diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 9949347a836..fe21a95fb78 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -35,6 +35,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/sink/kitchen{ + pixel_y = 26; + pixel_x = 2; + name = "sink" + }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) "ag" = ( @@ -126,60 +131,46 @@ "aB" = ( /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/cic) "aC" = ( -/obj/structure/bed/stool/chair/office/bridge/legion{ +/turf/simulated/wall/shuttle/legion, +/area/tcaf_corvette/ammo1) +"aF" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) -"aF" = ( /obj/structure/table/rack, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; +/obj/item/ship_ammunition/autocannon/he{ + pixel_x = -1; pixel_y = 4 }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; +/obj/item/ship_ammunition/autocannon/he{ + pixel_x = -1; pixel_y = 4 }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; +/obj/item/ship_ammunition/autocannon/he{ + pixel_x = -1; pixel_y = 4 }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; +/obj/item/ship_ammunition/autocannon/he{ + pixel_x = -1; pixel_y = 4 }, -/obj/item/ship_ammunition/francisca/ap{ - pixel_x = -4; +/obj/item/ship_ammunition/autocannon/he{ + pixel_x = -1; pixel_y = 4 }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/power/apc/north{ + req_access = list(204) }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "aH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -690,6 +681,8 @@ "cg" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/loot, +/obj/item/target, +/obj/item/target, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/hangar) "ch" = ( @@ -736,14 +729,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 8 }, -/obj/machinery/power/apc/south{ - req_access = list(204) - }, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/cable/green, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/super/south{ + req_access = list(204) + }, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engine) "co" = ( @@ -895,6 +888,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/structure/target_stake, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "cZ" = ( @@ -923,7 +918,7 @@ name = "adjusted light fixture" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "dc" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -1357,6 +1352,11 @@ /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 6 }, +/obj/structure/sink/kitchen{ + dir = 8; + name = "sink"; + pixel_x = 21 + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/forensics) "ez" = ( @@ -1370,6 +1370,13 @@ }, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engine) +"eD" = ( +/obj/machinery/ship_weapon/autocannon{ + weapon_id = "tcaf_autocannon" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open/airless, +/area/tcaf_corvette/autocannon) "eI" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -1638,23 +1645,11 @@ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "fJ" = ( /obj/effect/floor_decal/corner_wide/brown{ dir = 5 @@ -1696,7 +1691,7 @@ }, /obj/machinery/seed_storage/garden, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "fW" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -1967,13 +1962,14 @@ /area/tcaf_corvette/crew) "gI" = ( /obj/effect/floor_decal/corner_wide/brown{ - dir = 5 + dir = 10 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "gJ" = ( /obj/effect/floor_decal/industrial/hatch/security, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -2051,6 +2047,15 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/central_ring) "gV" = ( @@ -2104,7 +2109,7 @@ /area/tcaf_corvette/brig) "hf" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/rack, +/obj/machinery/mech_recharger, /obj/machinery/power/apc/north{ req_access = list(204) }, @@ -2113,8 +2118,12 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "hk" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2186,10 +2195,12 @@ /obj/effect/floor_decal/industrial/loading/security{ dir = 8 }, -/obj/machinery/alarm/south{ - req_one_access = list(204) - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/button/switch/crematorium{ + _wifi_id = "tcaf_crema"; + pixel_y = -21; + req_access = null + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/forensics) "hF" = ( @@ -2324,7 +2335,7 @@ }, /obj/machinery/vending/hydronutrients, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "ir" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -2375,14 +2386,16 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/central_ring) "iD" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/alarm/west{ - req_one_access = list(204) +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "iE" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -2440,7 +2453,7 @@ }, /obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "iL" = ( /obj/structure/platform{ @@ -2482,11 +2495,23 @@ /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "iT" = ( -/obj/effect/landmark/entry_point/aft{ - name = "aft, rotary cannon" +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 6 }, -/turf/simulated/wall/shuttle/legion, -/area/tcaf_corvette/francisca) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tcaf_corvette/central_ring) "iU" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -2524,7 +2549,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "iX" = ( /obj/effect/floor_decal/corner_wide/dark_blue/full{ @@ -2533,6 +2558,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/loot, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/mesmetron, /turf/simulated/floor/tiled, /area/tcaf_corvette/central_lift) "iY" = ( @@ -2548,18 +2574,18 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "je" = ( -/obj/machinery/ship_weapon/francisca{ - dir = 1; - weapon_id = "TCAF Francisca Rotary Gun"; - pixel_x = -32; - pixel_y = -159 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/ship_weapon_dummy, -/obj/effect/landmark/entry_point/port{ - name = "port, rotary cannon" +/obj/machinery/alarm/east{ + req_one_access = list(204) + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8; + level = 2 }, -/turf/simulated/floor/airless, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo1) "ji" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -2669,7 +2695,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "jO" = ( /obj/machinery/door/airlock/highsecurity{ @@ -2681,8 +2707,26 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) +"jR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/structure/ship_weapon_dummy, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "jT" = ( /obj/structure/table/stone/marble, /obj/item/storage/box/condiment{ @@ -3027,17 +3071,20 @@ /turf/simulated/floor/tiled/white, /area/tcaf_corvette/central_ring) "ly" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ - color = "#5F78A0"; - frame_color = "#5F78A0"; - spawn_firedoor = 1; - spawn_grille = 1 +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/machinery/door/blast/regular/open{ - id = "tcaf_window_lockdown" +/obj/item/ship_ammunition/grauwolf_bundle/ap, +/obj/item/ship_ammunition/grauwolf_bundle/ap, +/obj/item/ship_ammunition/grauwolf_bundle/ap, +/obj/item/ship_ammunition/grauwolf_bundle/ap, +/obj/machinery/light/small{ + dir = 8; + must_start_working = 1 }, -/turf/simulated/floor/plating, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo2) "lz" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3244,7 +3291,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "mq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -3273,6 +3320,40 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/tcaf_corvette/central_ring) +"mw" = ( +/obj/structure/table/rack, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ship_ammunition/francisca/ap{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo1) "my" = ( /obj/structure/cable/green{ d1 = 2; @@ -3376,6 +3457,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/brig) "mM" = ( @@ -3391,12 +3473,15 @@ /obj/structure/reagent_dispensers/peppertank/spacecleaner{ pixel_y = 32 }, -/obj/item/storage/toolbox/mechanical, /obj/item/reagent_containers/spray/cleaner{ pixel_y = 15; pixel_x = -7 }, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/janitorgloves{ + pixel_x = 6; + pixel_y = 4 + }, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/custodial) "mO" = ( @@ -3564,13 +3649,13 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/hangar) "ne" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - dir = 1 - }, /obj/effect/map_effect/marker/large_tank{ name = "tcaf_corvette_co2"; master_tag = "tcaf_corvette_co2" }, +/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{ + dir = 1 + }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/tcaf_corvette/engine) "nf" = ( @@ -3589,14 +3674,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "nk" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/ship_weapon_dummy, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "nl" = ( /turf/simulated/wall/shuttle/legion, /area/shuttle/tcaf) @@ -3694,10 +3787,8 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/captain_quarters) "nz" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/tcaf_corvette/messhall) +/turf/simulated/wall/shuttle/legion, +/area/tcaf_corvette/ammo2) "nE" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/suit_cycler/offship/biesel, @@ -3747,21 +3838,20 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "nN" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ - color = "#5F78A0"; - frame_color = "#5F78A0"; - spawn_firedoor = 1; - spawn_grille = 1 - }, -/obj/machinery/door/blast/regular/open{ - id = "tcaf_window_lockdown"; - dir = 8 +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/effect/landmark/entry_point/fore{ - name = "fore, rotary cannon" +/obj/item/ship_ammunition/grauwolf_bundle, +/obj/item/ship_ammunition/grauwolf_bundle, +/obj/item/ship_ammunition/grauwolf_bundle, +/obj/item/ship_ammunition/grauwolf_bundle, +/obj/machinery/light/small{ + dir = 8; + must_start_working = 1 }, -/turf/simulated/floor/plating, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo2) "nO" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "Body Armor"; @@ -3824,10 +3914,8 @@ /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, -/obj/item/ship_ammunition/grauwolf_bundle, -/obj/item/ship_ammunition/grauwolf_bundle, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "nT" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -3929,12 +4017,25 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/freezer, /area/tcaf_corvette/freezer) +"oB" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "oC" = ( -/obj/effect/floor_decal/corner_wide/brown/full{ +/obj/effect/floor_decal/corner_wide/brown{ + dir = 10 + }, +/obj/machinery/computer/ship/navigation/terminal{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "oE" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -4085,7 +4186,8 @@ /area/tcaf_corvette/cargo_bay) "pm" = ( /obj/structure/morgue/crematorium{ - dir = 4 + dir = 4; + _wifi_id = "tcaf_crema" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, @@ -4114,6 +4216,22 @@ }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) +"pt" = ( +/obj/effect/floor_decal/corner_wide/dark_blue/full{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/brig) "pw" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 5 @@ -4321,11 +4439,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "qm" = ( /obj/structure/table/reinforced/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 14 + }, /obj/item/device/hand_labeler{ pixel_y = 4 }, @@ -4468,14 +4589,11 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "qO" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/rack, -/obj/machinery/alarm/north{ - req_one_access = list(204) +/obj/effect/floor_decal/corner_wide/brown{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/autocannon) "qQ" = ( /turf/simulated/wall/shuttle/legion, /area/tcaf_corvette/hydroponics) @@ -4597,6 +4715,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engine) +"rq" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "rt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 @@ -4700,6 +4822,7 @@ /obj/item/storage/secure/briefcase, /obj/item/device/camera, /obj/item/clothing/accessory/badge/tcaf_papers/service, +/obj/item/reagent_containers/food/drinks/flask, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/captain_quarters) "rM" = ( @@ -4793,6 +4916,10 @@ }, /obj/structure/bed/stool/chair/sofa/corner/convex/beige, /obj/effect/decal/cleanable/dirt, +/obj/item/eightball{ + pixel_x = -2; + pixel_y = -7 + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "sl" = ( @@ -5051,7 +5178,7 @@ req_one_access = list(204) }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "tx" = ( /obj/effect/shuttle_landmark/tcaf_corvette/nav2, @@ -5110,7 +5237,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "tJ" = ( /obj/structure/cable/green{ @@ -5132,22 +5259,22 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) -"tN" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/structure/ship_weapon_dummy, -/turf/simulated/open/airless, -/area/tcaf_corvette/exterior) +/area/tcaf_corvette/autocannon) "tR" = ( -/obj/machinery/ammunition_loader/francisca{ - dir = 8; - weapon_id = "TCAF Francisca Rotary Gun" +/obj/effect/landmark/entry_point/port{ + name = "port, autocannon emplacement" }, -/turf/simulated/floor/plating, -/area/tcaf_corvette/francisca) +/turf/simulated/wall/shuttle/legion, +/area/tcaf_corvette/autocannon) "tU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "tV" = ( /obj/effect/floor_decal/corner_wide/brown{ dir = 5 @@ -5399,6 +5526,7 @@ pixel_y = 6; pixel_x = 7 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "uP" = ( @@ -5493,7 +5621,6 @@ /area/tcaf_corvette/hangar) "vp" = ( /obj/structure/table/rack, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/item/stack/material/glass/phoronrglass/full{ pixel_y = 6 }, @@ -5502,7 +5629,12 @@ pixel_y = 6 }, /obj/item/stack/material/wood/full, -/obj/effect/decal/cleanable/dirt, +/obj/item/stack/material/plasteel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/rods/full, +/obj/item/stack/material/glass/reinforced/full, +/obj/item/stack/material/aluminium/full, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "vq" = ( @@ -5678,15 +5810,34 @@ /obj/effect/floor_decal/corner_wide/brown{ dir = 10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "wa" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/corner_wide/brown/full{ dir = 1 }, -/obj/effect/decal/cleanable/cobweb2, -/turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/obj/structure/table/reinforced/steel, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 + }, +/obj/item/device/binoculars{ + pixel_y = 1; + pixel_x = 7 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 2; + pixel_x = -9 + }, +/obj/machinery/alarm/north{ + req_one_access = list(204) + }, +/obj/item/clothing/glasses/safety/goggles{ + pixel_y = -8; + pixel_x = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/autocannon) "wd" = ( /obj/effect/floor_decal/corner_wide/brown{ dir = 10 @@ -5774,16 +5925,11 @@ /turf/simulated/floor/carpet/rubber, /area/tcaf_corvette/engineering) "wv" = ( -/obj/effect/floor_decal/corner_wide/brown{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/obj/item/clothing/ears/earmuffs{ - pixel_y = -6 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "ww" = ( /obj/structure/bed/roller, /obj/effect/floor_decal/corner_wide/green{ @@ -5938,11 +6084,15 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "xh" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/rack, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) +/obj/effect/floor_decal/corner_wide/brown{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8; + level = 2 + }, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/autocannon) "xl" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/mech_recharger, @@ -5977,18 +6127,9 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "xp" = ( -/obj/effect/floor_decal/corner_wide/brown{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/obj/item/storage/toolbox/mechanical, -/obj/item/clothing/glasses/safety/goggles{ - pixel_x = -3; - pixel_y = 12 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/obj/structure/ship_weapon_dummy, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "xt" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -6026,6 +6167,9 @@ pixel_y = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm/north{ + req_one_access = list(204) + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/forensics) "xE" = ( @@ -6040,22 +6184,14 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "xF" = ( +/obj/effect/floor_decal/industrial/warning, /obj/structure/table/rack, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, -/obj/machinery/light/small{ - dir = 8; - must_start_working = 1 - }, -/obj/item/ship_ammunition/grauwolf_bundle/ap, -/obj/item/ship_ammunition/grauwolf_bundle/ap, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "xG" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, washroom" @@ -6160,6 +6296,7 @@ /obj/item/sticker/flagpole/biesel/gibson{ pixel_x = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "ym" = ( @@ -6358,6 +6495,7 @@ }, /obj/item/device/radio/intercom/expedition/north, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "yW" = ( @@ -6595,8 +6733,17 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "zT" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable/green{ @@ -6801,7 +6948,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "AH" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 8 @@ -6811,11 +6958,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/tcaf_corvette/central_ring) @@ -6857,6 +7009,23 @@ }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) +"AV" = ( +/obj/structure/ship_weapon_dummy/barrel, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open/airless, +/area/tcaf_corvette/autocannon) +"AX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/alarm/west{ + req_one_access = list(204) + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo2) "Bc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -6960,21 +7129,19 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/tcaf_corvette/engine) "Bz" = ( -/obj/effect/floor_decal/corner_wide/brown/full{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/corner_wide/brown/full, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "BB" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -7007,7 +7174,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "BM" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, @@ -7150,11 +7317,14 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/tcaf_corvette/central_ring) @@ -7286,7 +7456,7 @@ }, /obj/machinery/biogenerator, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "Dd" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -7297,20 +7467,8 @@ /obj/effect/floor_decal/corner_wide/dark_green{ dir = 6 }, -/obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/storage/backpack/duffel/eng{ - pixel_y = 9 - }, -/obj/item/gun/energy/plasmacutter{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/random/tool, -/obj/random/tool, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/pipedispenser, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "Dh" = ( @@ -7441,15 +7599,15 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/central_ring) "DQ" = ( -/obj/effect/floor_decal/corner_wide/brown{ +/obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light/small{ + dir = 8; + must_start_working = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "DU" = ( /obj/machinery/sparker{ id = "tcaf_igniter_tank"; @@ -7609,10 +7767,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/sign/flag/biesel/large/west{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/flag/zora/large/west{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "EE" = ( @@ -7650,6 +7808,7 @@ }, /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/ridged, /area/tcaf_corvette/cic) "EN" = ( @@ -7684,7 +7843,7 @@ name = "port, port ammo storage" }, /turf/simulated/wall/shuttle/legion, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "Fa" = ( /obj/effect/floor_decal/spline/plain/paleblue{ dir = 1 @@ -7694,6 +7853,7 @@ }, /obj/machinery/computer/ship/helm/terminal, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Fb" = ( @@ -7739,6 +7899,7 @@ /obj/structure/platform, /obj/machinery/computer/ship/navigation/terminal, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Fi" = ( @@ -7873,6 +8034,9 @@ /obj/item/cane/crutch, /obj/item/cane/crutch, /obj/item/storage/box/monkeycubes, +/obj/item/storage/box/autoinjectors, +/obj/item/storage/box/inhalers_auto, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/medical) "FF" = ( @@ -7889,7 +8053,7 @@ /obj/machinery/power/apc/north{ req_access = list(204) }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "FH" = ( /turf/simulated/wall/shuttle/legion, @@ -7907,12 +8071,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/target_stake, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "FR" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "FT" = ( /obj/structure/cable/green{ @@ -7930,7 +8097,6 @@ /obj/structure/bed/stool/padded/black{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/messhall) "FX" = ( @@ -7961,9 +8127,9 @@ /obj/item/gun/projectile/revolver/konyang{ pixel_y = 5 }, -/obj/item/rig/combat/legionnaire{ - pixel_x = 5; - pixel_y = -3 +/obj/item/rig/combat/legionnaire/equipped{ + pixel_x = 3; + pixel_y = -4 }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/captain_quarters) @@ -8000,6 +8166,9 @@ pixel_y = -1; pixel_x = -2 }, +/obj/structure/sign/flag/portantillia/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "Gi" = ( @@ -8035,6 +8204,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/ridged, /area/tcaf_corvette/cic) "Gp" = ( @@ -8061,6 +8231,7 @@ }, /obj/machinery/computer/ship/engines/terminal, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Gu" = ( @@ -8081,16 +8252,17 @@ must_start_working = 1 }, /obj/structure/flora/pottedplant/fernovergrown, -/obj/structure/sign/flag/zora/large/north{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/flag/valkyrie/large/north{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "Gy" = ( /obj/structure/platform, /obj/machinery/computer/ship/sensors/terminal, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Gz" = ( @@ -8149,7 +8321,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "GP" = ( /turf/simulated/wall/shuttle/legion, /area/tcaf_corvette/messhall) @@ -8392,30 +8564,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/closet/crate/drop{ - name = "personal belongings" - }, -/obj/item/flag/zora, -/obj/item/flag/zora/l, -/obj/item/flag/mictlan, -/obj/item/flag/mictlan/l, -/obj/item/flag/portantillia, -/obj/item/flag/portantillia/l, -/obj/item/clothing/accessory/flagpatch/zora, /obj/item/clothing/accessory/flagpatch/zora, -/obj/item/clothing/accessory/flagpatch/biesel, -/obj/item/clothing/accessory/flagpatch/biesel, /obj/item/clothing/accessory/flagpatch/valkyrie, -/obj/item/clothing/accessory/flagpatch/valkyrie, -/obj/item/clothing/accessory/flagpatch/newgibson, /obj/item/clothing/accessory/flagpatch/newgibson, /obj/item/clothing/accessory/flagpatch/mictlan, -/obj/item/clothing/accessory/flagpatch/mictlan, -/obj/item/flag/newgibson, /obj/item/clothing/accessory/flagpatch/portantillia, -/obj/item/clothing/accessory/flagpatch/portantillia, -/obj/item/flag/trinaryperfection, -/obj/item/clothing/accessory/crucifix/silver/saint_peter, /obj/item/clothing/accessory/crucifix/gold, /obj/item/clothing/head/hijab/black, /obj/item/clothing/ears/skrell/scrunchy, @@ -8477,6 +8630,27 @@ /obj/item/device/versebook/skakh, /obj/item/device/versebook/thakh, /obj/item/device/versebook/trinary, +/obj/item/clothing/accessory/tajaran/charm, +/obj/item/flag/trinaryperfection, +/obj/item/flag/traverse, +/obj/item/clothing/ears/antenna/whip/single{ + color = "#23395f" + }, +/obj/item/clothing/ears/antenna/whip{ + color = "#23395f" + }, +/obj/item/clothing/ears/antenna/trinary_halo, +/obj/item/flag/mictlan, +/obj/structure/closet/crate/drop{ + name = "personal belongings" + }, +/obj/item/clothing/accessory/offworlder/bracer{ + color = "#554444" + }, +/obj/item/clothing/accessory/offworlder{ + color = "#554444" + }, +/obj/item/gamehelm/black, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "HU" = ( @@ -8756,9 +8930,10 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/tcaf) "IZ" = ( -/obj/structure/ship_weapon_dummy/barrel, -/turf/simulated/floor/airless, -/area/tcaf_corvette/exterior) +/obj/structure/lattice/catwalk/indoor, +/obj/structure/ship_weapon_dummy, +/turf/simulated/open/airless, +/area/tcaf_corvette/autocannon) "Je" = ( /obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/alarm/south, @@ -8886,6 +9061,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "Jw" = ( @@ -9100,17 +9276,12 @@ /turf/simulated/floor, /area/tcaf_corvette/hangar) "Ky" = ( -/obj/item/stack/material/aluminium/full, -/obj/item/stack/material/glass/reinforced/full, -/obj/item/stack/rods/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/plasteel/full, /obj/effect/floor_decal/corner_wide/dark_green{ dir = 10 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/rack, /obj/effect/decal/cleanable/dirt, +/obj/machinery/shieldwallgen, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "Kz" = ( @@ -9239,14 +9410,26 @@ pixel_x = 2; pixel_y = 2 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Lb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "Lc" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -9472,7 +9655,7 @@ /area/tcaf_corvette/engineering) "LI" = ( /turf/simulated/wall/shuttle/legion, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "LL" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/mech_recharger, @@ -9495,15 +9678,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "LS" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading/yellow{ +/obj/effect/floor_decal/corner_wide/brown/full{ dir = 4 }, -/turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/obj/structure/table/reinforced/steel, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/flask/barflask{ + pixel_y = 10; + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn{ + pixel_y = 10; + pixel_x = 9 + }, +/obj/item/reagent_containers/food/drinks/cans/zorasoda/kois{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/coin/battlemonsters{ + pixel_x = -8; + pixel_y = -3 + }, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/autocannon) "LV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9601,6 +9801,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Mn" = ( @@ -9784,18 +9985,19 @@ dir = 5 }, /obj/structure/bed/stool/chair/sofa/beige, -/obj/structure/sign/flag/portantillia/large/north{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/flag/newgibson/large/north{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) "MZ" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/mech_recharger, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/ship_weapon_dummy, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "Nc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9922,6 +10124,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/storage) +"NP" = ( +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open/airless, +/area/tcaf_corvette/autocannon) "NQ" = ( /obj/effect/floor_decal/industrial/outline/service, /obj/effect/decal/cleanable/dirt, @@ -9982,10 +10188,8 @@ /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, -/obj/item/ship_ammunition/grauwolf_bundle/ap, -/obj/item/ship_ammunition/grauwolf_bundle/ap, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "Oc" = ( /obj/structure/cable{ icon_state = "2-8" @@ -10027,7 +10231,7 @@ /obj/item/material/minihoe, /obj/item/wirecutters/clippers, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "Ok" = ( /obj/effect/floor_decal/corner/brown/full, @@ -10046,6 +10250,7 @@ }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engine) "Om" = ( @@ -10143,6 +10348,19 @@ }, /obj/structure/cable/green, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/gun/energy/plasmacutter{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/pipewrench, +/obj/item/storage/backpack/duffel/eng{ + pixel_y = 9 + }, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow/specialt, +/obj/item/clothing/gloves/yellow/specialu, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "OF" = ( @@ -10171,14 +10389,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "OK" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, starboard ammo storage" }, /turf/simulated/wall/shuttle/legion, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "OM" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 6 @@ -10195,7 +10413,7 @@ /obj/effect/floor_decal/corner_wide/brown{ dir = 5 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/hydroponics) "OR" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ @@ -10420,6 +10638,7 @@ /obj/item/clothing/head/helmet/pilot/tcaf{ pixel_y = -6 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Qe" = ( @@ -10458,6 +10677,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/sink/kitchen{ + dir = 8; + name = "sink"; + pixel_x = 21 + }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) "Qk" = ( @@ -10498,11 +10722,35 @@ /turf/simulated/wall/shuttle/legion, /area/tcaf_corvette/captain_quarters) "Qx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/rack, +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/item/ship_ammunition/autocannon/frag{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/ship_ammunition/autocannon/frag{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/ship_ammunition/autocannon/frag{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/ship_ammunition/autocannon/frag{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/ship_ammunition/autocannon/frag{ + pixel_x = -1; + pixel_y = 4 + }, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/ammo1) "Qz" = ( /obj/machinery/ship_weapon/francisca/compact{ pixel_x = -39; @@ -10538,7 +10786,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "QJ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10587,13 +10835,21 @@ /turf/simulated/floor/carpet/rubber, /area/tcaf_corvette/storage) "Rd" = ( -/obj/effect/floor_decal/corner_wide/brown/full, -/obj/machinery/computer/ship/navigation/terminal{ - dir = 1 +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#5F78A0"; + frame_color = "#5F78A0"; + spawn_firedoor = 1; + spawn_grille = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/obj/machinery/door/blast/regular/open{ + id = "tcaf_window_lockdown"; + dir = 8 + }, +/obj/effect/landmark/entry_point/aft{ + name = "aft, autocannon emplacement" + }, +/turf/simulated/floor/plating, +/area/tcaf_corvette/autocannon) "Rf" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 9 @@ -10688,6 +10944,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) "Rv" = ( @@ -10734,6 +10991,9 @@ /obj/item/clothing/head/beret/legion/tcaf/tcaf_field, /obj/item/clothing/head/beret/legion/tcaf/tcaf_field, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/tiled/techfloor, /area/tcaf_corvette/crew) "Ry" = ( @@ -10759,7 +11019,7 @@ /obj/machinery/door/airlock/highsecurity{ dir = 8; req_access = list(204); - name = "Rotary Cannon Module" + name = "Autocannon Module" }, /obj/machinery/door/firedoor/noid{ dir = 8 @@ -10772,15 +11032,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "RO" = ( -/obj/machinery/pipedispenser, -/obj/item/pipewrench, /obj/effect/floor_decal/corner_wide/dark_green/full{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, +/obj/machinery/shieldwallgen, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "RP" = ( @@ -10838,6 +11097,7 @@ pixel_x = 6 }, /obj/item/device/radio/intercom/expedition/north, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/ridged, /area/tcaf_corvette/cic) "RX" = ( @@ -10982,7 +11242,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "Sw" = ( /obj/machinery/atmospherics/portables_connector/aux, /obj/effect/floor_decal/industrial/outline/yellow, @@ -10994,51 +11254,34 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/engine) "Sx" = ( +/obj/effect/floor_decal/industrial/warning, /obj/structure/table/rack, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/ship_ammunition/francisca{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/item/ship_ammunition/francisca{ +/obj/item/ship_ammunition/francisca/frag{ pixel_y = 4; pixel_x = -4 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "Sy" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 4 @@ -11219,7 +11462,6 @@ poster_type = "/datum/poster/bay_32"; pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/messhall) "Tf" = ( @@ -11239,12 +11481,11 @@ /turf/simulated/floor/carpet/magenta, /area/tcaf_corvette/captain) "Th" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/machinery/ammunition_loader/autocannon{ + weapon_id = "tcaf_autocannon" }, -/obj/machinery/light/small, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "Tm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11628,6 +11869,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle{ + pixel_x = -14; + pixel_y = -6 + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/engine) "Uw" = ( @@ -11772,6 +12017,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/security, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/ridged, /area/tcaf_corvette/cic) "Vg" = ( @@ -11839,7 +12085,7 @@ name = "sink"; pixel_x = -20 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/gunmetal/full, /area/tcaf_corvette/hydroponics) "Vt" = ( /obj/effect/floor_decal/corner_wide/dark_blue/full{ @@ -11930,9 +12176,15 @@ /turf/simulated/floor/tiled, /area/tcaf_corvette/central_ring) "VQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /obj/structure/ship_weapon_dummy, -/turf/simulated/floor/airless, -/area/tcaf_corvette/exterior) +/obj/effect/landmark/entry_point/fore{ + name = "fore, autocannon emplacment" + }, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "VW" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 6 @@ -12012,6 +12264,17 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/central_ring) "Wk" = ( @@ -12021,14 +12284,13 @@ /turf/simulated/floor/carpet/red, /area/tcaf_corvette/captain_quarters) "Wp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/corner_wide/brown{ + dir = 5 }, -/turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/obj/structure/bed/stool/chair/office/bridge/legion, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/autocannon) "Wq" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/industrial/outline/operations, @@ -12148,22 +12410,23 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/central_ring) "WR" = ( -/obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning{ - dir = 9 + dir = 1 }, +/obj/structure/table/rack, /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, -/obj/item/ship_ammunition/grauwolf_bundle, -/obj/item/ship_ammunition/grauwolf_bundle, -/obj/machinery/light/small{ - dir = 8; - must_start_working = 1 +/obj/machinery/power/apc/north{ + req_access = list(204) + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo2) "WT" = ( /obj/structure/table/wood, /obj/machinery/alarm/west{ @@ -12262,6 +12525,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) "Xh" = ( @@ -12269,53 +12533,59 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, -/obj/item/ship_ammunition/francisca/frag{ +/obj/item/ship_ammunition/autocannon{ pixel_y = 4; - pixel_x = -4 + pixel_x = -1 }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "Xm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) "Xn" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "Xs" = ( /obj/machinery/door/airlock/external, /obj/effect/floor_decal/industrial/hatch/red, @@ -12374,6 +12644,7 @@ "XE" = ( /obj/structure/curtain/open/privacy, /obj/structure/toilet, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/brig) "XH" = ( @@ -12431,7 +12702,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/tcaf_corvette/francisca) +/area/tcaf_corvette/autocannon) "XP" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 6 @@ -12513,16 +12784,10 @@ /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/engine) "Yi" = ( -/obj/effect/floor_decal/corner_wide/brown/full{ - dir = 4 - }, -/obj/structure/table/reinforced/steel, -/obj/item/device/binoculars{ - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/tcaf_corvette/francisca) +/obj/structure/ship_weapon_dummy, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/reinforced, +/area/tcaf_corvette/autocannon) "Yk" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -12686,6 +12951,7 @@ dir = 1; level = 2 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/brig) "YN" = ( @@ -12751,14 +13017,16 @@ /turf/simulated/floor/tiled/full, /area/tcaf_corvette/central_lift) "YY" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm/east{ - req_one_access = list(204) +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/reinforced, -/area/tcaf_corvette/central_ring) +/area/tcaf_corvette/ammo1) "Za" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, @@ -12811,6 +13079,7 @@ id_tag = "tcaf_cell_1_sensor"; output = 31 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/brig) "Zi" = ( @@ -12872,6 +13141,15 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tcaf_corvette/central_ring) "ZA" = ( @@ -108203,10 +108481,10 @@ Mv Mv Mv Mv -Mv -Mv -Mv -Mv +Et +nz +OK +nz wP Qe wP @@ -108461,9 +108739,9 @@ Et Et Et Et -Ne -OK -Ne +nN +AX +ly wP KN wP @@ -109232,9 +109510,9 @@ zr pw XD Et -Ne +nz zR -Ne +nz wP pP wP @@ -109251,7 +109529,7 @@ iW FR GT Pr -nz +KI FT Rg Lx @@ -109262,7 +109540,7 @@ vz pm zF XE -Vt +pt YL lX XE @@ -111045,10 +111323,10 @@ xB IF kt HW -Fi +ia QK -Fi -Fi +ia +ia HW Cg bA @@ -112831,7 +113109,7 @@ Xm Ky sK FI -TF +iT Fy Fy CE @@ -113344,9 +113622,9 @@ CI SI td sK -Ne +aC jO -Ne +aC LI tJ LI @@ -114115,9 +114393,9 @@ sK sK sK sK -Ne -ES -Ne +Qx +je +mw LI XO LI @@ -114371,10 +114649,10 @@ Mv Mv Mv Mv -Mv -Mv -Mv -Mv +sK +aC +ES +aC LI BI LI @@ -114895,8 +115173,8 @@ LI LI LI LI -Mv -Mv +LI +LI Mv Mv Mv @@ -115025,196 +115303,196 @@ Mv Mv Mv Mv -"} -(143,1,2) = {" -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -LI -hf -Bz -DQ -MZ -Rd -LI -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv +"} +(143,1,2) = {" +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +LI +hf +Bz +DQ +MZ +MZ +jR +NP +eD +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv +Mv Mv Mv Mv @@ -115402,15 +115680,15 @@ Mv Mv Mv Mv -LI +AF xh gI -Qx -aC -Su -LI -Mv -Mv +wv +xp +xp +nk +IZ +AV Mv Mv Mv @@ -115659,15 +115937,15 @@ Mv Mv Mv Mv -LI +Rd qO oC wv xp Yi -LI -Mv -Mv +VQ +NP +NP Mv Mv Mv @@ -115916,15 +116194,15 @@ Mv Mv Mv Mv -iT +AF Wp -nk -nk +Su +wv Th +rq +LI LI LI -Mv -Mv Mv Mv Mv @@ -116178,8 +116456,8 @@ wa LS tU Xn -nN -Mv +oB +LI Mv Mv Mv @@ -116433,10 +116711,10 @@ Mv LI LI tR -ly -ly -AF -Mv +LI +LI +LI +LI Mv Mv Mv @@ -116689,12 +116967,12 @@ Mv Mv Mv Mv -je -VQ -tN -lL -lL -lL +Mv +Mv +Mv +Mv +Mv +Mv Mv Mv Mv @@ -116946,12 +117224,12 @@ Mv Mv Mv Mv -tN -VQ -VQ -VQ -IZ -lL +Mv +Mv +Mv +Mv +Mv +Mv Mv Mv Mv @@ -117203,11 +117481,11 @@ Mv Mv Mv Mv -lL -lL -lL -lL -lL +Mv +Mv +Mv +Mv +Mv Mv Mv Mv diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm index 89e20c8ad89..b7b99725b2f 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm @@ -13,8 +13,18 @@ icon_state = "Tactical" ambience = AMBIENCE_HIGHSEC -/area/tcaf_corvette/francisca - name = "Republican Fleet Corvette - Rotary Cannon" +/area/tcaf_corvette/autocannon + name = "Republican Fleet Corvette - Autocannon Emplacement" + icon_state = "Tactical" + ambience = AMBIENCE_HIGHSEC + +/area/tcaf_corvette/ammo1 + name = "Republican Fleet Corvette - Portside Ammunition Storage" + icon_state = "Tactical" + ambience = AMBIENCE_HIGHSEC + +/area/tcaf_corvette/ammo2 + name = "Republican Fleet Corvette - Starboard Ammunition Storage" icon_state = "Tactical" ambience = AMBIENCE_HIGHSEC