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

Shadow sect rework part 1/2 [Do not merge][Will be removed soon] #12149

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a6ee232
Changing crews armblade wepons
wikimody Jan 5, 2025
fb762d1
Restore old shadow sect
wikimody Jan 9, 2025
8a96d78
Some formating + comented out antag text
wikimody Jan 10, 2025
5bd9a5c
One more cleanup
wikimody Jan 10, 2025
1891ac0
Removing not needed rytuals
wikimody Jan 11, 2025
5deb700
Some coment clearing
wikimody Jan 11, 2025
0ffec44
Debugging
wikimody Jan 11, 2025
f59a202
Changes after first test
wikimody Jan 11, 2025
607c71f
Debug 2 electric bugallo
wikimody Jan 11, 2025
84fa439
More favor for flashligths
wikimody Jan 11, 2025
2b477e1
Obelisc buff
wikimody Jan 11, 2025
b799dc8
Obelisc buff fix
wikimody Jan 11, 2025
63d369a
Nigth vision aura
wikimody Jan 11, 2025
67431d1
Merge remote-tracking branch 'upstream/master'
wikimody Jan 11, 2025
8476ed2
Merge branch 'shadow_cult_basic'
wikimody Jan 11, 2025
f9934d8
cleanign up
wikimody Jan 11, 2025
406c0e8
Merge branch 'shadow_cult_basic'
wikimody Jan 11, 2025
82c50f2
Urgent fix
wikimody Jan 11, 2025
34471ca
unarchoning
wikimody Jan 12, 2025
63d36c3
Merge branch 'shadow_cult_basic'
wikimody Jan 12, 2025
690c306
Including incremental prices
wikimody Jan 12, 2025
8e42acf
Fixed the numbers
wikimody Jan 12, 2025
d90de44
some more changes
wikimody Jan 12, 2025
5977a55
Some cleanup
wikimody Jan 12, 2025
912b6c3
Trying to fix nigthvision
wikimody Jan 12, 2025
c831927
Changed all TRAIT_NIGTH_VISION into TRAIT_NIGHT_VISION_WEAK for great…
wikimody Jan 12, 2025
711ea70
Adding proper nigth vision trait
wikimody Jan 12, 2025
9309a11
Nigth vision part 2
wikimody Jan 12, 2025
45bb8b1
Nigth vision part 3 (hopefully last)
wikimody Jan 12, 2025
8694870
Fixing speling error
wikimody Jan 12, 2025
3baae3e
Changed to use new trait
wikimody Jan 12, 2025
e15fe75
Some tweak
wikimody Jan 12, 2025
a3c99f3
some more spelling
wikimody Jan 12, 2025
5a8712e
Fixing night vision (FIrst working test!!!!)
wikimody Jan 12, 2025
dcb8f0b
Now obelisc only make points when archoned
wikimody Jan 13, 2025
f5eaf44
Working night vision ritual
wikimody Jan 13, 2025
bd4829d
No close anchoning done
wikimody Jan 13, 2025
0535368
FInal nigth vision fix
wikimody Jan 13, 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
Prev Previous commit
FInal nigth vision fix
  • Loading branch information
