linter fix 1

Foundation-19 · Mar 29, 2024 · b3416ae · b3416ae
1 parent a46db2f
commit b3416ae
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 44 deletions.
diff --git a/_maps/pahrump-everything.json b/_maps/pahrump-everything.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RockSprings.dmm",
 		"RockSprings-Upper.dmm",
 		"RedRiver.dmm",

diff --git a/_maps/pahrump-garland.json b/_maps/pahrump-garland.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "East Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"Garland-City.dmm"
 	],
 	"station_ruin_budget":0,

diff --git a/_maps/pahrump-redriver-garland.json b/_maps/pahrump-redriver-garland.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "North East Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RedRiver.dmm",
 		"Garland-City.dmm"
 	],

diff --git a/_maps/pahrump-redriver.json b/_maps/pahrump-redriver.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "North Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RedRiver.dmm"
 	],
 	"station_ruin_budget":0,

diff --git a/_maps/pahrump-rocksprings-garland.json b/_maps/pahrump-rocksprings-garland.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "South East Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RockSprings.dmm",
 		"RockSprings-Upper.dmm",
 		"Garland-City.dmm"

diff --git a/_maps/pahrump-rocksprings-redriver.json b/_maps/pahrump-rocksprings-redriver.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "West Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RockSprings.dmm",
 		"RockSprings-Upper.dmm",
 		"RedRiver.dmm"

diff --git a/_maps/pahrump-rocksprings.json b/_maps/pahrump-rocksprings.json
@@ -1,12 +1,12 @@
 {
 	"map_name": "South Texarkana",
-	"map_path": "map_files/Pahrump-Sunset",
+	"map_path": "map_files/Pahrump-AB",
 	"map_file": [
 		"Dungeons.dmm",
-		"Pahrump-Sunset-Lower.dmm",
-		"Pahrump-Sunset.dmm",
-		"Pahrump-Sunset-Upper.dmm",
-		"Pahrump-Sunset-Upper-2.dmm",
+		"Pahrump-AB-Lower.dmm",
+		"Pahrump-AB.dmm",
+		"Pahrump-AB-Upper.dmm",
+		"Pahrump-AB-Upper-2.dmm",
 		"RockSprings.dmm",
 		"RockSprings-Upper.dmm"
 	],

diff --git a/code/datums/components/crafting/recipes/recipes_medicine.dm b/code/datums/components/crafting/recipes/recipes_medicine.dm
@@ -148,8 +148,8 @@
 	time = 40
 	category = CAT_MEDICAL
 
- /* 
- /datum/crafting_recipe/stimpak 
+ /*
+ /datum/crafting_recipe/stimpak
 	name = "Stimpak"
 	result = /obj/item/reagent_containers/hypospray/medipen/stimpak
 	reqs = list(/obj/item/reagent_containers/food/snacks/grown/broc = 1,

diff --git a/code/modules/mob/special_stats.dm b/code/modules/mob/special_stats.dm
@@ -129,7 +129,7 @@ proc/get_top_level_mob(mob/S)
 /// CHARISMA
 
 /mob/living/carbon/human/initialize_special_charisma()
-	RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(handle_special_charisma_examine_moodlet))
+	RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(handle_special_charisma_examine_moodlet), TRUE)
 
 /mob/living/carbon/human/Destroy()
 	UnregisterSignal(src, COMSIG_PARENT_EXAMINE)

diff --git a/dependencies.sh b/dependencies.sh
@@ -4,8 +4,8 @@
 #Final authority on what's required to fully build the project
 
 # byond version
-export BYOND_MAJOR=514
-export BYOND_MINOR=1571
+export BYOND_MAJOR=51
+export BYOND_MINOR=1633
 
 #rust_g git tag
 export RUST_G_VERSION=3.1.0

diff --git a/fallout/code/modules/QuestMachines/assets.dm b/fallout/code/modules/QuestMachines/assets.dm
@@ -16,4 +16,4 @@
 		"employer_13.png" = 'icons/bounty_employers/employer_13.png',
 		"employer_14.png" = 'icons/bounty_employers/employer_14.png',
 		"employer_15.png" = 'icons/bounty_employers/employer_15.png'
-	)
+	)
diff --git a/fallout/code/modules/QuestMachines/bounty_quests.dm b/fallout/code/modules/QuestMachines/bounty_quests.dm
@@ -202,4 +202,4 @@
 	employer_icon = "employer_00.png"
 	need_message = "We're looking to see if there's any difference between Texan deathclaws and the deathclaws back west, we'd like to dissect a body. Bring us a deathclaw corpse intact and we'll pay you 1200 caps"
 	target_items = list(/obj/item/nuke_core = 1)
-	caps_reward = 6500
+	caps_reward = 6500
diff --git a/fallout/code/modules/QuestMachines/coureer.dm b/fallout/code/modules/QuestMachines/coureer.dm
@@ -214,4 +214,5 @@
 		vend_mode = 1
 	if(href_list["removecaps"])
 		remove_all_caps()
-	ShowUI()
+	ShowUI()
+
diff --git a/fallout/code/modules/QuestMachines/quests/coureer.dm b/fallout/code/modules/QuestMachines/quests/coureer.dm
@@ -6,4 +6,5 @@
 	need_message = "Deliver the package and return the stamp."
 	end_message = "The Postal Service is proud of you!"
 	target_items = list(/obj/item/mark = 1)
-	caps_reward = 500
+	caps_reward = 500
+