Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: Ashwalkers survival update #5893

Draft
wants to merge 62 commits into
base: master220
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
1fe84e5
ya nasral v kod
MeowEmiya Sep 10, 2024
0655a9d
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Sep 10, 2024
d35eaa0
1
MeowEmiya Sep 10, 2024
f6d3832
fix
MeowEmiya Sep 10, 2024
0fe536e
palatka
MeowEmiya Sep 11, 2024
3a9de2e
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Sep 16, 2024
a96ce3e
-drill
MeowEmiya Sep 16, 2024
48cdbf1
sprites
MeowEmiya Sep 16, 2024
42c8c5e
Desc & drill
MeowEmiya Sep 16, 2024
9ed839c
leather/weaver gloves
MeowEmiya Sep 16, 2024
365c3b4
fixes
MeowEmiya Sep 17, 2024
5dcc397
bow arrow sprites & runtime fix
MeowEmiya Sep 18, 2024
a755f2e
bolt
MeowEmiya Sep 18, 2024
59068d5
runtime fix 2
MeowEmiya Sep 19, 2024
6b25a08
Update code/modules/clothing/suits/armor.dm
MeowEmiya Sep 21, 2024
a45f2c0
armor
MeowEmiya Sep 22, 2024
960279b
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Sep 22, 2024
eacb97b
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Sep 22, 2024
be32ff9
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Sep 27, 2024
70660ac
Merge branch 'ss220-space:master220' into small-things
MeowEmiya Oct 1, 2024
31bce17
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 2, 2024
7a8ef8b
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Oct 2, 2024
239fe3b
fix
MeowEmiya Oct 2, 2024
6fc752b
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 3, 2024
0976cca
Алерты
MeowEmiya Oct 3, 2024
dbcafd3
Na russkom
MeowEmiya Oct 4, 2024
e4954aa
span_notice
MeowEmiya Oct 5, 2024
2f911ec
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 5, 2024
10d156a
неравная борьба с мержконфликтами
MeowEmiya Oct 5, 2024
5b7aa99
Merge branch 'ss220-space:master220' into small-things
MeowEmiya Oct 6, 2024
833fdf1
Merge branch 'ss220-space:master220' into small-things
MeowEmiya Oct 7, 2024
1bfbed8
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 19, 2024
8ff9255
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Oct 19, 2024
d7d00a9
fixes
MeowEmiya Oct 19, 2024
4800fc2
bow
MeowEmiya Oct 19, 2024
7140291
kolotushka
MeowEmiya Oct 20, 2024
c8e3099
!
MeowEmiya Oct 20, 2024
13fb098
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 27, 2024
923ea8f
fixes
MeowEmiya Oct 27, 2024
8c6a103
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Oct 27, 2024
42d27ab
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Nov 5, 2024
552a0ce
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Nov 5, 2024
651c634
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Nov 6, 2024
f65f22c
sprites
MeowEmiya Nov 6, 2024
83494ac
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Nov 6, 2024
7c493d2
drill fix, saw
MeowEmiya Nov 7, 2024
e72a0be
sprites fix
MeowEmiya Nov 8, 2024
beec455
kolotushka hotfix
Vladisvell Nov 10, 2024
331038d
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Nov 10, 2024
5ee3919
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Nov 11, 2024
5087928
implants fix
MeowEmiya Nov 14, 2024
d163830
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Nov 14, 2024
1b637de
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Nov 18, 2024
7baf088
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Nov 28, 2024
ca9dd21
primitive kolotushka > kolotushka
MeowEmiya Nov 28, 2024
db93fb4
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Dec 18, 2024
1a48fda
Merge remote-tracking branch 'upstream/master220' into small-things
Vladisvell Dec 21, 2024
e976869
Merge https://github.com/MeowEmiya/Paradise into small-things
MeowEmiya Dec 23, 2024
0729a9c
Merge branch 'small-things' of https://github.com/MeowEmiya/Paradise …
MeowEmiya Dec 23, 2024
73127ec
fix
MeowEmiya Dec 23, 2024
2c86c2b
metal-rod
MeowEmiya Dec 23, 2024
d36123e
fixes
MeowEmiya Dec 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,37 @@
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/wall/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"an" = (
/obj/machinery/optable,
/obj/structure/stone_tile{
dir = 1
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"ao" = (
/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)
"ap" = (
/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)
"aq" = (
/obj/structure/stone_tile/block/cracked{
dir = 8
Expand Down Expand Up @@ -185,6 +216,20 @@
/obj/item/storage/toolbox/syndicate,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aD" = (
/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)
"aE" = (
/obj/structure/stone_tile{
dir = 4
Expand Down Expand Up @@ -244,16 +289,13 @@
/turf/simulated/floor/lava,
/area/ruin/unpowered/ash_walkers)
"aK" = (
/obj/structure/stone_tile/block/cracked{
dir = 8
},
/obj/structure/stone_tile/cracked{
/obj/structure/stone_tile{
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)
/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)
"aM" = (
/obj/structure/stone_tile/cracked{
dir = 4
Expand All @@ -277,6 +319,7 @@
/area/ruin/unpowered/ash_walkers)
"aP" = (
/obj/structure/stone_tile,
/obj/item/healthanalyzer/gem_analyzer,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aQ" = (
Expand Down Expand Up @@ -371,19 +414,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
Expand Down Expand Up @@ -474,20 +504,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,
Expand Down Expand Up @@ -1149,13 +1165,6 @@
},
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"cW" = (
/obj/machinery/optable,
/obj/structure/stone_tile{
dir = 1
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"cX" = (
/obj/item/storage/box/rxglasses,
/obj/structure/stone_tile{
Expand Down Expand Up @@ -1554,10 +1563,10 @@ aa
aa
ae
as
cW
an
aP
aZ
bm
aD
by
ak
bV
Expand All @@ -1582,7 +1591,7 @@ ba
bn
bz
ak
cb
aK
df
bX
co
Expand Down Expand Up @@ -1688,7 +1697,7 @@ ak
au
aG
aS
bc
ap
bp
ak
ak
Expand Down Expand Up @@ -1774,7 +1783,7 @@ af
ak
ak
ay
aK
ao
aW
bg
bt
Expand Down
3 changes: 2 additions & 1 deletion code/datums/mapgen/LavalandGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,18 @@ REAGENT SCANNER
origin_tech = "magnets=2;biotech=2"
usesound = 'sound/items/deconstruct.ogg'

/obj/item/healthanalyzer/gem_analyzer
name = "eye of health"
icon = 'icons/obj/device.dmi'
icon_state = "Gem_analyzer"
item_state = "gem_analyzer"
desc = "Необычный самоцвет в форме сердца."
origin_tech = null

/obj/item/healthanalyzer/healtheye/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/healthupgrade))
to_chat(user, span_notice("Установить невозможно."))
MeowEmiya marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/reagent_scanner
name = "reagent scanner"
desc = "A hand-held reagent scanner which identifies chemical agents and blood types."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(), amount + amount + amount)
MeowEmiya marked this conversation as resolved.
Show resolved Hide resolved
hide.add_fingerprint(user)
qdel(src)
return ATTACK_CHAIN_BLOCKED_ALL
Expand Down
Loading