Skip to content

Commit

Permalink
+hrp
Browse files Browse the repository at this point in the history
  • Loading branch information
ihatethisengine committed Jul 28, 2023
1 parent 6d44221 commit ef631bc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
iff_tag = null
user.visible_message(SPAN_NOTICE("[user] removes \the [src]'s IFF tag."), SPAN_NOTICE("You remove \the [src]'s IFF tag."), max_distance = 3)
if(hive.hivenumber == XENO_HIVE_RENEGADE) //it's important to know their IFF settings for renegade
to_chat(src, SPAN_NOTICE("Your IFF tag was removed. You can now attack anyone."))
to_chat(src, SPAN_NOTICE("With the removal of the device, your instincts have returned to normal."))
return
return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
faction_groups = list()
to_chat(programmer, SPAN_NOTICE("You <b>[option]</b> the IFF group data, the IFF group on the tag now reads as: [english_list(faction_groups, "None")]"))
if(xeno?.hive.hivenumber == XENO_HIVE_RENEGADE) //it's important to know their IFF settings for renegade
to_chat(xeno, SPAN_NOTICE("Your IFF tag settings were changed: [english_list(faction_groups, "None")]. You cannot attack creatures within these settings."))
to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(faction_groups, "no one")]."))
return TRUE

/obj/item/iff_tag/pmc_handler
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1388,14 +1388,14 @@
addtimer(CALLBACK(src, PROC_REF(handle_defectors), faction), 11 SECONDS)

/datum/hive_status/corrupted/proc/give_defection_choice(mob/living/carbon/xenomorph/xeno, faction)
if(tgui_alert(xeno, "Your Queen has broken the alliance with [faction]. Your IFF tag begins to suppress your connection with the Hive. Do you wish to remove the tag and stay with your Queen or do you wish to stay loyal to your new masters? You have 10 seconds to decide.", "Choose", list("Stay with the Queen", "Stay with your masters"), 10 SECONDS) == "Stay with your masters")
if(tgui_alert(xeno, "Your Queen has broken the alliance with [faction]. The talls made device inside your carapace begins to suppress your connection with the Hive. Do you wish to remove the tag and stay with your Queen or do you wish to stay loyal to your new masters? You have 10 seconds to decide.", "Choose", list("Stay with the Queen", "Stay with your masters"), 10 SECONDS) == "Stay with your masters")
if(!xeno.iff_tag)
to_chat(xeno, SPAN_XENOWARNING("It's too late now. Your IFF tag is broken and your service to the Queen continues."))
to_chat(xeno, SPAN_XENOWARNING("It's too late now. The device is gone and your service to the Queen continues."))
return
defectors += xeno
xeno.set_hive_and_update(XENO_HIVE_RENEGADE)
to_chat(xeno, SPAN_XENOANNOUNCE("You lost the connection with your Hive. Now you have no Queen, only your masters."))
to_chat(xeno, SPAN_NOTICE("Your IFF tag settings are: [english_list(xeno.iff_tag.faction_groups, "None")]. You cannot attack creatures within these settings."))
to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(faction_groups, "no one")]."))

Check failure on line 1398 in code/modules/mob/living/carbon/xenomorph/xeno_defines.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "faction_groups"
return
xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("You rip out [xeno.iff_tag]! For the Hive!"))
xeno.adjustBruteLoss(50)
Expand All @@ -1417,7 +1417,7 @@
if(!length(defectors))
return

xeno_message(SPAN_XENOANNOUNCE("You sense that [defectors.Join(", ")] turned their backs against their sisters and the Queen in favor of their slavemasters!"), 3, hivenumber)
xeno_message(SPAN_XENOANNOUNCE("You sense that [english_list(defectors)] turned their backs against their sisters and the Queen in favor of their slavemasters!"), 3, hivenumber)
defectors.Cut()

//Xeno Resin Mark Shit, the very best place for it too :0)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

if(hive.hivenumber == XENO_HIVE_RENEGADE) //Renegade's ability to attack someone depends on IFF settings, not on alliance
if(!iff_tag)
to_chat(src, SPAN_NOTICE("You have no IFF tag. You can attack anyone."))
to_chat(src, SPAN_NOTICE("You are not oblidged to protect anyone."))
return
to_chat(src, SPAN_NOTICE("Your IFF tag settings are: [english_list(iff_tag.faction_groups, "None")]. You cannot attack creatures within these settings."))
to_chat(src, SPAN_NOTICE("You seem compelled to protect [english_list(faction_groups, "no one")]."))

Check failure on line 32 in code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "faction_groups"
return

if((!hive.living_xeno_queen || Check_WO()) && !hive.allow_no_queen_actions) //No Hive status on WO
Expand Down

0 comments on commit ef631bc

Please sign in to comment.