Merge pull request #9431 from Ghommie/Ghommie-cit221

Ports "Makes the illegal tech node harder to unlock"
This commit is contained in:
kevinz000
2019-10-07 23:35:18 -07:00
committed by GitHub
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -1054,7 +1054,7 @@
boost_item_paths = list()
for(var/path in GLOB.uplink_items)
var/datum/uplink_item/UI = new path
if(!UI.item)
if(!UI.item || !UI.illegal_tech)
continue
boost_item_paths |= UI.item //allows deconning to unlock.
+6
View File
@@ -75,6 +75,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
var/player_minimum //The minimum crew size needed for this item to be added to uplinks.
var/purchase_log_vis = TRUE // Visible in the purchase log?
var/restricted = FALSE // Adds restrictions for VR/Events
var/illegal_tech = TRUE // Can this item be deconstructed to unlock certain techweb research nodes?
/datum/uplink_item/New()
. = ..()
@@ -769,6 +770,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/ammo_box/a357
cost = 4
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
illegal_tech = FALSE
/datum/uplink_item/ammo/a40mm
name = "40mm Grenade"
@@ -898,6 +900,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/ammo_box/foambox/riot
cost = 2
surplus = 0
illegal_tech = FALSE
/datum/uplink_item/ammo/bioterror
name = "Box of Bioterror Syringes"
@@ -1926,6 +1929,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/toy/syndicateballoon
cost = 20
cant_discount = TRUE
illegal_tech = FALSE
/datum/uplink_item/badass/syndiecash
name = "Syndicate Briefcase Full of Cash"
@@ -1949,9 +1953,11 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/toy/cards/deck/syndicate
cost = 1
surplus = 40
illegal_tech = FALSE
/datum/uplink_item/badass/syndiecigs
name = "Syndicate Smokes"
desc = "Strong flavor, dense smoke, infused with omnizine."
item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
cost = 2
illegal_tech = FALSE