Skip to content

Commit

Permalink
nits
Browse files Browse the repository at this point in the history
  • Loading branch information
Zonespace27 committed Sep 19, 2024
1 parent 6927928 commit 7d6a687
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/human_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define HUMAN_AI_GRENADES "grenades"

#define AI_ACTION_APPROACH /datum/ongoing_action/approach_target
#define AI_ACTION_APPROACH_C /datum/ongoing_action/approach_target/carefully
#define AI_ACTION_APPROACH_CAREFUL /datum/ongoing_action/approach_target/carefully
#define AI_ACTION_RETREAT /datum/ongoing_action/retreat_from_target
#define AI_ACTION_PICKUP /datum/ongoing_action/item_pickup
#define AI_ACTION_PICKUP_GUN /datum/ongoing_action/item_pickup/pickup_primary
Expand Down
2 changes: 1 addition & 1 deletion code/_compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@

//#define UNIT_TESTS //If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between

// #define TESTING
#define TESTING
// #define REFERENCE_TRACKING
// #define GC_FAILURE_HARD_LOOKUP
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
if(slot_type)
equipment_map[slot_type][object_ref] = object_loc

appraise_inventory()


/// Whenever an item is deleted, purge it from anywhere it may be stored in here
/datum/human_ai_brain/proc/on_item_delete(obj/item/source, force)
SIGNAL_HANDLER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,12 @@

if(get_dist(tied_human, current_target) > gun_data.maximum_range)
end_gun_fire()
if(!in_cover)
ADD_ONGOING_ACTION(src, AI_ACTION_APPROACH_C, current_target, 0)
if(grenading_allowed)
throw_grenade_cover()
else if(overwatch_allowed)
establish_overwatch()
else if(grenading_allowed)
throw_grenade_cover()
else if(!in_cover)
ADD_ONGOING_ACTION(src, AI_ACTION_APPROACH_CAREFUL, current_target, 0)
return

if(istype(primary_weapon, /obj/item/weapon/gun/shotgun/pump))
Expand Down

0 comments on commit 7d6a687

Please sign in to comment.