Exodus

.github/workflows/cancel.yml

@@ -2,7 +2,7 @@ name: Cancel
 on:
   push:
     branches:
-      - dev
+      - master
 
 jobs:
   cancel:

.github/workflows/changelog_generation.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   CompileCL:
     runs-on: ubuntu-latest
-    if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks
+    if: github.repository == 'Project-Wildflower/Wildflower' # to prevent this running on forks
     steps:
       - name: Checkout
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

.github/workflows/make_changelogs.yml

@@ -3,12 +3,12 @@ name: Make changelogs
 on:
   push:
     branches:
-    - dev
+    - master
 
 jobs:
   MakeCL:
     runs-on: ubuntu-latest
-    if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks
+    if: github.repository == 'Project-Wildflower/Wildflower' # to prevent this running on forks
     steps:
       - name: Checkout
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

.github/workflows/test.yml

@@ -3,13 +3,13 @@ name: Run Tests
 on:
   push:
     branches:
-      - dev
+      - master
   pull_request:
     branches:
-      - dev
+      - master
 env:
-  BYOND_MAJOR: "512"
-  BYOND_MINOR: "1485"
+  BYOND_MAJOR: "514"
+  BYOND_MINOR: "1557"
   SPACEMAN_DMM_VERSION: suite-1.7
 
 jobs:
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, torch, away_sites_testing]
+        map_path: [example, torch, exodus, away_sites_testing]
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache

baystation12.dme

@@ -3222,6 +3222,8 @@
 #include "maps\away\away_sites.dm"
 #include "maps\away_sites_testing\away_sites_testing_define.dm"
 #include "maps\example\example_define.dm"
+#include "maps\exodus\exodus.dm"
+#include "maps\exodus\exodus_define.dm"
 #include "maps\random_ruins\exoplanet_ruins\exoplanet_ruins.dm"
 #include "maps\random_ruins\exoplanet_ruins\crashed_pod\crashed_pod.dm"
 #include "maps\random_ruins\exoplanet_ruins\datacapsule\datacapsule.dm"
@@ -3244,7 +3246,6 @@
 #include "maps\random_ruins\exoplanet_ruins\tar_anomaly\tar_anomaly.dm"
 #include "maps\random_ruins\exoplanet_ruins\trash_heap\trash_heap.dm"
 #include "maps\random_ruins\space_ruins\space_ruins.dm"
-#include "maps\torch\torch.dm"
 #include "maps\torch\torch_define.dm"
 #include "maps\~mapsystem\map_preferences.dm"
 #include "maps\~mapsystem\map_ranks.dm"
@@ -3254,5 +3255,6 @@
 #include "maps\~mapsystem\maps_jobs.dm"
 #include "maps\~mapsystem\maps_unit_testing.dm"
 #include "maps\~unit_tests\unit_testing.dm"
+#include "wildflower\code\modules\landmarks.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE

code/game/machinery/doors/airlock_control.dm

@@ -147,6 +147,7 @@
 	name = "airlock sensor"
 
 	anchored = TRUE
+	layer = ABOVE_WINDOW_LAYER
 	power_channel = ENVIRON
 
 	var/master_tag
@@ -231,6 +232,7 @@
 	name = "access button"
 
 	anchored = TRUE
+	layer = ABOVE_WINDOW_LAYER
 	power_channel = ENVIRON
 
 	var/master_tag

code/game/machinery/doors/multi_tile.dm

@@ -46,6 +46,7 @@
 			set_dir(WEST)
 	else
 		set_dir(SOUTH)
+	SetBounds() //We may have made directional edits. Need to make sure. Wildflower edit.
 
 /obj/machinery/door/airlock/multi_tile/update_connections(var/propagate = 0)
 	var/dirs = 0
@@ -183,4 +184,4 @@
 	stripe_color = COLOR_AMBER
 
 /obj/machinery/door/airlock/multi_tile/glass/civilian
-	stripe_color = COLOR_CIVIE_GREEN
+	stripe_color = COLOR_CIVIE_GREEN

code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm

@@ -51,7 +51,7 @@
 
 /obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/nanoui/master_ui = null, var/datum/topic_state/state = GLOB.default_state)
 	var/data[0]
-	var/datum/computer/file/embedded_program/airlock/multi_docking/airlock_program
+	var/datum/computer/file/embedded_program/airlock/multi_docking/airlock_program = program // Wildflower change.
 
 	data = list(
 		"chamber_pressure" = round(airlock_program.memory["chamber_sensor_pressure"]),
@@ -61,6 +61,7 @@
 		"docking_status" = airlock_program.master_status,
 		"airlock_disabled" = (airlock_program.docking_enabled && !airlock_program.override_enabled),
 		"override_enabled" = airlock_program.override_enabled,
+		"name" = airlock_program.master_tag //This thing is meant to be used as a mapin, this should probably be reading a var somewhere but this works for now. Wildflower change.
 	)
 
 	ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open)

code/game/machinery/embedded_controller/embedded_controller_base.dm

@@ -1,6 +1,7 @@
 /obj/machinery/embedded_controller
 	name = "Embedded Controller"
 	anchored = TRUE
+	layer = ABOVE_WINDOW_LAYER //Wildflower change
 	idle_power_usage = 10
 	var/datum/computer/file/embedded_program/program	//the currently executing program
 	var/on = 1
@@ -77,7 +78,7 @@ obj/machinery/embedded_controller/radio/Destroy()
 		if(docking_program.override_enabled)
 			overlays += image(icon, "indicator_forced")
 		airlock_program = docking_program.airlock_program
-	
+
 	if(istype(airlock_program) && airlock_program.memory["processing"])
 		if(airlock_program.memory["pump_status"] == "siphon")
 			overlays += image(icon, "screen_drain")

code/game/machinery/nuclear_bomb.dm

@@ -157,7 +157,7 @@ var/bomb_set
 		extended = 1
 		if(!src.lighthack)
 			flick("lock", src)
-			update_icon()	
+			update_icon()
 
 /obj/machinery/nuclearbomb/interface_interact(mob/user as mob)
 	if(extended && !panel_open)
@@ -413,7 +413,7 @@ var/bomb_set
 
 /obj/item/folder/envelope/nuke_instructions/Initialize()
 	. = ..()
-	var/obj/item/paper/R = new(src)
+	var/obj/item/paper/R = new(src) //Wildflower Start (Modified instructions to remove references to exact rod round)
 	R.set_content("<center><img src=sollogo.png><br><br>\
 	<b>Warning: Classified<br>[GLOB.using_map.station_name] Self-Destruct System - Instructions</b></center><br><br>\
 	In the event of a Delta-level emergency, this document will guide you through the activation of the vessel's \
@@ -435,6 +435,7 @@ var/bomb_set
 	13) When ready, disable the safety switch.<br>\
 	14) Start the countdown.<br><br>\
 	This concludes the instructions.", "vessel self-destruct instructions")
+//Wildflower end
 
 	//stamp the paper
 	var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -459,7 +460,7 @@ var/bomb_set
 	var/announced = 0
 	var/time_to_explosion = 0
 	var/self_destruct_cutoff = 60 //Seconds
-	timeleft = 300 
+	timeleft = 300
 	minTime = 300
 	maxTime = 900
 

code/game/machinery/nuke_cylinder_dispenser.dm

@@ -3,7 +3,7 @@
 	desc = "It's a secure, armored storage unit embeded into the floor for storing the nuclear cylinders."
 	icon = 'icons/obj/machines/self_destruct.dmi'
 	icon_state = "base"
-	anchored = TRUE	
+	anchored = TRUE
 	density = FALSE
 	req_access = list(access_heads_vault)
 

code/game/objects/effects/misc.dm

@@ -66,6 +66,13 @@ obj/effect/paint/palegreengray
 /obj/effect/paint/brown
 	color = COLOR_DARK_BROWN
 
+//Yo why this shit exist in another file to make multimap suffering -TT
+/obj/effect/paint/sol
+	color = COLOR_SOL
+
+/obj/effect/paint/sol_expeditionary
+	color = "#68099e"
+
 //Stripes the wall it spawns on, then dies
 /obj/effect/paint_stripe
 	name = "stripe of paint"
