Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul

Tribal Crafting Overhauled & Expanded
This commit is contained in:
silicons
2021-10-03 11:20:55 -07:00
committed by GitHub
22 changed files with 140438 additions and 140177 deletions
+2 -2
View File
@@ -535,13 +535,13 @@
oneuse = FALSE
remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?")
/obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
/*/obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
name = "bowyery sandstone slab" // this is an actual word
desc = "A sandstone slab with inscriptions describing the Ash Walkers of Lavaland's bowyery."
crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet)
icon_state = "stone_tablet"
oneuse = FALSE
remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...")
remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...")*/
/obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book
name = "Under The Oven"
+1 -1
View File
@@ -312,7 +312,7 @@
/obj/item/storage/belt/mining/primitive/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 5
STR.max_items = 8
/obj/item/storage/belt/soulstone
name = "soul stone belt"
+7
View File
@@ -41,6 +41,13 @@
/obj/item/crowbar/brass/family
toolspeed = 1
/obj/item/crowbar/ashwalker
name = "bone crowbar"
desc = "A rudimentary crowbar made of bones."
icon = 'icons/obj/mining.dmi'
icon_state = "crowbar_bone"
toolspeed = 0.75
/obj/item/crowbar/bronze
name = "bronze plated crowbar"
desc = "A bronze plated crowbar."
@@ -93,6 +93,14 @@
/obj/item/screwdriver/brass/family
toolspeed = 1
/obj/item/screwdriver/ashwalker
name = "bone screwdriver"
desc = "A rudimentary screwdriver made of carved bones."
icon = 'icons/obj/mining.dmi'
icon_state = "screwdriver_bone"
toolspeed = 0.75
random_color = FALSE
/obj/item/screwdriver/bronze
name = "bronze screwdriver"
desc = "A screwdriver plated with bronze."
@@ -385,6 +385,16 @@
icon_state = "clockwelder"
item_state = "brasswelder"
/obj/item/weldingtool/experimental/ashwalker
name = "necropolis welding torch"
desc = "A mysterious welding tool with its origins in the depths of the necropolis. A mysterious force keeps replenishing its fuel."
resistance_flags = FIRE_PROOF | ACID_PROOF
refueling_interval = 5
toolspeed = 0.75
max_fuel = 20
icon = 'icons/obj/mining.dmi'
icon_state = "ashwelder"
/obj/item/weldingtool/abductor
name = "alien welding tool"
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
@@ -90,6 +90,14 @@
/obj/item/wirecutters/brass/family
toolspeed = 1
/obj/item/wirecutters/ashwalker
name = "bone wirecutters"
desc = "Rudimentary wirecutters made out of sharpened bones and sinew."
icon = 'icons/obj/mining.dmi'
icon_state = "cutters_bone"
toolspeed = 0.75
random_color = FALSE
/obj/item/wirecutters/bronze
name = "bronze plated wirecutters"
desc = "A pair of wirecutters plated with bronze."
+7
View File
@@ -44,6 +44,13 @@
/obj/item/wrench/brass/family
toolspeed = 1
/obj/item/wrench/ashwalker
name = "bone wrench"
desc = "A shoddy wrench made out of bent bones and sinew."
icon = 'icons/obj/mining.dmi'
icon_state = "wrench_bone"
toolspeed = 0.75
/obj/item/wrench/bronze
name = "bronze plated wrench"
desc = "A bronze plated wrench."
@@ -66,12 +66,6 @@
//Ash walkers on birth understand how to make bone bows, bone arrows and ashen arrows
new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_arrow)
new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_bow)
new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/ashen_arrow)
new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/quiver)
new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bow_tablet)
if(ishuman(new_spawn))
var/mob/living/carbon/human/H = new_spawn
H.underwear = "Nude"
@@ -634,9 +628,9 @@
log_game("[key_name(user)] has successfully pried open [src] and disabled a space pirate spawner.")
W.play_tool_sound(src)
playsound(src.loc, 'modular_citadel/sound/voice/scream_skeleton.ogg', 50, 1, 4, 1.2)
if(rank == "Captain")
if(rank == "Captain")
new /obj/effect/mob_spawn/human/pirate/corpse/captain(get_turf(src))
else
else
new /obj/effect/mob_spawn/human/pirate/corpse(get_turf(src))
qdel(src)
else