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: fishing #6150

Draft
wants to merge 90 commits into
base: master220
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
642b9d6
1. Map
NightDawnFox Nov 8, 2024
432c8d5
2. Map Spawn
NightDawnFox Nov 8, 2024
e29db8c
3. Component
NightDawnFox Nov 9, 2024
8e4b162
4. Fishing rod
NightDawnFox Nov 9, 2024
b3564f3
5. Krill (yourself)
NightDawnFox Nov 9, 2024
f68bc84
6. Component
NightDawnFox Nov 9, 2024
f81d34b
7. Bait
NightDawnFox Nov 9, 2024
b1c68e9
8. Fish
NightDawnFox Nov 9, 2024
6d927b2
8.1 First fixes
NightDawnFox Nov 9, 2024
c3d3724
8.2 second fixes
NightDawnFox Nov 13, 2024
28099ab
8.3 Another fixes & sprites
NightDawnFox Nov 14, 2024
5d18011
9.1 Ash crab
NightDawnFox Nov 14, 2024
5c940d4
10. dead horseman & shellfish
NightDawnFox Nov 15, 2024
bee9efc
11. bottom eel
NightDawnFox Nov 15, 2024
fda9a45
12. Red devourer
NightDawnFox Nov 15, 2024
54a0d54
13. Magma hammerhead
NightDawnFox Nov 16, 2024
0514714
fuck
NightDawnFox Nov 16, 2024
b710ee4
14. All remaining fish
NightDawnFox Nov 16, 2024
c42f465
14. bugfix
NightDawnFox Nov 16, 2024
2e934e8
15. bigger lake
NightDawnFox Nov 16, 2024
068bd89
16. bugfixes 2: electric boogaloo
NightDawnFox Nov 16, 2024
f21bc79
ммда
NightDawnFox Nov 16, 2024
04c2b30
боже
NightDawnFox Nov 16, 2024
6c83ba3
17. better tribal category
NightDawnFox Nov 17, 2024
c9493ac
17.1 bugfix
NightDawnFox Nov 17, 2024
53dd967
18. The last Item
NightDawnFox Nov 19, 2024
bc50314
unrelated: grublunch bugfix
NightDawnFox Nov 19, 2024
eee57db
19. Sprites for scorched skull
NightDawnFox Nov 20, 2024
786dad1
20. Sulfuric tramp inhands
NightDawnFox Nov 20, 2024
5330d16
21. The last items
NightDawnFox Nov 20, 2024
d708106
22. New ashwalkers den
NightDawnFox Nov 21, 2024
d17df2b
23. The last item (for real this time)
NightDawnFox Nov 21, 2024
1cd2372
24. New ash rune
NightDawnFox Nov 21, 2024
741e3e3
25. Massive update
NightDawnFox Nov 21, 2024
fb6a7dd
26. bugfixes
NightDawnFox Nov 22, 2024
e7bf7be
27. First food
NightDawnFox Nov 23, 2024
795be4c
28. Legs, veggies & treat
NightDawnFox Nov 23, 2024
09b365a
+1
NightDawnFox Nov 23, 2024
701eecc
+2
NightDawnFox Nov 23, 2024
f88f3c7
+3 +4
NightDawnFox Nov 24, 2024
343c872
+5 +6
NightDawnFox Nov 25, 2024
795eab8
bf
NightDawnFox Nov 25, 2024
e26cdab
+7
NightDawnFox Nov 28, 2024
9130200
фиксы
NightDawnFox Nov 29, 2024
aec9b6b
+ сразу много
NightDawnFox Nov 30, 2024
dfa37c2
предпоследнее
NightDawnFox Dec 2, 2024
3358c1a
Последняя еда
NightDawnFox Dec 4, 2024
793a4b4
небольшие багфиксы
NightDawnFox Dec 7, 2024
73e1dbb
Система красок на тело
NightDawnFox Dec 18, 2024
03dfc74
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Dec 19, 2024
1325bb9
rituals refactor
Antoonij Dec 20, 2024
f18b63b
fix nr1
Antoonij Dec 20, 2024
0744d0d
fix nr2
Antoonij Dec 20, 2024
3b690f6
fix nr3
Antoonij Dec 20, 2024
0d41a2f
пилим пилим пилим
Antoonij Dec 20, 2024
d402a2b
допил x2
Antoonij Dec 20, 2024
398227e
доработка ритуалов
Antoonij Dec 21, 2024
95ca1ef
fix
Antoonij Dec 21, 2024
c1493d9
more fix
Antoonij Dec 21, 2024
ed509f9
one more.
Antoonij Dec 21, 2024
e961573
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Dec 24, 2024
8c63800
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Jan 9, 2025
b6ab80f
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Jan 11, 2025
670dd7c
merge conflict
Antoonij Jan 11, 2025
1242ce4
improve rituals code, grace of lazis as invokers
Antoonij Jan 13, 2025
c08a422
fix
Antoonij Jan 13, 2025
7cf44c3
КАК ГОТОВИТЬ МЯСО
NightDawnFox Jan 14, 2025
87f369f
Уаааа
NightDawnFox Jan 14, 2025
542839b
лопата!
NightDawnFox Jan 17, 2025
4d54ca4
temp
NightDawnFox Jan 22, 2025
38b5d44
signal for rituals
Antoonij Jan 22, 2025
d42b3c0
Update ritual_object.dm
NightDawnFox Jan 22, 2025
a8ab0fb
Merge branch 'fishing-update' of https://github.com/NightDawnFox/Para…
NightDawnFox Jan 22, 2025
0cb838d
ньюлайн
NightDawnFox Jan 22, 2025
8374aef
change signal pos
Antoonij Jan 22, 2025
b393d25
боже прекрасно.
NightDawnFox Jan 22, 2025
943637b
Перевод и новый вариабл описания (для эшель)
NightDawnFox Jan 25, 2025
ecd8775
Набор разных изменений
NightDawnFox Jan 31, 2025
1f7e85a
извлечь
NightDawnFox Jan 31, 2025
f40f7c6
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Jan 31, 2025
c886db8
Переводы и новая мебель
NightDawnFox Feb 2, 2025
df80401
факела + крепления для них
NightDawnFox Feb 2, 2025
5f8a2f6
Ritual UI
dageavtobusnick Feb 2, 2025
f188250
Merge pull request #15 from dageavtobusnick/fishing-update
NightDawnFox Feb 2, 2025
e7e2e62
Merge remote-tracking branch 'upstream/master220' into fishing-update
NightDawnFox Feb 3, 2025
4863327
Merge branch 'fishing-update' of https://github.com/NightDawnFox/Para…
NightDawnFox Feb 3, 2025
632c25f
деревянный стеллаж
NightDawnFox Feb 3, 2025
cd4ea1c
быстрофиксы
NightDawnFox Feb 3, 2025
ba66745
ПЕРЕВОД
NightDawnFox Feb 5, 2025
42af06e
обновленное логово
NightDawnFox Feb 6, 2025
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
140 changes: 72 additions & 68 deletions _maps/map_files/Delta/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5280,6 +5280,10 @@
},
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"Ea" = (
/obj/ash_walker_landmark,
/turf/template_noop,
/area/lavaland/surface/outdoors/necropolis)
"Ef" = (
/obj/structure/stone_tile/block{
dir = 1
Expand Down Expand Up @@ -60973,9 +60977,9 @@ Ct
Ct
Ct
aj
ab
aj
ab
aj
aj
ab
ab
ab
Expand Down Expand Up @@ -62262,7 +62266,7 @@ aj
aj
aj
aj
aj
ab
ab
ab
ab
Expand Down Expand Up @@ -63034,7 +63038,7 @@ aj
aj
aj
aj
ab
aj
ab
ab
Vh
Expand Down Expand Up @@ -63276,13 +63280,14 @@ RD
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
Expand All @@ -63291,7 +63296,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Expand Down Expand Up @@ -63533,13 +63537,15 @@ RD
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
aj
Expand All @@ -63548,8 +63554,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Vh
Expand Down Expand Up @@ -63790,13 +63794,15 @@ jK
gU
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
aj
Expand All @@ -63805,8 +63811,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Vh
Expand Down Expand Up @@ -64047,13 +64051,15 @@ jK
jK
jK
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Ea
Zx
Zx
Zx
aj
aj
aj
aj
aj
Expand All @@ -64062,8 +64068,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Vh
Expand Down Expand Up @@ -64304,13 +64308,15 @@ jK
jK
jK
jK
jK
Ct
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
aj
Expand All @@ -64319,8 +64325,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Vh
Expand Down Expand Up @@ -64561,13 +64565,15 @@ jK
jK
jK
jK
jK
jK
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
aj
Expand All @@ -64576,8 +64582,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Vh
Expand Down Expand Up @@ -64818,13 +64822,14 @@ jK
jK
jK
jK
jK
jK
Ct
Ct
Ct
Ct
Ct
Zx
Zx
Zx
Zx
Zx
Zx
Zx
aj
aj
aj
aj
Expand All @@ -64833,7 +64838,6 @@ aj
aj
aj
aj
ab
ab
ab
Vh
Expand Down Expand Up @@ -65603,7 +65607,7 @@ aj
aj
aj
aj
aj
ab
ab
ab
ab
Expand Down Expand Up @@ -66111,10 +66115,10 @@ Ct
Ct
Ct
Ct
Ct
zW
aj
aj
aj
ab
ab
ab
Vh
Expand Down
Loading