mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
Init Sanity Unit Test (#25442)
* Init Sanity Unit Test * Oops * Update code/modules/unit_tests/init_sanity.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Makes noticeboard less silly --------- Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
co-authored by
Contrabang
DGamerL
parent
23ad8a48fa
commit
03cca11f95
@@ -532,7 +532,7 @@
|
||||
var/target_area = /area/mine/unexplored
|
||||
|
||||
/obj/docking_port/stationary/random/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
var/list/turfs = get_area_turfs(target_area)
|
||||
var/turf/T = pick(turfs)
|
||||
src.loc = T
|
||||
|
||||
@@ -808,6 +808,8 @@
|
||||
var/admin_controlled
|
||||
var/max_connect_range = 7
|
||||
var/moved = FALSE //workaround for nukie shuttle, hope I find a better way to do this...
|
||||
/// Do we want to search for shuttle destinations as part of Initialize (fixed) or LateInitialize (variable)
|
||||
var/find_destinations_in_late_init = FALSE
|
||||
|
||||
/obj/machinery/computer/shuttle/New(location, obj/item/circuitboard/shuttle/C)
|
||||
..()
|
||||
@@ -817,6 +819,12 @@
|
||||
|
||||
/obj/machinery/computer/shuttle/Initialize(mapload)
|
||||
. = ..()
|
||||
if(find_destinations_in_late_init && mapload) // We only care about this in mapload, if its mid round its fine
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
connect()
|
||||
|
||||
/obj/machinery/computer/shuttle/LateInitialize()
|
||||
connect()
|
||||
|
||||
/obj/machinery/computer/shuttle/proc/connect()
|
||||
@@ -952,27 +960,7 @@
|
||||
circuit = /obj/item/circuitboard/white_ship
|
||||
shuttleId = "whiteship"
|
||||
possible_destinations = null // Set at runtime
|
||||
|
||||
/obj/machinery/computer/shuttle/white_ship/Initialize(mapload)
|
||||
if(mapload)
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
return ..()
|
||||
|
||||
// Yes. This is disgusting, but the console needs to be loaded AFTER the docking ports load.
|
||||
/obj/machinery/computer/shuttle/white_ship/LateInitialize()
|
||||
Initialize()
|
||||
|
||||
/obj/machinery/computer/shuttle/engineering
|
||||
name = "Engineering Shuttle Console"
|
||||
desc = "Used to call and send the engineering shuttle."
|
||||
shuttleId = "engineering"
|
||||
possible_destinations = "engineering_home;engineering_away"
|
||||
|
||||
/obj/machinery/computer/shuttle/science
|
||||
name = "Science Shuttle Console"
|
||||
desc = "Used to call and send the science shuttle."
|
||||
shuttleId = "science"
|
||||
possible_destinations = "science_home;science_away"
|
||||
find_destinations_in_late_init = TRUE
|
||||
|
||||
/obj/machinery/computer/shuttle/admin
|
||||
name = "admin shuttle console"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
var/blocking_item = "ERR_UNKNOWN"
|
||||
|
||||
/obj/docking_port/mobile/supply/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
for(var/T in subtypesof(/datum/economy/simple_seller))
|
||||
var/datum/economy/simple_seller/seller = new T
|
||||
simple_sellers += seller
|
||||
|
||||
Reference in New Issue
Block a user