cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 07:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining

Browse Source 
The art of drunken captaining
This commit is contained in:
kevinz000
2019-09-10 22:06:36 -07:00
committed by Dip
parent 4a9d6a82ce
commit f1f89cbb50
5 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+8 -1
View File
@@ -885,4 +885,11 @@
name = "Hotlime Miami"
id = "hotlime_miami"
results = list("hotlime_miami" = 2)
required_reagents = list("ephedrine" = 1, "pina_colada" = 1)
required_reagents = list("ephedrine" = 1, "pina_colada" = 1)
/datum/chemical_reaction/commander_and_chief
name = "Commander and Chief"
id = "commander_and_chief"
results = list("commander_and_chief" = 50)
required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctorsdelight" = 10, "quintuple_sec" = 10, "screwdrivercocktail" = 10)
mix_message = "When your powers combine, I am Captain Pl-..."
code/modules/jobs/job_types/captain.dm
+2
View File
@@ -22,6 +22,8 @@ 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/insanity)
/datum/job/captain/get_access()
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+23
View File
@@ -2161,6 +2161,29 @@ datum/reagent/consumable/ethanol/creme_de_coconut
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.radiation - 25, 0)
. = 1
return ..()
/datum/reagent/consumable/ethanol/fruit_wine
name = "Fruit Wine"
id = "fruit_wine"