Skip to content

v2.0.6 #329

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.

Sign up for GitHub

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

Merged
kyres1 merged 25 commits into from
Jun 22, 2025
Merged

v2.0.6 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3f675d4
setup
Hockaa May 4, 2025
552e907
Saving Progress
furrycactus Jun 12, 2025
e7d4679
Saving Progress
furrycactus Jun 13, 2025
b8e1d90
Saving Progress
furrycactus Jun 14, 2025
c5951f2
Save Changes
furrycactus Jun 16, 2025
5d3531f
dagger fix
furrycactus Jun 16, 2025
48fd276
Saving Progress
furrycactus Jun 16, 2025
8807a38
remember when i said i'd never do another armour PR
furrycactus Jun 17, 2025
f96fe42
Map Tweaks
furrycactus Jun 17, 2025
d1bd3d2
blacksmith recipes
furrycactus Jun 17, 2025
deabc48
Changelog
furrycactus Jun 17, 2025
dc9737e
Merge pull request #327 from furrycactus/silver-gear-stuff
kyres1 Jun 20, 2025
5de8a84
Merge branch 'master' into samurai-merc-class
furrycactus Jun 21, 2025
272dc44
Merge branch 'Encore-Server:master' into quiverrefactortaketwo
Hockaa Jun 21, 2025
d917889
conflict fix
furrycactus Jun 21, 2025
8bd5644
resolve a few mix-ups with attackby()
Hockaa Jun 21, 2025
e24bb41
Saving Changes
furrycactus Jun 21, 2025
0db889c
Finishing Touches + Changelog
furrycactus Jun 21, 2025
f78ce7a
stopped unnecessary call of check_ammo()
Hockaa Jun 21, 2025
f033aae
changelog
Hockaa Jun 21, 2025
a1bff43
removed debug messages
Hockaa Jun 21, 2025
9359a0f
adds ninja invisibility at kyres request
furrycactus Jun 22, 2025
84e652c
Merge pull request #328 from Hockaa/quiverrefactortaketwo
kyres1 Jun 22, 2025
74f118f
Merge pull request #325 from furrycactus/samurai-merc-class
kyres1 Jun 22, 2025
be2a762
Apply automatic changes
kyres1 Jun 22, 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
222 changes: 111 additions & 111 deletions _maps/map_files/domotan/old_doma.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5749,27 +5749,29 @@
/turf/open/floor/rogue/blocks/stonered,
/area/rogue/outdoors/town)
"gtQ" = (
/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/obj/item/clothing/head/roguetown/mjallidhornhood,
/obj/item/clothing/head/roguetown/mjallidhornhood,
/obj/item/clothing/cloak/templar/mjallidhorn,
/obj/item/clothing/cloak/templar/mjallidhorn,
/obj/item/clothing/cloak/templar/mjallidhorn/frost,
/obj/item/clothing/cloak/templar/mjallidhorn/frost,
/obj/item/clothing/neck/roguetown/psicross/golerkanh,
/obj/item/clothing/neck/roguetown/psicross/golerkanh,
/obj/item/clothing/neck/roguetown/psicross/gani,
/obj/item/clothing/neck/roguetown/psicross/gani,
/obj/item/clothing/cloak/templar/golerkanh,
/obj/item/clothing/cloak/templar/gani,
/obj/item/clothing/cloak/templar/gani,
/obj/item/clothing/head/roguetown/ganimask,
/obj/item/clothing/cloak/templar/golerkanh/earth,
/obj/item/clothing/cloak/templar/golerkanh/earth,
/obj/structure/closet/crate/chest/neu_iron{
name = "Frost chest"
name = "Earth chest"
},
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"gue" = (
Expand Down Expand Up @@ -10117,28 +10119,6 @@
},
/turf/open/floor/rogue/wood,
/area/rogue/indoors/town/magician)
"lcl" = (
/obj/item/clothing/neck/roguetown/psicross/visires,
/obj/item/clothing/neck/roguetown/psicross/visires,
/obj/item/clothing/cloak/templar/visires,
/obj/item/clothing/cloak/templar/visires,
/obj/item/clothing/cloak/templar/visires/fire,
/obj/item/clothing/cloak/templar/visires/fire,
/obj/structure/closet/crate/chest/neu_iron{
name = "Fire chest"
},
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"lcv" = (
/obj/structure/stairs{
dir = 4
Expand Down Expand Up @@ -11219,9 +11199,25 @@
/turf/open/floor/rogue/ruinedwood/turned,
/area/rogue/indoors/town/garrison)
"med" = (
/obj/structure/fluff/walldeco/katholikos_banner{
pixel_y = 25
},
/obj/item/clothing/neck/roguetown/psicross/wood/katholikos,
/obj/item/clothing/neck/roguetown/psicross/silver,
/obj/item/clothing/neck/roguetown/psicross/silver,
/obj/item/clothing/cloak/all_aspect/alt,
/obj/item/clothing/cloak/all_aspect/alt,
/obj/item/clothing/cloak/all_aspect,
/obj/item/clothing/cloak/all_aspect,
/obj/item/clothing/cloak/templar/all_aspect,
/obj/item/clothing/cloak/templar/all_aspect,
/obj/item/clothing/under/roguetown/heavy_leather_pants,
/obj/item/clothing/under/roguetown/heavy_leather_pants,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/indoors/town/church)
"mff" = (
Expand Down Expand Up @@ -11470,34 +11466,23 @@
/turf/open/floor/rogue/church,
/area/rogue/outdoors/town/roofs)
"mrx" = (
/obj/item/rogueweapon/huntingknife/idagger/steel,
/obj/item/rogueweapon/huntingknife/idagger/silver,
/obj/item/rogueweapon/huntingknife/cleaver/combat,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/neck/roguetown/psicross/wood/katholikos,
/obj/item/clothing/neck/roguetown/psicross,
/obj/item/clothing/neck/roguetown/psicross/g,
/obj/item/clothing/neck/roguetown/psicross/akan,
/obj/item/clothing/neck/roguetown/psicross/akan,
/obj/item/clothing/cloak/templar/akan,
/obj/item/clothing/cloak/templar/akan,
/obj/item/clothing/cloak/templar/iliope,
/obj/item/clothing/cloak/templar/iliope,
/obj/structure/closet/crate/chest/neu_iron{
name = "Katholikos chest"
name = "Air chest"
},
/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron,
/obj/item/clothing/neck/roguetown/psicross/silver,
/obj/item/clothing/neck/roguetown/psicross/silver,
/obj/item/clothing/cloak/all_aspect/alt,
/obj/item/clothing/cloak/all_aspect/alt,
/obj/item/clothing/cloak/all_aspect,
/obj/item/clothing/cloak/all_aspect,
/obj/item/clothing/cloak/templar/all_aspect,
/obj/item/clothing/cloak/templar/all_aspect,
/obj/item/clothing/under/roguetown/heavy_leather_pants,
/obj/item/clothing/under/roguetown/heavy_leather_pants,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"mrR" = (
Expand Down Expand Up @@ -15196,6 +15181,28 @@
/obj/structure/roguewindow/openclose,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/garrison)
"pYt" = (
/obj/item/clothing/neck/roguetown/psicross/visires,
/obj/item/clothing/neck/roguetown/psicross/visires,
/obj/item/clothing/cloak/templar/visires,
/obj/item/clothing/cloak/templar/visires,
/obj/item/clothing/cloak/templar/visires/fire,
/obj/item/clothing/cloak/templar/visires/fire,
/obj/structure/closet/crate/chest/neu_iron{
name = "Fire chest"
},
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"pYC" = (
/obj/structure/fluff/railing/border,
/turf/open/floor/rogue/cobble,
Expand Down Expand Up @@ -15245,29 +15252,13 @@
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/shelter/town/dwarf)
"qaN" = (
/obj/item/clothing/neck/roguetown/psicross/golerkanh,
/obj/item/clothing/neck/roguetown/psicross/golerkanh,
/obj/item/clothing/neck/roguetown/psicross/gani,
/obj/item/clothing/neck/roguetown/psicross/gani,
/obj/item/clothing/cloak/templar/golerkanh,
/obj/item/clothing/cloak/templar/gani,
/obj/item/clothing/cloak/templar/gani,
/obj/item/clothing/head/roguetown/ganimask,
/obj/item/clothing/cloak/templar/golerkanh/earth,
/obj/item/clothing/cloak/templar/golerkanh/earth,
/obj/structure/closet/crate/chest/neu_iron{
name = "Earth chest"
},
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
/obj/structure/rack/rogue,
/obj/item/quiver/silver_bolts,
/obj/item/quiver/silver_bolts,
/obj/item/quiver/silver_bolts,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"qbk" = (
Expand Down Expand Up @@ -15762,6 +15753,9 @@
pixel_y = 9
},
/obj/item/clothing/neck/roguetown/psicross/silver,
/obj/structure/fluff/walldeco/katholikos_banner{
pixel_y = 25
},
/turf/open/floor/rogue/blocks/green,
/area/rogue/indoors/town/church)
"qGK" = (
Expand Down Expand Up @@ -21096,7 +21090,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack/rogue,
/obj/item/gwstrap,
/obj/item/rogueweapon/greatsword/zwei,
/obj/item/rogueweapon/greatsword/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"wHH" = (
Expand Down Expand Up @@ -22494,23 +22488,29 @@
/turf/open/floor/rogue/cobblerock,
/area/rogue/outdoors/exposed/town/keep)
"yeM" = (
/obj/item/clothing/neck/roguetown/psicross/akan,
/obj/item/clothing/neck/roguetown/psicross/akan,
/obj/item/clothing/cloak/templar/akan,
/obj/item/clothing/cloak/templar/akan,
/obj/item/clothing/cloak/templar/iliope,
/obj/item/clothing/cloak/templar/iliope,
/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/obj/item/clothing/head/roguetown/mjallidhornhood,
/obj/item/clothing/head/roguetown/mjallidhornhood,
/obj/item/clothing/cloak/templar/mjallidhorn,
/obj/item/clothing/cloak/templar/mjallidhorn,
/obj/item/clothing/cloak/templar/mjallidhorn/frost,
/obj/item/clothing/cloak/templar/mjallidhorn/frost,
/obj/structure/closet/crate/chest/neu_iron{
name = "Air chest"
name = "Frost chest"
},
/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/under/roguetown/chainlegs/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/under/roguetown/chainlegs/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"yeT" = (
Expand Down Expand Up @@ -28915,7 +28915,7 @@ hye
cpA
oZR
hye
lcl
wHl
jWf
jfL
hye
Expand Down Expand Up @@ -29181,7 +29181,7 @@ hye
hye
gtQ
jfL
wHl
pYt
hye
wZh
stD
Expand Down
50 changes: 28 additions & 22 deletions _maps/map_files/templates/hellwatch/z3/q1_v1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/quiver/bolts,
/obj/item/quiver/bolts,
/obj/item/quiver/bolts,
/obj/item/quiver/bolts,
/obj/item/quiver/silver_bolts,
/obj/item/quiver/silver_bolts,
/obj/item/quiver/silver_bolts,
/obj/item/quiver/silver_bolts,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"nk" = (
Expand Down Expand Up @@ -95,18 +95,20 @@
/area/rogue/outdoors/woods/churchfort/basement)
"rg" = (
/obj/structure/closet/crate/roguecloset/dark,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"sz" = (
Expand Down Expand Up @@ -260,12 +262,16 @@
/area/rogue/outdoors/woods/churchfort/basement)
"QB" = (
/obj/structure/rack/rogue,
/obj/item/rogueweapon/flail,
/obj/item/rogueweapon/flail,
/obj/item/rogueweapon/mace/spiked,
/obj/item/rogueweapon/mace/spiked,
/obj/item/rogueweapon/sword/long/exe,
/obj/item/rogueweapon/sword/long/exe,
/obj/item/rogueweapon/katar/silver,
/obj/item/rogueweapon/katar/silver,
/obj/item/rogueweapon/flail/silver,
/obj/item/rogueweapon/flail/silver,
/obj/item/rogueweapon/stoneaxe/silver,
/obj/item/rogueweapon/stoneaxe/silver,
/obj/item/rogueweapon/mace/silver,
/obj/item/rogueweapon/mace/silver,
/obj/item/rogueweapon/sword/long/silver,
/obj/item/rogueweapon/sword/long/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"Rc" = (
Expand Down
Loading