Merge branch 'master' into sextended

ARF-SS13 · Oct 18, 2023 · 733838c · 733838c
2 parents cfadcd7 + 26d79c6
commit 733838c
Show file tree

Hide file tree

Showing 229 changed files with 5,314 additions and 3,749 deletions.
diff --git a/COOLBOOK_books/chief_guide/Leadership.txt b/COOLBOOK_books/chief_guide/Leadership.txt
@@ -40,7 +40,7 @@ A chief who does not build trust with those around him will have a dagger at his
 - All look to you for leadership.  Make sure that what they see and seek to emulate is something that should be copied.
 
 5. Know when to delegate tasks
-- You are but one soul chief.  Remember that at all times.  Use the shamans, druids, and Head Hunter to ease your workload.  Do not lose sight of the forest for the trees.
+- You are but one soul chief.  Remember that at all times.  Use the shamans, druids, and Hunt Master to ease your workload.  Do not lose sight of the forest for the trees.
 
 6. Know your limits
 - Know when it is time to step back and approach a problem in a different way.  While there are times that doubling down is the right choice for a hunt, there are also
@@ -54,4 +54,4 @@ Instead, have the space to step back from a mistake and realize what it is.  Tak
 
 When the darkness comes.
 When the torches sputter out.
-Lead with wisdom, chief.
+Lead with wisdom, chief.
diff --git a/COOLBOOK_books/chief_guide/Our History.txt b/COOLBOOK_books/chief_guide/Our History.txt
@@ -70,7 +70,7 @@ The climb out of the long darkness was not perilous, but the surface was.  This
 hellpigs, deathclaws.  None of these monsters had ever creeped into the Bottoms lands before the storm and were considered rumors by many of our people.
 
 A few hunters knew otherwise, having been welcomed in as refugees themselves before the sealing of the cave they taught how to fight these new creatures and showed us all how
-to engage them successfully. We conquered the land around us in a way that we never had before, the Head Hunter and Guardian concepts grew into being as the village became a town.
+to engage them successfully. We conquered the land around us in a way that we never had before, the Hunt Master and Guardian concepts grew into being as the village became a town.
 Then a city.  
 
 Fired clay on unstable earth, gecko meat over a humid campsite.  These days were full of growth.

diff --git a/COOLBOOK_books/druid_guide/Our History.txt b/COOLBOOK_books/druid_guide/Our History.txt
@@ -70,7 +70,7 @@ The climb out of the long darkness was not perilous, but the surface was.  This
 hellpigs, deathclaws.  None of these monsters had ever creeped into the Bottoms lands before the storm and were considered rumors by many of our people.
 
 A few hunters knew otherwise, having been welcomed in as refugees themselves before the sealing of the cave they taught how to fight these new creatures and showed us all how
-to engage them successfully. We conquered the land around us in a way that we never had before, the Head Hunter and Guardian concepts grew into being as the village became a town.
+to engage them successfully. We conquered the land around us in a way that we never had before, the Hunt Master and Guardian concepts grew into being as the village became a town.
 Then a city.  
 
 Fired clay on unstable earth, gecko meat over a humid campsite.  These days were full of growth.

diff --git a/COOLBOOK_books/villager_guide/Our History.txt b/COOLBOOK_books/villager_guide/Our History.txt
@@ -70,7 +70,7 @@ The climb out of the long darkness was not perilous, but the surface was.  This
 hellpigs, deathclaws.  None of these monsters had ever creeped into the Bottoms lands before the storm and were considered rumors by many of our people.
 
 A few hunters knew otherwise, having been welcomed in as refugees themselves before the sealing of the cave they taught how to fight these new creatures and showed us all how
-to engage them successfully. We conquered the land around us in a way that we never had before, the Head Hunter and Guardian concepts grew into being as the village became a town.
+to engage them successfully. We conquered the land around us in a way that we never had before, the Hunt Master and Guardian concepts grew into being as the village became a town.
 Then a city.  
 
 Fired clay on unstable earth, gecko meat over a humid campsite.  These days were full of growth.

diff --git a/COOLBOOK_books/warrior_guide/Our History.txt b/COOLBOOK_books/warrior_guide/Our History.txt
@@ -70,7 +70,7 @@ The climb out of the long darkness was not perilous, but the surface was.  This
 hellpigs, deathclaws.  None of these monsters had ever creeped into the Bottoms lands before the storm and were considered rumors by many of our people.
 
 A few hunters knew otherwise, having been welcomed in as refugees themselves before the sealing of the cave they taught how to fight these new creatures and showed us all how
-to engage them successfully. We conquered the land around us in a way that we never had before, the Head Hunter and Guardian concepts grew into being as the village became a town.
+to engage them successfully. We conquered the land around us in a way that we never had before, the Hunt Master and Guardian concepts grew into being as the village became a town.
 Then a city.  
 
 Fired clay on unstable earth, gecko meat over a humid campsite.  These days were full of growth.

