Skip to content

Commit

Permalink
hostility indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Oct 11, 2023
1 parent 681e3ff commit 7f97545
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
27 changes: 18 additions & 9 deletions code/game/jobs/job/civilians/other/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
job_options = SURVIVOR_VARIANT_LIST
var/intro_text
var/story_text
var/hostile = FALSE

/datum/job/civilian/survivor/set_spawn_positions(count)
spawn_positions = Clamp((round(count * SURVIVOR_TO_TOTAL_SPAWN_RATIO)), 2, 8)
Expand Down Expand Up @@ -59,23 +60,31 @@

if(picked_spawner.story_text)
story_text = picked_spawner.story_text

if(picked_spawner.hostile)
hostile = TRUE

new /datum/cm_objective/move_mob/almayer/survivor(H)

/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/H)
/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/survivor)
if(intro_text)
if(hostile)
to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!"))
else
to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!"))
for(var/line in intro_text)
to_chat(H, line)
to_chat(survivor, line)
else
to_chat(H, "<h2>You are a survivor!</h2>")
to_chat(H, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message))
to_chat(H, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit."))
to_chat(H, SPAN_NOTICE("You are NOT aware of the marines or their intentions. "))
to_chat(survivor, "<h2>You are a survivor!</h2>")
to_chat(survivor, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message))
to_chat(survivor, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit."))
to_chat(survivor, SPAN_NOTICE("You are NOT aware of the marines or their intentions. "))

if(story_text)
to_chat(H, story_text)
H.mind.memory += story_text
to_chat(survivor, story_text)
survivor.mind.memory += story_text
else
tell_survivor_story(H)
tell_survivor_story(survivor)

/datum/job/civilian/survivor/proc/tell_survivor_story(mob/living/carbon/human/H)
var/list/survivor_story = list(
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
var/roundstart_damage_min = 0
var/roundstart_damage_max = 0
var/roundstart_damage_times = 1
var/hostile = FALSE

var/spawn_priority = LOWEST_SPAWN_PRIORITY

Expand All @@ -27,6 +28,7 @@
return TRUE

/obj/effect/landmark/survivor_spawner/lv624_crashed_clf
hostile = TRUE
equipment = /datum/equipment_preset/survivor/clf
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
Expand All @@ -40,6 +42,7 @@
spawn_priority = SPAWN_PRIORITY_HIGH

/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_engineer
hostile = TRUE
equipment = /datum/equipment_preset/clf/engineer
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
Expand All @@ -53,6 +56,7 @@
spawn_priority = SPAWN_PRIORITY_VERY_HIGH

/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_medic
hostile = TRUE
equipment = /datum/equipment_preset/clf/medic
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
Expand Down

0 comments on commit 7f97545

Please sign in to comment.