add: Ashwalkers survival update (ss220-space#5893)

* ya nasral v kod * 1 * fix * palatka * -drill * sprites * Desc & drill * leather/weaver gloves * fixes * bow arrow sprites & runtime fix * bolt * runtime fix 2 * Update code/modules/clothing/suits/armor.dm Co-authored-by: Den109G <[email protected]> * armor * fix * Алерты * Na russkom * span_notice * неравная борьба с мержконфликтами * fixes * bow * kolotushka * ! * fixes * sprites * drill fix, saw * sprites fix * kolotushka hotfix * implants fix * primitive kolotushka > kolotushka * fix * metal-rod * fixes * Колотушка * Бесполезная и проблемная хуйня * probel * PeReVoD * a * fix * Забыл сушилку * Фиксы перевода 1 * Update tools.dm * Roach * Apply suggestions from code review * Фиксы перевода (очередные) * 1 --------- Co-authored-by: Den109G <[email protected]> Co-authored-by: Vladisvell <[email protected]> Co-authored-by: PlayerUnknown14 <[email protected]>
VasilevAY · Feb 17, 2025 · 8bdf79e · 8bdf79e
1 parent adc980d
commit 8bdf79e
Show file tree

Hide file tree

Showing 53 changed files with 776 additions and 98 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -243,17 +243,6 @@
 	},
 /turf/simulated/floor/lava,
 /area/ruin/unpowered/ash_walkers)
-"aK" = (
-/obj/structure/stone_tile/block/cracked{
-	dir = 8
-	},
-/obj/structure/stone_tile/cracked{
-	dir = 1
-	},
-/obj/structure/stone_tile,
-/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck,
-/turf/simulated/floor/indestructible/boss/indoors,
-/area/ruin/unpowered/ash_walkers)
 "aM" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