@@ -130,4 +137,4 @@ obj/effect/paint/palegreengray
 		P.air_temporary = new(P.volume, tempurature)
 		var/datum/gas_mixture/G = P.air_temporary
 		G.adjust_gas(GAS_OXYGEN,((pressure*P.volume)/(R_IDEAL_GAS_EQUATION*temperature)))
-	return INITIALIZE_HINT_QDEL
+	return INITIALIZE_HINT_QDEL

code/game/objects/items/weapons/cards_ids.dm

@@ -130,7 +130,7 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/card/emag/Initialize()
 	. = ..()
 	set_extension(src,/datum/extension/chameleon/emag)
-	
+
 /obj/item/card/emag/get_antag_info()
 	. = ..()
 	. += "You can use this cryptographic sequencer in order to subvert electronics or forcefully open doors you don't have access to. These actions are irreversible and the card only has a limited number of charges!"
@@ -337,7 +337,7 @@ var/const/NO_EMAG_ACT = -50
 				id.military_branch = new_branch
 				id.military_rank = null
 			return
-	
+
 	to_chat(client, SPAN_WARNING("Input, must be an existing branch - [var_value] is invalid"))
 
 /decl/vv_set_handler/id_card_military_rank
@@ -366,7 +366,7 @@ var/const/NO_EMAG_ACT = -50
 		if(new_rank)
 			id.military_rank = new_rank
 			return
-	
+
 	to_chat(client, SPAN_WARNING("Input must be an existing rank belonging to military_branch - [var_value] is invalid"))
 
 /obj/item/card/id/silver

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -160,4 +160,9 @@ var/global/list/stool_cache = list() //haha stool
 //Generated subtypes for mapping porpoises
 
 /obj/item/stool/wood/New(var/newloc)
-	..(newloc,MATERIAL_WOOD)
+	..(newloc,MATERIAL_WOOD)
+
+//Wildflower Start
+/obj/item/stool/wood_yew/New(var/newloc)
+	..(newloc,MATERIAL_YEW)
+//Wildflower End

code/modules/clothing/_clothing.dm

@@ -57,7 +57,7 @@
 			bloodsies.appearance_flags |= NO_CLIENT_COLOR
 			ret.overlays	+= bloodsies
 
-	if(accessories.len)
+	if(accessories?.len)
 		for(var/obj/item/clothing/accessory/A in accessories)
 			ret.overlays |= A.get_mob_overlay(user_mob, slot)
 	return ret

code/modules/clothing/suits/jobs.dm

@@ -123,11 +123,13 @@
 	name = "red jacket"
 	desc = "A red forensics technician jacket."
 	icon_state = "forensics_red"
+	item_state = "forensics_red"
 
 /obj/item/clothing/suit/storage/forensics/blue
 	name = "blue jacket"
 	desc = "A blue forensics technician jacket."
 	icon_state = "forensics_blue"
+	item_state = "forensics_blue"
 
 //Engineering
 /obj/item/clothing/suit/storage/hazardvest

code/modules/materials/material_sheets.dm

@@ -29,7 +29,7 @@
 	if(default_reinf_type)
 		reinf_material = SSmaterials.get_material_by_name(default_reinf_type)
 	base_state = icon_state
-	
+
 	if(!stacktype)
 		stacktype = material.stack_type
 	if(islist(material.stack_origin_tech))
@@ -47,7 +47,7 @@
 	if(!material)
 		return
 	recipes = material.get_recipes(reinf_material && reinf_material.name)
-	..() 
+	..()
 
 /obj/item/stack/material/get_codex_value()
 	return (material && !material.hidden_from_codex) ? "[lowertext(material.display_name)] (material)" : ..()
@@ -75,7 +75,7 @@
 
 	if(material_flags & USE_MATERIAL_PLURAL_NAME)
 		plural_name = material.sheet_plural_name
-	
+
 	if(amount>1)
 		SetName("[material.use_name] [plural_name]")
 		desc = "A stack of [material.use_name] [plural_name]."
