From ecaaf6813f91b418718ed5a4fc010031938e4cb5 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 3 Jul 2021 14:49:03 -0700 Subject: [PATCH] powder that makes you say yes --- maps/southern_cross/overmap/sectors.dm | 103 ++----------------------- 1 file changed, 5 insertions(+), 98 deletions(-) diff --git a/maps/southern_cross/overmap/sectors.dm b/maps/southern_cross/overmap/sectors.dm index 4e1319041a..717af80290 100644 --- a/maps/southern_cross/overmap/sectors.dm +++ b/maps/southern_cross/overmap/sectors.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD // Overmap object for Sif, hanging in the void of space /obj/effect/overmap/visitable/planet/Sif name = "Sif" @@ -12,11 +11,7 @@ mountain_color = "#735555" ice_color = "FFFFFF" icecaps = "icecaps" - - initial_generic_waypoints = list( - "outpost_nw", - "outpost_s" - ) + icon_state = "frozen" //CHOMP comment: Not sure what this does at the moment, but we're doing it live. /obj/effect/overmap/visitable/planet/Sif/Initialize() atmosphere = new(CELL_VOLUME) @@ -75,95 +70,7 @@ Z_LEVEL_STATION_TWO, Z_LEVEL_STATION_THREE, Z_LEVEL_MISC) -||||||| parent of 90dab73f30... Merge pull request #10807 from VOREStation/Icons/overmap -// Overmap object for Sif, hanging in the void of space -/obj/effect/overmap/visitable/planet/Sif - name = "Sif" - map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD) - in_space = 0 - start_x = 10 - start_y = 10 - skybox_offset_x = 128 - skybox_offset_y = 128 - surface_color = "#2D545B" - mountain_color = "#735555" - ice_color = "FFFFFF" - icecaps = "icecaps" - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - atmosphere = new(CELL_VOLUME) - atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273) - atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273) - - . = ..() - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - . = ..() - docking_codes = null - -/obj/effect/overmap/visitable/planet/Sif/get_skybox_representation() - var/image/tmp = ..() - tmp.pixel_x = skybox_offset_x - tmp.pixel_y = skybox_offset_y - return tmp - -/obj/effect/overmap/visitable/Southern_Cross - name = "Southern Cross" - icon_state = "object" - base = 1 - in_space = 1 - start_x = 10 - start_y = 10 - map_z = list(Z_LEVEL_STATION_ONE, Z_LEVEL_STATION_TWO, Z_LEVEL_STATION_THREE) - extra_z_levels = list(Z_LEVEL_TRANSIT) // Hopefully temporary, so arrivals announcements work. - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - . = ..() - docking_codes = null -======= -// Overmap object for Sif, hanging in the void of space -/obj/effect/overmap/visitable/planet/Sif - name = "Sif" - map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD) - in_space = 0 - start_x = 10 - start_y = 10 - skybox_offset_x = 128 - skybox_offset_y = 128 - surface_color = "#2D545B" - mountain_color = "#735555" - ice_color = "FFFFFF" - icecaps = "icecaps" - icon_state = "frozen" - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - atmosphere = new(CELL_VOLUME) - atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273) - atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273) - - . = ..() - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - . = ..() - docking_codes = null - -/obj/effect/overmap/visitable/planet/Sif/get_skybox_representation() - var/image/tmp = ..() - tmp.pixel_x = skybox_offset_x - tmp.pixel_y = skybox_offset_y - return tmp - -/obj/effect/overmap/visitable/Southern_Cross - name = "Southern Cross" - icon_state = "object" - base = 1 - in_space = 1 - start_x = 10 - start_y = 10 - map_z = list(Z_LEVEL_STATION_ONE, Z_LEVEL_STATION_TWO, Z_LEVEL_STATION_THREE) - extra_z_levels = list(Z_LEVEL_TRANSIT) // Hopefully temporary, so arrivals announcements work. - -/obj/effect/overmap/visitable/planet/Sif/Initialize() - . = ..() - docking_codes = null ->>>>>>> 90dab73f30... Merge pull request #10807 from VOREStation/Icons/overmap + +/obj/effect/overmap/visitable/planet/Sif/Initialize() + . = ..() + docking_codes = null