cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 21:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NONMOD] Locks tribal weapons to ashwalkers (#11505)

Browse Source 
* uncrafts bone sword adds to village

* why is this so fucking strong

* locks all tribal weapons to tribals.

* changes requested
This commit is contained in:
YakumoChen
2022-02-15 13:05:22 +00:00
committed by GitHub
parent 63ff2c9218
commit 87d7992ebf
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm
+7 -4
View File
@@ -582,9 +582,9 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"tm" = (
/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch,
/obj/structure/stone_tile/surrounding/cracked,
/obj/structure/stone_tile/cracked,
/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"tH" = (
@@ -833,7 +833,6 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"Do" = (
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 8
},
@@ -843,6 +842,7 @@
/obj/structure/stone_tile/cracked{
dir = 4
},
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"DJ" = (
@@ -1049,8 +1049,8 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"LM" = (
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/obj/structure/stone_tile/slab,
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"LO" = (
@@ -1410,8 +1410,8 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"RR" = (
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/obj/structure/stone_tile/slab/burnt,
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"St" = (
@@ -1442,6 +1442,9 @@
/obj/item/knife/combat/bone{
pixel_x = -8
},
/obj/item/claymore/bone{
pixel_x = 8
},
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"SF" = (
code/datums/components/crafting/recipes.dm
+3
View File
@@ -927,6 +927,7 @@
result = /obj/item/knife/combat/bone
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2)
always_available = FALSE //SKYRAT EDIT
category = CAT_PRIMAL
/datum/crafting_recipe/bonespear
@@ -935,6 +936,7 @@
time = 30
reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1)
always_available = FALSE //SKYRAT EDIT
category = CAT_PRIMAL
/datum/crafting_recipe/boneaxe
@@ -943,6 +945,7 @@
time = 50
reqs = list(/obj/item/stack/sheet/bone = 6,
/obj/item/stack/sheet/sinew = 3)
always_available = FALSE //SKYRAT EDIT
category = CAT_PRIMAL
/datum/crafting_recipe/bonfire
code/game/objects/items/spear.dm
+2 -2
View File
@@ -179,14 +179,14 @@
icon_prefix = "bone_spear"
name = "bone spear"
desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
force = 12
force = 8 //SKYRAT EDIT
throwforce = 22
reach = 2 // SKYRAT EDIT
armour_penetration = 15 //Enhanced armor piercing
/obj/item/spear/bonespear/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=12, force_wielded=20, icon_wielded="[icon_prefix]1")
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=16, icon_wielded="[icon_prefix]1") //SKYRAT EDIT
/*
* Bamboo Spear
code/modules/antagonists/ashwalker/ashwalker.dm
+5
View File
@@ -33,6 +33,11 @@
RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, .proc/on_examinate)
owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key)
owner.teach_crafting_recipe(/datum/crafting_recipe/ashnecklace) //SKYRAT EDIT DRACONIC NECKLACE//
owner.teach_crafting_recipe(/datum/crafting_recipe/bonesword) //SKYRAT EDIT TRIBAL WEAPONS FOR TRIBALS//
owner.teach_crafting_recipe(/datum/crafting_recipe/macahuitl) //SKYRAT EDIT
owner.teach_crafting_recipe(/datum/crafting_recipe/boneaxe) //SKYRAT EDIT
owner.teach_crafting_recipe(/datum/crafting_recipe/bonespear) //SKYRAT EDIT
owner.teach_crafting_recipe(/datum/crafting_recipe/bonedagger) //SKYRAT EDIT
/datum/antagonist/ashwalker/on_removal()
. = ..()
code/modules/cargo/bounties/mining.dm
+8 -1
View File
@@ -18,11 +18,15 @@
required_count = 2
wanted_types = list(/obj/item/oar = TRUE)
//SKYRAT EDIT REMOVAL
/*
/datum/bounty/item/mining/bone_axe
name = "Bone Axe"
description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
reward = CARGO_CRATE_VALUE * 15
wanted_types = list(/obj/item/fireaxe/boneaxe = TRUE)
*/
//END SKYRAT EDIT REMOVAL
/datum/bounty/item/mining/bone_armor
name = "Bone Armor"
@@ -42,13 +46,16 @@
reward = CARGO_CRATE_VALUE * 15
required_count = 3
wanted_types = list(/obj/item/clothing/accessory/talisman = TRUE)
//SKYRAT EDIT REMOVAL
/*
/datum/bounty/item/mining/bone_dagger
name = "Bone Daggers"
description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our Chef can keep working."
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/knife/combat/bone = TRUE)
*/
//END SKYRAT EDIT REMOVAL
/datum/bounty/item/mining/polypore_mushroom
name = "Mushroom Bowl"
modular_skyrat/modules/ashwalker_shaman/code/ashwalker_shaman.dm
+6 -6
View File
@@ -76,7 +76,7 @@
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
time = 40
category = CAT_CLOTHING
category = CAT_PRIMAL
/obj/item/clothing/head/ash_headdress/Initialize()
. = ..()
@@ -110,7 +110,7 @@
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
time = 40
category = CAT_CLOTHING
category = CAT_PRIMAL
/obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes/Initialize()
. = ..()
@@ -137,7 +137,7 @@
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
time = 40
category = CAT_CLOTHING
category = CAT_PRIMAL
/obj/item/clothing/suit/ash_plates/Initialize()
. = ..()
@@ -154,7 +154,7 @@
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
time = 40
category = CAT_CLOTHING
category = CAT_PRIMAL
//ASH WEAPON
/obj/item/melee/macahuitl
@@ -182,8 +182,8 @@
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_available = FALSE
category = CAT_PRIMAL
/obj/item/cautery/ashwalker
name = "primitive cautery"
modular_skyrat/modules/tribal_extended/code/recipes.dm
+2 -1
View File
@@ -27,7 +27,7 @@
result = /obj/item/ammo_casing/caseless/arrow/wood
reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
/obj/item/stack/sheet/cloth= 1,
/obj/item/stack/rods = 1)
/obj/item/stack/rods = 1)
time = 15
category = CAT_PRIMAL
@@ -70,6 +70,7 @@
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 2)
time = 40
always_available = FALSE
category = CAT_PRIMAL
/datum/crafting_recipe/quiver