lots of things

_maps/map_files/Pahrump/Pahrump-Surface-2.dmm

@@ -3447,8 +3447,7 @@
 	move_me = 1
 	},
 /obj/effect/turf_decal/stripes/red/line{
-	dir = 9;
-	icon_state = "warningline_red"
+	dir = 9
 	},
 /turf/open/floor/plasteel/f13/vault_floor/plating,
 /area/f13/brotherhood)
@@ -5005,8 +5004,7 @@
 	move_me = 1
 	},
 /obj/effect/turf_decal/stripes/red/line{
-	dir = 10;
-	icon_state = "warningline_red"
+	dir = 10
 	},
 /turf/open/floor/plasteel/f13/vault_floor/plating,
 /area/f13/brotherhood)
@@ -13055,6 +13053,10 @@
 /obj/item/reagent_containers/blood/radaway,
 /turf/open/floor/f13/wood,
 /area/f13/village)
+"hOT" = (
+/obj/machinery/rnd/server/vault,
+/turf/open/floor/plasteel/f13/vault_floor/green/white/whitegreenchess,
+/area/f13/city)
 "hPA" = (
 /obj/structure/stacklifter,
 /turf/open/floor/f13,
@@ -14128,8 +14130,7 @@
 /area/f13/city)
 "iul" = (
 /obj/structure/chair/comfy/black{
-	dir = 8;
-	icon_state = "comfychair"
+	dir = 8
 	},
 /turf/open/floor/carpet/green,
 /area/f13/ncr)
@@ -17998,7 +17999,6 @@
 "kMu" = (
 /obj/structure/fermenting_barrel,
 /obj/effect/decal/fakelattice{
-	density = 0;
 	pixel_x = 17
 	},
 /turf/open/indestructible/ground/inside/mountain,
@@ -18401,7 +18401,6 @@
 	pixel_x = -3
 	},
 /obj/effect/decal/fakelattice{
-	density = 0;
 	pixel_x = 17
 	},
 /turf/open/indestructible/ground/inside/mountain,
@@ -25236,8 +25235,7 @@
 	move_me = 1
 	},
 /obj/effect/turf_decal/stripes/red/line{
-	dir = 5;
-	icon_state = "warningline_red"
+	dir = 5
 	},
 /turf/open/floor/plasteel/f13/vault_floor/plating,
 /area/f13/brotherhood)
@@ -25455,7 +25453,6 @@
 "pEJ" = (
 /obj/structure/closet/crate/large,
 /obj/effect/decal/fakelattice{
-	density = 0;
 	pixel_x = 17
 	},
 /turf/open/floor/f13/wood,
@@ -30360,7 +30357,6 @@
 /area/f13/caves)
 "sIN" = (
 /obj/effect/decal/fakelattice{
-	density = 0;
 	pixel_x = 17
 	},
 /turf/open/indestructible/ground/inside/mountain,
@@ -35874,8 +35870,7 @@
 	move_me = 1
 	},
 /obj/effect/turf_decal/stripes/red/line{
-	dir = 6;
-	icon_state = "warningline_red"
+	dir = 6
 	},
 /turf/open/floor/plasteel/f13/vault_floor/plating,
 /area/f13/brotherhood)
@@ -36493,8 +36488,7 @@
 /area/f13/wasteland)
 "wpd" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = "bosgarage";
-	name = "shutters"
+	id = "bosgarage"
 	},
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/brotherhood)
@@ -57828,7 +57822,7 @@ sAL
 sfB
 yiF
 xWT
-xnr
+hOT
 xnr
 xnr
 xnr

code/__DEFINES/traits.dm

@@ -213,6 +213,7 @@
 #define TRAIT_PERFECT_ATTACKER	"perfect_attacker"
 #define TRAIT_BUFFOUT_BUFF		"buffout_buff"
 #define TRAIT_UNARMED_WEAPON	"unarmed_weapon"
+#define TRAIT_CHEM_USER 		"chem_user" //average chem enjoyer vs chad ace outlaw
 
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)

code/controllers/subsystem/ticker.dm

@@ -716,25 +716,24 @@ SUBSYSTEM_DEF(ticker)
 		'sound/f13roundend/these_days.ogg',
 		'sound/f13roundend/democracy.ogg',
 		'sound/f13roundend/power_armor.ogg',
-		'sound/f13roundend/deathclaws_can_speak_and_theyre_lizard_people.ogg',
 		'sound/f13roundend/three_dog_awooo.ogg',
-		'sound/f13roundend/fallout_dodgeball_truncated.ogg',
-		'sound/f13roundend/fuck_me_sideways.ogg',
-		'sound/f13roundend/i_prefer_the_term_autocrat.ogg',
 		'sound/f13roundend/i_should_kick_your_fucking_ass.ogg',
