Torpedo juice, munitions metabolism trait, and munitions paycheck dep…

…artment. (BeeStation#1074) * maa gets muni metab trait, pay-dept is now MUN * mt now gets muni metab trait, paydept is now MUN * attempt to fix build failing (?) send help * attempt to fix build failing (part 2) * maa - paycheck is now MUN * MT - paycheck department is now MUN * made all of muni get the changes * forgot flight lead * replaced drinks.dmi with new drinks.dmi * add torp_juice to drinks_recipes * added torp_juice to alcohol_reagents * add trait_munitions_metabolism * added NSV13 tags to muni-metab * deletes emoji.dmi (to replace) * replaces emoji.dmi * deletes new one (FUCK YOU GITHUB WEBSITE FOR ADDING THIS SHIT TO MY MUNI PR) * adds the old one back in (AGAIN,FUCK YOU GITHUB WEBSITE)
Kmc2000 · Dec 4, 2020 · 0cdac72 · 0cdac72
1 parent 9d7359c
commit 0cdac72
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 8 deletions.
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -148,6 +148,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define	TRAIT_MAGIC_CHOKE		"magic_choke"
 #define TRAIT_SOOTHED_THROAT    "soothed-throat"
 #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
+#define TRAIT_MUNITIONS_METABOLISM    "munitions-metabolism" //NSV13
 #define TRAIT_ALWAYS_CLEAN      "always-clean"
 #define TRAIT_BOOZE_SLIDER      "booze-slider"
 #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech"

diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -840,3 +840,11 @@
 	id = /datum/reagent/consumable/ethanol/beesknees
 	results = list(/datum/reagent/consumable/ethanol/beesknees = 4)
 	required_reagents = list(/datum/reagent/consumable/ethanol/mead = 1, /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1)
+
+/datum/chemical_reaction/torp_juice
+	name = "Torpedo Juice"
+	id = /datum/reagent/consumable/ethanol/torp_juice
+	results = list(/datum/reagent/consumable/ethanol/torp_juice = 5)
+	required_reagents = list(/datum/reagent/consumable/lemon_lime = 3,  /datum/reagent/consumable/ethanol = 2)
+	mix_message = "The mixture violently and loudly reacts, but settles down immediately. Almost makes you wish for a nuclear winter."
+	mix_sound = 'sound/effects/explosion1.ogg'
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2339,3 +2339,20 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		M.adjustFireLoss(-1.5, 0)
 		M.adjustToxLoss(-1, 0)
 	. = ..()
+
+/datum/reagent/consumable/ethanol/torp_juice
+	name = "Torpedo Juice"
+	color = "#F9E43D"
+	description = "Attention munitions: MAKE TORP."
+	taste_description = "an explosion in your mouth"
+	glass_icon_state = "torp_juice"
+	glass_name = "glass of torpedo juice"
+	glass_desc = "Attention munitions: MAKE TORP."
+	quality = DRINK_VERYGOOD
+	boozepwr = 70
+/datum/reagent/consumable/ethanol/torp_juice/on_mob_life(mob/living/carbon/M)
+    if(HAS_TRAIT(M.mind, TRAIT_MUNITIONS_METABOLISM))
+        M.heal_bodypart_damage(1, 1)
+        M.adjustBruteLoss(-2,0)
+        . = 1
+    return ..()
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
diff --git a/nsv13/code/modules/jobs/job_types/air_traffic_controller.dm b/nsv13/code/modules/jobs/job_types/air_traffic_controller.dm
@@ -17,7 +17,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER) //temp
 	minimal_access = list(ACCESS_MUNITIONS) //temp
 	paycheck = PAYCHECK_MEDIUM
-	paycheck_department = ACCOUNT_CAR
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 
 	display_order = JOB_DISPLAY_ORDER_AIR_TRAFFIC_CONTROLLER
 	display_rank = "SGT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

diff --git a/nsv13/code/modules/jobs/job_types/fighter_pilot.dm b/nsv13/code/modules/jobs/job_types/fighter_pilot.dm
@@ -17,7 +17,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER) //temp
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MUNITIONS, ACCESS_FIGHTER) //temp
 	paycheck = PAYCHECK_MEDIUM
-	paycheck_department = ACCOUNT_CAR
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 
 	display_order = JOB_DISPLAY_ORDER_FIGHTER_PILOT
 
@@ -65,7 +66,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER, ACCESS_FL) //temp
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MUNITIONS, ACCESS_FIGHTER, ACCESS_FL) //temp
 	paycheck = PAYCHECK_MEDIUM
-	paycheck_department = ACCOUNT_CAR
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 
 	display_order = JOB_DISPLAY_ORDER_FLIGHT_LEADER
 

diff --git a/nsv13/code/modules/jobs/job_types/fighter_technician.dm b/nsv13/code/modules/jobs/job_types/fighter_technician.dm
@@ -15,7 +15,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER) //temp
 	minimal_access = list(ACCESS_MINERAL_STOREROOM, ACCESS_CONSTRUCTION, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE) //temp
 	paycheck = PAYCHECK_MEDIUM
-	paycheck_department = ACCOUNT_CAR
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 
 	display_order = JOB_DISPLAY_ORDER_DECK_TECHNICIAN
 

diff --git a/nsv13/code/modules/jobs/job_types/master_at_arms.dm b/nsv13/code/modules/jobs/job_types/master_at_arms.dm
@@ -20,8 +20,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_HEADS, ACCESS_EVA, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_MUNITIONS, ACCESS_MAA, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER, ACCESS_FL, ACCESS_RC_ANNOUNCE)
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_HEADS, ACCESS_EVA, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_MUNITIONS, ACCESS_MAA, ACCESS_MUNITIONS_STORAGE, ACCESS_FIGHTER, ACCESS_FL, ACCESS_RC_ANNOUNCE)
 	paycheck = PAYCHECK_HARD
-	paycheck_department = ACCOUNT_SEC
-
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 	display_order = JOB_DISPLAY_ORDER_MASTER_AT_ARMS
 	display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
 

diff --git a/nsv13/code/modules/jobs/job_types/munitions_technician.dm b/nsv13/code/modules/jobs/job_types/munitions_technician.dm
@@ -15,8 +15,8 @@
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE) //temp
 	minimal_access = list(ACCESS_MINERAL_STOREROOM, ACCESS_CONSTRUCTION, ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE) //temp
 	paycheck = PAYCHECK_MEDIUM
-	paycheck_department = ACCOUNT_CAR
-
+	paycheck_department = ACCOUNT_MUN
+	mind_traits = list(TRAIT_MUNITIONS_METABOLISM)
 	display_order = JOB_DISPLAY_ORDER_MUNITIONS_TECHNICIAN
 
 /datum/outfit/job/munitions_tech