Skip to content

Commit

Permalink
Merge pull request #1055 from AyyRobotics/AGRComplexNew
Browse files Browse the repository at this point in the history
The A.G.R Complex (Gateway Mission)
  • Loading branch information
MosleyTheMalO authored Mar 31, 2024
2 parents 548b23e + 261fff2 commit 68c08a2
Show file tree
Hide file tree
Showing 34 changed files with 188,146 additions and 2 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/_flags/_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ GLOBAL_LIST_INIT(bitflags, list(
#define NO_ALERTS (1<<12)
/// If blood cultists can draw runes or build structures on this AREA.
#define CULT_PERMITTED (1<<13)
/// If cultists can use abilities in this area but the area is not on station.
#define CULTMAGIC_BYPASS (1<<14)

/*
These defines are used specifically with the atom/pass_flags bitmask
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/bitfields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ DEFINE_BITFIELD(area_flags, list(
"BLOBS_ALLOWED" = BLOBS_ALLOWED,
"BLOCK_SUICIDE" = BLOCK_SUICIDE,
"CULT_PERMITTED" = CULT_PERMITTED,
"CULTMAGIC_BYPASS" = CULTMAGIC_BYPASS,
"FLORA_ALLOWED" = FLORA_ALLOWED,
"HIDDEN_AREA" = HIDDEN_AREA,
"MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED,
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
return
var/turf/T = get_turf(user) //we may have moved. adjust as needed...
var/area/A = get_area(user)
if(A?.area_flags & CULTMAGIC_BYPASS) //Bypass code so areas that aren't on-station can still use cult magics.
return ..()
if((!is_station_level(T.z) && !is_mining_level(T.z)) || !(A?.area_flags & CULT_PERMITTED))
to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
return FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/clockcult/clock_scripture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Judgement 80k power or nine converts

/datum/clockwork_scripture/proc/check_offstation_penalty()//don't cast spells away from the station
var/turf/T = get_turf(invoker)
if(!T || (!is_centcom_level(T.z) && !is_station_level(T.z) && !is_mining_level(T.z) && !is_reebe(T.z)))
if(!T || (!is_centcom_level(T.z) && !is_station_level(T.z) && !is_mining_level(T.z) && !is_reebe(T.z) && !is_away_level(T.z))) //Added is_away_level to help spells work properly on AGRComplex, or any future gateways that use cultists.))
channel_time *= 3
power_cost *= 3
return TRUE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
/datum/clockwork_scripture/create_object/stargazer/check_special_requirements()
var/area/A = get_area(invoker)
var/turf/T = get_turf(invoker)
if(A?.area_flags & CULTMAGIC_BYPASS)
return ..()
if(!is_station_level(invoker.z) || isspaceturf(T) || !(A?.area_flags & CULT_PERMITTED))
to_chat(invoker, "<span class='danger'>Stargazers can't be built off-station.</span>")
return
Expand Down
2 changes: 2 additions & 0 deletions code/modules/antagonists/cult/ritual.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ This file contains the cult dagger and rune list code
to_chat(user, "<span class='cult'>There is already a rune here.</span>")
return FALSE
var/area/A = get_area(T)
if(A?.area_flags & CULTMAGIC_BYPASS)
return TRUE
if((!is_station_level(T.z) && !is_mining_level(T.z)) || !(A?.area_flags & CULT_PERMITTED))
to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
return FALSE
Expand Down
4 changes: 3 additions & 1 deletion config/awaymissionconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ _maps/RandomZLevels/away_mission/jungleresort.dmm
#_maps/RandomZLevels/away_mission/caves.dmm
#_maps/RandomZLevels/away_mission/snowdin.dmm
#_maps/RandomZLevels/away_mission/research.dmm
#_maps/RandomZLevels/away_mission/SnowCabin.dmm
#_maps/RandomZLevels/away_mission/SnowCabin.dmm
#modular_splurt/_maps/away_mission/AGRComplexClock.dmm
#modular_splurt/_maps/away_mission/AGRComplexCult.dmm
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified modular_sand/icons/obj/stock_parts.dmi
Binary file not shown.
Loading

0 comments on commit 68c08a2

Please sign in to comment.