-		'sound/f13roundend/im_turning_into_a_ghoul.ogg',
 		'sound/f13roundend/lupa_is_still_a_tough_old_bitch.ogg',
-		'sound/f13roundend/sulik_suggests_a_hole.ogg',
 		'sound/f13roundend/sulik_suggests_soap.ogg',
 		'sound/f13roundend/centurion_armor_unspattered.ogg',
-		'sound/f13roundend/legions_view_on_slavery.ogg',
 		'sound/f13roundend/we_gone_get_along_just_fine.ogg',
 		'sound/f13roundend/this_one_bad_trip_friend.ogg',
 		'sound/f13roundend/silk_sheets.ogg',
 		'sound/f13roundend/war_never_changes_3.ogg',
-		'sound/f13roundend/we_can_go_another_round.ogg',
 		'sound/f13roundend/wham_bam_oh_god_my_brains.ogg',
 		'sound/f13roundend/mr_new_vegas_says_i_love_you.ogg',
+		'sound/f13roundend/a_kiss_to_build_a_dream_on.ogg',
+		'sound/f13roundend/You_Do_Want_Us_To_Be_Friends_Right.ogg',
+		'sound/f13roundend/Get_Fucked.ogg',
+		'sound/f13roundend/Deep_and_Wide.ogg',
+		'sound/f13roundend/Load_Your_Gun.ogg',
+		'sound/f13roundend/Good_Old_Days.ogg',
+		'sound/f13roundend/Horrible_Sticky_Blood.ogg',
 		'sound/f13roundend/youve_gotten_a_lot_farther_than_you_should_have.ogg'	,\
 		)
 

code/game/objects/items/granters.dm

@@ -915,13 +915,21 @@
 	traitname = "hitting things"
 	remarks = list("Line up your bat...", "Judge target travel speed...", "Buy a premium swatter to maximize ball hit rate - or to break skulls...", "Apply blunt object to head...")
 
+/obj/item/book/granter/trait/chem_user
+	name = "Cook-Cook's guide to enjoying your cook-up"
+	desc = "A manual on how to take chems and not suffer too many adverse effects."
+	oneuse = TRUE
+	granted_trait = TRAIT_CHEM_USER
+	traitname = "chem use"
+	remarks = list("Clean your needles...", "Ensure you have quality product...", "Don't mix drugs...", "Only buy from trusted dealers...")
+
 /obj/item/book/granter/trait/selection
 	name = "Private Diary"
 	desc = "Your private diary, reminding you of the knowledge you previously had."
 	granted_trait = null
 
 /obj/item/book/granter/trait/selection/attack_self(mob/user)
-	var/list/choices = list("Hard Yards","Minor Surgery","Power Armor","Chemistry","Salvager","Melee Expert", "Tinkerer")
+	var/list/choices = list("Hard Yards","Minor Surgery","Power Armor","Chemistry","Salvager","Melee Expert", "Tinkerer", "Iron Fist")
 	if(granted_trait == null)
 		var/choice = input("Choose a trait:") in choices
 		switch(choice)
@@ -949,9 +957,45 @@
 			if("Tinkerer")
 				granted_trait = TRAIT_MASTER_GUNSMITH
 				traitname = "tinkering"
+			if("Iron Fist")
+				granted_trait = TRAIT_IRONFIST
+				traitname = "punching"	
 	else
 		. = ..()
 
 /obj/item/book/granter/trait/selection/Initialize()
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, TRAIT_GENERIC)
+
+
+/obj/item/book/granter/trait/selection/waster
+
+/obj/item/book/granter/trait/selection/waster/attack_self(mob/user)
+	var/list/choices = list("Minor Surgery","Chemistry","Salvager", "Tinkerer", "Chem User")
+	if(granted_trait == null)
+		var/choice = input("Choose a trait:") in choices
+		switch(choice)
+			if(null)
+				return 0
+			if("Minor Surgery")
+				granted_trait = TRAIT_SURGERY_LOW
+				traitname = "minor surgery"
+			if("Chemistry")
+				granted_trait = TRAIT_CHEMWHIZ
+				traitname = "chemistry"
+				crafting_recipe_types = list(/datum/crafting_recipe/jet, /datum/crafting_recipe/turbo, /datum/crafting_recipe/psycho, /datum/crafting_recipe/medx, /datum/crafting_recipe/buffout)
+			if("Salvager")
+				granted_trait = TRAIT_TECHNOPHREAK
+				traitname = "salvaging"
+			if("Tinkerer")
+				granted_trait = TRAIT_MASTER_GUNSMITH
+				traitname = "tinkering"
+			if("Chem User")
+				granted_trait = TRAIT_CHEM_USER
+				traitname = "chem use"	
+	else
+		. = ..()
+
+/obj/item/book/granter/trait/selection/waster/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, TRAIT_GENERIC)

