From 41b15d17399b7ab460be0d05b5b71a795a7dff8a Mon Sep 17 00:00:00 2001 From: RustingWithYou Date: Sat, 20 Apr 2024 15:05:41 +1200 Subject: [PATCH 1/4] adds blueprints to various offship sites --- code/modules/mining/mine_turfs.dm | 1 + .../RustingWithYou - shipblueprints.yml | 58 +++++++++++++++++++ .../abandoned_industrial_station.dmm | 13 ++--- .../orion/orion_automated_station.dmm | 5 ++ .../away_site/sensor_relay/sensor_relay.dmm | 11 ++-- .../tajara/mining_jack/mining_jack.dmm | 9 +++ .../peoples_station/peoples_station.dmm | 12 ++-- .../away_site/tajara/scrapper/scrapper.dmm | 28 ++++++++- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 17 +++++- maps/away/ships/casino/casino.dmm | 13 ++++- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 12 ++-- .../coc/coc_scarab/coc_scarab_deck_2.dmm | 1 + .../ships/coc/coc_surveyor/coc_surveyor.dmm | 17 +++--- .../coc/gadpathur_patrol/gadpathur_patrol.dmm | 8 ++- .../dominian_corvette/dominian_corvette.dmm | 2 + .../dominian_science_vessel.dmm | 4 ++ .../dominian_unathi_privateer.dmm | 2 + .../ships/dpra/hailstorm/hailstorm_ship.dmm | 10 +++- .../elyra/elyra_corvette/elyra_corvette.dmm | 11 +--- .../away/ships/freebooter/freebooter_ship.dmm | 9 +-- .../golden_deep/golden_deep_merchant.dmm | 5 +- .../hegemony_corvette/hegemony_corvette.dmm | 11 ++-- .../merchants_guild/merchant_freighter.dmm | 10 +++- .../miners_guild/miners_guild_station.dmm | 9 ++- maps/away/ships/heph/cyclops/cyclops.dmm | 12 +++- .../heph/heph_security/heph_security.dmm | 7 ++- maps/away/ships/iac/iac_rescue_ship.dmm | 15 ++--- maps/away/ships/idris/idris_cruiser.dmm | 1 + .../ships/kataphracts/kataphract_ship.dmm | 9 ++- .../ships/konyang/air_konyang/air_konyang.dmm | 10 +++- .../einstein_shuttle/einstein_shuttle.dmm | 10 +++- .../konyang/ipc_refugee/ipc_refugee_ship.dmm | 5 ++ .../ships/konyang/kasf_ship/kasf_ship.dmm | 10 +--- .../konyang/konyang_wreck/konyang_wreck.dmm | 5 ++ .../ships/konyang/water_barge/water_barge.dmm | 8 ++- .../ships/nka/nka_merchant/nka_merchant.dmm | 8 ++- maps/away/ships/orion/orion_express_ship.dmm | 6 ++ .../database_freighter/database_freighter.dmm | 9 +++ .../ships/pra/headmaster/headmaster_ship.dmm | 6 ++ maps/away/ships/sadar_scout/sadar_scout.dmm | 5 ++ maps/away/ships/scc/scc_scout_ship.dmm | 16 +++-- .../away/ships/sol_pirate/sfa_patrol_ship.dmm | 10 +++- maps/away/ships/sol_ssmd/ssmd_ship.dmm | 15 ++--- .../ships/tajara/circus/adhomian_circus.dmm | 6 ++ .../tajara/taj_smuggler/tajaran_smuggler.dmm | 9 ++- .../tirakqi_smuggler/tirakqi_smuggler.dmm | 7 ++- .../ships/tramp_freighter/tramp_freighter.dmm | 46 +++++++++++++-- .../hiskyn/unathi_pirate_hiskyn.dmm | 17 ++++-- .../izharshan/unathi_pirate_izharshan.dmm | 8 +++ .../tarwa/unathi_pirate_tarwa.dmm | 11 +++- maps/away/ships/xanu/xanu_frigate.dmm | 1 + maps/away/ships/yacht/yacht.dmm | 21 ++++--- maps/away/ships/yacht_civ/yacht_civ.dmm | 4 ++ .../abandoned_prison/abandoned_prison.dmm | 7 +++ .../asteroid/old_outpost/old_outpost.dmm | 9 ++- .../exoplanets/burzsia/burzsia_mining.dmm | 5 ++ .../exoplanets/haneunim/haneunim_crash.dmm | 10 +++- .../konyang/abandoned/landing_zone.dmm | 6 +- .../exoplanets/konyang/landing_zone.dmm | 6 +- .../konyang/ocean/naval_landing_zone.dmm | 6 +- .../exoplanets/konyang/pirate_outpost.dmm | 7 ++- .../exoplanets/raskara/raskara_okon.dmm | 24 +++++--- .../uueoaesa/heph_mining_station.dmm | 18 +++++- .../exoplanets/uueoaesa/heph_survey_post.dmm | 12 +++- .../exoplanets/uueoaesa/kazhkz_crash.dmm | 9 ++- .../uueoaesa/miners_guild_outpost.dmm | 6 ++ .../exoplanets/uueoaesa/pid_kois_farm.dmm | 6 ++ 67 files changed, 551 insertions(+), 155 deletions(-) create mode 100644 html/changelogs/RustingWithYou - shipblueprints.yml diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 4ee5a55ae51..6ac05dfffbf 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -31,6 +31,7 @@ var/list/mineral_can_smooth_with = list( // canSmoothWith is set in Initialize(). smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON + turf_flags = TURF_FLAG_BACKGROUND initial_gas = null opacity = TRUE diff --git a/html/changelogs/RustingWithYou - shipblueprints.yml b/html/changelogs/RustingWithYou - shipblueprints.yml new file mode 100644 index 00000000000..30f55d4cd2b --- /dev/null +++ b/html/changelogs/RustingWithYou - shipblueprints.yml @@ -0,0 +1,58 @@ +################################ +# 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: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds blueprints to most overmap ships, as well as several away sites and ruins." diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm index 0a975eac91e..9eda57f2315 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm @@ -1371,15 +1371,12 @@ /area/abandoned_industrial_station/maint_a1) "eo" = ( /obj/structure/table/standard, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a vessel."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints" - }, /obj/random/dirt_75, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, /turf/simulated/floor/tiled, /area/abandoned_industrial_station/engineering) "ep" = ( diff --git a/maps/away/away_site/orion/orion_automated_station.dmm b/maps/away/away_site/orion/orion_automated_station.dmm index a4790a4981b..fd90c9a5f0c 100644 --- a/maps/away/away_site/orion/orion_automated_station.dmm +++ b/maps/away/away_site/orion/orion_automated_station.dmm @@ -1563,6 +1563,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/orion_automated_station/engineering) "Di" = ( diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dmm b/maps/away/away_site/sensor_relay/sensor_relay.dmm index e9669f83a35..5e6ffcb3cf5 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dmm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dmm @@ -186,8 +186,7 @@ "dDU" = ( /obj/structure/bed/padded, /obj/item/bedsheet/random, -/obj/structure/curtain{ - }, +/obj/structure/curtain, /obj/structure/sign/poster{ pixel_x = 32 }, @@ -957,8 +956,7 @@ /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/yellow, /obj/item/clothing/head/hardhat/orange, -/obj/structure/curtain{ - }, +/obj/structure/curtain, /turf/simulated/floor/carpet/green, /area/sensor_relay) "qnu" = ( @@ -973,6 +971,11 @@ "qtq" = ( /obj/structure/table/standard, /obj/item/crossbowframe, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/carpet/rubber, /area/sensor_relay) "qyb" = ( diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm index 149c0412ba1..1db4a6c7583 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm @@ -1017,6 +1017,15 @@ /obj/machinery/power/apc/east{ req_access = list(202) }, +/obj/item/blueprints, +/obj/structure/table/steel, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index 062c849537a..3de0d74cac2 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -1985,8 +1985,7 @@ /obj/machinery/portable_atmospherics/canister/empty{ name = "waste canister" }, -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/alarm/cold/north{ req_one_access = list(209) }, @@ -5708,7 +5707,7 @@ /area/peoples_station/mess_hall) "Ae" = ( /obj/machinery/atmospherics/portables_connector{ - dir = 4; + dir = 4 }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating{ @@ -9408,8 +9407,13 @@ }, /area/peoples_station/atmos) "Sw" = ( -/obj/machinery/pipedispenser/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index 6905ddf7ef3..05587adfced 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -2810,6 +2810,12 @@ /area/shuttle/scrapper_ship/bridge) "HP" = ( /obj/machinery/firealarm/west, +/obj/structure/table/standard, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3816,6 +3822,26 @@ temperature = 278 }, /area/scrapper_base/atmos) +"TI" = ( +/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" + }, +/obj/item/blueprints, +/obj/structure/table/standard, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/scrapper_base/atmos) "TL" = ( /obj/structure/cable/green{ d1 = 1; @@ -37847,7 +37873,7 @@ kz RN fn pl -sE +TI kz Uk OZ diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 92f9016a5ca..c299b2349d1 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -830,6 +830,11 @@ }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/engineering) +"gl" = ( +/obj/structure/closet/radiation, +/obj/effect/floor_decal/industrial/outline/engineering, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/engineering) "gm" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ @@ -1986,10 +1991,15 @@ /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/messhall) "qt" = ( -/obj/structure/closet/radiation, /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engineering) "qu" = ( @@ -2138,6 +2148,7 @@ /area/tcaf_corvette/grauwolf) "sb" = ( /obj/machinery/vending/tool, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engineering) "sd" = ( @@ -4490,6 +4501,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engineering) "MS" = ( @@ -5708,6 +5720,7 @@ /obj/item/stack/material/tritium/full, /obj/item/stack/material/tritium/full, /obj/item/stack/material/tritium/full, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engineering) "Xi" = ( @@ -31344,7 +31357,7 @@ Jm wq Xh Gm -Sd +gl RA Yg wx diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm index d328335a388..e727095d347 100644 --- a/maps/away/ships/casino/casino.dmm +++ b/maps/away/ships/casino/casino.dmm @@ -4667,6 +4667,15 @@ "ns" = ( /turf/simulated/floor/reinforced/airless, /area/casino/casino_bow) +"nt" = ( +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/plating, +/area/casino/casino_crew_atmos) "ob" = ( /obj/structure/casino/roulette_chart, /obj/random/coin, @@ -4838,7 +4847,7 @@ "td" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ - dir = 4; + dir = 4 }, /turf/simulated/floor/plating, /area/casino/casino_crew_atmos) @@ -10013,7 +10022,7 @@ kv kv jN le -jN +nt kg mm mH diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 13318cb156d..f5efd27daef 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -3705,17 +3705,13 @@ /area/ship/ranger_corvette/gunnery) "pFY" = ( /obj/structure/table/steel, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a Xansan-class vessel."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints" - }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/engine2) "pHP" = ( diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm index 011117f8df9..419bbad8b37 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm @@ -1124,6 +1124,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/ladder_mobile, /obj/item/hoist_kit, +/obj/item/blueprints, /turf/simulated/floor/carpet/rubber, /area/ship/coc_scarab/engistorage) "fz" = ( diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm index c71d057cb29..910b19e4ecc 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm @@ -1903,18 +1903,11 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a vessel."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints" - }, /obj/item/pen/drafting/blue{ pixel_y = 5 }, /obj/machinery/light, +/obj/item/blueprints, /turf/simulated/floor/tiled, /area/coc_survey_ship/atmos) "ra" = ( @@ -5624,6 +5617,12 @@ "UF" = ( /turf/simulated/wall, /area/coc_survey_ship/anomaly) +"UH" = ( +/obj/structure/table/steel, +/obj/item/device/hand_labeler, +/obj/item/blueprints/outpost, +/turf/simulated/floor/tiled, +/area/coc_survey_ship/miningeva) "UI" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 @@ -11983,7 +11982,7 @@ Fb MH MH bM -TF +UH vs MH Lr diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm index 3fe0ab49201..564098db6c0 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm @@ -5480,6 +5480,12 @@ }, /turf/simulated/floor/tiled/white, /area/ship/gadpathur_patrol/galley) +"Rj" = ( +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting, +/turf/simulated/floor, +/area/ship/gadpathur_patrol/engineering) "Rn" = ( /obj/effect/floor_decal/corner_wide/white/diagonal, /obj/machinery/light/floor{ @@ -35059,7 +35065,7 @@ LJ Zs Mz rY -Wl +Rj Zs Zs Zs diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm index bed223d1a8d..a3172e85539 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm @@ -4505,6 +4505,8 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/item/pen/drafting, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette/engineering) "pJj" = ( diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index 59d80a8ca40..dd8c55f0c32 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -3428,6 +3428,8 @@ /obj/machinery/cell_charger{ pixel_y = 0 }, +/obj/item/blueprints, +/obj/item/pen/drafting, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "leu" = ( @@ -6545,6 +6547,8 @@ /obj/item/crowbar/rescue_axe, /obj/item/crowbar, /obj/item/crowbar/rescue_axe, +/obj/item/pen/drafting, +/obj/item/blueprints/outpost, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) "wzs" = ( diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm index d60e52f84f3..d634f7282ad 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm @@ -5810,6 +5810,8 @@ /area/ship/dominian_unathi/med) "Nw" = ( /obj/structure/table/standard, +/obj/item/blueprints, +/obj/item/pen/drafting, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/engineering) "Nx" = ( diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index c4c0e19fc63..47bae32c047 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -2740,6 +2740,14 @@ "CR" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/barracks) +"CU" = ( +/obj/item/pen/drafting, +/obj/item/blueprints, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engineering) "Dd" = ( /obj/effect/landmark/entry_point/port{ name = "port, crew compartment" @@ -14640,7 +14648,7 @@ WG la Hm rq -Hm +CU Pv dJ yx diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index bb1de024778..17a73f96498 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -6323,15 +6323,6 @@ /turf/simulated/wall/shuttle/space_ship, /area/ship/elyran_corvette/dorm) "JX" = ( -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a Sahin-class corvette."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints"; - pixel_y = 6 - }, /obj/item/clothing/glasses/welding{ pixel_x = 4; pixel_y = -4 @@ -6343,6 +6334,8 @@ dir = 4 }, /obj/structure/table/steel, +/obj/item/blueprints, +/obj/item/pen/drafting, /turf/simulated/floor/tiled/full, /area/ship/elyran_corvette/engineering) "Ka" = ( diff --git a/maps/away/ships/freebooter/freebooter_ship.dmm b/maps/away/ships/freebooter/freebooter_ship.dmm index a3210946894..1ebcb9905d9 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dmm +++ b/maps/away/ships/freebooter/freebooter_ship.dmm @@ -8961,17 +8961,10 @@ dir = 10 }, /obj/structure/table/steel, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a vessel."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints" - }, /obj/item/pen/drafting/blue{ pixel_y = 5 }, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/engineering) "tYU" = ( diff --git a/maps/away/ships/golden_deep/golden_deep_merchant.dmm b/maps/away/ships/golden_deep/golden_deep_merchant.dmm index 6a4c2dcd194..17e77b063f2 100644 --- a/maps/away/ships/golden_deep/golden_deep_merchant.dmm +++ b/maps/away/ships/golden_deep/golden_deep_merchant.dmm @@ -3263,7 +3263,10 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/book/manual/evaguide, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/golden_deep/atmos) "Fy" = ( diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index 9b2a146d3f4..e5e2debfc57 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -1791,6 +1791,7 @@ /obj/machinery/atmospherics/portables_connector/fuel{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor, /area/hegemony_ship/engineering) "mc" = ( @@ -4538,11 +4539,11 @@ /turf/simulated/floor, /area/hegemony_ship/docking_port) "Bk" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor, /area/hegemony_ship/engineering) "Bo" = ( @@ -23244,8 +23245,8 @@ Bg Bg Ot nS -Bk Dz +Bk BH wC Di diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm index 961ea666df9..dd790c0d4e6 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm @@ -414,6 +414,14 @@ /obj/structure/sign/flag/hegemony/large/south, /turf/simulated/floor/tiled, /area/merchants_guild/office) +"fn" = ( +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/obj/structure/table/standard, +/obj/item/blueprints, +/turf/simulated/floor/plating, +/area/merchants_guild/starboardengine) "fq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15635,7 +15643,7 @@ Lk Bu gM HN -Wd +fn uz Wd Wd diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm index 4baa8eff49e..2c21cdb2e9a 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm @@ -411,7 +411,9 @@ "fz" = ( /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/structure/filingcabinet/chestdrawer, -/obj/structure/sign/flag/hegemony/large/north, +/obj/structure/sign/flag/hegemony/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/steel, /area/miners_guild/bridge) "fE" = ( @@ -3663,6 +3665,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel, /area/miners_guild/engineering1) "On" = ( diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm index a773877c949..a5244403ea1 100644 --- a/maps/away/ships/heph/cyclops/cyclops.dmm +++ b/maps/away/ships/heph/cyclops/cyclops.dmm @@ -1311,6 +1311,9 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, +/obj/structure/closet/secure_closet/engineering_electrical{ + req_access = list(216) + }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "nb" = ( @@ -4550,8 +4553,13 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/structure/closet/secure_closet/engineering_electrical{ - req_access = list(216) +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/item/pen/drafting/blue{ + pixel_y = 5 }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 1d6c899ebc3..28f74a94d9e 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -3079,11 +3079,15 @@ /turf/simulated/floor/tiled, /area/heph_security_ship/armory) "vU" = ( -/obj/machinery/pipedispenser, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" }, +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, /turf/simulated/floor, /area/heph_security_ship/engineering) "vZ" = ( @@ -6216,6 +6220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 10 }, +/obj/machinery/pipedispenser, /turf/simulated/floor, /area/heph_security_ship/atmos) "Xe" = ( diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index bec67cea60b..3ad1ab6fdce 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -1121,19 +1121,14 @@ /area/ship/iac_rescue_ship/afthallway) "bWO" = ( /obj/structure/table/steel, -/obj/item/stack/material/steel/full{ - pixel_x = -8 - }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/stack/material/steel/full{ - pixel_x = -8 +/obj/item/blueprints, +/obj/item/blueprints/outpost{ + pixel_y = 6 }, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/steel/full{ - pixel_x = -8 +/obj/item/pen/drafting/blue{ + pixel_y = 5 }, -/obj/item/stack/material/glass/full, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/engineering) "bXv" = ( diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index a488633577b..97986f136b9 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -11947,6 +11947,7 @@ /obj/item/storage/box/fancy/crayons/chalkbox{ pixel_y = 8 }, +/obj/item/blueprints, /obj/item/device/radio/intercom/ship/west, /turf/simulated/floor/plating, /area/ship/idris_cruiser/engineering) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index 260d5c1056f..18e347a7d2b 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -4224,7 +4224,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/stack/material/aluminium/full, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "ja" = ( @@ -9842,6 +9841,7 @@ /obj/item/stack/material/plastic/full, /obj/item/stack/material/aluminium/full, /obj/item/stack/material/lead/full, +/obj/item/stack/material/aluminium/full, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "Td" = ( @@ -10084,11 +10084,14 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/entry) "Wi" = ( -/obj/item/pipewrench, -/obj/random/tech_supply, /obj/machinery/alarm/north{ req_one_access = list(113) }, +/obj/item/blueprints, +/obj/structure/table/reinforced/steel, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, /turf/simulated/floor/plating, /area/kataphract_chapter/engineering) "Wl" = ( diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dmm b/maps/away/ships/konyang/air_konyang/air_konyang.dmm index 2f455fdc178..1fbc5496c1b 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dmm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dmm @@ -1080,6 +1080,14 @@ }, /turf/simulated/floor/plating, /area/shuttle/air_konyang/crew) +"Ax" = ( +/obj/item/blueprints/shuttle, +/obj/structure/table/steel, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/shuttle/air_konyang/engineering) "AC" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 0663; @@ -15166,7 +15174,7 @@ wU Ei qs JP -JP +Ax wy cD aL diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm index 448360c328f..441140d7a4b 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm @@ -323,6 +323,14 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/einstein_shuttle/room/four) +"jt" = ( +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/obj/item/blueprints/shuttle, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/plating, +/area/shuttle/einstein_shuttle/porteng) "jC" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -7802,7 +7810,7 @@ NW NW Hp lH -iD +jt YJ LU Wh diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm index 401e379ded1..78c48c0fb43 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm @@ -5810,6 +5810,11 @@ /obj/item/clothing/head/hardhat{ pixel_y = 7 }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/ipc_refugee/engie) "Ts" = ( diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index c2c626a5eb0..8c46b5311de 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -8547,15 +8547,6 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for a Sai-class corvette."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints"; - pixel_y = -1 - }, /obj/item/pen/drafting/blue{ pixel_x = -6; pixel_y = 8 @@ -8570,6 +8561,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark/full, /area/ship/kasf_corvette/engie) "Xu" = ( diff --git a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm index 79ee04e48f0..2ebd65dc820 100644 --- a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm +++ b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm @@ -2826,6 +2826,11 @@ /obj/item/stack/material/lead/full{ pixel_y = 5 }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/engineering) "xO" = ( diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm index 137dc4e8843..c3284c9fccd 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dmm +++ b/maps/away/ships/konyang/water_barge/water_barge.dmm @@ -4377,12 +4377,14 @@ /turf/simulated/floor/plating, /area/water_barge/fuelbay) "Qy" = ( -/obj/structure/closet/secure_closet/engineering_electrical{ - req_access = null - }, /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, +/obj/structure/table/steel, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/water_barge/toolstorage) "QB" = ( diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm index ce592329fba..4565cd15acd 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm @@ -4849,11 +4849,15 @@ }, /area/nka_merchant) "IJ" = ( -/obj/machinery/pipedispenser/disposal, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, +/obj/structure/table/standard, /turf/simulated/floor/tiled{ temperature = 278.15 }, diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm index f7a995095e9..6554504e5bf 100644 --- a/maps/away/ships/orion/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship.dmm @@ -1767,6 +1767,12 @@ /obj/machinery/power/apc{ req_access = list(201) }, +/obj/structure/table/standard, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor, /area/ship/orion/engie) "hlr" = ( diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 411cfc4647c..4840e58fb4e 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -616,6 +616,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index deb2a0c841d..12722c33cce 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -5573,6 +5573,12 @@ /obj/machinery/alarm/cold/north{ req_one_access = list(209) }, +/obj/item/blueprints, +/obj/structure/table/reinforced/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engineering) "AC" = ( diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm index 086d2960a35..c5584640b3e 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dmm +++ b/maps/away/ships/sadar_scout/sadar_scout.dmm @@ -6619,6 +6619,11 @@ /obj/random/powercell, /obj/random/powercell, /obj/machinery/light/colored/decayed/dimmed, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, /turf/simulated/floor/carpet/rubber, /area/ship/sadar_scout/tools) "WN" = ( diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 345697effe5..4d16fff13e6 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -1508,14 +1508,13 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/engineering_cargo) "hE" = ( -/obj/machinery/suit_cycler/captain, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/captain, -/obj/item/clothing/head/helmet/space/void/captain, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, /obj/machinery/firealarm/west, +/obj/machinery/suit_cycler/captain/prepared{ + req_access = null + }, /turf/simulated/floor/wood, /area/ship/scc_scout_ship/quarters) "hF" = ( @@ -5721,6 +5720,15 @@ pixel_x = -5; pixel_y = 4 }, +/obj/item/blueprints, +/obj/structure/table/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_power) "Jd" = ( diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm index 406636b2345..5723f719407 100644 --- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm +++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm @@ -476,6 +476,9 @@ /obj/item/storage/belt/utility, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, +/obj/item/tape_roll, +/obj/item/stack/material/plasteel/full, +/obj/item/stack/material/steel/full, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/Engineering) "bbb" = ( @@ -2745,9 +2748,10 @@ "ivQ" = ( /obj/structure/table/standard, /obj/item/blueprints, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/plasteel/full, -/obj/item/tape_roll, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/Engineering) "izK" = ( diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol_ssmd/ssmd_ship.dmm index 7f9e8a56162..652cf3b1666 100644 --- a/maps/away/ships/sol_ssmd/ssmd_ship.dmm +++ b/maps/away/ships/sol_ssmd/ssmd_ship.dmm @@ -3393,14 +3393,6 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/book/manual/wiki/engineering_construction{ - desc = "Blueprints for an Uhlan-class vessel."; - icon = 'icons/obj/items.dmi'; - icon_state = "blueprints"; - item_icons = null; - item_state = null; - name = "ship blueprints" - }, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /turf/simulated/floor/tiled/dark, @@ -7288,8 +7280,11 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/item/pen/drafting/blue, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints, /turf/simulated/floor/tiled/dark, /area/ship/ssmd_corvette/portengine) "vMV" = ( diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index 0950b0830c0..de6009dd3fc 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -3314,6 +3314,12 @@ d2 = 4; icon_state = "0-4" }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/plating{ temperature = 278.15 }, diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index d7da37488e3..3436c6db4dc 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -4062,8 +4062,7 @@ /turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler_cargo) "xeO" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor{ temperature = 278.15 @@ -4172,6 +4171,12 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced/steel, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor{ temperature = 278.15 }, diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index 2c1675a21b7..ef21f7e048c 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -2259,6 +2259,9 @@ /obj/machinery/light/skrell{ dir = 8 }, +/obj/item/reagent_containers/weldpack{ + pixel_y = 8 + }, /turf/simulated/floor/shuttle/skrell/blue, /area/ship/tirakqi_smuggler/engi) "po" = ( @@ -6512,13 +6515,15 @@ /area/ship/tirakqi_smuggler/port_hall) "NI" = ( /obj/structure/table/skrell, -/obj/item/reagent_containers/weldpack{ +/obj/item/pen/drafting/blue{ + pixel_x = -6; pixel_y = 8 }, /obj/item/clothing/glasses/welding{ pixel_x = 4; pixel_y = -2 }, +/obj/item/blueprints, /turf/simulated/floor/shuttle/skrell/blue, /area/ship/tirakqi_smuggler/engi) "NM" = ( diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index 78fdd25bc39..821f5f0c7d5 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -233,6 +233,15 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/table/steel, +/obj/item/blueprints, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/power) "cP" = ( @@ -789,6 +798,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/hangar) "jZ" = ( @@ -961,9 +973,6 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/hangar) "lt" = ( @@ -1306,10 +1315,36 @@ /area/tramp_freighter/cargo) "ox" = ( /obj/structure/table/steel, -/obj/random/toolbox, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/stack/material/glass/full{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/stack/material/glass/full{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/stack/material/steel/full{ + pixel_y = 6; + pixel_x = 2 + }, +/obj/item/stack/material/steel/full{ + pixel_y = 6; + pixel_x = 2 + }, +/obj/item/stack/material/aluminium/full{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/stack/material/plastic/full{ + pixel_y = 6; + pixel_x = -5 + }, +/obj/item/stack/material/lead/full{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/engi) "oJ" = ( @@ -3709,8 +3744,6 @@ /turf/simulated/floor/plating, /area/tramp_freighter/atmos) "UH" = ( -/obj/structure/table/steel, -/obj/item/storage/belt/utility/alt, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -3723,6 +3756,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/autolathe, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/engi) "UI" = ( diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm index 5f5a0ace6fb..062748def52 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm @@ -2438,9 +2438,11 @@ /area/shuttle/hiskyn_revanchists) "bQp" = ( /obj/structure/table/reinforced/steel, -/obj/random/tool, -/obj/item/clothing/gloves/yellow/specialu, -/obj/item/clothing/gloves/yellow/specialu, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/engineering) "bTY" = ( @@ -2926,6 +2928,7 @@ /obj/random/dirt_75, /obj/structure/table/reinforced/steel, /obj/random/tool, +/obj/item/clothing/gloves/yellow/specialu, /turf/simulated/floor/plating, /area/hiskyn_ship/thrusts) "fmj" = ( @@ -5805,6 +5808,12 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) +"vfJ" = ( +/obj/item/stack/material/lead/full{ + pixel_y = 3 + }, +/turf/template_noop, +/area/space) "viZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -9288,7 +9297,7 @@ aOr aOr aOr aOr -aOr +vfJ aOr aOr aOr diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm index 38ea338ec7b..24583eeb12b 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -1256,6 +1256,11 @@ /area/shuttle/unathi_pirate_izharshan/dorms) "QF" = ( /obj/structure/table/reinforced/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/shuttle, /obj/item/device/binoculars/spyglass, /turf/simulated/floor/shuttle/black, /area/shuttle/unathi_pirate_izharshan/helm) @@ -1268,6 +1273,9 @@ /obj/item/stack/material/steel/full, /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, +/obj/item/stack/material/lead/full, +/obj/item/stack/material/aluminium/full, +/obj/item/stack/material/plastic/full, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/operations) "Rm" = ( diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index ffeaea75d5a..144c3c44eb7 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -1831,6 +1831,15 @@ }, /turf/simulated/floor/diona, /area/shuttle/tarwa) +"AA" = ( +/obj/structure/table/standard, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/diona, +/area/tarwa_ship/engineering2) "AI" = ( /obj/machinery/light{ dir = 1 @@ -15456,7 +15465,7 @@ IN kV LT XU -HG +AA Gd ci Gd diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm index 8b3b5e818ce..62dda74897e 100644 --- a/maps/away/ships/xanu/xanu_frigate.dmm +++ b/maps/away/ships/xanu/xanu_frigate.dmm @@ -39,6 +39,7 @@ /obj/item/storage/box/fancy/crayons/chalkbox{ pixel_y = 4 }, +/obj/item/blueprints, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/ship/xanu_frigate/engineering/port) diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm index 655d05521be..5b8b4e198af 100644 --- a/maps/away/ships/yacht/yacht.dmm +++ b/maps/away/ships/yacht/yacht.dmm @@ -608,6 +608,12 @@ pixel_y = -8 }, /obj/machinery/power/apc/empty/north, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/plating, /area/shuttle/yacht/engine) "bW" = ( @@ -770,9 +776,8 @@ /obj/effect/landmark/entry_point/east{ name = "port, solars central" }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_broken, +/turf/simulated/floor/airless, /area/shuttle/yacht/engine) "cq" = ( /obj/structure/cable{ @@ -790,9 +795,8 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_broken, +/turf/simulated/floor/airless, /area/shuttle/yacht/engine) "cr" = ( /obj/structure/cable{ @@ -813,9 +817,8 @@ /obj/item/storage/toolbox/syndicate{ name = "black toolbox" }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_broken, +/turf/simulated/floor/airless, /area/shuttle/yacht/engine) "cs" = ( /obj/structure/cable{ diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index ff6fb8be6cb..0c9586ef555 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -5104,6 +5104,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/blueprints, +/obj/item/pen/drafting/blue{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/engineering) "SQ" = ( diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm index c41018b5805..d3f077a2627 100644 --- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm +++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm @@ -762,6 +762,13 @@ }, /obj/structure/table/steel, /obj/item/storage/box/fancy/cigarettes/dromedaryco, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, /turf/simulated/floor/plating, /area/abandoned_prison/engineering) "kC" = ( diff --git a/maps/random_ruins/exoplanets/asteroid/old_outpost/old_outpost.dmm b/maps/random_ruins/exoplanets/asteroid/old_outpost/old_outpost.dmm index 6f4d1846df8..3e1e34cbb18 100644 --- a/maps/random_ruins/exoplanets/asteroid/old_outpost/old_outpost.dmm +++ b/maps/random_ruins/exoplanets/asteroid/old_outpost/old_outpost.dmm @@ -715,7 +715,14 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/material/shard, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/structure/table/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled, /area/old_outpost/refinery) "nS" = ( diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm index 4d77f73222a..156133326c7 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm @@ -1322,6 +1322,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/blueprints/outpost, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/steel, /area/burzsia_mining/mining) "JQ" = ( diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm index fe67c7c0c1b..0544d28e5e9 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm @@ -57,6 +57,13 @@ /obj/machinery/iff_beacon, /turf/simulated/floor/airless, /area/shuttle/haneunim_crash) +"iD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/item/pen/drafting/blue, +/turf/simulated/floor/plating, +/area/shuttle/haneunim_crash) "jc" = ( /obj/machinery/power/terminal{ dir = 8; @@ -325,6 +332,7 @@ "BR" = ( /obj/structure/table/reinforced/steel, /obj/item/clothing/gloves/yellow, +/obj/item/blueprints/shuttle, /turf/simulated/floor/plating, /area/shuttle/haneunim_crash) "Ce" = ( @@ -1095,7 +1103,7 @@ FE It QJ pn -ti +iD DO Ic yc diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index 048f8658fb9..fbf9a7e6b3a 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -1312,10 +1312,14 @@ /area/konyang_landing_zone/command_center_abandoned/living) "qz" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/item/blueprints/outpost, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center_abandoned) "qP" = ( diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index b870a18ad45..63df2e89c38 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -1278,10 +1278,14 @@ /area/konyang_landing_zone/command_center/living) "qz" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/item/blueprints/outpost, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "qQ" = ( diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 724c3d3eae6..427d68dcea0 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -986,10 +986,14 @@ /area/konyang_landing_zone) "lX" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/item/blueprints/outpost, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "mA" = ( diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm index 9e2551d87e6..d0f23b77f28 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm @@ -389,6 +389,7 @@ /obj/structure/table/standard, /obj/item/storage/bag/inflatable, /obj/item/storage/bag/inflatable, +/obj/item/blueprints/shuttle, /turf/simulated/floor/tiled/rust, /area/shuttle/konyang_pirate) "rH" = ( @@ -450,6 +451,10 @@ }, /turf/simulated/floor/wood, /area/konyang_pirate_outpost) +"wk" = ( +/obj/item/blueprints/shuttle, +/turf/simulated/floor/exoplanet/dirt_konyang, +/area/konyang_pirate_outpost) "wK" = ( /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_pirate_outpost) @@ -1464,7 +1469,7 @@ xe tZ tZ xe -wK +wk wK wK wK diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index e2e4ece63c8..af6261c697c 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -277,7 +277,7 @@ /obj/structure/plasticflaps, /obj/effect/floor_decal/industrial/warning/cee, /obj/machinery/conveyor{ - id = "okon_base_belt"; + id = "okon_base_belt" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -721,13 +721,19 @@ /area/raskara_okon/engineer) "jx" = ( /obj/structure/table/standard, -/obj/item/paper_bin, /obj/effect/floor_decal/corner/red{ dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -1110,7 +1116,7 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "okon_base_belt"; + id = "okon_base_belt" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1623,7 +1629,7 @@ /obj/structure/railing/mapped, /obj/machinery/conveyor{ dir = 8; - id = "okon_base_belt"; + id = "okon_base_belt" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2909,7 +2915,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "okon_base_belt"; + id = "okon_base_belt" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3068,6 +3074,10 @@ temperature = 278.15 }, /area/raskara_okon/mess_hall) +"OK" = ( +/obj/item/blueprints/shuttle, +/turf/simulated/wall/shuttle/raider, +/area/raskara_okon/engineer) "OL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/grey/diagonal, @@ -3352,7 +3362,7 @@ /obj/structure/railing/mapped, /obj/machinery/conveyor{ dir = 8; - id = "okon_base_belt"; + id = "okon_base_belt" }, /turf/simulated/floor/tiled/rust{ temperature = 278.15 @@ -4375,7 +4385,7 @@ HX "} (14,1,1) = {" HX -gs +OK Dy cw gs diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm index 9ab63365f6f..4a0f1e0733d 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm @@ -1295,6 +1295,13 @@ temperature = 303.15 }, /area/heph_mining_station/medbay) +"sI" = ( +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/airless, +/area/heph_mining_station/mining) "sO" = ( /obj/structure/reagent_dispensers/keg/xuizikeg, /turf/simulated/floor/tiled/dark{ @@ -2778,8 +2785,13 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialu, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/mechanical, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, /turf/simulated/floor{ temperature = 303.15 }, @@ -3738,7 +3750,7 @@ Rk (17,1,1) = {" Rk MI -MI +sI MI MI Sf diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm index 1e6b72e7646..4bca81dd828 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm @@ -517,6 +517,16 @@ /obj/effect/decal/cleanable/floor_damage/rust, /turf/simulated/floor/tiled/dark, /area/heph_survey_post) +"wy" = ( +/obj/random/dirt_75, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/structure/table/standard, +/obj/item/blueprints/outpost, +/turf/simulated/floor/tiled/dark, +/area/heph_survey_post) "wC" = ( /obj/structure/table/standard, /obj/structure/sign/flag/heph/large/north{ @@ -1387,7 +1397,7 @@ bN Ze ea Ir -PV +wy bN ds YI diff --git a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm index c734a12fbe2..002394e5c76 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm @@ -270,6 +270,12 @@ }, /turf/simulated/floor/plating, /area/shuttle/kazhkz_crash) +"pA" = ( +/obj/item/blueprints/outpost{ + pixel_y = 6 + }, +/turf/template_noop, +/area/template_noop) "pC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -699,6 +705,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/item/blueprints/shuttle, /turf/simulated/floor/tiled/slate, /area/shuttle/kazhkz_crash) "QA" = ( @@ -1625,7 +1632,7 @@ TJ TJ TJ TJ -TJ +pA TJ UK UK diff --git a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm index df14672e666..84feab8cf7c 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm @@ -243,6 +243,12 @@ /obj/machinery/alarm/west{ req_one_access = null }, +/obj/item/blueprints/outpost, +/obj/structure/table/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm index 98dd0a0c384..6d7d8ef2004 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm @@ -16,6 +16,12 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, +/obj/item/blueprints/outpost, +/obj/structure/table/steel, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled, /area/pid_kois_farm) "dh" = ( From 66ea28b726c39909686bbba1778e089bea833836 Mon Sep 17 00:00:00 2001 From: RustingWithYou Date: Sat, 20 Apr 2024 15:06:15 +1200 Subject: [PATCH 2/4] mineral cl --- html/changelogs/RustingWithYou - shipblueprints.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/html/changelogs/RustingWithYou - shipblueprints.yml b/html/changelogs/RustingWithYou - shipblueprints.yml index 30f55d4cd2b..6b777e62157 100644 --- a/html/changelogs/RustingWithYou - shipblueprints.yml +++ b/html/changelogs/RustingWithYou - shipblueprints.yml @@ -56,3 +56,4 @@ delete-after: True # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Adds blueprints to most overmap ships, as well as several away sites and ruins." + - qol: "Shuttles will no longer pull mineral turfs with them when taking off." \ No newline at end of file From ee785d098f54b73ac5ad44601b52e76593393c55 Mon Sep 17 00:00:00 2001 From: RustingWithYou Date: Thu, 25 Apr 2024 16:45:02 +1200 Subject: [PATCH 3/4] kata ship blueprints --- maps/away/ships/kataphracts/kataphract_ship.dmm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index bf5c023dede..be5904eb436 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -3837,6 +3837,10 @@ dir = 10 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/stack/material/plasteel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/rods/full, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "nk" = ( @@ -5619,15 +5623,18 @@ /turf/simulated/floor/plating, /area/kataphract_chapter/bruiser) "FP" = ( -/obj/structure/table/rack, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/plasteel/full, -/obj/item/stack/rods/full, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/standard, +/obj/item/blueprints{ + pixel_y = 5 + }, +/obj/item/pen/drafting/blue{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "FX" = ( From 1f6434da2ded74f0652cde4e41590fd2bb2ed79c Mon Sep 17 00:00:00 2001 From: RustingWithYou Date: Tue, 4 Jun 2024 02:40:44 +1200 Subject: [PATCH 4/4] guh --- .../ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm index f191d4379f0..33bed58dc98 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -1798,9 +1798,8 @@ w_class = 3; canhear_range = 6; throwforce = 12; - pixel_y = 10; + pixel_y = 10 }, - pixel_x = -5 /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/helm) "Rf" = (