cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Lings no longer get impossible identity theft objectives [MDB IGNORE] (#25364)

Browse Source 
* Lings no longer get impossible identity theft objectives

* Fix Conflict, Preserve SR Addition

* Should be Fixed now

* Fix Compile Error

---------

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-11-30 20:11:01 -06:00
committed by GitHub
co-authored by TJatPBnJ SomeRandomOwl
parent 20fa5e6e2c
commit b4dca646c9
2 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+31 -18
View File
@@ -125,6 +125,27 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
/datum/objective/proc/get_target()
return target
/datum/objective/proc/is_valid_target(datum/mind/possible_target)
if(!ishuman(possible_target.current))
return FALSE
if(possible_target.current.stat == DEAD)
return FALSE
var/target_area = get_area(possible_target.current)
if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival))
return FALSE
// SKYRAT EDIT ADDITION
if(SSticker.IsRoundInProgress() && istype(target_area, /area/centcom/interlink))
return FALSE
if(!count_space_areas)
if(istype(target_area, /area/space) || istype(target_area, /area/ruin) || istype(target_area, /area/icemoon) || istype(target_area, /area/lavaland))
return FALSE
// SKYRAT EDIT END
return TRUE
//dupe_search_range is a list of antag datums / minds / teams
/datum/objective/proc/find_target(dupe_search_range, list/blacklist)
var/list/datum/mind/owners = get_owners()
@@ -137,26 +158,14 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
if(O.late_joiner)
try_target_late_joiners = TRUE
for(var/datum/mind/possible_target in get_crewmember_minds())
var/target_area = get_area(possible_target.current)
if(possible_target in owners)
continue
if(!ishuman(possible_target.current))
continue
if(possible_target.current.stat == DEAD)
continue
if(!is_unique_objective(possible_target,dupe_search_range))
continue
if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival))
continue
if(possible_target in blacklist)
continue
// SKYRAT EDIT ADDITION
if(SSticker.IsRoundInProgress() && istype(target_area, /area/centcom/interlink))
if(!is_valid_target(possible_target))
continue
if(!count_space_areas)
if(istype(target_area, /area/space) || istype(target_area, /area/ruin) || istype(target_area, /area/icemoon) || istype(target_area, /area/lavaland))
continue
// SKYRAT EDIT END
possible_targets += possible_target
if(try_target_late_joiners)
var/list/all_possible_targets = possible_targets.Copy()
@@ -171,7 +180,6 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
update_explanation_text()
return target
/datum/objective/proc/update_explanation_text()
if(team_explanation_text && LAZYLEN(get_owners()) > 1)
explanation_text = team_explanation_text
@@ -217,7 +225,7 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
return TRUE
/datum/objective/assassinate
name = "assasinate"
name = "assassinate"
martyr_compatible = TRUE
admin_grantable = TRUE
var/target_role_type = FALSE
@@ -516,6 +524,11 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
target = ..()
update_explanation_text()
/datum/objective/escape/escape_with_identity/is_valid_target(datum/mind/possible_target)
if(HAS_TRAIT(possible_target.current, TRAIT_NO_DNA_COPY))
return FALSE
return ..()
/datum/objective/escape/escape_with_identity/update_explanation_text()
if(target?.current)
target_real_name = target.current.real_name
@@ -530,12 +543,12 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
explanation_text += "." //Proper punctuation is important!
else
explanation_text = "Free objective."
explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody."
/datum/objective/escape/escape_with_identity/check_completion()
if(!target || !target_real_name)
return TRUE
var/list/datum/mind/owners = get_owners()
if(!target || !target_real_name)
return ..()
for(var/datum/mind/M in owners)
if(!ishuman(M.current) || !considered_escaped(M))
continue
code/modules/antagonists/changeling/changeling.dm
+9 -4
View File
@@ -727,16 +727,21 @@
else
var/datum/objective/maroon/maroon_objective = new
maroon_objective.owner = owner
maroon_objective.find_target()
objectives += maroon_objective
if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible)
var/datum/objective/escape/escape_with_identity/identity_theft = new
identity_theft.owner = owner
identity_theft.target = maroon_objective.target
identity_theft.find_target()
identity_theft.update_explanation_text()
objectives += identity_theft
escape_objective_possible = FALSE
maroon_objective.target = identity_theft.target || maroon_objective.find_target()
maroon_objective.update_explanation_text()
objectives += maroon_objective
objectives += identity_theft
else
maroon_objective.find_target()
objectives += maroon_objective
if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible)
if(prob(50))