diff --git a/_maps/pahrump-everything.json b/_maps/pahrump-everything.json index 3d87a258ee6..cdef72a9df0 100644 --- 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 index b78ca64dd99..4ada617661b 100644 --- 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 index 84921118247..19b1d9455eb 100644 --- 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 index 692966c6b3b..fefe242dde8 100644 --- 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 index 7ddcebc29db..02e30ca76ea 100644 --- 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 index 150550da1d7..9d48fae50b8 100644 --- 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 index 218ed6abe3e..2bc916655c2 100644 --- 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 index 6b6916325f0..b7a4956c3ce 100644 --- 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 index 19952a7bae0..3eab666f135 100644 --- 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 index 1930330a73e..af9d10af0ea 100644 --- 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 index 1a5228a0bbb..663940ea2df 100644 --- 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' - ) \ No newline at end of file + ) diff --git a/fallout/code/modules/QuestMachines/bounty_quests.dm b/fallout/code/modules/QuestMachines/bounty_quests.dm index a354627e4c9..3084824649b 100644 --- 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 \ No newline at end of file + caps_reward = 6500 diff --git a/fallout/code/modules/QuestMachines/coureer.dm b/fallout/code/modules/QuestMachines/coureer.dm index 5eadf1a4676..25d1a5acd90 100644 --- 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() \ No newline at end of file + ShowUI() + \ No newline at end of file diff --git a/fallout/code/modules/QuestMachines/quests/coureer.dm b/fallout/code/modules/QuestMachines/quests/coureer.dm index c93d47d7553..1544c77a1dc 100644 --- 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 \ No newline at end of file + caps_reward = 500 + \ No newline at end of file