From 487c18cb7ea7e1d55dfdc38594f277dd2ba8312c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 13 Mar 2020 14:20:28 -0400 Subject: [PATCH 01/10] Update misc.dm --- code/modules/cargo/packs/misc.dm | 57 ++++++++++---------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index d9c9794bd8..80d6f76910 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -89,32 +89,17 @@ /datum/supply_pack/misc/paper_work name = "Freelance Paper work" - desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up. - cost = 700 // Net of 0 credits but makes (120 x 20 = 2400) + desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up. + cost = 700 // Net of 0 credits but makes (120 x 10 = 1200) contains = list(/obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, - /obj/item/folder/paperwork, /obj/item/pen/fountain ) crate_name = "Paperwork" +/datum/supply_pack/misc/paper_work/generate() + . = ..() + for(var/i in 1 to 9) + new /obj/item/folder/paperwork(.) ////////////////////////////////////////////////////////////////////////////// //////////////////////////////// Entertainment /////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -123,16 +108,14 @@ name = "Bedsheet Crate (R)" desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" cost = 2000 - contains = list(/obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random) //I'm lazy, and I copy paste stuff. + contains = list(/obj/item/bedsheet/random) crate_name = "random bedsheet crate" +/datum/supply_pack/misc/randombedsheets/generate() + . = ..() + for(var/i in 1 to 7) + new /obj/item/bedsheet/random(.) + /datum/supply_pack/misc/coloredsheets name = "Bedsheet Crate (C)" desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets." @@ -208,13 +191,14 @@ name = "Dueling Pistols" desc = "Resolve all your quarrels with some nonlethal fun." cost = 2000 - contains = list(/obj/item/storage/lockbox/dueling/hugbox/stamina, - /obj/item/storage/lockbox/dueling/hugbox/stamina, - /obj/item/storage/lockbox/dueling/hugbox/stamina, - /obj/item/storage/lockbox/dueling/hugbox/stamina, - /obj/item/storage/lockbox/dueling/hugbox/stamina) + contains = list(/obj/item/storage/lockbox/dueling/hugbox/stamina) crate_name = "dueling pistols" +/datum/supply_pack/misc/dueling_stam/generate() + . = ..() + for(var/i in 1 to 3) + new /obj/item/storage/lockbox/dueling/hugbox/stamina(.) + /datum/supply_pack/misc/dueling_lethal name = "Lethal Dueling Pistols" desc = "Settle your differences the true spaceman way." @@ -240,12 +224,7 @@ cost = 12000 var/num_contained = 3 contains = list(/obj/item/ammo_box/a357, - /obj/item/ammo_box/a357, - /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/pistolm9mm, - /obj/item/ammo_box/magazine/pistolm9mm, - /obj/item/ammo_box/magazine/pistolm9mm, - /obj/item/ammo_box/magazine/m45/kitchengun, /obj/item/ammo_box/magazine/m45/kitchengun) crate_name = "crate" From 888f67c4bc98d4789b32ba3c010004d23a3cadd7 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:21:12 -0400 Subject: [PATCH 02/10] Update borghydro.dm --- code/modules/reagents/reagent_containers/borghydro.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 73d0c5eafa..170ff64138 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -28,7 +28,7 @@ Borg Hypospray var/list/datum/reagents/reagent_list = list() var/list/reagent_ids = list(/datum/reagent/medicine/dexalin, /datum/reagent/medicine/kelotane, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/antitoxin, - /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/insulin) + /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/insulin, /datum/reagent/medicine/potass_iodide) var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed. var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values. //Used as list for input() in shakers. @@ -164,7 +164,7 @@ Borg Hypospray icon_state = "borghypo_s" charge_cost = 20 recharge_time = 2 - reagent_ids = list(/datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/potass_iodide, /datum/reagent/medicine/morphine, /datum/reagent/medicine/insulin) + reagent_ids = list(/datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/prussian_blue, /datum/reagent/medicine/morphine, /datum/reagent/medicine/insulin) bypass_protection = 1 accepts_reagent_upgrades = FALSE @@ -261,5 +261,5 @@ Borg Shaker /obj/item/reagent_containers/borghypo/epi name = "Stabilizer injector" desc = "An advanced chemical synthesizer and injection system, designed to stabilize patients." - reagent_ids = list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/insulin) + reagent_ids = list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/insulin, /datum/reagent/medicine/potass_iodide) accepts_reagent_upgrades = FALSE From 6993dfde2aca001378cf94f817d690a21d0b744b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:29:46 -0400 Subject: [PATCH 03/10] Now stocked at your local robotics --- code/game/objects/items/robot/robot_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 56af03139a..28a93a7a83 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -462,7 +462,7 @@ desc = "An upgrade to the Medical module's hypospray, containing \ stronger versions of existing chemicals." additional_reagents = list(/datum/reagent/medicine/oxandrolone, /datum/reagent/medicine/sal_acid, - /datum/reagent/medicine/rezadone, /datum/reagent/medicine/pen_acid) + /datum/reagent/medicine/rezadone, /datum/reagent/medicine/pen_acid, /datum/reagent/medicine/prussian_blue) /obj/item/borg/upgrade/piercing_hypospray name = "cyborg piercing hypospray" From 888cdbeaf64bee10c036616b03cea5450f5812a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 23:43:45 +0000 Subject: [PATCH 04/10] Bump minimist from 1.2.0 to 1.2.2 in /tgui Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2) Signed-off-by: dependabot[bot] --- tgui/package-lock.json | 6 +++--- tgui/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tgui/package-lock.json b/tgui/package-lock.json index 470e5c2d23..d2567aba36 100644 --- a/tgui/package-lock.json +++ b/tgui/package-lock.json @@ -5480,9 +5480,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==" }, "mixin-deep": { "version": "1.3.2", diff --git a/tgui/package.json b/tgui/package.json index dd81c3b318..85d47ecfe7 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -35,7 +35,7 @@ "html5shiv": "3.7.3", "ie8": "0.8.1", "lodash": "^4.17.15", - "minimist": "1.2.0", + "minimist": "1.2.2", "paths-js": "0.4.10", "pleeease-filters": "2.0.0", "postcss": "7.0.18", From a2592483b549de5358b1cbb420394ed6212ab98f Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:07:13 +0100 Subject: [PATCH 05/10] hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too --- code/game/gamemodes/objective.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a4b1f68265..b0092d8d67 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1163,12 +1163,16 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/payout = 0 var/payout_bonus = 0 var/area/dropoff = null + var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected, + /area/solar/, + /area/ruin/, //thank you station space ruins + /area/science/test_area/)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE while(!found) var/area/dropoff_area = pick(GLOB.sortedAreas) - if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !istype(dropoff_area, /area/shuttle/)) + if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !is_type_in_typecache(dropoff_area, blacklisted_areas)) dropoff = dropoff_area found = TRUE From 3f44882c1ac662091a4b0abc610fa3e24474ca14 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:13:26 +0100 Subject: [PATCH 06/10] FUCK --- code/game/gamemodes/objective.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b0092d8d67..192153535d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1166,7 +1166,8 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected, /area/solar/, /area/ruin/, //thank you station space ruins - /area/science/test_area/)) + /area/science/test_area/, + /area/shuttle)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE From f8a365490bbdca6f4ae72354364db8403ea2dce1 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:15:09 +0100 Subject: [PATCH 07/10] =?UTF-8?q?FUCK=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 192153535d..b42b41aba4 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1167,7 +1167,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages) /area/solar/, /area/ruin/, //thank you station space ruins /area/science/test_area/, - /area/shuttle)) + /area/shuttle/)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE From 3c5f382f62c5b362f1801362db78a6f3599267c8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 15 Mar 2020 00:11:24 -0500 Subject: [PATCH 08/10] Automatic changelog generation for PR #11467 [ci skip] --- html/changelogs/AutoChangeLog-pr-11467.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11467.yml diff --git a/html/changelogs/AutoChangeLog-pr-11467.yml b/html/changelogs/AutoChangeLog-pr-11467.yml new file mode 100644 index 0000000000..5b59fc2e7b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11467.yml @@ -0,0 +1,4 @@ +author: "Kraseo" +delete-after: True +changes: + - tweak: "Blacklists turret protected areas, the toxins test range, asteroid ruins, and solars from being valid dropoff locations for contracts." From 46d05053fd35f0476bb2ed585e5a7b06562bc6f1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 15 Mar 2020 00:21:34 -0500 Subject: [PATCH 09/10] Automatic changelog generation for PR #11458 [ci skip] --- html/changelogs/AutoChangeLog-pr-11458.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11458.yml diff --git a/html/changelogs/AutoChangeLog-pr-11458.yml b/html/changelogs/AutoChangeLog-pr-11458.yml new file mode 100644 index 0000000000..14e8d7d650 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11458.yml @@ -0,0 +1,5 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Potass Iodide has been fitted into standered borgs as well as medical ones. Upgraded hypos now have Prussian Blue as well." + - tweak: "Syndi borgs Potass Iodide has been swapped for Prussian Blue" From f91d30dae5bb815ff615244d12f69d97b250e730 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 15 Mar 2020 00:22:18 -0500 Subject: [PATCH 10/10] Automatic changelog generation for PR #11455 [ci skip] --- html/changelogs/AutoChangeLog-pr-11455.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11455.yml diff --git a/html/changelogs/AutoChangeLog-pr-11455.yml b/html/changelogs/AutoChangeLog-pr-11455.yml new file mode 100644 index 0000000000..a54556673e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11455.yml @@ -0,0 +1,5 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - tweak: "Number of paper work in the crate \"freelance paperwork\" is half" + - code_imp: "A few cases were something their is unneeded copy past replaced with many 1 in spawns"