code/modules/fallout/reagents/drugs.dm

@@ -19,6 +19,14 @@
 /datum/reagent/drug/jet/on_mob_life(mob/living/carbon/M)
 	M.adjustStaminaLoss(-20, 0)
 	M.set_drugginess(20)
+	var/is_druggie = FALSE
+	if(HAS_TRAIT(M, TRAIT_CHEM_USER))
+		is_druggie = TRUE
+	if(is_druggie == FALSE)
+		to_chat(M, "<span class='userdanger'>I don't feel like I should be taking this!</span>")
+		M.blur_eyes(50)
+		M.set_disgust(100)
+		M.Dizzy(50)
 	if(CHECK_MOBILITY(M, MOBILITY_MOVE) && !isspaceturf(M.loc) && prob(10))
 		step(M, pick(GLOB.cardinals))
 	if(prob(12))
@@ -94,6 +102,14 @@
 
 /datum/reagent/drug/turbo/on_mob_life(mob/living/carbon/M)
 	var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
+	var/is_druggie = FALSE
+	if(HAS_TRAIT(M, TRAIT_CHEM_USER))
+		is_druggie = TRUE
+	if(is_druggie == FALSE)
+		to_chat(M, "<span class='userdanger'>I don't feel like I should be taking this!</span>")
+		M.blur_eyes(50)
+		M.set_disgust(100)
+		M.Dizzy(50)
 	if(prob(5))
 		to_chat(M, "<span class='notice'>[high_message]</span>")
 	M.Jitter(2)
@@ -163,6 +179,14 @@
 
 /datum/reagent/drug/psycho/on_mob_life(mob/living/carbon/M)
 	var/high_message = pick("<br><font color='#FF0000'><b>FUCKING KILL!</b></font>", "<br><font color='#FF0000'><b>RAAAAR!</b></font>", "<br><font color='#FF0000'><b>BRING IT!</b></font>")
+	var/is_druggie = FALSE
+	if(HAS_TRAIT(M, TRAIT_CHEM_USER))
+		is_druggie = TRUE
+	if(is_druggie == FALSE)
+		to_chat(M, "<span class='userdanger'>I don't feel like I should be taking this!</span>")
+		M.blur_eyes(50)
+		M.set_disgust(100)
+		M.Dizzy(50)
 	if(prob(20))
 		to_chat(M, "<span class='notice'>[high_message]</span>")
 	M.AdjustStun(-25, 0)
@@ -273,6 +297,14 @@
 		M.health -= 25
 
 /datum/reagent/drug/buffout/on_mob_life(mob/living/carbon/M)
+	var/is_druggie = FALSE
+	if(HAS_TRAIT(M, TRAIT_CHEM_USER))
+		is_druggie = TRUE
+	if(is_druggie == FALSE)
+		to_chat(M, "<span class='userdanger'>I don't feel like I should be taking this!</span>")
+		M.blur_eyes(50)
+		M.set_disgust(100)
+		M.Dizzy(50)
 	M.AdjustStun(-10*REAGENTS_EFFECT_MULTIPLIER, 0)
 	M.AdjustKnockdown(-10*REAGENTS_EFFECT_MULTIPLIER, 0)
 	..()

code/modules/fallout/reagents/medicines.dm

@@ -310,6 +310,14 @@ datum/reagent/medicine/bitter_drink/on_mob_life(mob/living/M)
 	..()
 
 /datum/reagent/medicine/medx/on_mob_life(mob/living/carbon/M)
+	var/is_druggie = FALSE
+	if(HAS_TRAIT(M, TRAIT_CHEM_USER))
+		is_druggie = TRUE
+	if(is_druggie == FALSE)
+		to_chat(M, "<span class='userdanger'>I don't feel like I should be taking this!</span>")
+		M.blur_eyes(50)
+		M.set_disgust(100)
+		M.Dizzy(50)
 	M.AdjustStun(-30*REAGENTS_EFFECT_MULTIPLIER, 0)
 	M.AdjustKnockdown(-30*REAGENTS_EFFECT_MULTIPLIER, 0)
 	M.AdjustUnconscious(-30*REAGENTS_EFFECT_MULTIPLIER, 0)

code/modules/jobs/job_types/legion.dm

@@ -28,7 +28,6 @@
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/legioncombatarmormk2)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/legioncombathelmetmk2)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/cateye)
-	H.mind.teach_crafting_recipe(/datum/crafting_recipe/hydra)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/legionsalvagedarmorconversion)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/Legionhelmsalvagedarmorconversion)
 

code/modules/jobs/job_types/tribals.dm

@@ -38,6 +38,7 @@
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/sturdybow)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/silverbow)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/bonebow)
+	H.mind.teach_crafting_recipe(/datum/crafting_recipe/hydra)
 
 /*
 Tribal Chief