Skip to content

Quests, Ambush Refactor & Human NPC overhaul#5357

Open
dwasint wants to merge 85 commits intoMonkestation:mainfrom
dwasint:revert-removal
Open

Quests, Ambush Refactor & Human NPC overhaul#5357
dwasint wants to merge 85 commits intoMonkestation:mainfrom
dwasint:revert-removal

Conversation

@dwasint
Copy link

@dwasint dwasint commented Feb 22, 2026

About The Pull Request

This is like total difficulty spike across the board since human AI is DRASTICALLY more "resourceful"
ports: Azure-Peak/Azure-Peak#4206 & Azure-Peak/Azure-Peak#3507
with cleanup done around points I found weird.

New Human AI (still wip)

Why It's Good For The Game

Changelog

🆑
add: human npcs are more dynamic in their interaction
add: threat system to areas to scale ambush intensity, decreases as ambushes are spawned so FG can work
add: questing system
/:cl:

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@github-actions github-actions bot added the MERGE CONFLICT This PR has conflicting changes with the main branch and can't be merged label Feb 26, 2026
@github-actions github-actions bot removed the MERGE CONFLICT This PR has conflicting changes with the main branch and can't be merged label Feb 26, 2026
return ..()

/datum/controller/subsystem/regionthreat/fire(resumed)
var/player_count = GLOB.player_list.len
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var/player_count = GLOB.player_list.len
var/player_count = length(get_active_player_count(alive_check = TRUE))

Comment on lines +18 to +19
for(var/T in threat_regions)
var/datum/threat_region/TR = T
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for(var/T in threat_regions)
var/datum/threat_region/TR = T
for(var/datum/threat_region/TR as anything in threat_regions)

Comment on lines +26 to +27
for(var/T in threat_regions)
var/datum/threat_region/TR = T
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for(var/T in threat_regions)
var/datum/threat_region/TR = T
for(var/datum/threat_region/TR as anything in threat_regions)

Comment on lines +39 to +40
for(var/T in threat_regions)
var/datum/threat_region/TR = T
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for(var/T in threat_regions)
var/datum/threat_region/TR = T
for(var/datum/threat_region/TR as anything in threat_regions)


var/converted_type

var/threat_region = "" // Key used to look up threat region this area belongs to
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tie this to an area typecache instead?

@@ -0,0 +1,104 @@
/obj/item/clothing/barding
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it clothing?

/obj/structure/fluff/traveltile/proc/resolve_destination_area()
if(!aportalgoesto)
return
for(var/obj/structure/fluff/traveltile/other in GLOB.traveltiles) // or however you iterate portals
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for(var/obj/structure/fluff/traveltile/other in GLOB.traveltiles) // or however you iterate portals
for(var/obj/structure/fluff/traveltile/other as anything in GLOB.traveltiles) // or however you iterate portals

grid_height = 32
grid_width = 32
dropshrink = 0.6
var/obj/item/reagent_containers/food/snacks/food = null // The food item wrapped in the ration
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Destroy


/mob/living/carbon/human/species/human/northern/highwayman
ai_controller = /datum/ai_controller/human_npc
faction = list("viking", "station")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faction defines please?


/mob/living/carbon/human/species/human/northern/deranged_knight
ai_controller = /datum/ai_controller/human_npc
faction = list("dundead")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dundead or undead?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Maintenance Fixing this mess one line at a time Mapping You changed a map file, thank you for your tiles. May require additional approval.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants