From 5f75664350a397634b40df4471397abde26ed2de Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 25 Oct 2019 09:35:59 -0700 Subject: [PATCH 1/7] Update shuttle.dm --- code/controllers/subsystem/shuttle.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 08f657a1b9..09d5a443af 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -37,6 +37,8 @@ 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/last_fire = 0 var/list/supply_packs = list() var/list/shoppinglist = list() @@ -111,6 +113,13 @@ 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 + last_fire = world.time + //Cargo stuff end + if(!SSmapping.clearing_reserved_turfs) while(transit_requesters.len) var/requester = popleft(transit_requesters) From 8f1c983b25568a9923c815c693d01dc8586a9431 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 25 Oct 2019 09:36:54 -0700 Subject: [PATCH 2/7] Update armory.dm --- code/modules/cargo/packs/armory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 50b9ae3cf3c31fb567e4bac4d3804f8426ba4175 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 25 Oct 2019 09:39:00 -0700 Subject: [PATCH 3/7] Update large_objects.dm --- code/modules/cargo/exports/large_objects.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 78174fcc0677d038885cd4febc8df90cb7fa00e9 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 27 Oct 2019 16:16:02 -0700 Subject: [PATCH 4/7] Update shuttle.dm --- code/controllers/subsystem/shuttle.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 09d5a443af..382bf25b98 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -38,7 +38,6 @@ SUBSYSTEM_DEF(shuttle) 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/last_fire = 0 var/list/supply_packs = list() var/list/shoppinglist = list() @@ -117,7 +116,6 @@ SUBSYSTEM_DEF(shuttle) 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 - last_fire = world.time //Cargo stuff end if(!SSmapping.clearing_reserved_turfs) From 9f04cba7bf1f2f6cb0c62caff75c419097cae6af Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 3 Nov 2019 18:27:47 -0500 Subject: [PATCH 5/7] workaround --- code/modules/uplink/uplink_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") From 2241f54c18d53b5fb5684a327898a4e4495c40ab Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 7 Nov 2019 19:17:20 -0600 Subject: [PATCH 6/7] Automatic changelog generation for PR #9611 [ci skip] --- html/changelogs/AutoChangeLog-pr-9611.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9611.yml 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" From dc9a700fa989dd81f05308cadc1508df53afd291 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 7 Nov 2019 19:18:02 -0600 Subject: [PATCH 7/7] Automatic changelog generation for PR #9705 [ci skip] --- html/changelogs/AutoChangeLog-pr-9705.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9705.yml 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"