@@ -190,7 +190,7 @@
 	amount = 10
 
 /obj/item/stack/material/uranium
-	name = "nuranium"
+	name = "uranium"//WF Fix
 	icon_state = "sheet-faery-uranium"
 	plural_icon_state = "sheet-faery-uranium-mult"
 	max_icon_state = "sheet-faery-uranium-max"
@@ -483,7 +483,7 @@
 	default_type = MATERIAL_GLASS
 
 /obj/item/stack/material/glass/on_update_icon()
-	if(reinf_material) 
+	if(reinf_material)
 		icon_state = "sheet-glass-reinf"
 		base_state = icon_state
 		plural_icon_state = "sheet-glass-reinf-mult"

code/modules/modular_computers/computers/subtypes/preset_tablet.dm

@@ -59,3 +59,34 @@
 		os.create_file(new/datum/computer_file/program/email_client())
 		os.create_file(new/datum/computer_file/program/records())
 		os.create_file(new/datum/computer_file/program/wordprocessor())
+
+//Wildflower Start
+
+/obj/item/modular_computer/tablet/lease/preset/medical
+	desc = "A small, portable microcomputer. This one has a white and red stripe, and a serial number stamped into the case."
+	icon_state = "tabletmed"
+	icon_state_unpowered = "tabletmed"
+
+/obj/item/modular_computer/tablet/lease/preset/medical/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/stock_parts/computer/processor_unit/small(src)
+	tesla_link = new/obj/item/stock_parts/computer/tesla_link(src)
+	hard_drive = new/obj/item/stock_parts/computer/hard_drive(src)
+	network_card = new/obj/item/stock_parts/computer/network_card(src)
+	nano_printer = new/obj/item/stock_parts/computer/nano_printer(src)
+	card_slot = new/obj/item/stock_parts/computer/card_slot/broadcaster(src)
+	battery_module = new/obj/item/stock_parts/computer/battery_module(src)
+	battery_module.charge_to_full()
+	scanner = new /obj/item/stock_parts/computer/scanner/medical(src)
+
+/obj/item/modular_computer/tablet/lease/preset/medical/install_default_programs()
+	..()
+	var/datum/extension/interactive/ntos/os = get_extension(src, /datum/extension/interactive/ntos)
+	if(os)
+		os.create_file(new/datum/computer_file/program/reports())
+		os.create_file(new/datum/computer_file/program/suit_sensors())
+		os.create_file(new/datum/computer_file/program/email_client())
+		os.create_file(new/datum/computer_file/program/records())
+		os.create_file(new/datum/computer_file/program/wordprocessor())
+
+//Wildflower End

code/modules/recycling/sortingmachinery.dm

@@ -261,6 +261,10 @@
 	if(istype(target, /obj/item/smallDelivery) || istype(target,/obj/structure/bigDelivery) \
 	|| istype(target, /obj/item/gift) || istype(target, /obj/item/evidencebag))
 		return
+	//Wildflower Change Start - Fix Package Wrap being unstackable
+	if(istype(target, /obj/item/stack/package_wrap))
+		return
+	//Wildflower Change End
 	if(target.anchored)
 		return
 	if(target in user)
@@ -418,7 +422,7 @@
 			if(AM.loc.y != src.loc.y-1) return
 		if(WEST)
 			if(AM.loc.x != src.loc.x-1) return
-			
+
 	var/mob/living/L = AM
 	if (istype(L) && L.ckey)
 		log_and_message_admins("has flushed themselves down \the [src].", L)
@@ -507,4 +511,4 @@
 	matter = null
 	uses_charge = 1
 	charge_costs = list(1)
-	stacktype = /obj/item/stack/package_wrap
+	stacktype = /obj/item/stack/package_wrap

code/modules/shuttles/landmarks.dm

@@ -7,6 +7,7 @@
 	unacidable = TRUE
 	simulated = FALSE
 	invisibility = 101
+	layer = OBFUSCATION_LAYER // Wildflower change.
 
 	var/landmark_tag
 	//ID of the controller on the dock side