diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index bc8afe3c5b..51a2761f74 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -37,6 +37,7 @@ SUBSYSTEM_DEF(shuttle) var/points = 5000 //number of trade-points we have var/centcom_message = "" //Remarks from CentCom on how well you checked the last order. var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentCom, associated with their potencies + var/passive_supply_points_per_minute = 750 var/list/supply_packs = list() var/list/shoppinglist = list() @@ -111,6 +112,12 @@ SUBSYSTEM_DEF(shuttle) qdel(T, force=TRUE) CheckAutoEvac() + //Cargo stuff start + var/fire_time_diff = max(0, world.time - last_fire) //Don't want this to be below 0, seriously. + var/point_gain = (fire_time_diff / 600) * passive_supply_points_per_minute + points += point_gain + //Cargo stuff end + if(!SSmapping.clearing_reserved_turfs) while(transit_requesters.len) var/requester = popleft(transit_requesters) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index 88ff5f4729..ce4502ba99 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -178,7 +178,7 @@ worth += gases[/datum/gas/bz]*4 worth += gases[/datum/gas/stimulum]*25 worth += gases[/datum/gas/hypernoblium]*1000 - worth += gases[/datum/gas/miasma]*15 + worth += gases[/datum/gas/miasma]*4 worth += gases[/datum/gas/tritium]*7 worth += gases[/datum/gas/pluoxium]*6 worth += gases[/datum/gas/nitryl]*30 diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 11aae8a054..ee983784fe 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -87,7 +87,7 @@ /datum/supply_pack/security/armory/mindshield name = "Mindshield Implants Crate" desc = "Prevent against radical thoughts with three Mindshield implants. Requires Armory access to open." - cost = 3000 //Lowered untill cargo rework MK II is done + cost = 4000 contains = list(/obj/item/storage/lockbox/loyalty) crate_name = "mindshield implant crate" diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index ba531cac93..280740688e 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1714,7 +1714,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes /datum/uplink_item/role_restricted/alientech name = "Alien Research Disk" desc = "A technology disk holding a terabyte of highly confidential abductor technology. \ - Simply insert into research console of choice and import the files from the disk. You might research some useful gear from this." + Simply insert into research console of choice and import the files from the disk. Because of its foreign nature, it may require multiple uploads to work properly." item = /obj/item/disk/tech_disk/abductor cost = 12 restricted_roles = list("Research Director", "Scientist", "Roboticist") diff --git a/html/changelogs/AutoChangeLog-pr-9611.yml b/html/changelogs/AutoChangeLog-pr-9611.yml new file mode 100644 index 0000000000..48a0e9982b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9611.yml @@ -0,0 +1,6 @@ +author: "kevinz000" +delete-after: True +changes: + - rscadd: "Cargo has passive point generation again at 750 points/minute" + - balance: "Mindshield crate price increased from 3000 to 4000" + - balance: "Miasma sell price reduced from 15/mol to 4/mol" diff --git a/html/changelogs/AutoChangeLog-pr-9705.yml b/html/changelogs/AutoChangeLog-pr-9705.yml new file mode 100644 index 0000000000..c3dafc0582 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9705.yml @@ -0,0 +1,4 @@ +author: "kappa-sama" +delete-after: True +changes: + - tweak: "changed flavor text of alien tech on uplink"