diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 659215d0b7b..b9cd36bd7fb 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -2,7 +2,7 @@ name = "heavy-duty cell charger" desc = "A much more powerful version of the standard recharger that is specially designed for charging power cells." icon = 'icons/obj/power.dmi' - icon_state = "ccharger0" + icon_state = "ccharger" anchored = 1 use_power = 1 idle_power_usage = 5 @@ -25,6 +25,8 @@ cut_overlays() add_overlay("ccharger-o[newlevel]") chargelevel = newlevel + add_overlay(charging.icon_state) + add_overlay("cell-o2") add_overlay("ccharger-on") else cut_overlays() diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index 783882217d1..07b64f89fc2 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -172,21 +172,20 @@ for(var/datum/exoplanet_theme/T as anything in themes) T.before_map_generation(src) - for(var/zlevel in map_z) - for(var/map_type in map_generators) - if(ispath(map_type, /datum/random_map/noise/exoplanet)) - var/datum/random_map/noise/exoplanet/RM = new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area, plant_colors) - get_biostuff(RM) - else - new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area) - + for (var/zlevel in map_z) var/list/edges edges += block(locate(1, 1, zlevel), locate(TRANSITIONEDGE, maxy, zlevel)) - edges |= block(locate(maxx-TRANSITIONEDGE+1, 1, zlevel),locate(maxx, maxy, zlevel)) + edges |= block(locate(maxx-TRANSITIONEDGE, 1, zlevel),locate(maxx, maxy, zlevel)) edges |= block(locate(1, 1, zlevel), locate(maxx, TRANSITIONEDGE, zlevel)) - edges |= block(locate(1, maxy-TRANSITIONEDGE+1, zlevel),locate(maxx, maxy, zlevel)) - for(var/turf/T in edges) - T.ChangeTurf(/turf/simulated/planet_edge) + edges |= block(locate(1, maxy-TRANSITIONEDGE, zlevel),locate(maxx, maxy, zlevel)) + for (var/turf/T in edges) + T.ChangeTurf(/turf/unsimulated/planet_edge) + var/padding = TRANSITIONEDGE + for (var/map_type in map_generators) + if (ispath(map_type, /datum/random_map/noise/exoplanet)) + new map_type(null,padding,padding,zlevel,maxx-padding,maxy-padding,0,1,1,planetary_area, plant_colors) + else + new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area) /obj/effect/overmap/visitable/sector/exoplanet/proc/generate_features() spawned_features = seedRuins(map_z, features_budget, possible_features, /area/exoplanet, maxx, maxy) diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm index 75e929113df..7d169505134 100644 --- a/code/modules/overmap/exoplanets/turfs.dm +++ b/code/modules/overmap/exoplanets/turfs.dm @@ -161,9 +161,8 @@ icon = 'icons/turf/flooring/misc.dmi' icon_state = "concrete" -//Special world edge turf - -/turf/simulated/planet_edge +//Special world edge turf, +/turf/unsimulated/planet_edge name = "world's edge" desc = "Government didn't want you to see this!" density = TRUE @@ -172,23 +171,22 @@ icon = null icon_state = null -/turf/simulated/planet_edge/Initialize() +/turf/unsimulated/planet_edge/Initialize() . = ..() var/obj/effect/overmap/visitable/sector/exoplanet/E = map_sectors["[z]"] if(!istype(E)) return - var/nx = x if (x <= TRANSITIONEDGE) - nx = x + (E.maxx - 2*TRANSITIONEDGE) - else if (x >= (E.maxx - TRANSITIONEDGE + 1)) - nx = x - (E.maxx - 2*TRANSITIONEDGE) + nx = x + (E.maxx - 2*TRANSITIONEDGE) - 1 + else if (x >= (E.maxx - TRANSITIONEDGE)) + nx = x - (E.maxx - 2*TRANSITIONEDGE) + 1 var/ny = y if(y <= TRANSITIONEDGE) - ny = y + (E.maxy - 2*TRANSITIONEDGE) - else if (y >= (E.maxy - TRANSITIONEDGE + 1)) - ny = y - (E.maxy - 2*TRANSITIONEDGE) + ny = y + (E.maxy - 2*TRANSITIONEDGE) - 1 + else if (y >= (E.maxy - TRANSITIONEDGE)) + ny = y - (E.maxy - 2*TRANSITIONEDGE) + 1 var/turf/NT = locate(nx, ny, z) if(NT) @@ -200,7 +198,7 @@ O.name = "distant terrain" O.desc = "You need to come over there to take a better look." -/turf/simulated/planet_edge/CollidedWith(atom/movable/A) +/turf/unsimulated/planet_edge/CollidedWith(atom/movable/A) . = ..() var/obj/effect/overmap/visitable/sector/exoplanet/E = map_sectors["[z]"] if(!istype(E)) @@ -210,12 +208,12 @@ var/new_x = A.x var/new_y = A.y if(x <= TRANSITIONEDGE) - new_x = E.maxx - TRANSITIONEDGE - else if (x >= (E.maxx - TRANSITIONEDGE + 1)) + new_x = E.maxx - TRANSITIONEDGE - 1 + else if (x >= (E.maxx - TRANSITIONEDGE)) new_x = TRANSITIONEDGE + 1 else if (y <= TRANSITIONEDGE) - new_y = E.maxy - TRANSITIONEDGE - else if (y >= (E.maxy - TRANSITIONEDGE + 1)) + new_y = E.maxy - TRANSITIONEDGE - 1 + else if (y >= (E.maxy - TRANSITIONEDGE)) new_y = TRANSITIONEDGE + 1 var/turf/T = locate(new_x, new_y, A.z) diff --git a/html/changelog.html b/html/changelog.html index 3c232715c3d..001897cf11e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,20 @@ -->
+

18 January 2022

+

MattAtlas updated:

+ +

Wowzewow updated:

+ +

17 January 2022

Geeves updated: