Add files via upload

code/modules/clothing/head/f13factionhead.dm

@@ -1266,8 +1266,8 @@
 	desc = "A People's Liberation Army cap, worn by enlisted and non-commissioned officers."
 	icon = 'icons/fallout/clothing/hats.dmi'
 	mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
-	icon_state = "chinese_soldier"
-	item_state = "chinese_soldier"
+	icon_state = "chinese_cap"
+	item_state = "chinese_cap"
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0, "wound" = 30)
 
 /obj/item/clothing/head/f13/chinese/officer

code/modules/fallout/reagents/alcohol.dm

@@ -815,6 +815,17 @@
 	glass_name = "Nukashine"
 	glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night. Stronger than the normal stuff, whooboy."
 
+/datum/reagent/consumable/ethanol/nukashine/on_mob_end_metabolize(mob/living/L)
+	switch(current_cycle)
+		if(11)
+			to_chat(L, "<span class='warning'>You start to feel tired...</span>" )
+		if(12 to 24)
+			L.drowsyness += 1
+		if(24 to INFINITY)
+			L.Sleeping(40, 0)
+			. = 1
+	..()
+
 /datum/reagent/consumable/ethanol/olflakey
 	name = "Ol' Flakey"
 	description = "So smooth its flakey, leaves your throat confused and your body numb."
@@ -1009,7 +1020,7 @@
 /datum/reagent/consumable/ethanol/vaultboy/overdose_process(mob/living/M)
 	if(M && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		H.hair_style = "Business Hair 4"
+		H.hair_style = "Business Hair"
 		H.facial_hair_style = "Clean shave (Hairless)"
 		H.facial_hair_color = "#FFFF99"
 		H.hair_color = "#FFFF99"
@@ -1044,7 +1055,7 @@
 /datum/reagent/consumable/ethanol/vaultgirl/overdose_process(mob/living/M)
 	if(M && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		H.hair_style = "Over Eye"
+		H.hair_style = "Long (Overeye)"
 		H.facial_hair_style = "Clean shave (Hairless)"
 		H.facial_hair_color = "#FFFF99"
 		H.hair_color = "#FFFF99"

code/modules/fallout/reagents/juices.dm

@@ -15,7 +15,7 @@
 
 /datum/reagent/consumable/yuccajuice
 	name = "Yucca Juice"
-	description = "The raw essence of a	banana yucca."
+	description = "The raw essence of a banana yucca."
 	color = "#863333" // rgb: 175, 175, 0
 	taste_description = "sand and bunker-air"
 	glass_icon_state = "banana"

code/modules/fallout/reagents/medicines.dm

@@ -362,6 +362,39 @@
 	. = TRUE
 	..()
 
+
+// ---------------------------
+// RADSHIELD REAGENT
+
+/datum/reagent/medicine/radshield
+	name = "Radshield"
+
+	description = "A potent anti-rad refined made by refining radaway. More effective at removing rads at the cost of some anti-toxin capabilities. Can also clear away radioactive contamination from objects."
+	reagent_state = LIQUID
+	color = "#ff7200"
+	metabolization_rate = 8 * REAGENTS_METABOLISM
+	value = REAGENT_VALUE_COMMON
+	ghoulfriendly = TRUE
+
+/datum/reagent/medicine/radshield/on_mob_life(mob/living/carbon/M)	
+	var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive)
+	M.adjustToxLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+	M.radiation -= min(M.radiation, 40)
+	if(ishuman(M) && prob(7))
+		var/mob/living/carbon/human/H = M
+		H.confused = max(M.confused, 3)
+	. = TRUE
+	if(contamination && contamination.strength > 0)
+		contamination.strength -= min(contamination.strength, 100)
+	..()
+
+/datum/reagent/medicine/radshield/reaction_obj(obj/O, reac_volume)
+	var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive)
+	if(contamination && reac_volume >= 5)
+		qdel(contamination)
+		return
+
+
 // ---------------------------
 // MED-X REAGENT
 

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -789,13 +789,11 @@
 	required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 2, /datum/reagent/consumable/ethanol/lizardwine = 2, /datum/reagent/consumable/eggyolk = 1, /datum/reagent/gold = 1)
 	mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
 