@@ -275,10 +264,6 @@
 	},
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"aP" = (
-/obj/structure/stone_tile,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/ash_walkers)
 "aQ" = (
 /obj/structure/stone_tile/block{
 	dir = 8
@@ -371,19 +356,6 @@
 /obj/item/seeds/reishi,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"bc" = (
-/obj/structure/stone_tile/block{
-	dir = 4
-	},
-/obj/structure/stone_tile{
-	dir = 8
-	},
-/obj/structure/stone_tile{
-	dir = 4
-	},
-/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
-/turf/simulated/floor/indestructible/boss/indoors,
-/area/ruin/unpowered/ash_walkers)
 "bd" = (
 /obj/structure/stone_tile/surrounding_tile/cracked{
 	dir = 4
@@ -474,20 +446,6 @@
 	},
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"bm" = (
-/obj/structure/stone_tile{
-	dir = 1
-	},
-/obj/structure/stone_tile,
-/obj/structure/stone_tile/cracked{
-	dir = 8
-	},
-/obj/structure/stone_tile/cracked{
-	dir = 4
-	},
-/obj/item/rcd/preloaded,
-/turf/simulated/floor/indestructible/boss,
-/area/ruin/unpowered/ash_walkers)
 "bn" = (
 /obj/structure/closet/crate/radiation,
 /obj/item/flashlight/lantern,
@@ -1099,6 +1057,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/twohanded/spear,
+/obj/item/clothing/head/shamanash,
 /turf/simulated/floor/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "cN" = (
@@ -1402,14 +1361,51 @@
 	},
 /turf/simulated/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"qj" = (
+"eK" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
 	},
 /obj/effect/mapping_helpers/no_lava,
 /obj/effect/decal/cleanable/ashrune,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"ic" = (
+/obj/structure/stone_tile,
+/obj/item/healthanalyzer/gem_analyzer,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/ash_walkers)
+"lA" = (
+/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
+/obj/structure/stone_tile/block{
+	dir = 4
+	},
+/obj/structure/stone_tile{
+	dir = 8
+	},
+/obj/structure/stone_tile{
+	dir = 4
+	},
+/turf/simulated/floor/indestructible/boss/indoors,
+/area/ruin/unpowered/ash_walkers)
+"rV" = (
+/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck,
+/obj/structure/stone_tile/block/cracked{
+	dir = 8
+	},
+/obj/structure/stone_tile/cracked{
+	dir = 1
+	},
+/obj/structure/stone_tile,
+/turf/simulated/floor/indestructible/boss/indoors,
+/area/ruin/unpowered/ash_walkers)
+"zn" = (
+/obj/structure/stone_tile{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/no_lava,
+/obj/machinery/smartfridge/drying_rack/ash,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "zz" = (
 /obj/effect/mapping_helpers/no_lava,
 /obj/structure/stone_tile{
@@ -1424,6 +1420,20 @@
 	},
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"KC" = (
+/obj/structure/stone_tile{
+	dir = 1
+	},
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+	dir = 8
+	},
+/obj/structure/stone_tile/cracked{
+	dir = 4
+	},
+/obj/item/stack/fireproof_rods/twentyfive,
+/turf/simulated/floor/indestructible/boss,
+/area/ruin/unpowered/ash_walkers)
 
 (1,1,1) = {"
 aa
@@ -1563,9 +1573,9 @@ aa
 ae
 as
 cW
-aP
+ic
 aZ
-bm
+KC
 by
 ak
 bV
@@ -1590,7 +1600,7 @@ ba
 bn
 bz
 ak
-cb
+zn
 df
 bX
 co
@@ -1614,7 +1624,7 @@ ak
 ak
 cg
 cb
-qj
+eK
 cn
 bL
 dr
@@ -1696,7 +1706,7 @@ ak
 au
 aG
 aS
-bc
+lA
 bp
 ak
 ak
@@ -1782,7 +1792,7 @@ af
 ak
 ak
 ay
-aK
+rV
 aW
 bg
 bt

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -211,6 +211,7 @@
 #define isunathi(A) (is_species(A, /datum/species/unathi))
 #define isashwalker(A) (is_species(A, /datum/species/unathi/ashwalker))
 #define isashwalkershaman(A) (is_species(A, /datum/species/unathi/ashwalker/shaman))
+#define isdraconid(A) (is_species(A, /datum/species/unathi/draconid))
 #define istajaran(A) (is_species(A, /datum/species/tajaran))
 #define isvulpkanin(A) (is_species(A, /datum/species/vulpkanin))
 #define isskrell(A) (is_species(A, /datum/species/skrell))

diff --git a/code/datums/mapgen/LavalandGenerator.dm b/code/datums/mapgen/LavalandGenerator.dm
@@ -26,7 +26,8 @@
 		/obj/structure/flora/ash/stem_shroom = 2,
 		/obj/structure/flora/ash/cacti = 1,
 		/obj/structure/flora/ash/tall_shroom = 2,
-		/obj/structure/flora/ash/fireblossom = 2
+		/obj/structure/flora/ash/fireblossom = 2,
+		/obj/structure/flora/ash/coaltree = 1
 	)
 
 	smoothing_iterations = 50

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
@@ -732,6 +732,25 @@ REAGENT SCANNER
 	origin_tech = "magnets=2;biotech=2"
 	usesound = 'sound/items/deconstruct.ogg'
 
+/obj/item/healthanalyzer/gem_analyzer
+	name = "eye of health"
+	desc = "Необычный самоцвет в форме сердца. Позволяет пользователю ощущать раны и болезни других существ на метафизическом уровне. Магия, не иначе."
+	ru_names = list(
+		NOMINATIVE = "глаз здоровья",
+		GENITIVE = "глаза здоровья",
+		DATIVE = "глазу здоровья",
+		ACCUSATIVE = "глаз здоровья",
+		INSTRUMENTAL = "глазом здоровья",
+		PREPOSITIONAL = "глазе здоровья"
+	)
+	icon = 'icons/obj/device.dmi'
+	icon_state = "gem_analyzer"
+	item_state = "gem_analyzer"
+	origin_tech = null
+
+/obj/item/healthanalyzer/gem_analyzer/attackby(obj/item/I, mob/user, params)
+	return ATTACK_CHAIN_BLOCKED_ALL
+
 /obj/item/reagent_scanner
 	name = "reagent scanner"
 	desc = "A hand-held reagent scanner which identifies chemical agents and blood types."

diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
@@ -286,7 +286,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		if(!do_after(user, 5 SECONDS * I.toolspeed, src, category = DA_CAT_TOOL))
 			return ATTACK_CHAIN_PROCEED
 		to_chat(user, span_notice("You cut the hair from [src]."))
-		var/obj/item/stack/sheet/hairlesshide/hide = new(drop_location(), amount)
+		var/obj/item/stack/sheet/hairlesshide/hide = new(drop_location(), 3 * amount)
 		hide.add_fingerprint(user)
 		qdel(src)
 		return ATTACK_CHAIN_BLOCKED_ALL

diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
@@ -89,7 +89,7 @@
 	item_state = "goliath_shield"
 	materials = list()
 	origin_tech = "materials=1;combat=3;biotech=2"
-	block_chance = 30
+	block_chance = 45
 	obj_integrity = 380
 	max_integrity = 380
 

diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
@@ -440,6 +440,42 @@
 	w_class = WEIGHT_CLASS_BULKY
 	block_chance = 30
 
+/obj/item/melee/nutcracker
+	name = "nutcracker"
+	desc = "Простейшая дубина из кости. Воплощение силы первобытного разума и природной мощи. Настоящая классика."
+	ru_names = list(
+		NOMINATIVE = "колотушка",
+		GENITIVE = "колотушки",
+		DATIVE = "колотушке",
+		ACCUSATIVE = "колотушку",
+		INSTRUMENTAL = "колотушкой",
+		PREPOSITIONAL = "колотушке"
+	)
+	icon_state = "nutcracker"
+	item_state = "nutcracker"
+	gender = FEMALE
+	hitsound = 'sound/weapons/kolotushka_smash.ogg'
+	slot_flags = ITEM_SLOT_BELT
+	force = 3
+	throwforce = 3
+	w_class = WEIGHT_CLASS_NORMAL
+	var/stamina_damage = 22
+
+/obj/item/melee/nutcracker/afterattack(atom/target, mob/user, proximity, params, status)
+	if(!isliving(target) || !proximity || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+		return
+
+	var/mob/living/victim = target
+	if(isrobot(victim))
+		if(prob(30))
+			victim.flash_eyes(3 SECONDS)
+			victim.Stun(3 SECONDS)
+
+	if(ishuman(victim))
+		victim.apply_damage(stamina_damage, STAMINA, blocked = victim.getarmor(user.zone_selected, MELEE))
+		if(prob(30))
+			victim.Knockdown(3 SECONDS)
+
 /obj/item/melee/ghostface_knife
 	name = "Knife"
 	desc = "Очень острый нож. Судя по потёртостям и засохшей крови, он совсем не валялся без дела."

diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
@@ -478,7 +478,7 @@
 		var/mob/living/l_target = target
 		l_target.ExtinguishMob()
 		l_target.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
-		to_chat(l_target, span_warning("You've been drenched in water!"))
+		to_chat(l_target, span_warning("Вы насквозь промокли!"))
 
 	target.clean_blood()
 
@@ -705,6 +705,14 @@
 	can_rotate = 0
 	resistance_flags = UNACIDABLE
 
+/obj/structure/sink/puddle/Initialize(mapload)
+	. = ..()
+
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+
 
 /obj/structure/sink/puddle/attack_hand(mob/user)
 	flick("puddle-splash", src)
@@ -734,6 +742,22 @@
 
 	return ..()
 
+/obj/structure/sink/puddle/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	SIGNAL_HANDLER
+	wash(arrived)
+
+/obj/structure/sink/puddle/proc/wash(atom/target)
+	if(isitem(target))
+		var/obj/item/item = target
+		item.extinguish()
+
+	if(isliving(target))
+		var/mob/living/l_target = target
+		l_target.ExtinguishMob()
+		l_target.adjust_fire_stacks(-20)
+		to_chat(l_target, span_warning("Вы насквозь промокли!"))
+
+	target.clean_blood()
 
 //////////////////////////////////
 //		Bathroom Fixture Items	//