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

[MIRROR] Prevent Cultists from summoning nar-sie on shuttles or off-ship. #1746

Merged
merged 1 commit into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions code/game/antagonist/station/cultist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ GLOBAL_DATUM_INIT(cult, /datum/antagonist/cultist, new)
var/list/cult_rating_bounds = list(CULT_RUNES_1, CULT_RUNES_2, CULT_RUNES_3, CULT_GHOSTS_1, CULT_GHOSTS_2, CULT_GHOSTS_3)
var/max_cult_rating = 0
var/conversion_blurb = "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
var/station_summon_only = TRUE
var/no_shuttle_summon = TRUE

faction = "cult"

Expand Down
6 changes: 6 additions & 0 deletions code/game/gamemodes/cult/runes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,12 @@
/obj/rune/tearreality/cast(mob/living/user)
if(!GLOB.cult.allow_narsie)
return
if (GLOB.cult.station_summon_only && !(get_z(user) in GLOB.using_map.station_levels))
to_chat(user, SPAN_OCCULT("Nar-Sie cannot be summoned here."))
return
if (GLOB.cult.no_shuttle_summon && istype(get_area(user), /area/shuttle))
to_chat(user, SPAN_OCCULT("Nar-Sie cannot be summoned on a shuttle."))
return
if(the_end_comes)
to_chat(user, SPAN_OCCULT("You are already summoning! Be patient!"))
return
Expand Down