From 391d91132c3698db0ec989766d83b6ef73db8e2b Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 4 Apr 2019 23:23:30 +0200 Subject: [PATCH] Fix code review issues (planetary_atmos and Initialize()) --- code/LINDA/LINDA_turf_tile.dm | 2 -- code/game/objects/effects/decals/decal.dm | 4 ++-- code/game/objects/effects/mapping_helpers.dm | 8 ++------ code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/turfs/simulated/floor/chasm.dm | 1 - .../mob/living/simple_animal/hostile/megafauna/swarmer.dm | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 82a3642c2b4..f186a2e0cf3 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -54,8 +54,6 @@ var/atmos_overlay_type = "" //current active overlay - var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time - /turf/simulated/New() ..() if(!blocks_air) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index ace2e9940ea..31ae7ab68de 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -3,8 +3,8 @@ icon_state = "warningline" layer = TURF_DECAL_LAYER -/obj/effect/turf_decal/Initialize() - ..() +/obj/effect/turf_decal/Initialize(mapload) + . = ..() qdel(src) // return INITIALIZE_HINT_QDEL <-- Doesn't work /obj/effect/turf_decal/ComponentInitialize() diff --git a/code/game/objects/effects/mapping_helpers.dm b/code/game/objects/effects/mapping_helpers.dm index 54cd43a88c3..0f1f5216ecf 100644 --- a/code/game/objects/effects/mapping_helpers.dm +++ b/code/game/objects/effects/mapping_helpers.dm @@ -7,11 +7,7 @@ layer = POINT_LAYER -/obj/effect/baseturf_helper/Initialize() - . = ..() - return INITIALIZE_HINT_LATELOAD - -/obj/effect/baseturf_helper/Initialize() +/obj/effect/baseturf_helper/Initialize(mapload) . = ..() var/area/thearea = get_area(src) for(var/turf/T in get_area_turfs(thearea, z)) @@ -63,7 +59,7 @@ icon_state = "" var/late = FALSE -/obj/effect/mapping_helpers/Initialize() +/obj/effect/mapping_helpers/Initialize(mapload) ..() return late ? INITIALIZE_HINT_LATELOAD : qdel(src) // INITIALIZE_HINT_QDEL <-- Doesn't work diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index f8487e3ec18..5f131758502 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -75,7 +75,7 @@ //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. var/list/strong_against -/obj/item/melee/flyswatter/Initialize() +/obj/item/melee/flyswatter/Initialize(mapload) . = ..() strong_against = typecacheof(list( /mob/living/simple_animal/hostile/poison/bees/, diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index 4968b8963ab..5abfeba6a0e 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -122,7 +122,6 @@ oxygen = 14 nitrogen = 23 temperature = 300 - planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface light_range = 1.9 //slightly less range than lava light_power = 0.65 //less bright, too diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 307c0561f95..20b2b7d358f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa var/static/list/swarmer_caps -/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize() +/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize(mapload) . = ..() swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits for(var/ddir in cardinal)