-/*
 /datum/chemical_reaction/red_queen
 	name = "Red Queen"
 	id = /datum/reagent/consumable/red_queen
 	results = list(/datum/reagent/consumable/red_queen = 10)
 	required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1)
-*/
 
 /datum/chemical_reaction/gunfire
 	name = "Gunfire"

code/modules/hydroponics/grown/agave.dm

@@ -25,5 +25,5 @@
 	desc = "A strange kind of fleshy grass often used as a primitive burn medication that rapidly depletes stored nutrients in the body."
 	icon_state = "Agave Leaf"
 	icon = 'icons/obj/flora/wastelandflora.dmi'
-	juice_results = list(/datum/reagent/consumable/agavejuice = 0)
+	juice_results = list(/datum/reagent/consumable/agavejuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/tequila

code/modules/hydroponics/grown/apple.dm

@@ -23,7 +23,7 @@
 	filling_color = "#FF4500"
 	bitesize = 100 // Always eat the apple in one bite
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/applejuice = 0)
+	juice_results = list(/datum/reagent/consumable/applejuice = 1)
 	tastes = list("apple" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/hcider
 

code/modules/hydroponics/grown/banana.dm

@@ -25,7 +25,7 @@
 	filling_color = "#FFFF00"
 	bitesize = 5
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/banana = 0)
+	juice_results = list(/datum/reagent/consumable/banana = 1)
 
 /obj/item/reagent_containers/food/snacks/grown/banana/generate_trash(atom/location)
 	. = ..()

code/modules/hydroponics/grown/berries.dm

@@ -27,7 +27,7 @@
 	filling_color = "#FF00FF"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/berryjuice = 0)
+	juice_results = list(/datum/reagent/consumable/berryjuice = 1)
 	tastes = list("berry" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/gin
 
@@ -50,7 +50,7 @@
 	icon_state = "poisonberrypile"
 	filling_color = "#C71585"
 	foodtype = FRUIT | TOXIC
-	juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
+	juice_results = list(/datum/reagent/consumable/poisonberryjuice = 1)
 	tastes = list("poison-berry" = 1)
 	distill_reagent = null
 	wine_power = 35
@@ -136,7 +136,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
+	grind_results = list(/datum/reagent/consumable/cherryjelly = 1)
 	tastes = list("cherry" = 1)
 	wine_power = 30
 
@@ -160,7 +160,7 @@
 	filling_color = "#6495ED"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list(/datum/reagent/consumable/bluecherryjelly = 0)
+	grind_results = list(/datum/reagent/consumable/bluecherryjelly = 1)
 	tastes = list("blue cherry" = 1)
 	wine_power = 50
 
@@ -185,7 +185,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
+	grind_results = list(/datum/reagent/consumable/cherryjelly = 1)
 	tastes = list("cherry" = 1)
 	wine_power = 50
 
@@ -219,7 +219,7 @@
 	filling_color = "#FF1493"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/grapejuice = 0)
+	juice_results = list(/datum/reagent/consumable/grapejuice = 1)
 	tastes = list("grape" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/wine
 
@@ -263,6 +263,6 @@
 	name = "strawberry"
 	icon_state = "strawberry"
 	filling_color = "#E50D31"
-	juice_results = list(/datum/reagent/consumable/strawberryjuice = 0)
+	juice_results = list(/datum/reagent/consumable/strawberryjuice = 1)
 	tastes = list("strawberries" = 1)
 	wine_power = 20

code/modules/hydroponics/grown/broc.dm

@@ -24,5 +24,5 @@
 	desc = "This vibrant, orange flower grows on tall stalks in the wasteland and exhibits moderate healing properties, even when unprocessed."
 	icon_state = "broc"
 	filling_color = "#FF6347"
-	juice_results = list(/datum/reagent/consumable/brocjuice = 0)
+	juice_results = list(/datum/reagent/consumable/brocjuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/brocbrew

code/modules/hydroponics/grown/cereals.dm

@@ -23,7 +23,7 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list(/datum/reagent/consumable/flour = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0.3)
 	tastes = list("wheat" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/beer
 
@@ -71,7 +71,7 @@
 	filling_color = "#FAFAD2"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list(/datum/reagent/consumable/rice = 0)
+	grind_results = list(/datum/reagent/consumable/rice = 0.3)
 	tastes = list("rice" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/sake
 
@@ -95,7 +95,7 @@
 	bitesize_mod = 2
 	seed = /obj/item/seeds/wheat/meat
 	foodtype = MEAT | GRAIN
-	grind_results = list(/datum/reagent/consumable/flour = 0, /datum/reagent/blood = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0.3, /datum/reagent/blood = 0.3)
 	tastes = list("meatwheat" = 1)
 	can_distill = FALSE
 

code/modules/hydroponics/grown/citrus.dm

@@ -32,7 +32,7 @@
 	foodtype = FRUIT | ANTITOXIC
 	icon_state = "lime"
 	filling_color = "#00FF00"
-	juice_results = list(/datum/reagent/consumable/limejuice = 0)
+	juice_results = list(/datum/reagent/consumable/limejuice = 1)
 
 // Orange
 /obj/item/seeds/orange
@@ -59,7 +59,7 @@
 	desc = "It's a tangy fruit."
 	icon_state = "orange"
 	filling_color = "#FFA500"
-	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
+	juice_results = list(/datum/reagent/consumable/orangejuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
 
 
@@ -87,7 +87,7 @@
 	desc = "You can hardly wrap your head around this thing."
 	icon_state = "orang"
 	filling_color = "#FFA500"
-	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
+	juice_results = list(/datum/reagent/consumable/orangejuice = 1)
 	distill_reagent = /datum/reagent/toxin/mindbreaker
 	tastes = list("polygons" = 1, "bluespace" = 1, "the true nature of reality" = 1)
 
@@ -123,7 +123,7 @@
 	desc = "When life gives you lemons, make lemonade."
 	icon_state = "lemon"
 	filling_color = "#FFD700"
-	juice_results = list(/datum/reagent/consumable/lemonjuice = 0)
+	juice_results = list(/datum/reagent/consumable/lemonjuice = 1)
 
 // Combustible lemon
 /obj/item/seeds/firelemon //combustible lemon is too long so firelemon

code/modules/hydroponics/grown/cocoa_vanilla.dm

@@ -80,7 +80,7 @@
 	trash = /obj/item/reagent_containers/food/snacks/grown/bungopit
 	filling_color = "#E8C22F"
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/bungojuice = 0)
+	juice_results = list(/datum/reagent/consumable/bungojuice = 1)
 	tastes = list("bungo" = 2, "tropical fruitiness" = 1)
 	distill_reagent = null
 

code/modules/hydroponics/grown/corn.dm

@@ -26,7 +26,7 @@
 	trash = /obj/item/grown/corncob
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list(/datum/reagent/consumable/corn_starch = 0)
+	juice_results = list(/datum/reagent/consumable/corn_starch = 1)
 	tastes = list("corn" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/whiskey
 

code/modules/hydroponics/grown/coyotetobacco.dm

@@ -23,5 +23,5 @@
 	desc = "This tobacco like plant is commonly used by tribals for a great variety of medicinal and ceremonial purposes."
 	icon_state = "Coyote Tobacco"
 	filling_color = "#008000"
-	juice_results = list(/datum/reagent/consumable/coyotejuice = 0)
+	juice_results = list(/datum/reagent/consumable/coyotejuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/deathroach

code/modules/hydroponics/grown/datura.dm

@@ -24,5 +24,5 @@
 	filling_color = "#FFA500"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list(/datum/reagent/consumable/daturajuice = 0)
+	juice_results = list(/datum/reagent/consumable/daturajuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/daturatea

code/modules/hydroponics/grown/feracactus.dm

@@ -25,5 +25,5 @@
 	icon_state = "feracactus"
 	filling_color = "#FF6347"
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/ferajuice = 0)
+	juice_results = list(/datum/reagent/consumable/ferajuice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/yellowpulque

code/modules/hydroponics/grown/flowers.dm

@@ -279,7 +279,7 @@
 	throw_speed = 1
 	throw_range = 3
 	attack_verb = list("roasted", "scorched", "burned")
-	grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0)
+	grind_results = list(/datum/reagent/consumable/capsaicin = 0.25, /datum/reagent/consumable/condensedcapsaicin = 0.3)
 	tastes = list("cooked sunflower" = 1)
 
 /obj/item/grown/novaflower/add_juice()

code/modules/hydroponics/grown/melon.dm

@@ -33,10 +33,9 @@
 	filling_color = "#008000"
 	bitesize_mod = 3
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
+	juice_results = list(/datum/reagent/consumable/watermelonjuice = 1)
 	wine_power = 40
 
-/*
 
 // Holymelon
 /obj/item/seeds/watermelon/holy
@@ -76,4 +75,3 @@
 	to_chat(user, "<span class='warning'>[src] rapidly turns into ash!</span>")
 	qdel(src)
 	new /obj/effect/decal/cleanable/ash(drop_location())
-*/

code/modules/hydroponics/grown/mutfruit.dm

@@ -23,4 +23,4 @@
 	icon_state = "mutfruit"
 	filling_color = "#FF6347"
 	distill_reagent = /datum/reagent/consumable/ethanol/purplecider
-	juice_results = list(/datum/reagent/consumable/mutjuice = 0)
+	juice_results = list(/datum/reagent/consumable/mutjuice = 1)

code/modules/hydroponics/grown/peach.dm

@@ -23,5 +23,5 @@
 	filling_color = "#FF4500"
 	bitesize = 25
 	foodtype = FRUIT
-	juice_results = list(/datum/reagent/consumable/peachjuice = 0)
+	juice_results = list(/datum/reagent/consumable/peachjuice = 1)
 	tastes = list("peach" = 1)

code/modules/hydroponics/grown/peas.dm

@@ -62,7 +62,7 @@
 	filling_color = "#ee7bee"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list (/datum/reagent/consumable/laughsyrup = 0)
+	juice_results = list (/datum/reagent/consumable/laughsyrup = 0.5)
 	tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is.
 	wine_power = 90
 	wine_flavor = "a vector-graphic rabbit dancing on your tongue"

code/modules/hydroponics/grown/pineapple.dm

@@ -30,6 +30,6 @@
 	filling_color = "#F6CB0B"
 	w_class = WEIGHT_CLASS_NORMAL
 	foodtype = FRUIT | PINEAPPLE
-	juice_results = list(/datum/reagent/consumable/pineapplejuice = 0)
+	juice_results = list(/datum/reagent/consumable/pineapplejuice = 1)
 	tastes = list("pineapple" = 1)
 	wine_power = 40

code/modules/hydroponics/grown/pinyon.dm

@@ -28,5 +28,5 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list(/datum/reagent/consumable/flour = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0.8)
 	tastes = list("pine nuts" = 1)

code/modules/hydroponics/grown/potato.dm

@@ -26,7 +26,7 @@
 	filling_color = "#E9967A"
 	bitesize = 100
 	foodtype = VEGETABLES
-	juice_results = list(/datum/reagent/consumable/tato_juice = 0)
+	juice_results = list(/datum/reagent/consumable/tato_juice = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/vodka
 
 /obj/item/reagent_containers/food/snacks/grown/potato/wedges

code/modules/hydroponics/grown/prickly.dm

@@ -26,7 +26,7 @@
 	filling_color = "#FF6347"
 	foodtype = FRUIT
 	bitesize_mod = 2
-	juice_results = list(/datum/reagent/consumable/tea/pricklytea = 0)
+	juice_results = list(/datum/reagent/consumable/tea/pricklytea = 1)
 	tastes = list("sweet cactus" = 1)
 	distill_reagent = /datum/reagent/consumable/ethanol/pinkpulque