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

[MIRROR] Fixes species uplinks [MDB IGNORE] (#11445)

Browse Source 
* Fixes species uplinks (#64816)

I was fucking deranged when I originally made this. I not only didn't actually include the assigned species to the uplink's ui data, but I made the code add each objective item to the uplink list twice. This fixes both of those problems, and makes it more readable.

Fixes a mistake I caused.
Closes #64806 (Species-Restricted uplink items don't appear)

Role-restricted and species restricted items can be purchased again.
Species-restricted items no longer appear in surplus.

* Fixes species uplinks

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-02-11 10:27:43 +00:00
committed by GitHub
co-authored by John Willard
parent f8196cd6a8
commit 9eef5d65b6
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/uplink.dm
+2 -1
View File
@@ -200,7 +200,7 @@
"restricted_roles" = item.restricted_roles,
"restricted_species" = item.restricted_species,
"progression_minimum" = item.progression_minimum,
"ref" = REF(item)
"ref" = REF(item),
))
var/list/remaining_stock = list()
@@ -218,6 +218,7 @@
data["has_objectives"] = uplink_handler.has_objectives
data["lockable"] = lockable
data["assigned_role"] = uplink_handler.assigned_role
data["assigned_species"] = uplink_handler.assigned_species
data["debug"] = uplink_handler.debug_mode
return data
code/modules/antagonists/traitor/datum_traitor.dm
+8 -6
View File
@@ -55,14 +55,16 @@
if(uplink_handler.progression_points < SStraitor.current_global_progression)
uplink_handler.progression_points = SStraitor.current_global_progression * SStraitor.newjoin_progression_coeff
var/list/uplink_items = list()
for(var/datum/uplink_item/item as anything in SStraitor.uplink_items)
if(item.item && (!length(item.restricted_roles) || (uplink_handler.assigned_role in item.restricted_roles)) \
&& !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost > 1)
uplink_items += item
if(item.item && (!length(item.restricted_species) || (uplink_handler.assigned_species in item.restricted_species)) \
&& !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost > 1)
uplink_items += item
if(item.item && !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost > 1)
if(!length(item.restricted_roles) && !length(item.restricted_species))
uplink_items += item
continue
if((uplink_handler.assigned_role in item.restricted_roles) || (uplink_handler.assigned_species in item.restricted_species))
uplink_items += item
continue
uplink_handler.extra_purchasable += create_uplink_sales(uplink_sale_count, /datum/uplink_category/discounts, -1, uplink_items)
if(give_objectives)
code/modules/asset_cache/assets/uplink.dm
+1 -1
View File
@@ -23,7 +23,7 @@
"name" = item.name,
"cost" = item.cost,
"desc" = item.desc,
"category" = item.category? initial(item.category.name) : null,
"category" = item.category ? initial(item.category.name) : null,
"purchasable_from" = item.purchasable_from,
"restricted" = item.restricted,
"limited_stock" = item.limited_stock,
code/modules/uplink/uplink_items/species.dm
+1
View File
@@ -5,6 +5,7 @@
/datum/uplink_item/species_restricted
category = /datum/uplink_category/species
purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
surplus = 0
/datum/uplink_item/species_restricted/moth_lantern
name = "Extra-Bright Lantern"