Skip to content

Enlightened Centrism #5300

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

Open
realforest2001 wants to merge 24 commits into
base: main
Choose a base branch
from
+920 −573
Open

Enlightened Centrism #5300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a693f56
repath
Feb 16, 2026
a250e86
start
Feb 17, 2026
6432285
cleaner convert code for priest, and identify the shamed
Feb 17, 2026
2e8bdd6
better trait application
Feb 17, 2026
b6810a0
heal refuses heretics
Feb 17, 2026
fe92e84
holy fire enchant
Feb 18, 2026
145c51e
conversion
Feb 18, 2026
d5f426e
brand name
Feb 18, 2026
b0b97b3
lint fix
Feb 18, 2026
a50d48f
more lint fix
Feb 18, 2026
a0140dc
Merge remote-tracking branch 'upstream/main' into forest/undivided
Feb 18, 2026
0c9d16a
rv
Feb 18, 2026
9f782e6
verb helpers
Feb 18, 2026
ff6e1ec
temp lore primer content
Feb 18, 2026
c65ad3f
Back to Ravox.
Feb 19, 2026
abf141b
shield work
Feb 19, 2026
707c1a5
shield function
Feb 20, 2026
853ddac
devotion stat entry
Feb 20, 2026
66b5e05
Merge remote-tracking branch 'upstream/main' into forest/undivided
Feb 21, 2026
a10af07
vitae
Feb 21, 2026
5baa6da
Merge remote-tracking branch 'upstream/main' into forest/undivided
Feb 22, 2026
a524252
bugfix
Feb 22, 2026
78066f0
Merge remote-tracking branch 'upstream/main' into forest/undivided
Feb 24, 2026
b8d49bf
rounding
Feb 24, 2026
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
44 changes: 22 additions & 22 deletions _maps/map_files/daftmarsh/daftmarsh.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3251,11 +3251,11 @@
/area/indoors/town/vault)
"cGO" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/eora{
/obj/item/clothing/neck/psycross/silver/divine/eora{
pixel_y = 4;
pixel_x = -6
},
/obj/item/clothing/neck/psycross/silver/eora,
/obj/item/clothing/neck/psycross/silver/divine/eora,
/obj/item/clothing/neck/psycross/silver{
pixel_x = 7;
pixel_y = 2
Expand All @@ -3264,13 +3264,13 @@
pixel_x = -5;
pixel_y = 8
},
/obj/item/clothing/neck/psycross/silver/ravox,
/obj/item/clothing/neck/psycross/silver/ravox{
/obj/item/clothing/neck/psycross/silver/divine/ravox,
/obj/item/clothing/neck/psycross/silver/divine/ravox{
pixel_x = 7;
pixel_y = -5
},
/obj/item/clothing/neck/psycross/silver/abyssor,
/obj/item/clothing/neck/psycross/silver/abyssor{
/obj/item/clothing/neck/psycross/silver/divine/abyssor,
/obj/item/clothing/neck/psycross/silver/divine/abyssor{
pixel_y = 6;
pixel_x = 7
},
Expand Down Expand Up @@ -3361,24 +3361,24 @@
/area/indoors/town/steward)
"cKT" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/malum/steel,
/obj/item/clothing/neck/psycross/silver/malum/steel{
/obj/item/clothing/neck/psycross/silver/divine/malum/steel,
/obj/item/clothing/neck/psycross/silver/divine/malum/steel{
pixel_y = -5;
pixel_x = -11
},
/obj/item/clothing/neck/psycross/silver/xylix,
/obj/item/clothing/neck/psycross/silver/xylix{
/obj/item/clothing/neck/psycross/silver/divine/xylix,
/obj/item/clothing/neck/psycross/silver/divine/xylix{
pixel_y = 7;
pixel_x = 8
},
/obj/item/clothing/neck/psycross/silver/dendor{
/obj/item/clothing/neck/psycross/silver/divine/dendor{
pixel_y = 7;
pixel_x = -7
},
/obj/structure/fluff/walldeco/church/line{
dir = 4
},
/obj/item/clothing/neck/psycross/silver/dendor,
/obj/item/clothing/neck/psycross/silver/divine/dendor,
/turf/open/floor/churchmarble,
/area/indoors/town/church)
"cLh" = (
Expand Down Expand Up @@ -14063,23 +14063,23 @@
/area/indoors/town/keep/magician)
"mdH" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/pestra,
/obj/item/clothing/neck/psycross/silver/pestra{
/obj/item/clothing/neck/psycross/silver/divine/pestra,
/obj/item/clothing/neck/psycross/silver/divine/pestra{
pixel_y = 7;
pixel_x = 9
},
/obj/item/clothing/neck/psycross/silver/noc{
/obj/item/clothing/neck/psycross/silver/divine/noc{
pixel_y = 7;
pixel_x = 3
},
/obj/item/clothing/neck/psycross/silver/noc,
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/astrata{
/obj/item/clothing/neck/psycross/silver/divine/noc,
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/obj/item/clothing/neck/psycross/silver/divine/astrata{
pixel_y = 4;
pixel_x = 5
},
/obj/item/clothing/neck/psycross/silver/necra,
/obj/item/clothing/neck/psycross/silver/necra{
/obj/item/clothing/neck/psycross/silver/divine/necra,
/obj/item/clothing/neck/psycross/silver/divine/necra{
pixel_y = -3;
pixel_x = 9
},
Expand Down Expand Up @@ -19306,7 +19306,7 @@
/area/indoors/town/tavern)
"qOl" = (
/obj/structure/table/wood/plain_alt,
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/turf/open/floor/blocks/newstone,
/area/indoors/town/church)
"qOp" = (
Expand Down Expand Up @@ -23549,7 +23549,7 @@
/area/outdoors/town)
"uOC" = (
/obj/structure/table/wood/plain/alt,
/obj/item/clothing/neck/psycross/silver/dendor{
/obj/item/clothing/neck/psycross/silver/divine/dendor{
pixel_x = 5;
pixel_y = -3
},
Expand Down
60 changes: 30 additions & 30 deletions _maps/map_files/rosewood/rosewood.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@
/obj/structure/table/wood{
icon_state = "tablewood1"
},
/obj/item/clothing/neck/psycross/silver/necra,
/obj/item/clothing/neck/psycross/silver/divine/necra,
/turf/open/floor/blocks,
/area/outdoors/exposed/church)
"aTp" = (
Expand Down Expand Up @@ -5669,21 +5669,21 @@
/area/outdoors/town/roofs)
"cIb" = (
/obj/structure/rack/shelf/biggest,
/obj/item/clothing/neck/psycross/silver/noc,
/obj/item/clothing/neck/psycross/silver/noc{
/obj/item/clothing/neck/psycross/silver/divine/noc,
/obj/item/clothing/neck/psycross/silver/divine/noc{
pixel_y = 7;
pixel_x = 3
},
/obj/item/clothing/neck/psycross/silver/noc{
/obj/item/clothing/neck/psycross/silver/divine/noc{
pixel_y = 3;
pixel_x = 12
},
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/astrata{
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/obj/item/clothing/neck/psycross/silver/divine/astrata{
pixel_x = 3;
pixel_y = -5
},
/obj/item/clothing/neck/psycross/silver/astrata{
/obj/item/clothing/neck/psycross/silver/divine/astrata{
pixel_x = 9;
pixel_y = 3
},
Expand Down Expand Up @@ -17061,8 +17061,8 @@
/area/indoors/town/keep)
"ili" = (
/obj/structure/table/wood/plain/alt,
/obj/item/clothing/neck/psycross/silver/dendor,
/obj/item/clothing/neck/psycross/silver/dendor{
/obj/item/clothing/neck/psycross/silver/divine/dendor,
/obj/item/clothing/neck/psycross/silver/divine/dendor{
pixel_y = 7;
pixel_x = -7
},
Expand Down Expand Up @@ -19999,11 +19999,11 @@
/area/indoors/town/keep)
"jJh" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/eora{
/obj/item/clothing/neck/psycross/silver/divine/eora{
pixel_y = 4;
pixel_x = -6
},
/obj/item/clothing/neck/psycross/silver/eora,
/obj/item/clothing/neck/psycross/silver/divine/eora,
/obj/item/clothing/neck/psycross/silver{
pixel_x = 7;
pixel_y = 2
Expand All @@ -20012,13 +20012,13 @@
pixel_x = -5;
pixel_y = 8
},
/obj/item/clothing/neck/psycross/silver/ravox,
/obj/item/clothing/neck/psycross/silver/ravox{
/obj/item/clothing/neck/psycross/silver/divine/ravox,
/obj/item/clothing/neck/psycross/silver/divine/ravox{
pixel_x = 7;
pixel_y = -5
},
/obj/item/clothing/neck/psycross/silver/abyssor,
/obj/item/clothing/neck/psycross/silver/abyssor{
/obj/item/clothing/neck/psycross/silver/divine/abyssor,
/obj/item/clothing/neck/psycross/silver/divine/abyssor{
pixel_y = 6;
pixel_x = 7
},
Expand Down Expand Up @@ -24998,23 +24998,23 @@
/area/indoors/town/clinic_large)
"miF" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/pestra,
/obj/item/clothing/neck/psycross/silver/pestra{
/obj/item/clothing/neck/psycross/silver/divine/pestra,
/obj/item/clothing/neck/psycross/silver/divine/pestra{
pixel_y = 7;
pixel_x = 9
},
/obj/item/clothing/neck/psycross/silver/noc{
/obj/item/clothing/neck/psycross/silver/divine/noc{
pixel_y = 7;
pixel_x = 3
},
/obj/item/clothing/neck/psycross/silver/noc,
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/astrata{
/obj/item/clothing/neck/psycross/silver/divine/noc,
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/obj/item/clothing/neck/psycross/silver/divine/astrata{
pixel_y = 4;
pixel_x = 5
},
/obj/item/clothing/neck/psycross/silver/necra,
/obj/item/clothing/neck/psycross/silver/necra{
/obj/item/clothing/neck/psycross/silver/divine/necra,
/obj/item/clothing/neck/psycross/silver/divine/necra{
pixel_y = -3;
pixel_x = 9
},
Expand Down Expand Up @@ -25163,24 +25163,24 @@
/area/under/town/sewer)
"mlB" = (
/obj/structure/rack,
/obj/item/clothing/neck/psycross/silver/malum/steel,
/obj/item/clothing/neck/psycross/silver/malum/steel{
/obj/item/clothing/neck/psycross/silver/divine/malum/steel,
/obj/item/clothing/neck/psycross/silver/divine/malum/steel{
pixel_y = -5;
pixel_x = -11
},
/obj/item/clothing/neck/psycross/silver/xylix,
/obj/item/clothing/neck/psycross/silver/xylix{
/obj/item/clothing/neck/psycross/silver/divine/xylix,
/obj/item/clothing/neck/psycross/silver/divine/xylix{
pixel_y = 7;
pixel_x = 8
},
/obj/item/clothing/neck/psycross/silver/dendor{
/obj/item/clothing/neck/psycross/silver/divine/dendor{
pixel_y = 7;
pixel_x = -7
},
/obj/structure/fluff/walldeco/church/line{
dir = 4
},
/obj/item/clothing/neck/psycross/silver/dendor,
/obj/item/clothing/neck/psycross/silver/divine/dendor,
/obj/item/clothing/cloak/poncho,
/obj/item/clothing/cloak/poncho,
/turf/open/floor/ruinedwood/darker,
Expand Down Expand Up @@ -47776,7 +47776,7 @@
/area/indoors/town/tavern)
"xlQ" = (
/obj/structure/table/wood/plain/alt,
/obj/item/clothing/neck/psycross/silver/necra{
/obj/item/clothing/neck/psycross/silver/divine/necra{
pixel_x = -8;
pixel_y = 4
},
Expand Down
26 changes: 13 additions & 13 deletions _maps/map_files/rosewood/rosewood_marsh.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@
/turf/open/floor/ruinedwood/turned/darker,
/area/indoors/lich)
"aU" = (
/obj/item/clothing/neck/psycross/g{
/obj/item/clothing/neck/psycross/gold{
pixel_x = -7;
pixel_y = -3
},
/obj/item/clothing/neck/psycross/silver{
pixel_x = 1;
pixel_y = 7
},
/obj/item/clothing/neck/psycross/silver/pestra,
/obj/item/clothing/neck/psycross/silver/divine/pestra,
/turf/open/floor/cobble,
/area/indoors/lich)
"aW" = (
Expand Down Expand Up @@ -4301,11 +4301,11 @@
pixel_x = -9;
pixel_y = 0
},
/obj/item/clothing/neck/psycross/g{
/obj/item/clothing/neck/psycross/gold{
pixel_x = 2;
pixel_y = 8
},
/obj/item/clothing/neck/psycross/silver/necra,
/obj/item/clothing/neck/psycross/silver/divine/necra,
/obj/effect/decal/remains/human,
/turf/open/water/blood,
/area/indoors/lich)
Expand Down Expand Up @@ -4677,12 +4677,12 @@
/turf/open/floor/churchrough,
/area/indoors/cave)
"Ba" = (
/obj/item/clothing/neck/psycross/g{
/obj/item/clothing/neck/psycross/gold{
pixel_x = 2;
pixel_y = 7
},
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/eora{
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/obj/item/clothing/neck/psycross/silver/divine/eora{
pixel_x = -20;
pixel_y = 13
},
Expand Down Expand Up @@ -5247,7 +5247,7 @@
/turf/open/floor/grass/cold,
/area/indoors/mountains)
"Ef" = (
/obj/item/clothing/neck/psycross/g,
/obj/item/clothing/neck/psycross/gold,
/obj/effect/decal/remains/human,
/turf/open/floor/dirt,
/area/outdoors/bog)
Expand Down Expand Up @@ -6683,16 +6683,16 @@
/turf/open/floor/tile/masonic/spiral,
/area/indoors/lich)
"ME" = (
/obj/item/clothing/neck/psycross/g{
/obj/item/clothing/neck/psycross/gold{
pixel_x = 5;
pixel_y = 7
},
/obj/item/clothing/neck/psycross/silver{
pixel_x = -6;
pixel_y = 6
},
/obj/item/clothing/neck/psycross/silver/ravox,
/obj/item/clothing/neck/psycross/silver/noc{
/obj/item/clothing/neck/psycross/silver/divine/ravox,
/obj/item/clothing/neck/psycross/silver/divine/noc{
pixel_x = 15;
pixel_y = -2
},
Expand Down Expand Up @@ -7493,11 +7493,11 @@
pixel_x = 6;
pixel_y = 11
},
/obj/item/clothing/neck/psycross/g{
/obj/item/clothing/neck/psycross/gold{
pixel_x = -10;
pixel_y = 10
},
/obj/item/clothing/neck/psycross/silver/abyssor,
/obj/item/clothing/neck/psycross/silver/divine/abyssor,
/turf/open/floor/cobblerock,
/area/indoors/lich)
"Sb" = (
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/shared/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3133,13 +3133,13 @@
"rf" = (
/obj/item/clothing/neck/mercator,
/obj/item/clothing/neck/shalal,
/obj/item/clothing/neck/psycross/silver/astrata,
/obj/item/clothing/neck/psycross/silver/dendor,
/obj/item/clothing/neck/psycross/silver/eora,
/obj/item/clothing/neck/psycross/g,
/obj/item/clothing/neck/psycross/silver/necra,
/obj/item/clothing/neck/psycross/silver/noc,
/obj/item/clothing/neck/psycross/silver/ravox,
/obj/item/clothing/neck/psycross/silver/divine/astrata,
/obj/item/clothing/neck/psycross/silver/divine/dendor,
/obj/item/clothing/neck/psycross/silver/divine/eora,
/obj/item/clothing/neck/psycross/gold,
/obj/item/clothing/neck/psycross/silver/divine/necra,
/obj/item/clothing/neck/psycross/silver/divine/noc,
/obj/item/clothing/neck/psycross/silver/divine/ravox,
/turf/open/floor/wood,
/area/indoors)
"ri" = (
Expand Down Expand Up @@ -6232,7 +6232,7 @@
/obj/item/clothing/pants/grenzelpants,
/obj/item/clothing/shirt/grenzelhoft,
/obj/item/clothing/shoes/rare/grenzelhoft,
/obj/item/clothing/neck/psycross/g,
/obj/item/clothing/neck/psycross/gold,
/turf/open/floor/herringbone,
/area/indoors/vampire_manor)
"Mm" = (
Expand Down
Loading
Loading