Merge branch 'master' into loadout-averaging

Foundation-19 · Dec 7, 2023 · d88241e · d88241e
2 parents c4d3130 + d66ce57
commit d88241e
Show file tree

Hide file tree

Showing 8 changed files with 192,579 additions and 184,652 deletions.
diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
diff --git a/code/datums/components/crafting/recipes/recipes_medicine.dm b/code/datums/components/crafting/recipes/recipes_medicine.dm
@@ -34,16 +34,16 @@
 /datum/crafting_recipe/healpowder
 	name = "Healing powder"
 	result = /obj/item/reagent_containers/pill/patch/healingpowder
-	reqs = list(/obj/item/reagent_containers/food/snacks/grown/broc = 3,
-				/obj/item/reagent_containers/food/snacks/grown/xander = 3)
+	reqs = list(/obj/item/reagent_containers/food/snacks/grown/broc = 2,
+				/obj/item/reagent_containers/food/snacks/grown/xander = 2)
 	time = 5
 	category = CAT_MEDICAL
 
 /datum/crafting_recipe/healpowder5
 	name = "Batch of healing powders (x5)"
 	result = /obj/item/storage/box/medicine/powder5
-	reqs = list(/obj/item/reagent_containers/food/snacks/grown/broc = 15,
-				/obj/item/reagent_containers/food/snacks/grown/xander = 15)
+	reqs = list(/obj/item/reagent_containers/food/snacks/grown/broc = 10,
+				/obj/item/reagent_containers/food/snacks/grown/xander = 10)
 	time = 5
 	category = CAT_MEDICAL
 

diff --git a/code/game/turfs/simulated/floor/f13_floors.dm b/code/game/turfs/simulated/floor/f13_floors.dm
@@ -530,3 +530,39 @@
 	icon = 'icons/turf/ice.dmi'
 	icon_state = "ice_floor"
 
+/// Rooftops
+
+/turf/open/floor/plating/f13/outside/roof
+	name = "\proper rooftop"
+	desc = "It's a roof. What more do you want?"
+	icon = 'icons/fallout/turfs/f13rooftop.dmi'
+	icon_state = "brick_1"
+
+/turf/open/floor/plating/f13/outside/roof/red
+	icon_state = "brick_r"
+
+/turf/open/floor/plating/f13/outside/roof/blue
+	icon_state = "brick_b"
+
+/turf/open/floor/plating/f13/outside/roof/metal
+	name = "\proper metal roof"
+	icon_state = "rust_1"
+
+/turf/open/floor/plating/f13/outside/roof/metal/verdigris
+	icon_state = "rust_c"
+
+/turf/open/floor/plating/f13/outside/roof/metal/corrugated
+	icon_state = "shingles_1"
+
+/turf/open/floor/plating/f13/outside/roof/metal/corrugated/red
+	icon_state = "shingles_r"
+
+/turf/open/floor/plating/f13/outside/roof/metal/corrugated/green
+	icon_state = "shingles_g"
+
+/turf/open/floor/plating/f13/outside/roof/wood
+	name = "\proper wooden roof"
+	icon_state = "wood_1"
+
+/turf/open/floor/plating/f13/outside/roof/wood/old
+	icon_state = "wood_2"
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -1718,11 +1718,14 @@ Brand for permanently marking brahmin as yours (won't stop people stealing em an
 
 /mob/living/simple_animal/horse/post_buckle_mob(mob/living/M)
 	. = ..()
-	action.Grant(M)	
+	action.Grant(M)
+	ADD_TRAIT(M, TRAIT_NOGUNS, type)
+
 
 /mob/living/simple_animal/horse/post_unbuckle_mob(mob/living/M)
 	. = ..()
 	action.Remove(M)
+	REMOVE_TRAIT(M, TRAIT_NOGUNS, type)
 
 /datum/action/cooldown/horse/Trigger()
 	. = ..()

diff --git a/code/modules/projectiles/guns/ballistic/flamethrower.dm b/code/modules/projectiles/guns/ballistic/flamethrower.dm
@@ -98,7 +98,7 @@
 	icon_state = "m2_flamethrower_on"
 	item_state = "m2flamethrower"
 	flags_1 = CONDUCT_1
-	slowdown = 1
+	slowdown = 0.4
 	slot_flags = null
 	w_class = WEIGHT_CLASS_HUGE
 	custom_materials = null

diff --git a/icons/fallout/turfs/f13rooftop.dmi b/icons/fallout/turfs/f13rooftop.dmi