From a65fe73a475121ec707b9f3613cd1aadcdf000fb Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:29:21 +0100 Subject: [PATCH] OX delivery point ruin updated and fixed (#18135) * ox * 65 * tests rerun please * tests rerun please * barren asteroid no atmos --------- Co-authored-by: DreamySkrell <> --- code/modules/maps/planet_types/asteroid.dm | 3 + .../overmap/exoplanets/decor/_turfs.dm | 2 +- .../exoplanets/decor/turfs/concrete.dm | 2 +- ...ySkrell-ox-delivery-point-ruin-updated.yml | 41 ++++ .../exoplanets/delivery/delivery_site.dmm | 211 ++++++++++++++---- 5 files changed, 211 insertions(+), 48 deletions(-) create mode 100644 html/changelogs/DreamySkrell-ox-delivery-point-ruin-updated.yml diff --git a/code/modules/maps/planet_types/asteroid.dm b/code/modules/maps/planet_types/asteroid.dm index 534d2509122..555ec58709b 100644 --- a/code/modules/maps/planet_types/asteroid.dm +++ b/code/modules/maps/planet_types/asteroid.dm @@ -24,6 +24,9 @@ skybox_image.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR skybox_image.blend_mode = BLEND_OVERLAY +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/generate_atmosphere() + atmosphere = null + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/romanovich name = "romanovich cloud asteroid" desc = "A phoron rich asteroid." diff --git a/code/modules/overmap/exoplanets/decor/_turfs.dm b/code/modules/overmap/exoplanets/decor/_turfs.dm index 82ceae9bc9b..51034ddfbf2 100644 --- a/code/modules/overmap/exoplanets/decor/_turfs.dm +++ b/code/modules/overmap/exoplanets/decor/_turfs.dm @@ -209,7 +209,7 @@ name = "concrete" desc = "Stone-like artificial material." icon = 'icons/turf/flooring/concrete.dmi' - icon_state = "concrete" + icon_state = "concrete0" //Special world edge turf, /turf/unsimulated/planet_edge diff --git a/code/modules/overmap/exoplanets/decor/turfs/concrete.dm b/code/modules/overmap/exoplanets/decor/turfs/concrete.dm index fc8744251e8..dd70f89ed18 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/concrete.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/concrete.dm @@ -2,5 +2,5 @@ name = "concrete" desc = "Stone-like artificial material." icon = 'icons/turf/flooring/concrete.dmi' - icon_state = "concrete" + icon_state = "concrete0" does_footprint = FALSE diff --git a/html/changelogs/DreamySkrell-ox-delivery-point-ruin-updated.yml b/html/changelogs/DreamySkrell-ox-delivery-point-ruin-updated.yml new file mode 100644 index 00000000000..5934ab7a59f --- /dev/null +++ b/html/changelogs/DreamySkrell-ox-delivery-point-ruin-updated.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DreamySkrell + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "OX devlivery point ruin updated and fixed." diff --git a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm index f65e23e6c47..d96033e73b3 100644 --- a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm +++ b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm @@ -1,16 +1,16 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ao" = ( -/turf/simulated/wall/concrete, +/turf/simulated/wall, /area/template_noop) "aQ" = ( -/obj/effect/landmark/clear, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/unsimulated/floor/concrete, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, /area/template_noop) "aR" = ( -/obj/effect/landmark/clear, /obj/structure/closet/walllocker/medical{ pixel_y = 32 }, @@ -21,62 +21,163 @@ /obj/item/stack/medical/ointment/full, /obj/item/stack/medical/bruise_pack/full, /obj/item/stack/medical/bruise_pack/full, -/turf/unsimulated/floor/concrete, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, /area/template_noop) "bi" = ( -/obj/effect/landmark/clear, /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/turf/unsimulated/floor/concrete, -/area/template_noop) -"bk" = ( -/obj/effect/landmark/clear, -/turf/unsimulated/floor/concrete, -/area/template_noop) -"bA" = ( -/obj/structure/cargo_receptacle, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/unsimulated/floor/concrete, -/area/template_noop) -"bE" = ( -/obj/effect/landmark/clear, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/unsimulated/floor/concrete, -/area/template_noop) -"bP" = ( -/obj/effect/landmark/clear, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/unsimulated/floor/concrete, -/area/template_noop) -"bQ" = ( -/obj/effect/landmark/clear, /obj/structure/sign/flag/orion_express/unmovable{ dir = 1; pixel_y = 32 }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"bk" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"bA" = ( +/obj/structure/cargo_receptacle, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"bE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/structure/sign/flag/orion_express/unmovable{ + dir = 1; + pixel_x = -32 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"bP" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"bQ" = ( +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/walllocker/emerglocker/west, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"dj" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"fx" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"qg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"si" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/cargo_package{ + pixel_y = 3 + }, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"te" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/item/cargo_package{ + pixel_y = 3 + }, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"yx" = ( /turf/template_noop, /area/template_noop) +"AI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"JU" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) "Ku" = ( /obj/effect/landmark/clear, /turf/template_noop, /area/template_noop) +"Me" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/structure/closet/crate, +/obj/item/storage/backpack/duffel/orion, +/obj/item/stack/packageWrap, +/obj/item/device/hand_labeler, +/obj/random/tech_supply, +/obj/random/tool, +/obj/item/crowbar, +/obj/item/clothing/accessory/pin/corporate/orion, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"PC" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"RV" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) +"TK" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/concrete, +/area/template_noop) (1,1,1) = {" -Ku -Ku -Ku +yx +yx +yx Ku Ku Ku Ku "} (2,1,1) = {" -Ku +yx ao ao ao @@ -88,18 +189,18 @@ Ku Ku ao aQ -bk +bQ bE ao -bQ +Ku "} (4,1,1) = {" Ku ao aR bA -bk -bk +fx +AI Ku "} (5,1,1) = {" @@ -108,22 +209,40 @@ ao bi bk bP -ao -bQ +JU +Ku "} (6,1,1) = {" Ku ao ao -ao -ao -ao +Me +si +RV Ku "} (7,1,1) = {" Ku Ku Ku +TK +TK +te +Ku +"} +(8,1,1) = {" +yx +Ku +Ku +PC +dj +qg +Ku +"} +(9,1,1) = {" +yx +Ku +Ku Ku Ku Ku