From 4b6b2cf19524032efdf170d30f87a1ae644bfda8 Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sat, 17 Aug 2019 01:37:28 -0400 Subject: [PATCH 01/11] Adds new drink to drink recipes It's a drink for Captains --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 7c44857b1d..d35955d2d3 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -794,4 +794,11 @@ name = "Red Queen" id = "red_queen" results = list("red_queen" = 10) - required_reagents = list("tea" = 6, "mercury" = 2, "blackpepper" = 1, "growthserum" = 1) \ No newline at end of file + required_reagents = list("tea" = 6, "mercury" = 2, "blackpepper" = 1, "growthserum" = 1) + +/datum/chemical_reaction/commander_and_chief + name = "Commander and Chief" + id = "commander_and_chief" + results = list("commander_and_chief" = 50) + required_reagents = list("allies_cocktail" = 50, "champagne" = 20, "doctors_delight" = 10, "quintiple_sec" = 10, "screwdriver" = 10) + mix_message = "When your powers combine, I am Captain Pl-..." From 372c53b3da679aef0f5a2a34a6b71587109d3a35 Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sat, 17 Aug 2019 01:47:25 -0400 Subject: [PATCH 02/11] Uploads new drinks.dmi Adds Commander and Chif --- icons/obj/drinks.dmi | Bin 85302 -> 85723 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 7822cdb8c236ea58fc03d4812f74561781b6b0b2..c255e0a104b992bda3df8d0882a0c808d87ea506 100644 GIT binary patch delta 8618 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 Date: Sat, 17 Aug 2019 19:02:30 -0400 Subject: [PATCH 03/11] Update traits.dm Adds new mob trait at line 121 --- code/__DEFINES/traits.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index ed0007135d..a4bca2f2c8 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -118,6 +118,7 @@ #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism" #define TRAIT_STRONG_GRABBER "strong_grabber" #define TRAIT_CALCIUM_HEALER "calcium_healer" +#define TRAIT_CAPTAIN_METABOLISM "captain-metabolism" //non-mob traits #define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it @@ -203,4 +204,4 @@ #define FLIGHTSUIT_TRAIT "flightsuit" #define LOCKED_HELMET_TRAIT "locked-helmet" #define NINJA_SUIT_TRAIT "ninja-suit" -#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" \ No newline at end of file +#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" From d2760287e10335173865f1ca0348ca5407b4a49c Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sat, 17 Aug 2019 19:27:11 -0400 Subject: [PATCH 04/11] Update captain.dm Adds mind trait at line 24 --- code/modules/jobs/job_types/captain.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 80c78220e6..dd8cc5a887 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -21,6 +21,8 @@ Captain access = list() //See get_access() minimal_access = list() //See get_access() + mind_traits = list(TRAIT_CAPTAIN_METABOLISM) + /datum/job/captain/get_access() return get_all_accesses() From 975a33aad78f4d27b37be223970d53877283c924 Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sat, 17 Aug 2019 19:38:58 -0400 Subject: [PATCH 05/11] Update alcohol_reagents.dm Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully. --- .../chemistry/reagents/alcohol_reagents.dm | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 79b6f96781..35efd651df 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2122,6 +2122,29 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "Planet Cracker" glass_desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy." +/datum/reagent/consumable/ethanol/commander_and_chief + name = "Commander and Chief" + id = "commander_and_chief" + description = "A cocktail for the captain on the go." + color = "#ffffc9" + boozepwr = 50 + quality = DRINK_FANTASTIC + taste_description = "Tastes like...duty and responsibility?" + glass_icon_state = "commander_and_chief" + glass_name = "Commander and Chief" + glass_desc = "The gems of this majestic chalice represent the departments and their Heads." + +/datum/reagent/consumable/ethanol/commander_and_chief/on_mob_life(mob/living/carbon/M) + if(M.mind && HAS_TRAIT(M.mind, TRAIT_CAPTAIN_METABOLISM))) + M.heal_bodypart_damage(2,2,2) + M.adjustBruteLoss(-3.5,0) + M.adjustOxyLoss(-3.5,0) + M.adjustFireLoss(-3.5,0) + M.adjustToxLoss(-3.5,0) + M.radiation = max(M.raddiation - 25, 0) + . = 1 + return ..() + /datum/reagent/consumable/ethanol/fruit_wine name = "Fruit Wine" id = "fruit_wine" From a351d8f99574653405447c65d356c2627b38d85f Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sun, 18 Aug 2019 21:34:31 -0400 Subject: [PATCH 06/11] Update captain.dm Attempted error fix. --- code/modules/jobs/job_types/captain.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index dd8cc5a887..1e64773607 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -21,8 +21,12 @@ Captain access = list() //See get_access() minimal_access = list() //See get_access() + mind_traits = list(TRAIT_CAPTAIN_METABOLISM) + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/prosopagnosia, /datum/quirk/insanity) + + /datum/job/captain/get_access() return get_all_accesses() From 5840284e9ea12f6cdd52681e9c2588236f8a4b7d Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sun, 18 Aug 2019 22:14:41 -0400 Subject: [PATCH 07/11] Update alcohol_reagents.dm Edited a typo at line 2144. --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 35efd651df..8b787b5839 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2141,7 +2141,7 @@ All effects don't start immediately, but rather get worse over time; the rate is M.adjustOxyLoss(-3.5,0) M.adjustFireLoss(-3.5,0) M.adjustToxLoss(-3.5,0) - M.radiation = max(M.raddiation - 25, 0) + M.radiation = max(M.radiation - 25, 0) . = 1 return ..() From c8810be706cecde36d49a54a8a5970fb628e346e Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Sun, 18 Aug 2019 22:15:52 -0400 Subject: [PATCH 08/11] Update captain.dm --- code/modules/jobs/job_types/captain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 3d705ffef5..58943df4e4 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -21,7 +21,7 @@ Captain access = list() //See get_access() minimal_access = list() //See get_access() - mind_traits = list(TRAIT_CAPTAIN_METABOLISM) + mind_traits = list(TRAIT_CAPTAIN_METABOLISM) blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity) From 167b18d045386e1444bef0400fad23dbb9f85655 Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Mon, 19 Aug 2019 15:28:51 -0400 Subject: [PATCH 09/11] Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm Error spotted at 2138 and fixed by Sishen, aka Papa Pax! Co-Authored-By: Sishen1542 --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 8b787b5839..afd2be3f53 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2135,7 +2135,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "The gems of this majestic chalice represent the departments and their Heads." /datum/reagent/consumable/ethanol/commander_and_chief/on_mob_life(mob/living/carbon/M) - if(M.mind && HAS_TRAIT(M.mind, TRAIT_CAPTAIN_METABOLISM))) + if(M.mind && HAS_TRAIT(M.mind, TRAIT_CAPTAIN_METABOLISM)) M.heal_bodypart_damage(2,2,2) M.adjustBruteLoss(-3.5,0) M.adjustOxyLoss(-3.5,0) From e7d08d1fed42049545e41f6580519b11213b90fc Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Mon, 19 Aug 2019 15:53:13 -0400 Subject: [PATCH 10/11] Update drinks_recipes.dm Fixed error at line 803, allies_cocktail to alliescocktail. Am bone-head :(. --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index d35955d2d3..3ba16dfa48 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -800,5 +800,5 @@ name = "Commander and Chief" id = "commander_and_chief" results = list("commander_and_chief" = 50) - required_reagents = list("allies_cocktail" = 50, "champagne" = 20, "doctors_delight" = 10, "quintiple_sec" = 10, "screwdriver" = 10) + required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctors_delight" = 10, "quintiple_sec" = 10, "screwdriver" = 10) mix_message = "When your powers combine, I am Captain Pl-..." From d6c9daa4eb17ea293d0a22b891d867ccbd9aaec4 Mon Sep 17 00:00:00 2001 From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com> Date: Mon, 19 Aug 2019 16:04:16 -0400 Subject: [PATCH 11/11] Update drinks_recipes.dm Fixed more errors, spelling and id errors to be exact with the help of Papa Pax :D. --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 3ba16dfa48..82e80d7584 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -800,5 +800,5 @@ name = "Commander and Chief" id = "commander_and_chief" results = list("commander_and_chief" = 50) - required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctors_delight" = 10, "quintiple_sec" = 10, "screwdriver" = 10) + required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctorsdelight" = 10, "quintuple_sec" = 10, "screwdrivercocktail" = 10) mix_message = "When your powers combine, I am Captain Pl-..."