diff --git a/COOLBOOK_books/warrior_guide/index.json b/COOLBOOK_books/warrior_guide/index.json
@@ -10,7 +10,7 @@
 	"content" : [
 		"Greetings hunter",
 		"",
-		"This book has been an attempt by multiple head hunters and guardians to pass to you information that we think is vital.",
+		"This book has been an attempt by multiple Hunt Masters and guardians to pass to you information that we think is vital.",
 		"",
 		"Take care to read it carefully",
 		"",

diff --git a/_maps/map_files/Pahrump-Sunset/Dungeons.dmm b/_maps/map_files/Pahrump-Sunset/Dungeons.dmm
@@ -7646,15 +7646,6 @@
 	},
 /turf/open/floor/plating/tunnel,
 /area/f13/brotherhood/rnd)
-"dub" = (
-/obj/effect/decal/cleanable/dirt{
-	color = "#363636"
-	},
-/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril{
-	faction = list("mining","skeleton")
-	},
-/turf/open/floor/carpet/royalblack,
-/area/f13/building)
 "duA" = (
 /obj/effect/decal/remains/human,
 /turf/open/indestructible/ground/inside/mountain,
@@ -26404,15 +26395,6 @@
 	icon_state = "darkdirtysolid"
 	},
 /area/f13/enclave)
-"mht" = (
-/obj/effect/decal/cleanable/dirt{
-	color = "#363636"
-	},
-/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril{
-	faction = list("mining","skeleton")
-	},
-/turf/open/floor/wood_worn/wood_worn_dark,
-/area/f13/building)
 "mhA" = (
 /obj/structure/decoration/clock/old/active{
 	pixel_y = 32
@@ -114751,7 +114733,7 @@ toL
 riC
 lNK
 riC
-dub
+riC
 riC
 riC
 riC
@@ -116802,7 +116784,7 @@ iBB
 iBB
 iBB
 iBB
-mht
+iBB
 iBB
 iBB
 jSX
@@ -116813,7 +116795,7 @@ iBB
 pdE
 pdE
 pdE
-mht
+iBB
 iBB
 iBB
 iBB
@@ -117833,7 +117815,7 @@ ryA
 iBB
 iBB
 iBB
-mht
+iBB
 iBB
 rzd
 iBB

diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm
@@ -8382,7 +8382,6 @@
 /area/f13/tunnel)
 "dWl" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/bodypart/l_arm,
 /obj/effect/spawner/lootdrop/f13/uncommon,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
@@ -10323,7 +10322,6 @@
 /obj/item/clothing/head/hooded/human_head{
 	pixel_y = -10
 	},
-/obj/item/bodypart/chest,
 /turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/building/hospital)
 "fmc" = (
@@ -16728,7 +16726,6 @@
 	},
 /area/f13/tunnel)
 "jBD" = (
-/obj/item/bodypart/l_arm,
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "gibbear1"
 	},
@@ -25969,6 +25966,7 @@
 "pyb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/hydronutrients,
 /turf/open/floor/plasteel/f13/vault_floor/green/white/side{
 	dir = 6
 	},
@@ -38352,6 +38350,15 @@
 /obj/effect/spawner/lootdrop/f13/weapon/junk,
 /turf/open/floor/plating/tunnel,
 /area/f13/building/sewers)
+"xtE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel/f13/vault_floor/green/white,
+/area/f13/building)
 "xul" = (
 /obj/structure/wreck/trash/engine,
 /obj/effect/decal/cleanable/dirt,
@@ -41814,7 +41821,7 @@ bOb
 bOb
 pyb
 iEO
-rkV
+xtE
 jdc
 qlF
 pcG

diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Upper.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Upper.dmm
@@ -10226,7 +10226,6 @@
 /obj/structure/closet/fridge{
 	anchored = 1
 	},
-/obj/item/bodypart/l_arm,
 /obj/item/reagent_containers/food/snacks/f13/canned/dog,
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
@@ -11579,11 +11578,6 @@
 /obj/structure/closet/crate/bin/trashbin,
 /turf/open/floor/f13/wood,
 /area/f13/ruins)
-"jic" = (
-/obj/item/bodypart/l_arm,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plasteel/f13/vault_floor/floor,
-/area/f13/building/hospital)
 "jiC" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /mob/living/simple_animal/hostile/handy,
@@ -38573,7 +38567,7 @@ cOy
 ohv
 ohv
 ioS
-cjk
+iWq
 ioS
 cBX
 kUv
@@ -74496,7 +74490,7 @@ wCN
 ncX
 mYX
 sPQ
-jic
+vIH
 xXQ
 tVL
 oab