Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uncluttering Queen UI P1 #5350

Merged
merged 28 commits into from
Jan 12, 2024
Merged

Uncluttering Queen UI P1 #5350

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
657c5f3
qol
Dec 27, 2023
5248024
Merge branch 'master' into uistuff
Red-byte3D Dec 27, 2023
2e2fa3b
changes
Dec 31, 2023
3993291
Merge branch 'uistuff' of https://github.com/InsaneRed/cmss13 into ui…
Dec 31, 2023
4681f21
Merge branch 'master' into uistuff
Red-byte3D Dec 31, 2023
4fc7de2
Merge remote-tracking branch 'upstream/master' into uistuff
Dec 31, 2023
cfcc983
Merge branch 'uistuff' of https://github.com/InsaneRed/cmss13 into ui…
Dec 31, 2023
cabe069
fix
Dec 31, 2023
b19d651
we loove indentation
Dec 31, 2023
3e4eca8
changes
Jan 1, 2024
b56756a
fix
Jan 1, 2024
8e9adbb
Merge branch 'master' into uistuff
Red-byte3D Jan 1, 2024
491c0cb
procs
Jan 1, 2024
27d7ba9
Merge branch 'uistuff' of https://github.com/InsaneRed/cmss13 into ui…
Jan 1, 2024
364b11c
Merge branch 'master' into uistuff
Red-byte3D Jan 1, 2024
0b6f68a
Update code/modules/mob/living/carbon/xenomorph/abilities/queen/queen…
Red-byte3D Jan 2, 2024
ab6b518
Update code/modules/mob/living/carbon/xenomorph/abilities/queen/queen…
Red-byte3D Jan 2, 2024
84f5b3d
Merge branch 'master' into uistuff
Red-byte3D Jan 2, 2024
3098edc
requestedchanges
Jan 2, 2024
c8c1cd8
Merge branch 'uistuff' of https://github.com/InsaneRed/cmss13 into ui…
Jan 2, 2024
2bdc592
guh
Jan 2, 2024
896410b
yea
Jan 2, 2024
d526d1d
Merge branch 'master' into uistuff
Red-byte3D Jan 2, 2024
410ce0f
changes, plasma costs
Jan 4, 2024
87ec55c
Merge branch 'master' into uistuff
Red-byte3D Jan 4, 2024
16989bd
vars
Jan 11, 2024
0c37ca7
Merge branch 'uistuff' of https://github.com/InsaneRed/cmss13 into ui…
Jan 11, 2024
1c2042f
Merge branch 'master' into uistuff
Red-byte3D Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
action_icon_state = "xeno_readmit"
plasma_cost = 100


/datum/action/xeno_action/onclick/ManageHive
name = "Manage The Hive"
action_icon_state = "xeno_readmit"
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved

/datum/action/xeno_action/activable/secrete_resin/remote/queen
name = "Projected Resin (100)"
action_icon_state = "secrete_resin"
Expand Down
18 changes: 14 additions & 4 deletions code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// devolve a xeno - lots of old, vaguely shitty code here
/datum/action/xeno_action/onclick/deevolve/use_ability(atom/Atom)
/datum/action/xeno_action/proc/Devolve()
var/mob/living/carbon/xenomorph/queen/user_xeno = owner
if(!user_xeno.check_state())
return
Expand Down Expand Up @@ -353,7 +353,18 @@
user_xeno.hive.stored_larva--
return ..()

/datum/action/xeno_action/onclick/banish/use_ability(atom/Atom)
/datum/action/xeno_action/onclick/ManageHive/use_ability(atom/Atom)
var/mob/living/carbon/xenomorph/queen/queenbanish = owner



var/choice = tgui_input_list(queenbanish, "Manage The Hive", "Hive Management", list("Banish", "Re-Admit", "De-evolve"), theme="hive_status")
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
switch(choice)
if("Banish") banish(target)
if("Re-Admit") Readmit(target)
if("De-evolve") Devolve(target)
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved

/datum/action/xeno_action/proc/banish()
var/mob/living/carbon/xenomorph/queen/user_xeno = owner
if(!user_xeno.check_state())
return
Expand Down Expand Up @@ -410,7 +421,6 @@
target_xeno.hud_update_banished()
target_xeno.lock_evolve = TRUE
user_xeno.hive.banished_ckeys[target_xeno.name] = target_xeno.ckey
addtimer(CALLBACK(src, PROC_REF(remove_banish), user_xeno.hive, target_xeno.name), 30 MINUTES)
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved

message_admins("[key_name_admin(user_xeno)] has banished [key_name_admin(target_xeno)]. Reason: [reason]")
return ..()
Expand All @@ -421,7 +431,7 @@

// Readmission = un-banish

/datum/action/xeno_action/onclick/readmit/use_ability(atom/Atom)
/datum/action/xeno_action/proc/Readmit()
var/mob/living/carbon/xenomorph/queen/user_xeno = owner
if(!user_xeno.check_state())
return
Expand Down
13 changes: 5 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,9 @@
/datum/action/xeno_action/onclick/choose_resin/queen_macro, //fourth macro
/datum/action/xeno_action/activable/secrete_resin/queen_macro, //fifth macro
/datum/action/xeno_action/onclick/grow_ovipositor,
/datum/action/xeno_action/onclick/banish,
/datum/action/xeno_action/onclick/readmit,
/datum/action/xeno_action/onclick/queen_award,
/datum/action/xeno_action/activable/info_marker/queen,
/datum/action/xeno_action/onclick/ManageHive,
)

inherent_verbs = list(
Expand Down Expand Up @@ -338,13 +337,13 @@
/datum/action/xeno_action/onclick/choose_resin/queen_macro, //fourth macro
/datum/action/xeno_action/activable/secrete_resin/queen_macro, //fifth macro
/datum/action/xeno_action/onclick/grow_ovipositor,
/datum/action/xeno_action/onclick/banish,
/datum/action/xeno_action/onclick/readmit,
/datum/action/xeno_action/onclick/ManageHive,
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
/datum/action/xeno_action/onclick/queen_award,
/datum/action/xeno_action/activable/info_marker/queen,
/datum/action/xeno_action/onclick/screech, //custom macro, Screech
/datum/action/xeno_action/activable/xeno_spit/queen_macro, //third macro
/datum/action/xeno_action/onclick/shift_spits, //second macro
/datum/action/xeno_action/onclick/shift_spits,
//second macro
)

// Abilities they get when they've successfully aged.
Expand Down Expand Up @@ -839,8 +838,7 @@
/datum/action/xeno_action/onclick/psychic_whisper,
/datum/action/xeno_action/onclick/psychic_radiance,
/datum/action/xeno_action/onclick/choose_resin/queen_macro, //fourth macro
/datum/action/xeno_action/onclick/banish,
/datum/action/xeno_action/onclick/readmit,
/datum/action/xeno_action/onclick/ManageHive,
/datum/action/xeno_action/onclick/queen_award,
/datum/action/xeno_action/activable/info_marker/queen,
// Screech is typically new for this list, but its possible they never ovi and it then is forced here:
Expand All @@ -851,7 +849,6 @@
/datum/action/xeno_action/onclick/set_xeno_lead,
/datum/action/xeno_action/activable/queen_heal, //first macro
/datum/action/xeno_action/activable/queen_give_plasma, //second macro
/datum/action/xeno_action/onclick/deevolve,
/datum/action/xeno_action/onclick/queen_order,
/datum/action/xeno_action/activable/expand_weeds, //third macro
/datum/action/xeno_action/activable/secrete_resin/remote/queen, //fifth macro
Expand Down
Loading