wikimody committed Jan 13, 2025
commit 05353682c2df0eb5b60117d8c656334be0bca673
3 changes: 3 additions & 0 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -328,4 +328,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MOVE_UPSIDE_DOWN "move_upside_down"
#define TRAIT_NEGATES_GRAVITY "negates_gravity"
#define TRAIT_NIGHT_VISION "night_vision"
/// This trait does nothing and shoudn't ever do anything.
/// Its the best way i see to add simple bool on a mob without messing with any variables and have trait functionality
#define TRAIT_PROGRAMING_HELP "programers_help"
// END TRAIT DEFINES
3 changes: 2 additions & 1 deletion code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_FORCED_GRAVITY" = TRAIT_FORCED_GRAVITY,
"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
"TRAIT_NEGATES_GRAVITY" = TRAIT_NEGATES_GRAVITY,
"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION
"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
"TRAIT_PROGRAMING_HELP" = TRAIT_PROGRAMING_HELP
),
/obj/item/integrated_circuit = list(
"TRAIT_COMPONENT_MMI" = TRAIT_COMPONENT_MMI,
Expand Down
26 changes: 20 additions & 6 deletions code/modules/religion/sects/shadow_sect.dm
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,24 @@
if(sect.night_vision_active)
if(!HAS_TRAIT_FROM(affected_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
ADD_TRAIT(affected_mob,TRAIT_NIGHT_VISION, FROM_SHADOW_SECT)
if(!HAS_TRAIT_FROM(affected_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
ADD_TRAIT(affected_mob,TRAIT_PROGRAMING_HELP, FROM_SHADOW_SECT)


/obj/structure/destructible/religion/shadow_obelisk/proc/on_mob_effect(mob/living/affected_mob)
var/datum/religion_sect/shadow_sect/sect = GLOB.religious_sect
if(!src.anchored)
return
if(sect.night_vision_active)
if(!HAS_TRAIT_FROM(affected_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
ADD_TRAIT(affected_mob,TRAIT_PROGRAMING_HELP, FROM_SHADOW_SECT)
if(HAS_TRAIT_FROM(affected_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
return
else
ADD_TRAIT(affected_mob,TRAIT_NIGHT_VISION, FROM_SHADOW_SECT)
else
if(HAS_TRAIT_FROM(affected_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
REMOVE_TRAIT(affected_mob,TRAIT_PROGRAMING_HELP, FROM_SHADOW_SECT)
if(!HAS_TRAIT_FROM(affected_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
return
else
Expand All @@ -115,15 +121,23 @@
/obj/structure/destructible/religion/shadow_obelisk/proc/on_mob_leave(mob/living/affected_mob)
if(!src.anchored)
return
if(HAS_TRAIT_FROM(affected_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
REMOVE_TRAIT(affected_mob,TRAIT_NIGHT_VISION, FROM_SHADOW_SECT)
if(HAS_TRAIT_FROM(affected_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
REMOVE_TRAIT(affected_mob,TRAIT_PROGRAMING_HELP, FROM_SHADOW_SECT)
addtimer(CALLBACK(src, PROC_REF(process_nigth_vision_removal),affected_mob), 3 SECONDS)


/obj/structure/destructible/religion/shadow_obelisk/proc/process_nigth_vision_removal(mob/living/affected_mob)
if(!HAS_TRAIT_FROM(affected_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
if(HAS_TRAIT_FROM(affected_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
REMOVE_TRAIT(affected_mob,TRAIT_NIGHT_VISION, FROM_SHADOW_SECT)


/obj/structure/destructible/religion/shadow_obelisk/proc/unanchored_NV()
var/datum/religion_sect/shadow_sect/sect = GLOB.religious_sect
for(var/mob/each_mob in range(src,sect.light_reach))
if(HAS_TRAIT_FROM(each_mob,TRAIT_NIGHT_VISION,FROM_SHADOW_SECT))
REMOVE_TRAIT(each_mob,TRAIT_NIGHT_VISION, FROM_SHADOW_SECT)
if(HAS_TRAIT_FROM(each_mob,TRAIT_PROGRAMING_HELP,FROM_SHADOW_SECT))
REMOVE_TRAIT(each_mob,TRAIT_PROGRAMING_HELP, FROM_SHADOW_SECT)
addtimer(CALLBACK(src, PROC_REF(process_nigth_vision_removal),each_mob), 3 SECONDS)
src.set_light(0, 0, DARKNESS_INVERSE_COLOR)


Expand Down Expand Up @@ -257,7 +271,7 @@
/datum/religion_rites/shadow_obelisk
name = "Obelisk Manifestation"
desc = "Creates an obelisk that generates favor when in a dark area."
ritual_length = 20 SECONDS
ritual_length = 15 SECONDS
ritual_invocations = list(
"Let the shadows combine...",
"... Solidify and grow ...",
Expand Down Expand Up @@ -290,7 +304,7 @@
/datum/religion_rites/expand_shadows
name = "Shadow Expansion"
desc = "Grow the reach of shadows extending from the altar, and any obelisks."
ritual_length = 30 SECONDS
ritual_length = 20 SECONDS
ritual_invocations = list(
"Spread out...",
"... Kill the light ...",
Expand Down
Loading