Skip to content

Commit

Permalink
cowbot promised to become headcoder of tgui after this
Browse files Browse the repository at this point in the history
  • Loading branch information
Chubbygummibear committed Jul 27, 2023
1 parent cecdc5c commit d6908cd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
20 changes: 10 additions & 10 deletions code/modules/antagonists/changeling/cellular_emporium.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
var/list/abilities = list()

for(var/path in changeling.all_powers)
var/datum/action/changeling/ability = path
var/datum/action/changeling/ability = new path

var/dna_cost = initial(ability.dna_cost)
var/dna_cost = ability.dna_cost
if(dna_cost <= 0)
continue

Expand All @@ -35,18 +35,18 @@
continue //yogs end - removing combat abilities from xenolings

var/list/abilitydata = list()
abilitydata["name"] = initial(ability.name)
abilitydata["desc"] = initial(ability.desc)
abilitydata["helptext"] = initial(ability.helptext)
abilitydata["name"] = ability.name
abilitydata["desc"] = ability.desc
abilitydata["helptext"] = ability.helptext
abilitydata["owned"] = changeling.has_sting(ability)
var/req_dna = initial(ability.req_dna)
var/req_absorbs = initial(ability.req_absorbs)
var/req_dna = ability.req_dna
var/req_absorbs = ability.req_absorbs
abilitydata["dna_cost"] = dna_cost
abilitydata["can_purchase"] = ((req_absorbs <= true_absorbs) && (req_dna <= absorbed_dna_count) && (dna_cost <= genetic_points_remaining))
abilitydata["conflicting_powers"] = list()
for(var/conflicts in ability.conflicts)
var/datum/action/changeling/conflcting_ability = conflicts
abilitydata["conflicting_powers"] += initial(conflcting_ability.name)
for(var/conflict in ability.conflicts)
var/datum/action/changeling/conflcting_ability = new conflict
abilitydata["conflicting_powers"] += conflcting_ability.name

abilities += list(abilitydata)

Expand Down
9 changes: 5 additions & 4 deletions tgui/packages/tgui/interfaces/CellularEmporium.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ export const CellularEmporium = (props, context) => {
<Box color="good">
{ability.helptext}
</Box>
{!!ability.conflicting_powers && (
{!!ability.conflicting_powers.length && (
<Box color="bad">
{ability.conflicting_powers.forEach(power => {
power;
})}

{"This ability conflicts with: "
+ ability.conflicting_powers.join(", ")}

</Box>
)}
</LabeledList.Item>
Expand Down

0 comments on commit d6908cd

Please sign in to comment.