mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] Initialize fixing (#10335)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2e725a0727
commit
ce2446922e
@@ -192,7 +192,7 @@
|
||||
color = "#eacd7c"
|
||||
VIRGO2_SET_ATMOS
|
||||
|
||||
/turf/unsimulated/floor/sky/virgo2_sky/Initialize()
|
||||
/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload)
|
||||
skyfall_levels = list(z+1)
|
||||
. = ..()
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
skybox_pixel_x = 0
|
||||
skybox_pixel_y = 0
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo2/Initialize()
|
||||
/obj/effect/overmap/visitable/sector/virgo2/Initialize(mapload)
|
||||
for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world)
|
||||
docking_codes = sd.docking_codes
|
||||
. = ..()
|
||||
@@ -125,7 +125,7 @@
|
||||
color = "#eacd7c"
|
||||
VIRGO2_SET_ATMOS
|
||||
|
||||
/turf/unsimulated/floor/sky/virgo2_sky/Initialize()
|
||||
/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload)
|
||||
skyfall_levels = list(z+1)
|
||||
. = ..()
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
var/area/dump_area
|
||||
var/obj/shuttle_connector/shuttle_friend
|
||||
|
||||
/area/shuttle/excursion/away_alienship/Initialize()
|
||||
/area/shuttle/excursion/away_alienship/Initialize(mapload)
|
||||
. = ..()
|
||||
dump_area = locate(/area/tether_away/alienship/equip_dump)
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
name = "away mission initializer - beachcave"
|
||||
|
||||
//In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself
|
||||
/obj/away_mission_init/beachcave/Initialize()
|
||||
/obj/away_mission_init/beachcave/Initialize(mapload)
|
||||
// Cave submaps are first.
|
||||
/*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal)
|
||||
seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep)
|
||||
@@ -119,14 +119,14 @@
|
||||
|
||||
// These are step-teleporters, for map edge transitions
|
||||
// This top one goes INTO the cave
|
||||
/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize()
|
||||
/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize(mapload)
|
||||
. = ..()
|
||||
teleport_x = src.x //X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach
|
||||
teleport_y = 2 //2 is because it's putting you on row 2 of the map to the north
|
||||
teleport_z = z+1 //The cave is always our Z-level plus 1, because it's loaded after us
|
||||
|
||||
//This one goes OUT OF the cave
|
||||
/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize()
|
||||
/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize(mapload)
|
||||
. = ..()
|
||||
teleport_x = src.x //Same reason as bove
|
||||
teleport_y = world.maxy - 1 //This means "1 space from the top of the map"
|
||||
@@ -139,7 +139,7 @@
|
||||
name = "Water"
|
||||
icon_state = "water"
|
||||
|
||||
/turf/simulated/floor/beach/coastwater/Initialize()
|
||||
/turf/simulated/floor/beach/coastwater/Initialize(mapload)
|
||||
. = ..()
|
||||
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1))
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
/obj/away_mission_init/debrisfield
|
||||
name = "away mission initializer - debrisfield"
|
||||
|
||||
/obj/away_mission_init/debrisfield/Initialize()
|
||||
/obj/away_mission_init/debrisfield/Initialize(mapload)
|
||||
flags |= ATOM_INITIALIZED
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
has_gravity = FALSE
|
||||
|
||||
|
||||
/area/submap/debrisfield/phoron_tanker/Initialize()
|
||||
/area/submap/debrisfield/phoron_tanker/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/tsc/nanotrasen]
|
||||
ic_name = pick(O.ship_names)
|
||||
@@ -153,7 +153,7 @@
|
||||
landmark_tag = "debris_field_yacht_start"
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/luxury_boat
|
||||
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/luxury_boat/Initialize()
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/luxury_boat/Initialize(mapload)
|
||||
var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time
|
||||
LAZYINITLIST(O.initial_restricted_waypoints)
|
||||
O.initial_restricted_waypoints["Luxury Yacht"] = list(landmark_tag)
|
||||
@@ -166,7 +166,7 @@
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Luxury Yacht"
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize()
|
||||
/obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/elysia]
|
||||
var/newname = "ECS-T [pick(O.ship_names)]"
|
||||
@@ -244,7 +244,7 @@
|
||||
landmark_tag = "debris_field_carrier_start"
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/tinycarrier
|
||||
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier/Initialize()
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier/Initialize(mapload)
|
||||
var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time
|
||||
LAZYINITLIST(O.initial_restricted_waypoints)
|
||||
O.initial_restricted_waypoints["Debris Carrier"] = list(landmark_tag)
|
||||
@@ -257,7 +257,7 @@
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Debris Carrier"
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/tinycarrier/Initialize()
|
||||
/obj/effect/overmap/visitable/ship/landable/tinycarrier/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/other/sysdef]
|
||||
var/newname = "SDV [pick(O.ship_names)]"
|
||||
@@ -292,7 +292,7 @@
|
||||
/obj/mecha/combat/fighter/baron/busted
|
||||
starting_components = list(/obj/item/mecha_parts/component/hull/lightweight,/obj/item/mecha_parts/component/actuator/hispeed,/obj/item/mecha_parts/component/armor,/obj/item/mecha_parts/component/gas,/obj/item/mecha_parts/component/electrical/high_current)
|
||||
|
||||
/obj/mecha/combat/fighter/baron/busted/Initialize()
|
||||
/obj/mecha/combat/fighter/baron/busted/Initialize(mapload)
|
||||
. = ..()
|
||||
health = round(rand(50,120))
|
||||
cell?.charge = 0
|
||||
@@ -304,7 +304,7 @@
|
||||
|
||||
setInternalDamage(MECHA_INT_SHORT_CIRCUIT)
|
||||
|
||||
/obj/structure/fuel_port/empty_tank/Initialize()
|
||||
/obj/structure/fuel_port/empty_tank/Initialize(mapload)
|
||||
. = ..()
|
||||
var/obj/item/tank/phoron/T = locate() in src
|
||||
if(T)
|
||||
|
||||
Reference in New Issue
Block a user