The love of Space Jesus shines through!
")
- round_credits += "
"
-
- round_credits += ..()
- return round_credits
diff --git a/code/game/gamemodes/devil/game_mode.dm b/code/game/gamemodes/devil/game_mode.dm
deleted file mode 100644
index f91b863483c5..000000000000
--- a/code/game/gamemodes/devil/game_mode.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/datum/game_mode
- var/list/datum/mind/devils = list()
- var/devil_ascended = 0 // Number of arch devils on station
-
-/datum/game_mode/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
- var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
- var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
- for(var/i = 1 to quantity)
- var/type = pick(validtypes)
- var/datum/objective/devil/objective = new type(null)
- objective.owner = devil_mind
- D.objectives += objective
- if(!istype(objective, /datum/objective/devil/buy_target))
- validtypes -= type //prevent duplicate objectives, EXCEPT for buy_target.
- else
- objective.find_target()
-
-/datum/game_mode/proc/update_soulless_icons_added(datum/mind/soulless_mind)
- var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_SOULLESS]
- hud.join_hud(soulless_mind.current)
- set_antag_hud(soulless_mind.current, "soulless")
-
-/datum/game_mode/proc/update_soulless_icons_removed(datum/mind/soulless_mind)
- var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_SOULLESS]
- hud.leave_hud(soulless_mind.current)
- set_antag_hud(soulless_mind.current, null)
diff --git a/code/game/gamemodes/devil/objectives.dm b/code/game/gamemodes/devil/objectives.dm
deleted file mode 100644
index f3d5ce575f85..000000000000
--- a/code/game/gamemodes/devil/objectives.dm
+++ /dev/null
@@ -1,113 +0,0 @@
-/datum/objective/devil
-
-/datum/objective/devil/soulquantity
- explanation_text = "You shouldn't see this text. Error:DEVIL1"
- target_amount = 4
-
-/datum/objective/devil/soulquantity/New()
- target_amount = pick(6,7,8)
- update_explanation_text()
-
-/datum/objective/devil/soulquantity/update_explanation_text()
- explanation_text = "Purchase, and retain control over at least [target_amount] souls."
-
-/datum/objective/devil/soulquantity/check_completion()
- var/count = 0
- var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
- var/list/souls = devilDatum.soulsOwned
- for(var/S in souls) //Just a sanity check.
- var/datum/mind/L = S
- if(L.soulOwner == owner)
- count++
- return count >= target_amount
-
-
-
-/datum/objective/devil/soulquality
- explanation_text = "You shouldn't see this text. Error:DEVIL2"
- var/contractType
- var/contractName
-
-/datum/objective/devil/soulquality/New()
- contractType = pick(CONTRACT_POWER, CONTRACT_WEALTH, CONTRACT_PRESTIGE, CONTRACT_MAGIC, CONTRACT_REVIVE, CONTRACT_KNOWLEDGE/*, CONTRACT_UNWILLING*/)
- target_amount = pick(1,2)
- switch(contractType)
- if(CONTRACT_POWER)
- contractName = "for power"
- if(CONTRACT_WEALTH)
- contractName = "for wealth"
- if(CONTRACT_PRESTIGE)
- contractName = "for prestige"
- if(CONTRACT_MAGIC)
- contractName = "for magic"
- if(CONTRACT_REVIVE)
- contractName = "of revival"
- if(CONTRACT_KNOWLEDGE)
- contractName = "for knowledge"
- update_explanation_text()
-
-/datum/objective/devil/soulquality/update_explanation_text()
- explanation_text = "Have mortals sign at least [target_amount] contracts [contractName]"
-
-/datum/objective/devil/soulquality/check_completion()
- var/count = 0
- var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
- var/list/souls = devilDatum.soulsOwned
- for(var/S in souls)
- var/datum/mind/L = S
- if(!L.owns_soul() && L.damnation_type == contractType)
- count++
- return count>=target_amount
-
-
-
-/datum/objective/devil/sintouch
- explanation_text = "You shouldn't see this text. Error:DEVIL3"
-
-/datum/objective/devil/sintouch/New()
- target_amount = pick(4,5)
- explanation_text = "Ensure at least [target_amount] mortals are sintouched."
-
-/datum/objective/devil/sintouch/check_completion()
- var/list/touched = get_antag_minds(/datum/antagonist/sintouched)
- return touched.len >= target_amount
-
-
-/datum/objective/devil/buy_target
- explanation_text = "You shouldn't see this text. Error:DEVIL4"
-
-/datum/objective/devil/buy_target/update_explanation_text()
- if(target)
- explanation_text = "Purchase and retain the soul of [target.name], the [target.assigned_role]."
- else
- explanation_text = "Free objective."
-
-/datum/objective/devil/buy_target/check_completion()
- return target.soulOwner == owner
-
-
-/datum/objective/devil/outsell
- explanation_text = "You shouldn't see this text. Error:DEVIL5"
-
-/datum/objective/devil/outsell/New()
-
-/datum/objective/devil/outsell/update_explanation_text()
- var/datum/antagonist/devil/opponent = target.has_antag_datum(/datum/antagonist/devil)
- explanation_text = "Purchase and retain control over more souls than [opponent.truename], known to mortals as [target.name], the [target.assigned_role]."
-
-/datum/objective/devil/outsell/check_completion()
- var/selfcount = 0
- var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
- var/list/souls = devilDatum.soulsOwned
- for(var/S in souls)
- var/datum/mind/L = S
- if(L.soulOwner == owner)
- selfcount++
- var/targetcount = 0
- devilDatum = target.has_antag_datum(/datum/antagonist/devil)
- souls = devilDatum.soulsOwned
- for(var/S in souls)
- var/datum/mind/L = S
- if(L.soulOwner == target)
- targetcount++
- return selfcount > targetcount
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
index 1e6a2da4d867..7163dd0ca54e 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
@@ -35,7 +35,7 @@
var/list/enemy_roles = list()
/// If enemy_roles was set, this is the amount of enemy job workers needed per threat_level range (0-10,10-20,etc) IMPORTANT: DOES NOT WORK ON ROUNDSTART RULESETS.
var/required_enemies = list(1,1,0,0,0,0,0,0,0,0)
- /// The rule needs this many candidates (post-trimming) to be executed (example: Cult needs 4 players at round start)
+ /// The rule needs this many candidates (post-trimming) to be executed
var/required_candidates = 0
/// 1 -> 9, probability for this rule to be picked against other rules
var/weight = 5
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index 8c8fe19d0a97..70d9c8405204 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -191,65 +191,6 @@
M.add_antag_datum(new antag_datum())
return TRUE
-//////////////////////////////////////////////
-// //
-// BLOOD CULT //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/bloodcult
- name = "Blood Cult"
- antag_flag = ROLE_CULTIST
- antag_datum = /datum/antagonist/cult
- minimum_required_age = 14
- restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Research Director", "Chief Medical Officer", "Chief Engineer", "SolGov Representative")
- required_candidates = 2
- weight = 3
- cost = 35
- requirements = list(100,90,80,60,40,30,10,10,10,10)
- high_population_requirement = 10
- flags = HIGHLANDER_RULESET
- antag_cap = list(2,2,2,3,3,4,4,4,4,4)
- var/datum/team/cult/main_cult
-
-/datum/dynamic_ruleset/roundstart/bloodcult/ready(forced = FALSE)
- required_candidates = antag_cap[indice_pop]
- . = ..()
-
-/datum/dynamic_ruleset/roundstart/bloodcult/pre_execute()
- . = ..()
- var/cultists = antag_cap[indice_pop]
- mode.antags_rolled += cultists
- for(var/cultists_number = 1 to cultists)
- if(candidates.len <= 0)
- break
- var/mob/M = pick_n_take(candidates)
- assigned += M.mind
- M.mind.special_role = ROLE_CULTIST
- M.mind.restricted_roles = restricted_roles
- GLOB.pre_setup_antags += M.mind
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/bloodcult/execute()
- main_cult = new
- for(var/datum/mind/M in assigned)
- var/datum/antagonist/cult/new_cultist = new antag_datum()
- new_cultist.cult_team = main_cult
- new_cultist.give_equipment = TRUE
- M.add_antag_datum(new_cultist)
- GLOB.pre_setup_antags -= M
- main_cult.setup_objectives()
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/bloodcult/round_result()
- ..()
- if(main_cult.check_cult_victory())
- SSticker.mode_result = "win - cult win"
- SSticker.news_report = CULT_SUMMON
- else
- SSticker.mode_result = "loss - staff stopped the cult"
- SSticker.news_report = CULT_FAILURE
-
//////////////////////////////////////////////
// //
// NUCLEAR OPERATIVES //
@@ -382,93 +323,3 @@
for(var/datum/mind/V in assigned)
V.assigned_role = "Clown Operative"
V.special_role = "Clown Operative"
-
-//////////////////////////////////////////////
-// //
-// DEVIL //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/devil
- name = "Devil"
- antag_flag = ROLE_DEVIL
- antag_datum = /datum/antagonist/devil
- restricted_roles = list("Lawyer", "Curator", "Chaplain", "Prisoner", "Head of Security", "Captain", "AI")
- required_candidates = 1
- weight = 3
- cost = 0
- requirements = list(101,101,101,101,101,101,101,101,101,101)
- high_population_requirement = 101
- antag_cap = list(1,1,1,2,2,2,3,3,3,4)
-
-/datum/dynamic_ruleset/roundstart/devil/pre_execute()
- . = ..()
- var/num_devils = antag_cap[indice_pop]
- mode.antags_rolled += num_devils
-
- for(var/j = 0, j < num_devils, j++)
- if (!candidates.len)
- break
- var/mob/devil = pick_n_take(candidates)
- assigned += devil.mind
- devil.mind.special_role = ROLE_DEVIL
- devil.mind.restricted_roles = restricted_roles
- GLOB.pre_setup_antags += devil.mind
-
- log_game("[key_name(devil)] has been selected as a devil")
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/devil/execute()
- for(var/datum/mind/devil in assigned)
- add_devil(devil.current, ascendable = TRUE)
- GLOB.pre_setup_antags -= devil
- add_devil_objectives(devil,2)
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/devil/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
- var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
- var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
- for(var/i = 1 to quantity)
- var/type = pick(validtypes)
- var/datum/objective/devil/objective = new type(null)
- objective.owner = devil_mind
- D.objectives += objective
- if(!istype(objective, /datum/objective/devil/buy_target))
- validtypes -= type
- else
- objective.find_target()
-
-//////////////////////////////////////////////
-// //
-// METEOR //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/meteor
- name = "Meteor"
- persistent = TRUE
- required_candidates = 0
- weight = 3
- cost = 0
- requirements = list(101,101,101,101,101,101,101,101,101,101)
- high_population_requirement = 101
- var/meteordelay = 2000
- var/nometeors = 0
- var/rampupdelta = 5
-
-/datum/dynamic_ruleset/roundstart/meteor/rule_process()
- if(nometeors || meteordelay > world.time - SSticker.round_start_time)
- return
-
- var/list/wavetype = GLOB.meteors_normal
- var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
- if (prob(meteorminutes))
- wavetype = GLOB.meteors_threatening
-
- if (prob(meteorminutes/2))
- wavetype = GLOB.meteors_catastrophic
-
- var/ramp_up_final = clamp(round(meteorminutes/rampupdelta), 1, 10)
-
- spawn_meteors(ramp_up_final, wavetype)
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 56f873a50bd1..7db8207c9d71 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -47,11 +47,10 @@
for(var/area/A in GLOB.sortedAreas)
if(!A.requires_power || A.always_unpowered)
continue
- if(!istype(A, /area/shuttle))
- A.power_light = TRUE
- A.power_equip = TRUE
- A.power_environ = TRUE
- A.power_change()
+ A.power_light = TRUE
+ A.power_equip = TRUE
+ A.power_environ = TRUE
+ A.power_change()
/proc/power_restore_quick()
priority_announce("All SMESs have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 391ad852664f..00bc1bc95e13 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -418,9 +418,6 @@
return max(0, enemy_minimum_age - C.player_age)
-/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
- SSticker.mode.remove_cultist(newborgie, 0, 0)
-
/datum/game_mode/proc/generate_station_goals()
var/list/possible = list()
for(var/T in subtypesof(/datum/station_goal))
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
deleted file mode 100644
index 9149f5da35f6..000000000000
--- a/code/game/gamemodes/meteor/meteor.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-/datum/game_mode/meteor
- name = "meteor"
- config_tag = "meteor"
- report_type = "meteor"
- false_report_weight = 1
- var/meteordelay = 2000
- var/nometeors = 0
- var/rampupdelta = 5
- required_players = 0
-
- announce_span = "danger"
- announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
-
- title_icon = "meteor"
-
-/datum/game_mode/meteor/process()
- if(nometeors || meteordelay > world.time - SSticker.round_start_time)
- return
-
- var/list/wavetype = GLOB.meteors_normal
- var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
-
- if (prob(meteorminutes))
- wavetype = GLOB.meteors_threatening
-
- if (prob(meteorminutes/2))
- wavetype = GLOB.meteors_catastrophic
-
- var/ramp_up_final = clamp(round(meteorminutes/rampupdelta), 1, 10)
-
- spawn_meteors(ramp_up_final, wavetype)
-
-
-/datum/game_mode/meteor/special_report()
- var/survivors = 0
- var/list/survivor_list = list()
-
- for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD)
- ++survivors
-
- if(player.onCentCom())
- survivor_list += "[player.real_name] escaped to the safety of CentCom."
- else if(player.onSyndieBase())
- survivor_list += "[player.real_name] escaped to the (relative) safety of Syndicate Space."
- else
- survivor_list += "[player.real_name] survived but is stranded without any hope of rescue."
-
- if(survivors)
- return "
[survivor_list.Join("
")]
"
- else
- return "Nobody survived the meteor storm!
"
-
-/datum/game_mode/meteor/set_round_result()
- ..()
- SSticker.mode_result = "end - evacuation"
-
-/datum/game_mode/meteor/generate_report()
- return "[pick("Asteroids have", "Meteors have", "Large rocks have", "Stellar minerals have", "Space hail has", "Debris has")] been detected near your station, and a collision is possible, \
- though unlikely. Be prepared for largescale impacts and destruction. Please note that the debris will prevent the escape shuttle from arriving quickly."
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 65e161f2176b..ec74c51acc95 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -58,18 +58,11 @@ GLOBAL_LIST_EMPTY(objectives)
/datum/objective/proc/considered_escaped(datum/mind/M)
if(!considered_alive(M))
return FALSE
- if(considered_exiled(M))
- return FALSE
- if(M.force_escaped)
- return TRUE
- if(SSticker.force_ending || SSticker.mode.station_was_nuked) // Just let them win.
+ if(SSticker.force_ending) // Just let them win.
return TRUE
if(SSshuttle.jump_mode != BS_JUMP_COMPLETED)
return FALSE
- var/turf/location = get_turf(M.current)
- if(!location || istype(location, /turf/open/floor/mineral/plastitanium/red/brig)) // Fails if they are in the shuttle brig
- return FALSE
- return location.onCentCom() || location.onSyndieBase()
+ return TRUE
/datum/objective/proc/check_completion()
return completed
@@ -233,7 +226,7 @@ GLOBAL_LIST_EMPTY(objectives)
..()
/datum/objective/maroon/check_completion()
- return !target || !considered_alive(target) || (!target.current.onCentCom() && !target.current.onSyndieBase())
+ return !target || !considered_alive(target)
/datum/objective/maroon/update_explanation_text()
if(target && target.current)
@@ -334,7 +327,7 @@ GLOBAL_LIST_EMPTY(objectives)
name = "detain"
/datum/objective/jailbreak/detain/check_completion()
- return completed || (!considered_escaped(target) && (considered_alive(target) && target.current.onCentCom()))
+ return completed || (!considered_escaped(target) && (considered_alive(target)))
/datum/objective/jailbreak/detain/update_explanation_text()
..()
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 2389b699e7b9..96fbbd8254d1 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1,7 +1,6 @@
GLOBAL_LIST_INIT(arcade_prize_pool, list(
/obj/item/storage/box/snappops = 2,
/obj/item/toy/talking/AI = 2,
- /obj/item/toy/talking/codex_gigas = 2,
/obj/item/clothing/under/syndicate/tacticool = 2,
/obj/item/toy/sword = 2,
/obj/item/toy/gun = 2,
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 3412321b380b..2d76d7ecb351 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -370,26 +370,6 @@
audible_message("You hear a click from the bottom of the door.", null, 1)
update_appearance()
-/obj/machinery/door/airlock/narsie_act()
- var/turf/T = get_turf(src)
- var/obj/machinery/door/airlock/cult/A
- if(GLOB.cult_narsie)
- var/runed = prob(20)
- if(glass)
- if(runed)
- A = new/obj/machinery/door/airlock/cult/glass(T)
- else
- A = new/obj/machinery/door/airlock/cult/unruned/glass(T)
- else
- if(runed)
- A = new/obj/machinery/door/airlock/cult(T)
- else
- A = new/obj/machinery/door/airlock/cult/unruned(T)
- A.name = name
- else
- A = new /obj/machinery/door/airlock/cult/weak(T)
- qdel(src)
-
/obj/machinery/door/airlock/Destroy()
QDEL_NULL(wires)
QDEL_NULL(electronics)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 492ce30f6ac4..f6e6840f552b 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -461,115 +461,6 @@
security_level = 1
has_hatch = FALSE
-//////////////////////////////////
-/*
- Cult Airlocks
-*/
-
-/obj/machinery/door/airlock/cult
- name = "cult airlock"
- icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi'
- overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_cult
- hackProof = TRUE
- aiControlDisabled = AI_WIRE_DISABLED
- req_access = list(ACCESS_BLOODCULT)
- damage_deflection = 10
- has_hatch = FALSE
- var/openingoverlaytype = /obj/effect/temp_visual/cult/door
- var/friendly = FALSE
- var/stealthy = FALSE
-
-/obj/machinery/door/airlock/cult/Initialize()
- . = ..()
- new openingoverlaytype(loc)
-
-/obj/machinery/door/airlock/cult/canAIControl(mob/user)
- return (iscultist(user) && !isAllPowerCut())
-
-/obj/machinery/door/airlock/cult/on_break()
- if(!panel_open)
- panel_open = TRUE
-
-/obj/machinery/door/airlock/cult/isElectrified()
- return FALSE
-
-/obj/machinery/door/airlock/cult/hasPower()
- return TRUE
-
-/obj/machinery/door/airlock/cult/allowed(mob/living/L)
- if(!density)
- return 1
- if(friendly || iscultist(L) || istype(L, /mob/living/simple_animal/shade) || isconstruct(L))
- if(!stealthy)
- new openingoverlaytype(loc)
- return 1
- else
- if(!stealthy)
- new /obj/effect/temp_visual/cult/sac(loc)
- var/atom/throwtarget
- throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
- SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50))
- flash_color(L, flash_color="#960000", flash_time=20)
- L.Paralyze(40)
- L.throw_at(throwtarget, 5, 1)
- return 0
-
-/obj/machinery/door/airlock/cult/proc/conceal()
- icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- name = "airlock"
- desc = "It opens and closes."
- stealthy = TRUE
- update_appearance()
-
-/obj/machinery/door/airlock/cult/proc/reveal()
- icon = initial(icon)
- overlays_file = initial(overlays_file)
- name = initial(name)
- desc = initial(desc)
- stealthy = initial(stealthy)
- update_appearance()
-
-/obj/machinery/door/airlock/cult/narsie_act()
- return
-
-/obj/machinery/door/airlock/cult/emp_act(severity)
- return
-
-/obj/machinery/door/airlock/cult/friendly
- friendly = TRUE
-
-/obj/machinery/door/airlock/cult/glass
- glass = TRUE
- opacity = FALSE
-
-/obj/machinery/door/airlock/cult/glass/friendly
- friendly = TRUE
-
-/obj/machinery/door/airlock/cult/unruned
- icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
- overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned
- openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned
-
-/obj/machinery/door/airlock/cult/unruned/friendly
- friendly = TRUE
-
-/obj/machinery/door/airlock/cult/unruned/glass
- glass = TRUE
- opacity = FALSE
-
-/obj/machinery/door/airlock/cult/unruned/glass/friendly
- friendly = TRUE
-
-/obj/machinery/door/airlock/cult/weak
- name = "brittle cult airlock"
- desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state."
- normal_integrity = 150
- damage_deflection = 5
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
//////////////////////////////////
/*
Misc Airlocks
diff --git a/code/game/machinery/drone_dispenser.dm b/code/game/machinery/drone_dispenser.dm
index 4603044ab285..bb79d5f7e46e 100644
--- a/code/game/machinery/drone_dispenser.dm
+++ b/code/game/machinery/drone_dispenser.dm
@@ -108,28 +108,6 @@
recharge_sound = null
recharge_message = null
-/obj/machinery/droneDispenser/swarmer
- name = "swarmer fabricator"
- desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering."
- icon = 'icons/obj/objects.dmi'
- icon_state = "hivebot_fab"
- icon_off = "hivebot_fab"
- icon_on = "hivebot_fab"
- icon_recharging = "hivebot_fab"
- icon_creating = "hivebot_fab_on"
- metal_cost = 0
- glass_cost = 0
- cooldownTime = 300 //30 seconds
- maximum_idle = 0 // Swarmers have no restraint
- dispense_type = /obj/effect/mob_spawn/swarmer
- begin_create_message = "hums softly as an interface appears above it, scrolling by at unreadable speed."
- end_create_message = "materializes a strange shell, which drops to the ground."
- recharging_text = "Its lights are slowly increasing in brightness."
- work_sound = 'sound/effects/empulse.ogg'
- create_sound = 'sound/effects/phasein.ogg'
- break_sound = 'sound/effects/empulse.ogg'
- break_message = "slowly falls dark, lights stuttering."
-
/obj/machinery/droneDispenser/examine(mob/user)
. = ..()
if((mode == DRONE_RECHARGING) && !machine_stat && recharging_text)
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 47db5ce6d0ef..e6e754c4b807 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -43,27 +43,6 @@
if(.) //damage was dealt
new /obj/effect/temp_visual/impact_effect/ion(loc)
-/obj/structure/emergency_shield/sanguine
- name = "sanguine barrier"
- desc = "A potent shield summoned by cultists to defend their rites."
- icon_state = "shield-red"
- max_integrity = 60
-
-/obj/structure/emergency_shield/sanguine/emp_act(severity)
- return
-
-/obj/structure/emergency_shield/invoker
- name = "Invoker's Shield"
- desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals."
- color = "#FF0000"
- max_integrity = 20
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- layer = ABOVE_MOB_LAYER
-
-/obj/structure/emergency_shield/invoker/emp_act(severity)
- return
-
-
/obj/machinery/shieldgen
name = "anti-breach shielding projector"
desc = "Used to seal minor hull breaches."
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 12085b7d62d4..b46ccaca9f60 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -148,7 +148,3 @@
/obj/item/sbeacondrop/penetratorturret
desc = "A label on it reads: Warning: Activating this device will send a penetrator turret to your location."
droptype = /obj/machinery/porta_turret/syndicate/shuttle
-
-/obj/item/sbeacondrop/constructshell
- desc = "A label on it reads: Warning: Activating this device will send a Nar'sian construct shell to your location."
- droptype = /obj/structure/constructshell
diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm
index be2d89707882..66b027f2e516 100644
--- a/code/game/objects/effects/blessing.dm
+++ b/code/game/objects/effects/blessing.dm
@@ -16,14 +16,7 @@
I.alpha = 64
I.appearance_flags = RESET_ALPHA
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I)
- RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(block_cult_teleport))
/obj/effect/blessing/Destroy()
UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT)
return ..()
-
-/obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination)
- SIGNAL_HANDLER
-
- if(channel == TELEPORT_CHANNEL_CULT)
- return COMPONENT_BLOCK_TELEPORT
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index e46d8d92e82a..d4278d775888 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -19,14 +19,6 @@
/obj/effect/forcefield/singularity_pull()
return
-/obj/effect/forcefield/cult
- desc = "An unholy shield that blocks all attacks."
- name = "glowing wall"
- icon = 'icons/effects/cult_effects.dmi'
- icon_state = "cultshield"
- CanAtmosPass = ATMOS_PASS_NO
- timeleft = 200
-
///////////Mimewalls///////////
/obj/effect/forcefield/mime
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index 7fee84da562f..151be9b026da 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -49,7 +49,7 @@ AI MODULES
//Handle the lawcap
if(law_datum)
var/tot_laws = 0
- for(var/lawlist in list(law_datum.devillaws, law_datum.inherent, law_datum.supplied, law_datum.ion, law_datum.hacked, laws))
+ for(var/lawlist in list(law_datum.inherent, law_datum.supplied, law_datum.ion, law_datum.hacked, laws))
for(var/mylaw in lawlist)
if(mylaw != "")
tot_laws++
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index d2ce379274dc..232b4570a97e 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -150,7 +150,6 @@
if(A.outdoors)
return AREA_SPACE
var/list/SPECIALS = list(
- /area/shuttle,
/area/centcom,
/area/asteroid,
/area/tdome,
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index 51c17ff4290d..2fb225fd2fb9 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -27,6 +27,15 @@
/obj/item/documents/syndicate
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence."
+/obj/item/documents/syndicate/cybersun
+ name = "classified Cybersun documents"
+ desc = "\"Top Secret\" documents detailing sensitive Cybersun Virtual Solutions operational intelligence. These documents are verified with a red wax seal."
+ icon_state = "docs_red"
+
+/obj/item/documents/syndicate/cybersun/biodynamics
+ desc = "\"Top Secret\" Cybersun Biodynamics documents, filled with patient lists and unfinished designs. These documents are verified with a teal wax seal."
+ icon_state = "docs_teal"
+
/obj/item/documents/syndicate/red
name = "red secret documents"
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a red wax seal."
diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm
index 121fa9f0c234..0a7094fb3895 100644
--- a/code/game/objects/items/implants/implant_mindshield.dm
+++ b/code/game/objects/items/implants/implant_mindshield.dm
@@ -28,10 +28,7 @@
deconverted = TRUE
if(!silent)
- if(target.mind in SSticker.mode.cult)
- to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!")
- else
- to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.")
+ to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.")
ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant")
target.sec_hud_set_implants()
if(deconverted)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 3194c1302512..6aba20463392 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -289,7 +289,6 @@
if(M.laws.id == DEFAULT_AI_LAWID)
O.make_laws()
- SSticker.mode.remove_antag_for_borging(B.mind)
O.job = "Cyborg"
O.cell = chest.cell
diff --git a/code/game/objects/items/shuttle_creator.dm b/code/game/objects/items/shuttle_creator.dm
index 781020f87318..9f25041d1f00 100644
--- a/code/game/objects/items/shuttle_creator.dm
+++ b/code/game/objects/items/shuttle_creator.dm
@@ -218,7 +218,6 @@
/obj/item/shuttle_creator/proc/check_current_area(mob/user)
var/static/area_or_turf_fail_types = typecacheof(list(
/turf/open/space,
- /area/shuttle
))
//Check to see if the user can make a new area to prevent spamming
if(user)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index c00ba77b21b8..ce64af1fd205 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -7,7 +7,6 @@
* Plastic
* Cardboard
* Paper Frames
- * Runed Metal (cult)
* Bronze (bake brass)
*/
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 52a6fdf8738e..c6d55e03ef48 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -383,8 +383,7 @@
/obj/item/storage/bag/plants,
/obj/item/stack/marker_beacon,
/obj/item/restraints/legcuffs/bola/watcher,
- /obj/item/melee/sword/bone,
- /obj/item/key/lasso
+ /obj/item/melee/sword/bone
))
@@ -406,32 +405,6 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 5
-/obj/item/storage/belt/soulstone
- name = "soul stone belt"
- desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
- icon_state = "soulstone"
- item_state = "soulstone"
-
-/obj/item/storage/belt/soulstone/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 6
- STR.set_holdable(list(
- /obj/item/soulstone
- ))
-
-/obj/item/storage/belt/soulstone/full/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone(src)
-
-/obj/item/storage/belt/soulstone/full/chappy/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone/anybody/chaplain(src)
-
-/obj/item/storage/belt/soulstone/full/purified/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone/anybody/purified(src)
-
/obj/item/storage/belt/champion
name = "championship belt"
desc = "Proves to the world that you are the strongest!"
diff --git a/code/game/objects/items/storage/ration.dm b/code/game/objects/items/storage/ration.dm
index 169e0dfad0a6..9a9e4a5a2617 100644
--- a/code/game/objects/items/storage/ration.dm
+++ b/code/game/objects/items/storage/ration.dm
@@ -28,7 +28,9 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
- STR.set_holdable(list(/obj/item/reagent_containers/food))
+ STR.set_holdable(list(
+ /obj/item/reagent_containers/food,
+ /obj/item/ration_heater))
STR.locked = TRUE
STR.locked_flavor = "sealed closed"
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index f918a3b883fb..f46d6eb4c2c9 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -211,3 +211,20 @@
/obj/item/storage/secure/safe/suns/PopulateContents()
. = ..()
new /obj/item/storage/belt/sabre/suns(src)
+
+/obj/item/storage/secure/safe/cybersun
+ name = "Captain's secure safe"
+ desc = "An electronic safe manufactured by Cybersun Virtual Solutions."
+
+/obj/item/storage/secure/safe/cybersun/PopulateContents()
+ new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src)
+ new /obj/item/ammo_box/magazine/m22lr_himehabu(src)
+ new /obj/item/ammo_box/magazine/m22lr_himehabu(src)
+
+/obj/item/storage/secure/safe/cybersun/solutions/PopulateContents()
+ . = ..()
+ new /obj/item/folder/documents/syndicate/cybersun(src)
+
+/obj/item/storage/secure/safe/cybersun/biodynamics/PopulateContents()
+ . = ..()
+ new /obj/item/folder/documents/syndicate/cybersun/biodynamics(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 3ef2d547931a..9516c7128090 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -561,12 +561,3 @@
/obj/item/storage/box/syndie_kit/signaler/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/assembly/signaler(src)
-
-/obj/item/storage/box/syndie_kit/cultconstructkit
- name = "cult construct kit"
- desc = "A sleek, sturdy box with an ominous, dark energy inside. Yikes."
-
-/obj/item/storage/box/syndie_kit/cultconstructkit/PopulateContents()
- new /obj/item/storage/belt/soulstone/full/purified(src)
- new /obj/item/sbeacondrop/constructshell(src)
- new /obj/item/sbeacondrop/constructshell(src)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7d2828c41660..6d6d258b5b0c 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -542,31 +542,6 @@
/obj/item/toy/talking/AI/generate_messages()
return list(generate_ion_law())
-/obj/item/toy/talking/codex_gigas
- name = "Toy Codex Gigas"
- desc = "A tool to help you write fictional devils!"
- icon = 'icons/obj/library.dmi'
- icon_state = "demonomicon"
- lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- w_class = WEIGHT_CLASS_SMALL
- recharge_time = 60
-
-/obj/item/toy/talking/codex_gigas/activation_message(mob/user)
- user.visible_message(
- "[user] presses the button on \the [src].",
- "You press the button on \the [src].",
- "You hear a soft click.")
-
-/obj/item/toy/talking/codex_gigas/generate_messages()
- var/datum/fakeDevil/devil = new
- var/list/messages = list()
- messages += "Some fun facts about: [devil.truename]"
- messages += "[GLOB.lawlorify[LORE][devil.obligation]]"
- messages += "[GLOB.lawlorify[LORE][devil.ban]]"
- messages += "[GLOB.lawlorify[LORE][devil.banish]]"
- return messages
-
/obj/item/toy/talking/owl
name = "owl action figure"
desc = "An action figure modeled after 'The Owl', defender of justice."
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 1994ff330dd9..dba1c510767d 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -220,7 +220,6 @@
to_chat(user, "You connect the monitor.")
if(brain)
var/mob/living/brain/B = brain.brainmob
- SSticker.mode.remove_antag_for_borging(B.mind)
var/mob/living/silicon/ai/A = null
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 31e9d9a0b8fc..8ee8d8214f80 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -209,7 +209,7 @@ LINEN BINS
/obj/item/bedsheet/cult
name = "cultist's bedsheet"
- desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
+ desc = "You might dream of elder gods if you sleep with this. It seems rather tattered."
icon_state = "sheetcult"
item_state = "sheetcult"
dream_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d2bcf77cfda7..b77f86be469f 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -141,20 +141,6 @@
airlock_type = /obj/machinery/door/airlock/shuttle
glass_type = /obj/machinery/door/airlock/shuttle/glass
-/obj/structure/door_assembly/door_assembly_cult
- name = "cult airlock assembly"
- icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi'
- base_name = "cult airlock"
- overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/cult
- glass_type = /obj/machinery/door/airlock/cult/glass
-
-/obj/structure/door_assembly/door_assembly_cult/unruned
- icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
- overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/cult/unruned
- glass_type = /obj/machinery/door/airlock/cult/unruned/glass
-
/obj/structure/door_assembly/door_assembly_viro
name = "virology airlock assembly"
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index aed3ae724c59..f8893a3e3bc9 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -102,58 +102,6 @@
head = /obj/item/clothing/head/helmet/gladiator
uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
-/obj/effect/mob_spawn/human/demonic_friend
- name = "Essence of friendship"
- desc = "Oh boy! Oh boy! A friend!"
- mob_name = "Demonic friend"
- icon = 'icons/obj/cardboard_cutout.dmi'
- icon_state = "cutout_basic"
- outfit = /datum/outfit/demonic_friend
- death = FALSE
- roundstart = FALSE
- random = TRUE
- id_job = "SuperFriend"
- var/obj/effect/proc_holder/spell/targeted/summon_friend/spell
- var/datum/mind/owner
- assignedrole = "SuperFriend"
-
-/obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell)
- . = ..()
- owner = owner_mind
- flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil."
- important_info = "Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell."
- var/area/A = get_area(src)
- if(!mapload && A)
- notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
- objectives = "Be [owner.name]'s friend, and keep [owner.name] alive, so you don't get sent back to hell."
- spell = summoning_spell
-
-
-/obj/effect/mob_spawn/human/demonic_friend/special(mob/living/L)
- if(!QDELETED(owner.current) && owner.current.stat != DEAD)
- L.fully_replace_character_name(null,"[owner.name]'s best friend")
- soullink(/datum/soullink/oneway, owner.current, L)
- spell.friend = L
- spell.charge_counter = spell.charge_max
- L.mind.hasSoul = FALSE
- var/mob/living/carbon/human/H = L
- var/obj/item/worn = H.wear_id
- var/obj/item/card/id/id = worn.GetID()
- id.registered_name = L.real_name
- id.update_label()
- else
- to_chat(L, "Your owner is already dead! You will soon perish.")
- addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, dust), 150)) //Give em a few seconds as a mercy.
-
-/datum/outfit/demonic_friend
- name = "Demonic Friend"
- uniform = /obj/item/clothing/under/misc/assistantformal
- shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/radio
- back = /obj/item/storage/backpack
- implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend.
- id = /obj/item/card/id
-
/obj/effect/mob_spawn/human/syndicate
name = "Syndicate Operative"
roundstart = FALSE
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index df0d3cf1f43c..5f35e69d098e 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -314,10 +314,6 @@
new remains(loc)
qdel(src)
-/obj/structure/girder/narsie_act()
- new /obj/structure/girder/cult(loc)
- qdel(src)
-
/obj/structure/girder/displaced
name = "displaced girder"
icon_state = "displaced"
@@ -339,56 +335,6 @@
new remains(loc, 2)
qdel(src)
-
-
-//////////////////////////////////////////// cult girder //////////////////////////////////////////////
-
-/obj/structure/girder/cult
- name = "runed girder"
- desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts."
- icon = 'icons/obj/cult.dmi'
- icon_state= "cultgirder"
- can_displace = FALSE
-
-/obj/structure/girder/cult/attackby(obj/item/W, mob/user, params)
- add_fingerprint(user)
- if(W.tool_behaviour == TOOL_WELDER)
- if(!W.tool_start_check(user, amount=0))
- return
-
- to_chat(user, "You start slicing apart the girder...")
- if(W.use_tool(src, user, 40, volume=50))
- to_chat(user, "You slice apart the girder.")
- var/obj/item/stack/sheet/mineral/hidden/hellstone/R = new(drop_location(), 1)
- transfer_fingerprints_to(R)
- qdel(src)
-
- else if(istype(W, /obj/item/stack/sheet/mineral/hidden/hellstone))
- var/obj/item/stack/sheet/mineral/hidden/hellstone/R = W
- if(R.get_amount() < 1)
- to_chat(user, "You need at least one sheet of runed metal to construct a runed wall!")
- return 0
- user.visible_message("[user] begins laying runed metal on [src]...", "You begin constructing a runed wall...")
- if(do_after(user, 50, target = src))
- if(R.get_amount() < 1)
- return
- user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.")
- R.use(1)
- var/turf/T = get_turf(src)
- T.PlaceOnTop(/turf/closed/wall/mineral/cult)
- qdel(src)
-
- else
- return ..()
-
-/obj/structure/girder/cult/narsie_act()
- return
-
-/obj/structure/girder/cult/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- new /obj/item/stack/sheet/mineral/hidden/hellstone(drop_location(), 1)
- qdel(src)
-
/obj/structure/girder/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index b674e25fc8f8..6bbe3c623be0 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -8,24 +8,12 @@
canSmoothWith = null
sheet_type = /obj/item/stack/sheet/mineral/hidden/hellstone
sheet_amount = 1
- girder_type = /obj/structure/girder/cult
-
max_integrity = 600
/turf/closed/wall/mineral/cult/Initialize(mapload, inherited_virtual_z)
new /obj/effect/temp_visual/cult/turf(src)
. = ..()
-/turf/closed/wall/mineral/cult/Exited(atom/movable/AM, atom/newloc)
- . = ..()
- if(istype(AM, /mob/living/simple_animal/hostile/construct/harvester)) //harvesters can go through cult walls, dragging something with
- var/mob/living/simple_animal/hostile/construct/harvester/H = AM
- var/atom/movable/stored_pulling = H.pulling
- if(stored_pulling)
- stored_pulling.setDir(get_dir(stored_pulling.loc, newloc))
- stored_pulling.forceMove(src)
- H.start_pulling(stored_pulling, supress_message = TRUE)
-
/turf/closed/wall/mineral/cult/artificer
name = "runed stone wall"
desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index f7eac409b836..23fdfcc6d998 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -180,11 +180,6 @@
else if(prob(50))
ReplaceWithLattice()
-/turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
- . = ..()
- if(.)
- ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
-
/turf/open/floor/acid_melt()
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index 7fb94e541bda..9094b0a3238f 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -141,36 +141,6 @@
name = "hydrogen mix floor"
initial_gas_mix = ATMOS_TANK_HYDROGEN_FUEL
-/turf/open/floor/engine/cult
- name = "engraved floor"
- desc = "The air smells strange over this sinister flooring."
- icon_state = "plating"
- floor_tile = null
- var/obj/effect/cult_turf/overlay/floor/bloodcult/realappearance
-
-
-/turf/open/floor/engine/cult/Initialize(mapload, inherited_virtual_z)
- . = ..()
- new /obj/effect/temp_visual/cult/turf/floor(src)
- realappearance = new /obj/effect/cult_turf/overlay/floor/bloodcult(src)
- realappearance.linked = src
-
-/turf/open/floor/engine/cult/Destroy()
- be_removed()
- return ..()
-
-/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, flags)
- if(path != type)
- be_removed()
- return ..()
-
-/turf/open/floor/engine/cult/proc/be_removed()
- qdel(realappearance)
- realappearance = null
-
-/turf/open/floor/engine/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
-
/turf/open/floor/engine/vacuum
name = "vacuum floor"
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d05fd3ee3b98..b62a7830cc0d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -850,22 +850,6 @@
if(!ai_number)
to_chat(usr, "No AIs located" , confidential = TRUE)
-/datum/admins/proc/output_all_devil_info()
- var/devil_number = 0
- for(var/datum/mind/D in SSticker.mode.devils)
- devil_number++
- var/datum/antagonist/devil/devil = D.has_antag_datum(/datum/antagonist/devil)
- to_chat(usr, "Devil #[devil_number]:
" + devil.printdevilinfo(), confidential = TRUE)
- if(!devil_number)
- to_chat(usr, "No Devils located" , confidential = TRUE)
-
-/datum/admins/proc/output_devil_info(mob/living/M)
- if(is_devil(M))
- var/datum/antagonist/devil/devil = M.mind.has_antag_datum(/datum/antagonist/devil)
- to_chat(usr, devil.printdevilinfo(), confidential = TRUE)
- else
- to_chat(usr, "[M] is not a devil.", confidential = TRUE)
-
/datum/admins/proc/dynamic_mode_options(mob/user)
var/dat = {"
Dynamic Mode Options
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 04e84097f6d1..0be2f41696e6 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -136,8 +136,3 @@
/obj/effect/forcefield/arena_shuttle_entrance/proc/do_bloodbath(mob/living/L)
var/obj/item/mine/pressure/pickup/bloodbath/B = new (L)
B.mine_effect(L)
-
-/area/shuttle_arena
- name = "arena"
- has_gravity = STANDARD_GRAVITY
- requires_power = FALSE
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index 28646666b46a..bd3d189f85eb 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -285,8 +285,8 @@
var/list/long_job_lists = list("Service" = GLOB.service_positions,
"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
"Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN,
- ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
- ROLE_DEVIL, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
+ ROLE_BROTHER, ROLE_CHANGELING,
+ ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
ROLE_OVERTHROW, ROLE_REV, ROLE_REVENANT,
ROLE_REV_HEAD, ROLE_SYNDICATE,
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 7f546f5a6e7d..5123eed0be58 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -78,13 +78,6 @@
else
message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create changelings.")
- if("cult")
- if(src.makeCult())
- message_admins("[key_name(usr)] started a cult.")
- log_admin("[key_name(usr)] started a cult.")
- else
- message_admins("[key_name_admin(usr)] tried to start a cult. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to start a cult.")
if("wizard")
message_admins("[key_name(usr)] is creating a wizard...")
if(src.makeWizard())
@@ -350,14 +343,6 @@
M.change_mob_type(/mob/living/simple_animal/parrot , null, null, delmob)
if("polyparrot")
M.change_mob_type(/mob/living/simple_animal/parrot/Polly , null, null, delmob)
- if("constructjuggernaut")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/juggernaut , null, null, delmob)
- if("constructartificer")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/artificer , null, null, delmob)
- if("constructwraith")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/wraith , null, null, delmob)
- if("shade")
- M.change_mob_type(/mob/living/simple_animal/shade , null, null, delmob)
else if(href_list["boot2"])
if(!check_rights(R_ADMIN))
@@ -1140,12 +1125,6 @@
return
output_ai_laws()
- else if(href_list["admincheckdevilinfo"])
- if(!check_rights(R_ADMIN))
- return
- var/mob/M = locate(href_list["admincheckdevilinfo"])
- output_devil_info(M)
-
else if(href_list["adminmoreinfo"])
var/mob/M = locate(href_list["adminmoreinfo"]) in GLOB.mob_list
if(!ismob(M))
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index abdecf91de60..e30519342ffb 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -16,7 +16,6 @@
var/dat = {"
Make Traitors
Make Changelings
- Make Cult
Make Wizard (Requires Ghosts)
Make Nuke Team (Requires Ghosts)
Make Response Team (Requires Ghosts)
@@ -113,38 +112,6 @@
new_character.mind.make_Wizard()
return TRUE
-
-/datum/admins/proc/makeCult()
- var/datum/game_mode/cult/temp = new
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- temp.restricted_jobs += temp.protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- temp.restricted_jobs += "Assistant"
-
- var/list/mob/living/carbon/human/candidates = list()
- var/mob/living/carbon/human/H = null
-
- for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(isReadytoRumble(applicant, ROLE_CULTIST))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
-
- if(candidates.len)
- var/numCultists = min(candidates.len, 4)
-
- for(var/i = 0, iYou are feeling far too docile to do that.")
return
- if(iscultist(victim) || HAS_TRAIT(victim, TRAIT_MINDSHIELD))
- to_chat(src, "[victim]'s mind seems to be blocked by some unknown force!")
- return
-
else
log_game("[src]/([src.ckey]) assumed control of [victim]/([victim.ckey] with borer powers.")
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
deleted file mode 100644
index b4bfb265386d..000000000000
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ /dev/null
@@ -1,803 +0,0 @@
-/datum/action/innate/cult/blood_magic //Blood magic handles the creation of blood spells (formerly talismans)
- name = "Prepare Blood Magic"
- button_icon_state = "carve"
- desc = "Prepare blood magic by carving runes into your flesh. This is easier with an empowering rune."
- var/list/spells = list()
- var/channeling = FALSE
-
-/datum/action/innate/cult/blood_magic/Grant()
- ..()
- button.screen_loc = DEFAULT_BLOODSPELLS
- button.moved = DEFAULT_BLOODSPELLS
- button.ordered = FALSE
-
-/datum/action/innate/cult/blood_magic/Remove()
- for(var/X in spells)
- qdel(X)
- ..()
-
-/datum/action/innate/cult/blood_magic/IsAvailable()
- if(!iscultist(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/blood_magic/proc/Positioning()
- var/list/screen_loc_split = splittext(button.screen_loc,",")
- var/list/screen_loc_X = splittext(screen_loc_split[1],":")
- var/list/screen_loc_Y = splittext(screen_loc_split[2],":")
- var/pix_X = text2num(screen_loc_X[2])
- for(var/datum/action/innate/cult/blood_spell/B in spells)
- if(B.button.locked)
- var/order = pix_X+spells.Find(B)*31
- B.button.screen_loc = "[screen_loc_X[1]]:[order],[screen_loc_Y[1]]:[screen_loc_Y[2]]"
- B.button.moved = B.button.screen_loc
-
-/datum/action/innate/cult/blood_magic/Activate()
- var/rune = FALSE
- var/limit = RUNELESS_MAX_BLOODCHARGE
- for(var/obj/effect/rune/empower/R in range(1, owner))
- rune = TRUE
- break
- if(rune)
- limit = MAX_BLOODCHARGE
- if(spells.len >= limit)
- if(rune)
- to_chat(owner, "You cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.")
- else
- to_chat(owner, "You cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove.")
- var/nullify_spell = input(owner, "Choose a spell to remove.", "Current Spells") as null|anything in spells
- if(nullify_spell)
- qdel(nullify_spell)
- return
- var/entered_spell_name
- var/datum/action/innate/cult/blood_spell/BS
- var/list/possible_spells = list()
- for(var/I in subtypesof(/datum/action/innate/cult/blood_spell))
- var/datum/action/innate/cult/blood_spell/J = I
- var/cult_name = initial(J.name)
- possible_spells[cult_name] = J
- possible_spells += "(REMOVE SPELL)"
- entered_spell_name = input(owner, "Pick a blood spell to prepare...", "Spell Choices") as null|anything in possible_spells
- if(entered_spell_name == "(REMOVE SPELL)")
- var/nullify_spell = input(owner, "Choose a spell to remove.", "Current Spells") as null|anything in spells
- if(nullify_spell)
- qdel(nullify_spell)
- return
- BS = possible_spells[entered_spell_name]
- if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit))
- return
- to_chat(owner,"You begin to carve unnatural symbols into your flesh!")
- SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
- if(!channeling)
- channeling = TRUE
- else
- to_chat(owner, "You are already invoking blood magic!")
- return
- if(do_after(owner, 100 - rune*60, target = owner))
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.bleed(40 - rune*32)
- var/datum/action/innate/cult/blood_spell/new_spell = new BS(owner)
- new_spell.Grant(owner, src)
- spells += new_spell
- Positioning()
- to_chat(owner, "Your wounds glow with power, you have prepared a [new_spell.name] invocation!")
- channeling = FALSE
-
-/datum/action/innate/cult/blood_spell //The next generation of talismans, handles storage/creation of blood magic
- name = "Blood Magic"
- button_icon_state = "telerune"
- desc = "Fear the Old Blood."
- var/charges = 1
- var/magic_path = null
- var/obj/item/melee/blood_magic/hand_magic
- var/datum/action/innate/cult/blood_magic/all_magic
- var/base_desc //To allow for updating tooltips
- var/invocation
- var/health_cost = 0
-
-/datum/action/innate/cult/blood_spell/Grant(mob/living/owner, datum/action/innate/cult/blood_magic/BM)
- if(health_cost)
- desc += "
Deals [health_cost] damage to your arm per use."
- base_desc = desc
- desc += "
Has [charges] use\s remaining."
- all_magic = BM
- ..()
- button.locked = TRUE
- button.ordered = FALSE
-
-/datum/action/innate/cult/blood_spell/Remove()
- if(all_magic)
- all_magic.spells -= src
- if(hand_magic)
- qdel(hand_magic)
- hand_magic = null
- ..()
-
-/datum/action/innate/cult/blood_spell/IsAvailable()
- if(!iscultist(owner) || owner.incapacitated() || !charges)
- return FALSE
- return ..()
-
-/datum/action/innate/cult/blood_spell/Activate()
- if(magic_path) //If this spell flows from the hand
- if(!hand_magic)
- hand_magic = new magic_path(owner, src)
- if(!owner.put_in_hands(hand_magic))
- qdel(hand_magic)
- hand_magic = null
- to_chat(owner, "You have no empty hand for invoking blood magic!")
- return
- to_chat(owner, "Your wounds glow as you invoke the [name].")
- return
- if(hand_magic)
- qdel(hand_magic)
- hand_magic = null
- to_chat(owner, "You snuff out the spell, saving it for later.")
-
-
-//Cult Blood Spells
-/datum/action/innate/cult/blood_spell/stun
- name = "Stun"
- desc = "Empowers your hand to stun and mute a victim on contact."
- button_icon_state = "hand"
- magic_path = "/obj/item/melee/blood_magic/stun"
- health_cost = 10
-
-/datum/action/innate/cult/blood_spell/teleport
- name = "Teleport"
- desc = "Empowers your hand to teleport yourself or another cultist to a teleport rune on contact."
- button_icon_state = "tele"
- magic_path = "/obj/item/melee/blood_magic/teleport"
- health_cost = 7
-
-/datum/action/innate/cult/blood_spell/emp
- name = "Electromagnetic Pulse"
- desc = "Emits a large electromagnetic pulse."
- button_icon_state = "emp"
- health_cost = 10
- invocation = "Ta'gh fara'qha fel d'amar det!"
-
-/datum/action/innate/cult/blood_spell/emp/Activate()
- owner.visible_message(
- "[owner]'s hand flashes a bright blue!", \
- "You speak the cursed words, emitting an EMP blast from your hand.")
- empulse(owner, 2, 5)
- owner.whisper(invocation, language = /datum/language/common)
- charges--
- if(charges<=0)
- qdel(src)
-
-/datum/action/innate/cult/blood_spell/shackles
- name = "Shadow Shackles"
- desc = "Empowers your hand to start handcuffing victim on contact, and mute them if successful."
- button_icon_state = "cuff"
- charges = 4
- magic_path = "/obj/item/melee/blood_magic/shackles"
-
-/datum/action/innate/cult/blood_spell/construction
- name = "Twisted Construction"
- desc = "Empowers your hand to corrupt certain metalic objects.
Converts:
Plasteel into runed metal
50 metal into a construct shell
Living cyborgs into constructs after a delay
Cyborg shells into construct shells
Airlocks into brittle runed airlocks after a delay (harm intent)"
- button_icon_state = "transmute"
- magic_path = "/obj/item/melee/blood_magic/construction"
- health_cost = 12
-
-/datum/action/innate/cult/blood_spell/horror
- name = "Hallucinations"
- desc = "Gives hallucinations to a target at range. A silent and invisible spell."
- button_icon_state = "horror"
- var/obj/effect/proc_holder/horror/PH
- charges = 4
-
-/datum/action/innate/cult/blood_spell/horror/New()
- PH = new()
- PH.attached_action = src
- ..()
-
-/datum/action/innate/cult/blood_spell/horror/Destroy()
- var/obj/effect/proc_holder/horror/destroy = PH
- . = ..()
- if(destroy && !QDELETED(destroy))
- QDEL_NULL(destroy)
-
-/datum/action/innate/cult/blood_spell/horror/Activate()
- PH.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/horror
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- var/datum/action/innate/cult/blood_spell/attached_action
-
-/obj/effect/proc_holder/horror/Destroy()
- var/datum/action/innate/cult/blood_spell/AA = attached_action
- . = ..()
- if(AA && !QDELETED(AA))
- QDEL_NULL(AA)
-
-/obj/effect/proc_holder/horror/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You dispel the magic...")
- else
- add_ranged_ability(user, "You prepare to horrify a target...")
-
-/obj/effect/proc_holder/horror/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated() || !iscultist(caller))
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
- if(target in view(7, get_turf(ranged_ability_user)))
- if(!ishuman(target) || iscultist(target))
- return
- var/mob/living/carbon/human/H = target
- H.hallucination = max(H.hallucination, 120)
- SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50))
- var/image/C = image('icons/effects/cult_effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER)
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
- addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE)
- to_chat(ranged_ability_user,"[H] has been cursed with living nightmares!")
- attached_action.charges--
- attached_action.desc = attached_action.base_desc
- attached_action.desc += "
Has [attached_action.charges] use\s remaining."
- attached_action.UpdateButtonIcon()
- if(attached_action.charges <= 0)
- remove_ranged_ability("You have exhausted the spell's power!")
- qdel(src)
-
-/datum/action/innate/cult/blood_spell/veiling
- name = "Conceal Presence"
- desc = "Alternates between hiding and revealing nearby cult structures and runes."
- invocation = "Kla'atu barada nikt'o!"
- button_icon_state = "gone"
- charges = 10
- var/revealing = FALSE //if it reveals or not
-
-/datum/action/innate/cult/blood_spell/veiling/Activate()
- if(!revealing)
- owner.visible_message("Thin grey dust falls from [owner]'s hand!", \
- "You invoke the veiling spell, hiding nearby runes.")
- charges--
- SEND_SOUND(owner, sound('sound/magic/smoke.ogg',0,1,25))
- owner.whisper(invocation, language = /datum/language/common)
- for(var/obj/effect/rune/R in range(5,owner))
- R.conceal()
- for(var/obj/structure/destructible/cult/S in range(5,owner))
- S.conceal()
- for(var/turf/open/floor/engine/cult/T in range(5,owner))
- T.realappearance.alpha = 0
- for(var/obj/machinery/door/airlock/cult/AL in range(5, owner))
- AL.conceal()
- revealing = TRUE
- name = "Reveal Runes"
- button_icon_state = "back"
- else
- owner.visible_message(
- "A flash of light shines from [owner]'s hand!", \
- "You invoke the counterspell, revealing nearby runes.")
- charges--
- owner.whisper(invocation, language = /datum/language/common)
- SEND_SOUND(owner, sound('sound/magic/enter_blood.ogg',0,1,25))
- for(var/obj/effect/rune/R in range(7,owner)) //More range in case you weren't standing in exactly the same spot
- R.reveal()
- for(var/obj/structure/destructible/cult/S in range(6,owner))
- S.reveal()
- for(var/turf/open/floor/engine/cult/T in range(6,owner))
- T.realappearance.alpha = initial(T.realappearance.alpha)
- for(var/obj/machinery/door/airlock/cult/AL in range(6, owner))
- AL.reveal()
- revealing = FALSE
- name = "Conceal Runes"
- button_icon_state = "gone"
- if(charges<= 0)
- qdel(src)
- desc = base_desc
- desc += "
Has [charges] use\s remaining."
- UpdateButtonIcon()
-
-/datum/action/innate/cult/blood_spell/manipulation
- name = "Blood Rites"
- desc = "Empowers your hand to absorb blood to be used for advanced rites, or heal a cultist on contact. Use the spell in-hand to cast advanced rites."
- invocation = "Fel'th Dol Ab'orod!"
- button_icon_state = "manip"
- charges = 5
- magic_path = "/obj/item/melee/blood_magic/manipulator"
-
-
-// The "magic hand" items
-/obj/item/melee/blood_magic
- name = "\improper magical aura"
- desc = "A sinister looking aura that distorts the flow of reality around it."
- icon = 'icons/obj/items.dmi'
- lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
- icon_state = "disintegrate"
- item_state = "disintegrate"
- item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL
-
- w_class = WEIGHT_CLASS_HUGE
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- var/invocation
- var/uses = 1
- var/health_cost = 0 //The amount of health taken from the user when invoking the spell
- var/datum/action/innate/cult/blood_spell/source
-
-/obj/item/melee/blood_magic/New(loc, spell)
- if(spell)
- source = spell
- uses = source.charges
- health_cost = source.health_cost
- ..()
-
-/obj/item/melee/blood_magic/Destroy()
- if(!QDELETED(source))
- if(uses <= 0)
- source.hand_magic = null
- qdel(source)
- source = null
- else
- source.hand_magic = null
- source.charges = uses
- source.desc = source.base_desc
- source.desc += "
Has [uses] use\s remaining."
- source.UpdateButtonIcon()
- return ..()
-
-/obj/item/melee/blood_magic/attack_self(mob/living/user)
- afterattack(user, user, TRUE)
-
-/obj/item/melee/blood_magic/attack(mob/living/M, mob/living/carbon/user)
- if(!iscarbon(user) || !iscultist(user))
- uses = 0
- qdel(src)
- return
- log_combat(user, M, "used a cult spell on", source.name, "")
- M.lastattacker = user.real_name
- M.lastattackerckey = user.ckey
-
-/obj/item/melee/blood_magic/afterattack(atom/target, mob/living/carbon/user, proximity)
- . = ..()
- if(invocation)
- user.whisper(invocation, language = /datum/language/common)
- if(health_cost)
- if(user.active_hand_index == 1)
- user.apply_damage(health_cost, BRUTE, BODY_ZONE_L_ARM)
- else
- user.apply_damage(health_cost, BRUTE, BODY_ZONE_R_ARM)
- if(uses <= 0)
- qdel(src)
- else if(source)
- source.desc = source.base_desc
- source.desc += "
Has [uses] use\s remaining."
- source.UpdateButtonIcon()
-
-//Stun
-/obj/item/melee/blood_magic/stun
- name = "Stunning Aura"
- desc = "Will stun and mute a weak-minded victim on contact."
- color = RUNE_COLOR_RED
- invocation = "Fuu ma'jin!"
-
-/obj/item/melee/blood_magic/stun/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(!isliving(target) || !proximity)
- return
- var/mob/living/L = target
- if(iscultist(target))
- return
- if(iscultist(user))
- user.visible_message("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!", \
- "You attempt to stun [L] with the spell!")
-
- user.mob_light(_range = 3, _color = LIGHT_COLOR_BLOOD_MAGIC, _duration = 0.2 SECONDS)
-
- var/anti_magic_source = L.anti_magic_check()
- if(anti_magic_source)
-
- L.mob_light(_range = 2, _color = LIGHT_COLOR_HOLY_MAGIC, _duration = 10 SECONDS)
- var/mutable_appearance/forbearance = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)
- L.add_overlay(forbearance)
- addtimer(CALLBACK(L, TYPE_PROC_REF(/atom, cut_overlay), forbearance), 100)
-
- if(istype(anti_magic_source, /obj/item))
- var/obj/item/ams_object = anti_magic_source
- target.visible_message(
- "[L] starts to glow in a halo of light!", \
- "Your [ams_object.name] begins to glow, emitting a blanket of holy light which surrounds you and protects you from the flash of light!")
- else
- target.visible_message(
- "[L] starts to glow in a halo of light!", \
- "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!")
-
- else
- if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
- var/mob/living/carbon/C = L
- to_chat(user, "Their mind was stronger than expected, but you still managed to do some damage!")
- C.stuttering += 8
- C.dizziness += 30
- C.Jitter(8)
- C.drop_all_held_items()
- C.bleed(40)
- C.apply_damage(60, STAMINA, BODY_ZONE_CHEST)
- else
- to_chat(user, "In a brilliant flash of red, [L] falls to the ground!")
- L.Paralyze(160)
- L.flash_act(1,1)
- if(issilicon(target))
- var/mob/living/silicon/S = L
- S.emp_act(EMP_HEAVY)
- else if(iscarbon(target))
- var/mob/living/carbon/C = L
- C.silent += 6
- C.stuttering += 15
- C.cultslurring += 15
- C.Jitter(15)
- uses--
- ..()
-
-//Teleportation
-/obj/item/melee/blood_magic/teleport
- name = "Teleporting Aura"
- color = RUNE_COLOR_TELEPORT
- desc = "Will teleport a cultist to a teleport rune on contact."
- invocation = "Sas'so c'arta forbici!"
-
-/obj/item/melee/blood_magic/teleport/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(!iscultist(target) || !proximity)
- to_chat(user, "You can only teleport adjacent cultists with this spell!")
- return
- if(iscultist(user))
- var/list/potential_runes = list()
- var/list/teleportnames = list()
- for(var/R in GLOB.teleport_runes)
- var/obj/effect/rune/teleport/T = R
- potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T
-
- if(!potential_runes.len)
- to_chat(user, "There are no valid runes to teleport to!")
- log_game("Teleport talisman failed - no other teleport runes")
- return
-
- var/turf/T = get_turf(src)
- if(is_away_level(T))
- to_chat(user, "You are not in the right dimension!")
- log_game("Teleport spell failed - user in away mission")
- return
-
- var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
- var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !actual_selected_rune || !proximity)
- return
- var/turf/dest = get_turf(actual_selected_rune)
- if(dest.is_blocked_turf(TRUE))
- to_chat(user, "The target rune is blocked. You cannot teleport there.")
- return
- uses--
- var/turf/origin = get_turf(user)
- var/mob/living/L = target
- if(do_teleport(L, dest, channel = TELEPORT_CHANNEL_CULT))
- origin.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] with a sharp crack!", \
- "You speak the words of the talisman and find yourself somewhere else!", "You hear a sharp crack.")
- dest.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.")
- ..()
-
-//Shackles
-/obj/item/melee/blood_magic/shackles
- name = "Shackling Aura"
- desc = "Will start handcuffing a victim on contact, and mute them if successful."
- invocation = "In'totum Lig'abis!"
- color = "#000000" // black
-
-/obj/item/melee/blood_magic/shackles/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(iscultist(user) && iscarbon(target) && proximity)
- var/mob/living/carbon/C = target
- if(C.canBeHandcuffed())
- CuffAttack(C, user)
- else
- user.visible_message("This victim doesn't have enough arms to complete the restraint!")
- return
- ..()
-
-/obj/item/melee/blood_magic/shackles/proc/CuffAttack(mob/living/carbon/C, mob/living/user)
- if(!C.handcuffed)
- playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
- C.visible_message("[user] begins restraining [C] with dark magic!", \
- "[user] begins shaping dark magic shackles around your wrists!")
- if(do_after(user, 3 SECONDS, C))
- if(!C.handcuffed)
- C.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult/used(C))
- C.update_handcuffed()
- C.silent += 5
- to_chat(user, "You shackle [C].")
- log_combat(user, C, "shackled")
- uses--
- else
- to_chat(user, "[C] is already bound.")
- else
- to_chat(user, "You fail to shackle [C].")
- else
- to_chat(user, "[C] is already bound.")
-
-
-/obj/item/restraints/handcuffs/energy/cult //For the shackling spell
- name = "shadow shackles"
- desc = "Shackles that bind the wrists with sinister magic."
- trashtype = /obj/item/restraints/handcuffs/energy/used
- item_flags = DROPDEL
-
-/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
- user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \
- "Your [src] shatters in a discharge of dark magic!")
- . = ..()
-
-
-//Construction: Converts 50 metal to a construct shell, plasteel to runed metal, airlock to brittle runed airlock, a borg to a construct, or borg shell to a construct shell
-/obj/item/melee/blood_magic/construction
- name = "Twisting Aura"
- desc = "Corrupts certain metalic objects on contact."
- invocation = "Ethra p'ni dedol!"
- color = "#000000" // black
- var/channeling = FALSE
-
-/obj/item/melee/blood_magic/construction/examine(mob/user)
- . = ..()
- . += {"A sinister spell used to convert:\n
- Plasteel into runed metal\n
- [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal into a construct shell\n
- Living cyborgs into constructs after a delay\n
- Cyborg shells into construct shells\n
- Airlocks into brittle runed airlocks after a delay (harm intent)"}
-
-/obj/item/melee/blood_magic/construction/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(proximity_flag && iscultist(user))
- if(channeling)
- to_chat(user, "You are already invoking twisted construction!")
- return
- var/turf/T = get_turf(target)
- if(istype(target, /obj/item/stack/sheet/metal))
- var/obj/item/stack/sheet/candidate = target
- if(candidate.use(METAL_TO_CONSTRUCT_SHELL_CONVERSION))
- uses--
- to_chat(user, "A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!")
- new /obj/structure/constructshell(T)
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- else
- to_chat(user, "You need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!")
- return
- else if(istype(target, /obj/item/stack/sheet/plasteel))
- var/obj/item/stack/sheet/plasteel/candidate = target
- var/quantity = candidate.amount
- if(candidate.use(quantity))
- uses --
- new /obj/item/stack/sheet/mineral/hidden/hellstone(T,quantity)
- to_chat(user, "A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!")
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- else if(istype(target,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/candidate = target
- if(candidate.mmi)
- channeling = TRUE
- user.visible_message("A dark cloud emanates from [user]'s hand and swirls around [candidate]!")
- playsound(T, 'sound/machines/creaking.ogg', 80, TRUE)
- var/prev_color = candidate.color
- candidate.color = "black"
- if(do_after(user, 90, target = candidate))
- candidate.emp_act(EMP_HEAVY)
- var/list/constructs = list(
- "Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = "juggernaut"),
- "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = "wraith"),
- "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = "artificer")
- )
- var/construct_class = show_radial_menu(user, src, constructs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- if(!check_menu(user))
- return
- if(QDELETED(candidate))
- channeling = FALSE
- return
- user.visible_message("The dark cloud recedes from what was formerly [candidate], revealing a\n [construct_class]!")
- switch(construct_class)
- if("Juggernaut")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut, candidate, user, 0, T)
- if("Wraith")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith, candidate, user, 0, T)
- if("Artificer")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer, candidate, user, 0, T)
- else
- return
- uses--
- candidate.mmi = null
- qdel(candidate)
- channeling = FALSE
- else
- channeling = FALSE
- candidate.color = prev_color
- return
- else
- uses--
- to_chat(user, "A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!")
- new /obj/structure/constructshell(T)
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- qdel(candidate)
- else if(istype(target,/obj/machinery/door/airlock))
- channeling = TRUE
- playsound(T, 'sound/machines/airlockforced.ogg', 50, TRUE)
- do_sparks(5, TRUE, target)
- if(do_after(user, 50, target = user))
- if(QDELETED(target))
- channeling = FALSE
- return
- target.narsie_act()
- uses--
- user.visible_message("Black ribbons suddenly emanate from [user]'s hand and cling to the airlock - twisting and corrupting it!")
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- channeling = FALSE
- else
- channeling = FALSE
- return
- else
- to_chat(user, "The spell will not work on [target]!")
- return
- ..()
-
-/obj/item/melee/blood_magic/construction/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-
-//Armor: Gives the target a basic cultist combat loadout
-/obj/item/melee/blood_magic/armor
- name = "Arming Aura"
- desc = "Will equipt cult combat gear onto a cultist on contact."
- color = "#33cc33" // green
-
-/obj/item/melee/blood_magic/armor/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(iscarbon(target) && proximity)
- uses--
- var/mob/living/carbon/C = target
- C.visible_message("Otherworldly armor suddenly appears on [C]!")
- C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,ITEM_SLOT_ICLOTHING)
- C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OCLOTHING)
- C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), ITEM_SLOT_FEET)
- C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK)
- if(C == user)
- qdel(src) //Clears the hands
- C.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user))
- ..()
-
-/obj/item/melee/blood_magic/manipulator
- name = "Blood Rite Aura"
- desc = "Absorbs blood from anything you touch. Touching cultists and constructs can heal them. Use in-hand to cast an advanced rite."
- color = "#7D1717"
-
-/obj/item/melee/blood_magic/manipulator/examine(mob/user)
- . = ..()
- . += "Blood spear, blood bolt barrage, and blood beam cost [BLOOD_SPEAR_COST], [BLOOD_BARRAGE_COST], and [BLOOD_BEAM_COST] charges respectively."
-
-/obj/item/melee/blood_magic/manipulator/afterattack(atom/target, mob/living/carbon/human/user, proximity)
- if(proximity)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(NOBLOOD in H.dna.species.species_traits)
- to_chat(user,"Blood rites do not work on species with no blood!")
- return
- if(iscultist(H))
- if(H.stat == DEAD)
- to_chat(user,"Only a revive rune can bring back the dead!")
- return
- if(H.blood_volume < BLOOD_VOLUME_SAFE)
- var/restore_blood = BLOOD_VOLUME_SAFE - H.blood_volume
- if(uses*2 < restore_blood)
- H.blood_volume += uses*2
- to_chat(user,"You use the last of your blood rites to restore what blood you could!")
- uses = 0
- return ..()
- else
- H.blood_volume = BLOOD_VOLUME_SAFE
- uses -= round(restore_blood/2)
- to_chat(user,"Your blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!")
- var/overall_damage = H.getBruteLoss() + H.getFireLoss() + H.getToxLoss() + H.getOxyLoss()
- if(overall_damage == 0)
- to_chat(user,"That cultist doesn't require healing!")
- else
- var/ratio = uses/overall_damage
- if(H == user)
- to_chat(user,"Your blood healing is far less efficient when used on yourself!")
- ratio *= 0.35 // Healing is half as effective if you can't perform a full heal
- uses -= round(overall_damage) // Healing is 65% more "expensive" even if you can still perform the full heal
- if(ratio>1)
- ratio = 1
- uses -= round(overall_damage)
- H.visible_message("[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!")
- else
- H.visible_message("[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.")
- uses = 0
- ratio *= -1
- H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0)
- H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0)
- H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0)
- H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0)
- H.updatehealth()
- playsound(get_turf(H), 'sound/magic/staff_healing.ogg', 25)
- new /obj/effect/temp_visual/cult/sparks(get_turf(H))
- user.Beam(H,icon_state="sendbeam",time=15)
- else
- if(H.stat == DEAD)
- to_chat(user,"[H.p_their(TRUE)] blood has stopped flowing, you'll have to find another way to extract it.")
- return
- if(H.cultslurring)
- to_chat(user,"[H.p_their(TRUE)] blood has been tainted by an even stronger form of blood magic, it's no use to us like this!")
- return
- if(H.blood_volume > BLOOD_VOLUME_SAFE)
- H.blood_volume -= 100
- uses += 50
- user.Beam(H,icon_state="drainbeam",time=10)
- playsound(get_turf(H), 'sound/magic/enter_blood.ogg', 50)
- H.visible_message("[user] drains some of [H]'s blood!")
- to_chat(user,"Your blood rite gains 50 charges from draining [H]'s blood.")
- new /obj/effect/temp_visual/cult/sparks(get_turf(H))
- else
- to_chat(user,"[H.p_theyre(TRUE)] missing too much blood - you cannot drain [H.p_them()] further!")
- return
- if(isconstruct(target))
- var/mob/living/simple_animal/M = target
- var/missing = M.maxHealth - M.health
- if(missing)
- if(uses > missing)
- M.adjustHealth(-missing)
- M.visible_message("[M] is fully healed by [user]'s blood magic!")
- uses -= missing
- else
- M.adjustHealth(-uses)
- M.visible_message("[M] is partially healed by [user]'s blood magic!")
- uses = 0
- playsound(get_turf(M), 'sound/magic/staff_healing.ogg', 25)
- user.Beam(M,icon_state="sendbeam",time=10)
- if(istype(target, /obj/effect/decal/cleanable/blood))
- blood_draw(target, user)
- ..()
-
-/obj/item/melee/blood_magic/manipulator/proc/blood_draw(atom/target, mob/living/carbon/human/user)
- var/temp = 0
- var/turf/T = get_turf(target)
- if(T)
- for(var/obj/effect/decal/cleanable/blood/B in view(T, 2))
- if(B.blood_state == BLOOD_STATE_HUMAN)
- if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent cheese with footprint spam
- temp += 30
- else
- temp += max((B.bloodiness**2)/800,1)
- new /obj/effect/temp_visual/cult/turf/floor(get_turf(B))
- qdel(B)
- if(temp)
- user.Beam(T,icon_state="drainbeam",time=15)
- new /obj/effect/temp_visual/cult/sparks(get_turf(user))
- playsound(T, 'sound/magic/enter_blood.ogg', 50)
- to_chat(user, "Your blood rite has gained [round(temp)] charge\s from blood sources around you!")
- uses += max(1, round(temp))
-
-/obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user)
- if(iscultist(user))
- var/list/options = list("Blood Beam (500)")
- var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options
- if(!choice)
- to_chat(user, "You decide against conducting a greater blood rite.")
- return
- switch(choice)
- if("Blood Beam (500)")
- if(uses < BLOOD_BEAM_COST)
- to_chat(user, "You need [BLOOD_BEAM_COST] charges to perform this rite.")
- else
- var/obj/rite = new /obj/item/blood_beam()
- uses -= BLOOD_BEAM_COST
- qdel(src)
- if(user.put_in_hands(rite))
- to_chat(user, "Your hands glow with POWER OVERWHELMING!!!")
- else
- to_chat(user, "You need a free hand for this rite!")
- qdel(rite)
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
deleted file mode 100644
index d6330b386f29..000000000000
--- a/code/modules/antagonists/cult/cult.dm
+++ /dev/null
@@ -1,397 +0,0 @@
-#define SUMMON_POSSIBILITIES 3
-#define CULT_VICTORY 1
-#define CULT_LOSS 0
-#define CULT_NARSIE_KILLED -1
-
-/datum/antagonist/cult
- name = "Cultist"
- roundend_category = "cultists"
- antagpanel_category = "Cult"
- antag_moodlet = /datum/mood_event/cult
- var/datum/action/innate/cult/comm/communion = new
- var/datum/action/innate/cult/mastervote/vote = new
- var/datum/action/innate/cult/blood_magic/magic = new
- job_rank = ROLE_CULTIST
- antag_hud_type = ANTAG_HUD_CULT
- antag_hud_name = "cult"
- var/ignore_implant = FALSE
- var/give_equipment = FALSE
- var/datum/team/cult/cult_team
-
-
-/datum/antagonist/cult/get_team()
- return cult_team
-
-/datum/antagonist/cult/create_team(datum/team/cult/new_team)
- if(!new_team)
- //todo remove this and allow admin buttons to create more than one cult
- for(var/datum/antagonist/cult/H in GLOB.antagonists)
- if(!H.owner)
- continue
- if(H.cult_team)
- cult_team = H.cult_team
- return
- cult_team = new /datum/team/cult
- cult_team.setup_objectives()
- return
- if(!istype(new_team))
- stack_trace("Wrong team type passed to [type] initialization.")
- cult_team = new_team
-
-/datum/antagonist/cult/proc/add_objectives()
- objectives |= cult_team.objectives
-
-/datum/antagonist/cult/Destroy()
- QDEL_NULL(communion)
- QDEL_NULL(vote)
- return ..()
-
-/datum/antagonist/cult/can_be_owned(datum/mind/new_owner)
- . = ..()
- if(. && !ignore_implant)
- . = is_convertable_to_cult(new_owner.current,cult_team)
-
-/datum/antagonist/cult/greet()
- to_chat(owner, "You are a member of the cult!")
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/bloodcult.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change
- owner.announce_objectives()
-
-/datum/antagonist/cult/on_gain()
- . = ..()
- var/mob/living/current = owner.current
- add_objectives()
- if(give_equipment)
- equip_cultist()
- SSticker.mode.cult += owner // Only add after they've been given objectives
- current.log_message("has been converted to the cult of Nar'Sie!", LOG_ATTACK, color="#960000")
-
- if(cult_team.blood_target && cult_team.blood_target_image && current.client)
- current.client.images += cult_team.blood_target_image
-
-
-/datum/antagonist/cult/proc/equip_cultist()
- var/mob/living/carbon/H = owner.current
- if(!istype(H))
- return
- to_chat(owner, "These will help you jumpstart a cult of your own in this sector. Use them well, and remember - you are not the only one.")
-
-
-/datum/antagonist/cult/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob)
- var/list/slots = list(
- "backpack" = ITEM_SLOT_BACKPACK,
- "left pocket" = ITEM_SLOT_LPOCKET,
- "right pocket" = ITEM_SLOT_RPOCKET
- )
-
- var/T = new item_path(mob)
- var/item_name = initial(item_path.name)
- var/where = mob.equip_in_one_of_slots(T, slots)
- if(!where)
- to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).")
- return 0
- else
- to_chat(mob, "You have a [item_name] in your [where].")
- if(where == "backpack")
- SEND_SIGNAL(mob.back, COMSIG_TRY_STORAGE_SHOW, mob)
- return TRUE
-
-/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- add_antag_hud(antag_hud_type, antag_hud_name, current)
- handle_clown_mutation(current, mob_override ? null : "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
- current.faction |= "cult"
- current.grant_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST)
- if(!cult_team.cult_master)
- vote.Grant(current)
- communion.Grant(current)
- if(ishuman(current))
- magic.Grant(current)
- current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
- if(cult_team.cult_risen)
- cult_team.rise(current)
- if(cult_team.cult_ascendent)
- cult_team.ascend(current)
-
-/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- remove_antag_hud(antag_hud_type, current)
- handle_clown_mutation(current, removing = FALSE)
- current.faction -= "cult"
- current.remove_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST)
- vote.Remove(current)
- communion.Remove(current)
- magic.Remove(current)
- current.clear_alert("bloodsense")
- if(ishuman(current))
- var/mob/living/carbon/human/H = current
- H.eye_color = initial(H.eye_color)
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- REMOVE_TRAIT(H, CULT_EYES, null)
- H.remove_overlay(HALO_LAYER)
- H.update_body()
-
-/datum/antagonist/cult/on_removal()
- SSticker.mode.cult -= owner
- if(!silent)
- owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current)
- to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")
- owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000")
- if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)
- owner.current.client.images -= cult_team.blood_target_image
- . = ..()
-
-/datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin)
- give_equipment = FALSE
- new_owner.add_antag_datum(src)
- message_admins("[key_name_admin(admin)] has cult'ed [key_name_admin(new_owner)].")
- log_admin("[key_name(admin)] has cult'ed [key_name(new_owner)].")
-
-/datum/antagonist/cult/admin_remove(mob/user)
- message_admins("[key_name_admin(user)] has decult'ed [key_name_admin(owner)].")
- log_admin("[key_name(user)] has decult'ed [key_name(owner)].")
- SSticker.mode.remove_cultist(owner,silent=TRUE) //disgusting
-
-/datum/antagonist/cult/get_admin_commands()
- . = ..()
- .["Dagger"] = CALLBACK(src, PROC_REF(admin_give_dagger))
- .["Metal"] = CALLBACK(src, PROC_REF(admin_take_all))
-
-/datum/antagonist/cult/proc/admin_give_dagger(mob/admin)
- if(!equip_cultist())
- to_chat(admin, "Spawning dagger failed!")
-
-/datum/antagonist/cult/proc/admin_take_all(mob/admin)
- return
-
-/datum/antagonist/cult/master
- ignore_implant = TRUE
- show_in_antagpanel = FALSE //Feel free to add this later
- var/datum/action/innate/cult/master/finalreck/reckoning = new
- var/datum/action/innate/cult/master/cultmark/bloodmark = new
- var/datum/action/innate/cult/master/pulse/throwing = new
-
-/datum/antagonist/cult/master/Destroy()
- QDEL_NULL(reckoning)
- QDEL_NULL(bloodmark)
- QDEL_NULL(throwing)
- return ..()
-
-/datum/antagonist/cult/master/on_gain()
- . = ..()
- var/mob/living/current = owner.current
- set_antag_hud(current, "cultmaster")
-
-/datum/antagonist/cult/master/greet()
- to_chat(owner.current, "You are the cult's Master. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \
- targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location once.")
- to_chat(owner.current, "Use these abilities to direct the cult to victory at any cost.")
-
-/datum/antagonist/cult/master/apply_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- if(!cult_team.reckoning_complete)
- reckoning.Grant(current)
- bloodmark.Grant(current)
- throwing.Grant(current)
- current.update_action_buttons_icon()
- current.apply_status_effect(/datum/status_effect/cult_master)
- if(cult_team.cult_risen)
- cult_team.rise(current)
- if(cult_team.cult_ascendent)
- cult_team.ascend(current)
-
-/datum/antagonist/cult/master/remove_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- reckoning.Remove(current)
- bloodmark.Remove(current)
- throwing.Remove(current)
- current.update_action_buttons_icon()
- current.remove_status_effect(/datum/status_effect/cult_master)
-
- if(ishuman(current))
- var/mob/living/carbon/human/H = current
- H.eye_color = initial(H.eye_color)
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- REMOVE_TRAIT(H, CULT_EYES, null)
- H.remove_overlay(HALO_LAYER)
- H.update_body()
-
-/datum/team/cult
- name = "Cult"
-
- var/blood_target
- var/image/blood_target_image
- var/blood_target_reset_timer
-
- var/cult_vote_called = FALSE
- var/mob/living/cult_master
- var/reckoning_complete = FALSE
- var/cult_risen = FALSE
- var/cult_ascendent = FALSE
-
-/datum/team/cult/proc/check_size()
- if(cult_ascendent)
- return
- var/alive = 0
- var/cultplayers = 0
- for(var/I in GLOB.player_list)
- var/mob/M = I
- if(M.stat != DEAD)
- if(iscultist(M))
- ++cultplayers
- else
- ++alive
- var/ratio = cultplayers/alive
- if(ratio > CULT_RISEN && !cult_risen)
- for(var/datum/mind/B in members)
- if(B.current)
- SEND_SOUND(B.current, 'sound/hallucinations/i_see_you2.ogg')
- to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...")
- addtimer(CALLBACK(src, PROC_REF(rise), B.current), 200)
- cult_risen = TRUE
-
- if(ratio > CULT_ASCENDENT && !cult_ascendent)
- for(var/datum/mind/B in members)
- if(B.current)
- SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
- to_chat(B.current, "Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!")
- addtimer(CALLBACK(src, PROC_REF(ascend), B.current), 200)
- cult_ascendent = TRUE
-
-
-/datum/team/cult/proc/rise(cultist)
- if(ishuman(cultist))
- var/mob/living/carbon/human/H = cultist
- H.eye_color = "f00"
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- ADD_TRAIT(H, CULT_EYES, CULT_TRAIT)
- H.update_body()
-
-/datum/team/cult/proc/ascend(cultist)
- if(ishuman(cultist))
- var/mob/living/carbon/human/H = cultist
- new /obj/effect/temp_visual/cult/sparks(get_turf(H), H.dir)
- var/istate = pick("halo1","halo2","halo3","halo4","halo5","halo6")
- var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/32x64.dmi', istate, -HALO_LAYER)
- H.overlays_standing[HALO_LAYER] = new_halo_overlay
- H.apply_overlay(HALO_LAYER)
-
-/datum/objective/sacrifice/find_target(dupe_search_range)
- if(!istype(team, /datum/team/cult))
- return
- var/datum/team/cult/C = team
- var/list/target_candidates = list()
- for(var/mob/living/carbon/human/player in GLOB.player_list)
- if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD)
- target_candidates += player.mind
- if(target_candidates.len == 0)
- message_admins("Cult Sacrifice: Could not find unconvertible target, checking for convertible target.")
- for(var/mob/living/carbon/human/player in GLOB.player_list)
- if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD)
- target_candidates += player.mind
- listclearnulls(target_candidates)
- if(LAZYLEN(target_candidates))
- target = pick(target_candidates)
- update_explanation_text()
- else
- message_admins("Cult Sacrifice: Could not find unconvertible or convertible target. WELP!")
- for(var/datum/mind/M in C.members)
- if(M.current)
- M.current.clear_alert("bloodsense")
- M.current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
-
-/datum/team/cult/proc/setup_objectives()
- var/datum/objective/sacrifice/sac_objective = new
- sac_objective.team = src
- sac_objective.find_target()
- objectives += sac_objective
-
- var/datum/objective/eldergod/summon_objective = new
- summon_objective.team = src
- objectives += summon_objective
-
-
-/datum/objective/sacrifice
- var/sacced = FALSE
- var/sac_image
-
-/datum/objective/sacrifice/check_completion()
- return sacced || completed
-
-/datum/objective/sacrifice/update_explanation_text()
- if(target)
- explanation_text = "Sacrifice [target], the [target.assigned_role] via invoking an Offer rune with [target.p_them()] on it and three acolytes around it."
- else
- explanation_text = "The veil has already been weakened here, proceed to the final objective."
-
-/datum/objective/eldergod
- var/summoned = FALSE
- var/killed = FALSE
- var/list/summon_spots = list()
-
-/datum/objective/eldergod/New()
- ..()
- var/sanity = 0
- while(summon_spots.len < SUMMON_POSSIBILITIES && sanity < 100)
- var/area/summon_area = pick(GLOB.sortedAreas - summon_spots)
- if(summon_area && (summon_area.area_flags & VALID_TERRITORY))
- summon_spots += summon_area
- sanity++
- update_explanation_text()
-
-/datum/objective/eldergod/update_explanation_text()
- explanation_text = "Summon Nar'Sie by invoking the rune 'Summon Nar'Sie'. The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin."
-
-/datum/objective/eldergod/check_completion()
- if(killed)
- return CULT_NARSIE_KILLED // You failed so hard that even the code went backwards.
- return summoned || completed
-
-/datum/team/cult/proc/check_cult_victory()
- for(var/datum/objective/O in objectives)
- if(O.check_completion() == CULT_NARSIE_KILLED)
- return CULT_NARSIE_KILLED
- else if(!O.check_completion())
- return CULT_LOSS
- return CULT_VICTORY
-
-/datum/team/cult/roundend_report()
- var/list/parts = list()
- var/victory = check_cult_victory()
-
- if(victory == CULT_NARSIE_KILLED) // Epic failure, you summoned your god and then someone killed it.
- parts += "Nar'sie has been killed! The cult will haunt the universe no longer!"
- else if(victory)
- parts += "The cult has succeeded! Nar'Sie has snuffed out another torch in the void!"
- else
- parts += "The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!"
-
- if(objectives.len)
- parts += "The cultists' objectives were:"
- var/count = 1
- for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[count]: [objective.explanation_text] Success!"
- else
- parts += "Objective #[count]: [objective.explanation_text] Fail."
- count++
-
- if(members.len)
- parts += ""
- parts += printplayerlist(members)
-
- return "[parts.Join("
")]
"
-
-/datum/team/cult/is_gamemode_hero()
- return SSticker.mode.name == "cult"
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
deleted file mode 100644
index 0c070e8e423f..000000000000
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ /dev/null
@@ -1,461 +0,0 @@
-// Contains cult communion, guide, and cult master abilities
-
-/datum/action/innate/cult
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS
-
-/datum/action/innate/cult/IsAvailable()
- if(!iscultist(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/comm
- name = "Communion"
- desc = "Whispered words that all cultists can hear.
Warning:Nearby non-cultists can still hear you."
- button_icon_state = "cult_comms"
-
-/datum/action/innate/cult/comm/Activate()
- var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
- if(!input || !IsAvailable())
- return
- if(CHAT_FILTER_CHECK(input))
- to_chat(usr, "You cannot send a message that contains a word prohibited in IC chat!")
- return
- cultist_commune(usr, input)
-
-/datum/action/innate/cult/comm/proc/cultist_commune(mob/living/user, message)
- var/my_message
- if(!message)
- return
- user.whisper("O bidai nabora se[pick("'","`")]sma!", language = /datum/language/common)
- user.whisper(html_decode(message))
- var/title = "Acolyte"
- var/span = "cult italic"
- if(user.mind && user.mind.has_antag_datum(/datum/antagonist/cult/master))
- span = "cultlarge"
- title = "Master"
- else if(!ishuman(user))
- title = "Construct"
- my_message = "[title] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]"
- for(var/i in GLOB.player_list)
- var/mob/M = i
- if(iscultist(M))
- to_chat(M, my_message)
- else if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [my_message]")
-
- user.log_talk(message, LOG_SAY, tag="cult")
-
-/datum/action/innate/cult/comm/spirit
- name = "Spiritual Communion"
- desc = "Conveys a message from the spirit realm that all cultists can hear."
-
-/datum/action/innate/cult/comm/spirit/IsAvailable()
- if(iscultist(owner.mind.current))
- return TRUE
-
-/datum/action/innate/cult/comm/spirit/cultist_commune(mob/living/user, message)
- var/my_message
- if(!message)
- return
- my_message = "The [user.name]: [message]"
- for(var/i in GLOB.player_list)
- var/mob/M = i
- if(iscultist(M))
- to_chat(M, my_message)
- else if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [my_message]")
-
-/datum/action/innate/cult/mastervote
- name = "Assert Leadership"
- button_icon_state = "cultvote"
-
-/datum/action/innate/cult/mastervote/IsAvailable()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!C || C.cult_team.cult_vote_called || !ishuman(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/mastervote/Activate()
- var/choice = alert(owner, "The mantle of leadership is heavy. Success in this role requires an expert level of communication and experience. Are you sure?",, "Yes", "No")
- if(choice == "Yes" && IsAvailable())
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- pollCultists(owner,C.cult_team)
-
-/proc/pollCultists(mob/living/Nominee,datum/team/cult/team) //Cult Master Poll
- if(world.time < CULT_POLL_WAIT)
- to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].")
- return
- team.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
- to_chat(B.current, "Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.")
- sleep(100)
- var/list/asked_cultists = list()
- for(var/datum/mind/B in team.members)
- if(B.current && B.current != Nominee && !B.current.incapacitated())
- SEND_SOUND(B.current, 'sound/magic/exit_blood.ogg')
- asked_cultists += B.current
- var/list/yes_voters = pollCandidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
- if(QDELETED(Nominee) || Nominee.incapacitated())
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!")
- return FALSE
- if(!Nominee.mind)
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!")
- return FALSE
- if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5)
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")
- return FALSE
- team.cult_master = Nominee
- SSticker.mode.remove_cultist(Nominee.mind, TRUE)
- Nominee.mind.add_antag_datum(/datum/antagonist/cult/master)
- for(var/datum/mind/B in team.members)
- if(B.current)
- for(var/datum/action/innate/cult/mastervote/vote in B.current.actions)
- vote.Remove(B.current)
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!")
- return TRUE
-
-/datum/action/innate/cult/master/IsAvailable()
- if(!owner.mind || !owner.mind.has_antag_datum(/datum/antagonist/cult/master) || GLOB.cult_narsie)
- return 0
- return ..()
-
-/datum/action/innate/cult/master/finalreck
- name = "Final Reckoning"
- desc = "A single-use spell that brings the entire cult to the master's location."
- button_icon_state = "sintouch"
-
-/datum/action/innate/cult/master/finalreck/Activate()
- var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!antag)
- return
- for(var/i in 1 to 4)
- chant(i)
- var/list/destinations = list()
- for(var/turf/T in orange(1, owner))
- if(!T.is_blocked_turf(TRUE))
- destinations += T
- if(!LAZYLEN(destinations))
- to_chat(owner, "You need more space to summon your cult!")
- return
- if(do_after(owner, 30, target = owner))
- for(var/datum/mind/B in antag.cult_team.members)
- if(B.current && B.current.stat != DEAD)
- var/turf/mobloc = get_turf(B.current)
- switch(i)
- if(1)
- new /obj/effect/temp_visual/cult/sparks(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(2)
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(3)
- new /obj/effect/temp_visual/dir_setting/cult/phase(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(4)
- playsound(mobloc, 'sound/magic/exit_blood.ogg', 100, TRUE)
- if(B.current != owner)
- var/turf/final = pick(destinations)
- if(istype(B.current.loc, /obj/item/soulstone))
- var/obj/item/soulstone/S = B.current.loc
- S.release_shades(owner)
- B.current.setDir(SOUTH)
- new /obj/effect/temp_visual/cult/blood(final)
- addtimer(CALLBACK(B.current, TYPE_PROC_REF(/mob, reckon), final), 10)
- else
- return
- antag.cult_team.reckoning_complete = TRUE
- Remove(owner)
-
-/mob/proc/reckon(turf/final)
- new /obj/effect/temp_visual/cult/blood/out(get_turf(src))
- forceMove(final)
-
-/datum/action/innate/cult/master/finalreck/proc/chant(chant_number)
- switch(chant_number)
- if(1)
- owner.say("C'arta forbici!", language = /datum/language/common, forced = "cult invocation")
- if(2)
- owner.say("Pleggh e'ntrath!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 50, TRUE)
- if(3)
- owner.say("Barhah hra zar'garis!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 75, TRUE)
- if(4)
- owner.say("N'ath reth sh'yro eth d'rekkathnor!!!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 100, TRUE)
-
-/datum/action/innate/cult/master/cultmark
- name = "Mark Target"
- desc = "Marks a target for the cult."
- button_icon_state = "cult_mark"
- var/obj/effect/proc_holder/cultmark/CM
- var/cooldown = 0
- var/base_cooldown = 1200
-
-/datum/action/innate/cult/master/cultmark/New(Target)
- CM = new()
- CM.attached_action = src
- ..()
-
-/datum/action/innate/cult/master/cultmark/IsAvailable()
- if(cooldown > world.time)
- if(!CM.active)
- to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!")
- return FALSE
- return ..()
-
-/datum/action/innate/cult/master/cultmark/Destroy()
- QDEL_NULL(CM)
- return ..()
-
-/datum/action/innate/cult/master/cultmark/Activate()
- CM.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/cultmark
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- var/datum/action/innate/cult/master/cultmark/attached_action
-
-/obj/effect/proc_holder/cultmark/Destroy()
- attached_action = null
- return ..()
-
-/obj/effect/proc_holder/cultmark/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You cease the marking ritual.")
- else
- add_ranged_ability(user, "You prepare to mark a target for your cult...")
-
-/obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated())
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
-
- var/datum/antagonist/cult/C = caller.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
-
- if(target in view(7, get_turf(ranged_ability_user)))
- if(C.cult_team.blood_target)
- to_chat(ranged_ability_user, "The cult has already designated a target!")
- return FALSE
- C.cult_team.blood_target = target
- var/area/A = get_area(target)
- attached_action.cooldown = world.time + attached_action.base_cooldown
- addtimer(CALLBACK(attached_action.owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown)
- C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
- C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
- C.cult_team.blood_target_image.pixel_x = -target.pixel_x
- C.cult_team.blood_target_image.pixel_y = -target.pixel_y
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B.current && B.current.stat != DEAD && B.current.client)
- to_chat(B.current, "[ranged_ability_user] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")
- SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- B.current.client.images += C.cult_team.blood_target_image
- attached_action.owner.update_action_buttons_icon()
- remove_ranged_ability("The marking rite is complete! It will last for 90 seconds.")
- C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target),C.cult_team), 900, TIMER_STOPPABLE)
- return TRUE
- return FALSE
-
-/proc/reset_blood_target(datum/team/cult/team)
- for(var/datum/mind/B in team.members)
- if(B.current && B.current.stat != DEAD && B.current.client)
- if(team.blood_target)
- to_chat(B.current,"The blood mark has expired!")
- B.current.client.images -= team.blood_target_image
- QDEL_NULL(team.blood_target_image)
- team.blood_target = null
-
-
-/datum/action/innate/cult/master/cultmark/ghost
- name = "Mark a Blood Target for the Cult"
- desc = "Marks a target for the entire cult to track."
-
-/datum/action/innate/cult/master/cultmark/ghost/IsAvailable()
- if(istype(owner, /mob/dead/observer) && iscultist(owner.mind.current))
- return TRUE
- else
- qdel(src)
-
-/datum/action/innate/cult/ghostmark //Ghost version
- name = "Blood Mark your Target"
- desc = "Marks whatever you are orbitting - for the entire cult to track."
- button_icon_state = "cult_mark"
- var/tracking = FALSE
- var/cooldown = 0
- var/base_cooldown = 600
-
-/datum/action/innate/cult/ghostmark/IsAvailable()
- if(istype(owner, /mob/dead/observer) && iscultist(owner.mind.current))
- return TRUE
- else
- qdel(src)
-
-/datum/action/innate/cult/ghostmark/proc/reset_button()
- if(owner)
- name = "Blood Mark your Target"
- desc = "Marks whatever you are orbitting - for the entire cult to track."
- button_icon_state = "cult_mark"
- owner.update_action_buttons_icon()
- SEND_SOUND(owner, 'sound/magic/enter_blood.ogg')
- to_chat(owner,"Your previous mark is gone - you are now ready to create a new blood mark.")
-
-/datum/action/innate/cult/ghostmark/Activate()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(C.cult_team.blood_target)
- if(cooldown>world.time)
- reset_blood_target(C.cult_team)
- to_chat(owner, "You have cleared the cult's blood target!")
- deltimer(C.cult_team.blood_target_reset_timer)
- return
- else
- to_chat(owner, "The cult has already designated a target!")
- return
- if(cooldown>world.time)
- to_chat(owner, "You aren't ready to place another blood mark yet!")
- return
- target = owner.orbiting?.parent || get_turf(owner)
- if(!target)
- return
- C.cult_team.blood_target = target
- var/area/A = get_area(target)
- cooldown = world.time + base_cooldown
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown)
- C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
- C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
- C.cult_team.blood_target_image.pixel_x = -target.pixel_x
- C.cult_team.blood_target_image.pixel_y = -target.pixel_y
- SEND_SOUND(owner, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- owner.client.images += C.cult_team.blood_target_image
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B.current && B.current.stat != DEAD && B.current.client)
- to_chat(B.current, "[owner] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")
- SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- B.current.client.images += C.cult_team.blood_target_image
- to_chat(owner,"You have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].")
- name = "Clear the Blood Mark"
- desc = "Remove the Blood Mark you previously set."
- button_icon_state = "emp"
- owner.update_action_buttons_icon()
- C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target),C.cult_team), base_cooldown, TIMER_STOPPABLE)
- addtimer(CALLBACK(src, PROC_REF(reset_button)), base_cooldown)
-
-
-//////// ELDRITCH PULSE /////////
-
-
-
-/datum/action/innate/cult/master/pulse
- name = "Eldritch Pulse"
- desc = "Seize upon a fellow cultist or cult structure and teleport it to a nearby location."
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- button_icon_state = "arcane_barrage"
- var/obj/effect/proc_holder/pulse/PM
- var/cooldown = 0
- var/base_cooldown = 150
- var/throwing = FALSE
- var/mob/living/throwee
-
-/datum/action/innate/cult/master/pulse/New()
- PM = new()
- PM.attached_action = src
- ..()
-
-/datum/action/innate/cult/master/pulse/IsAvailable()
- if(!owner.mind || !owner.mind.has_antag_datum(/datum/antagonist/cult/master))
- return FALSE
- if(cooldown > world.time)
- if(!PM.active)
- to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!")
- return FALSE
- return ..()
-
-/datum/action/innate/cult/master/pulse/Destroy()
- PM.attached_action = null //What the fuck is even going on here.
- QDEL_NULL(PM)
- return ..()
-
-
-/datum/action/innate/cult/master/pulse/Activate()
- PM.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/pulse
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi'
- var/datum/action/innate/cult/master/pulse/attached_action
-
-/obj/effect/proc_holder/pulse/Destroy()
- attached_action = null
- return ..()
-
-
-/obj/effect/proc_holder/pulse/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You cease your preparations...")
- attached_action.throwing = FALSE
- else
- add_ranged_ability(user, "You prepare to tear through the fabric of reality...")
-
-/obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated())
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
- if(target in view(7, get_turf(ranged_ability_user)))
- if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == caller) && !(attached_action.throwing))
- return
- if(!attached_action.throwing)
- attached_action.throwing = TRUE
- attached_action.throwee = target
- SEND_SOUND(ranged_ability_user, sound('sound/weapons/thudswoosh.ogg'))
- to_chat(ranged_ability_user,"You reach through the veil with your mind's eye and seize [target]!")
- return
- else
- new /obj/effect/temp_visual/cult/sparks(get_turf(attached_action.throwee), ranged_ability_user.dir)
- var/distance = get_dist(attached_action.throwee, target)
- if(distance >= 16)
- return
- playsound(target,'sound/magic/exit_blood.ogg')
- attached_action.throwee.Beam(target,icon_state="sendbeam",time=4)
- attached_action.throwee.forceMove(get_turf(target))
- new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir)
- attached_action.throwing = FALSE
- attached_action.cooldown = world.time + attached_action.base_cooldown
- remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")
- caller.update_action_buttons_icon()
- addtimer(CALLBACK(caller, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
deleted file mode 100644
index 5dce420df1cf..000000000000
--- a/code/modules/antagonists/cult/cult_items.dm
+++ /dev/null
@@ -1,524 +0,0 @@
-/obj/item/tome
- name = "arcane tome"
- desc = "An old, dusty tome with frayed edges and a sinister-looking cover."
- icon_state ="tome"
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
-
-/datum/action/innate/dash/cult
- name = "Rend the Veil"
- desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target."
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- button_icon_state = "phaseshift"
- dash_sound = 'sound/magic/enter_blood.ogg'
- recharge_sound = 'sound/magic/exit_blood.ogg'
- beam_effect = "sendbeam"
- phasein = /obj/effect/temp_visual/dir_setting/cult/phase
- phaseout = /obj/effect/temp_visual/dir_setting/cult/phase/out
-
-/datum/action/innate/dash/cult/IsAvailable()
- if(iscultist(owner) && current_charges)
- return TRUE
- else
- return FALSE
-
-/obj/item/restraints/legcuffs/bola/cult
- name = "\improper Nar'Sien bola"
- desc = "A strong bola, bound with dark magic that allows it to pass harmlessly through Nar'Sien cultists. Throw it to trip and slow your victim."
- icon_state = "bola_cult"
- item_state = "bola_cult"
- breakouttime = 60
- knockdown = 30
-
-/obj/item/restraints/legcuffs/bola/cult/attack_hand(mob/living/user)
- . = ..()
- if(!iscultist(user))
- to_chat(user, "The bola seems to take on a life of its own!")
- ensnare(user)
-
-/obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(iscultist(hit_atom))
- return
- . = ..()
-
-/obj/item/clothing/head/hooded/cult_hoodie
- name = "ancient cultist hood"
- icon_state = "culthood"
- desc = "A torn, dust-caked hood. Strange letters line the inside."
- flags_inv = HIDEFACE|HIDEHAIR|HIDEEARS
- flags_cover = HEADCOVERSEYES
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 40, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- cold_protection = HEAD
- min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
- heat_protection = HEAD
- max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
-
-/obj/item/clothing/suit/hooded/cultrobes
- name = "ancient cultist robes"
- desc = "A ragged, dusty set of robes. Strange letters line the inside."
- icon_state = "cultrobes"
- item_state = "cultrobes"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/tome, /obj/item/tank)
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 40, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- flags_inv = HIDEJUMPSUIT
- cold_protection = CHEST|GROIN|LEGS|ARMS
- min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
- heat_protection = CHEST|GROIN|LEGS|ARMS
- max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
-
-
-/obj/item/clothing/head/hooded/cult_hoodie/alt
- name = "cultist hood"
- desc = "An armored hood worn by the followers of Nar'Sie."
- icon_state = "cult_hoodalt"
- item_state = "cult_hoodalt"
-
-/obj/item/clothing/suit/hooded/cultrobes/alt
- name = "cultist robes"
- desc = "An armored set of robes worn by the followers of Nar'Sie."
- icon_state = "cultrobesalt"
- item_state = "cultrobesalt"
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/alt
-
-/obj/item/clothing/suit/hooded/cultrobes/alt/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/suit/hooded/cultrobes/alt/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-/obj/item/clothing/head/helmet/space/hardsuit/cult
- name = "\improper Nar'Sien hardened helmet"
- desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
- icon_state = "cult_helmet"
- item_state = "cult_helmet"
- armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
- light_system = NO_LIGHT_SUPPORT
- light_range = 0
- actions_types = list()
-
-/obj/item/clothing/suit/space/hardsuit/cult
- name = "\improper Nar'Sien hardened armor"
- icon_state = "cult_armor"
- item_state = "cult_armor"
- desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
- w_class = WEIGHT_CLASS_BULKY
- allowed = list(/obj/item/tome, /obj/item/tank/internals/)
- armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult
-
-/obj/item/sharpener/cult
- name = "eldritch whetstone"
- desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."
- icon_state = "cult_sharpener"
- used = 0
- increment = 5
- max = 40
- prefix = "darkened"
-
-/obj/item/sharpener/cult/update_icon_state()
- icon_state = "cult_sharpener[used ? "_used" : ""]"
- return ..()
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield
- name = "empowered cultist armor"
- desc = "Empowered armor which creates a powerful shield around the user."
- icon_state = "cult_armor"
- item_state = "cult_armor"
- w_class = WEIGHT_CLASS_BULKY
- armor = list("melee" = 50, "bullet" = 40, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60)
- var/current_charges = 3
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield
-
-/obj/item/clothing/head/hooded/cult_hoodie/cult_shield
- name = "empowered cultist helmet"
- desc = "Empowered helmet which creates a powerful shield around the user."
- icon_state = "cult_hoodalt"
- armor = list("melee" = 50, "bullet" = 40, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60)
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- to_chat(user, "An overwhelming sense of nausea overpowers you!")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(current_charges)
- owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!")
- current_charges--
- new /obj/effect/temp_visual/cult/sparks(get_turf(owner))
- if(!current_charges)
- owner.visible_message("The runed shield around [owner] suddenly disappears!")
- owner.update_inv_wear_suit()
- return 1
- return 0
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands)
- . = ..()
- if(!isinhands && current_charges)
- . += mutable_appearance('icons/effects/cult_effects.dmi', "shield-cult", MOB_LAYER + 0.01)
-
-/obj/item/clothing/suit/hooded/cultrobes/berserker
- name = "flagellant's robes"
- desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
- allowed = list(/obj/item/tome)
- armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -55, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0)
- slowdown = -0.6
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
-
-/obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
- name = "flagellant's hood"
- desc = "Blood-soaked hood infused with dark magic."
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- to_chat(user, "An overwhelming sense of nausea overpowers you!")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
-
-/obj/item/clothing/glasses/hud/health/night/cultblind
- desc = "may Nar'Sie guide you through the darkness and shield you from the light."
- name = "zealot's blindfold"
- icon_state = "blindfold"
- item_state = "blindfold"
- flash_protect = FLASH_PROTECTION_FLASH
-
-/obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot)
- ..()
- if(prob(30))
- to_chat(user, "\"You want to be blind, do you?\"")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
- user.blind_eyes(30)
- else
- return
-
-/obj/item/reagent_containers/glass/beaker/unholywater
- name = "flask of unholy water"
- desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown."
- icon = 'icons/obj/drinks/drinks.dmi'
- icon_state = "holyflask"
- color = "#333333"
- list_reagents = list(/datum/reagent/fuel/unholywater = 50)
- can_have_cap = FALSE
- cap_icon_state = null
- cap_on = FALSE
-
-/obj/item/cult_shift
- name = "veil shifter"
- desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance."
- icon = 'icons/obj/cult.dmi'
- icon_state ="shifter"
- var/uses = 4
-
-/obj/item/cult_shift/examine(mob/user)
- . = ..()
- if(uses)
- . += "It has [uses] use\s remaining."
- else
- . += "It seems drained."
-
-/obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
- var/mob/living/carbon/C = user
- if(C.pulling)
- var/atom/movable/pulled = C.pulling
- do_teleport(pulled, T, channel = TELEPORT_CHANNEL_CULT)
- . = pulled
-
-/obj/item/cult_shift/attack_self(mob/user)
- if(!uses || !iscarbon(user))
- to_chat(user, "\The [src] is dull and unmoving in your hands.")
- return
-
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
- var/turf/destination = get_teleport_loc(mobloc,C,9,1,3,1,0,1)
-
- if(destination)
- uses--
- if(uses <= 0)
- icon_state ="shifter_drained"
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir)
-
- var/atom/movable/pulled = handle_teleport_grab(destination, C)
- if(do_teleport(C, destination, channel = TELEPORT_CHANNEL_CULT))
- if(pulled)
- C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
- new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir)
- playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
-
- else
- to_chat(C, "The veil cannot be torn here!")
-
-/obj/item/flashlight/flare/culttorch
- name = "void torch"
- desc = "Used by veteran cultists to instantly transport items to their needful brethren."
- w_class = WEIGHT_CLASS_SMALL
- light_range = 1
- icon_state = "torch"
- item_state = "torch"
- color = "#ff0000"
- on_damage = 15
- slot_flags = null
- on = TRUE
- var/charges = 5
-
-/obj/item/flashlight/flare/culttorch/afterattack(atom/movable/A, mob/user, proximity)
- if(!proximity)
- return
- if(!iscultist(user))
- to_chat(user, "That doesn't seem to do anything useful.")
- return
-
- if(istype(A, /obj/item))
-
- var/list/cultists = list()
- for(var/datum/mind/M in SSticker.mode.cult)
- if(M.current && M.current.stat != DEAD)
- cultists |= M.current
- var/mob/living/cultist_to_receive = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in (cultists - user)
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated())
- return
- if(!cultist_to_receive)
- to_chat(user, "You require a destination!")
- log_game("Void torch failed - no target")
- return
- if(cultist_to_receive.stat == DEAD)
- to_chat(user, "[cultist_to_receive] has died!")
- log_game("Void torch failed - target died")
- return
- if(!iscultist(cultist_to_receive))
- to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!")
- log_game("Void torch failed - target was deconverted")
- return
- if(A in user.GetAllContents())
- to_chat(user, "[A] must be on a surface in order to teleport it!")
- return
- to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!")
- cultist_to_receive.put_in_hands(A)
- charges--
- to_chat(user, "\The [src] now has [charges] charge\s.")
- if(charges == 0)
- qdel(src)
-
- else
- ..()
- to_chat(user, "\The [src] can only transport items!")
-
-/obj/item/blood_beam
- name = "\improper magical aura"
- desc = "Sinister looking aura that distorts the flow of reality around it."
- lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
- icon_state = "disintegrate"
- item_state = "disintegrate"
- item_flags = ABSTRACT | DROPDEL
- w_class = WEIGHT_CLASS_HUGE
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- var/charging = FALSE
- var/firing = FALSE
- var/angle
-
-/obj/item/blood_beam/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-
-/obj/item/blood_beam/afterattack(atom/A, mob/living/user, flag, params)
- . = ..()
- if(firing || charging)
- return
- var/C = user.client
- if(ishuman(user) && C)
- angle = mouse_angle_from_client(C)
- else
- qdel(src)
- return
- charging = TRUE
- INVOKE_ASYNC(src, PROC_REF(charge), user)
- if(do_after(user, 90, target = user))
- firing = TRUE
- INVOKE_ASYNC(src, PROC_REF(pewpew), user, params)
- var/obj/structure/emergency_shield/invoker/N = new(user.loc)
- if(do_after(user, 90, target = user))
- user.Paralyze(40)
- to_chat(user, "You have exhausted the power of this spell!")
- firing = FALSE
- if(N)
- qdel(N)
- qdel(src)
- charging = FALSE
-
-/obj/item/blood_beam/proc/charge(mob/user)
- var/obj/O
- playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, TRUE)
- for(var/i in 1 to 12)
- if(!charging)
- break
- if(i > 1)
- sleep(15)
- if(i < 4)
- O = new /obj/effect/temp_visual/cult/rune_spawn/rune1/inner(user.loc, 30, "#ff0000")
- else
- O = new /obj/effect/temp_visual/cult/rune_spawn/rune5(user.loc, 30, "#ff0000")
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(user.loc, user.dir)
- if(O)
- qdel(O)
-
-/obj/item/blood_beam/proc/pewpew(mob/user, params)
- var/turf/targets_from = get_turf(src)
- var/spread = 40
- var/second = FALSE
- var/set_angle = angle
- for(var/i in 1 to 12)
- if(second)
- set_angle = angle - spread
- spread -= 8
- else
- sleep(15)
- set_angle = angle + spread
- second = !second //Handles beam firing in pairs
- if(!firing)
- break
- playsound(src, 'sound/magic/exit_blood.ogg', 75, TRUE)
- new /obj/effect/temp_visual/dir_setting/cult/phase(user.loc, user.dir)
- var/turf/temp_target = get_turf_in_angle(set_angle, targets_from, 40)
- for(var/turf/T in getline(targets_from,temp_target))
- if (locate(/obj/effect/blessing, T))
- temp_target = T
- playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 50, TRUE)
- new /obj/effect/temp_visual/at_shield(T, T)
- break
- T.narsie_act(TRUE, TRUE)
- for(var/mob/living/target in T.contents)
- if(iscultist(target))
- new /obj/effect/temp_visual/cult/sparks(T)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(H.stat != DEAD)
- H.reagents.add_reagent(/datum/reagent/fuel/unholywater, 7)
- if(isshade(target) || isconstruct(target))
- var/mob/living/simple_animal/M = target
- if(M.health+15 < M.maxHealth)
- M.adjustHealth(-15)
- else
- M.health = M.maxHealth
- else
- var/mob/living/L = target
- if(L.density)
- L.Paralyze(20)
- L.adjustBruteLoss(45)
- playsound(L, 'sound/hallucinations/wail.ogg', 50, TRUE)
- L.emote("scream")
- user.Beam(temp_target, icon_state="blood_beam", time = 7, beam_type = /obj/effect/ebeam/blood)
-
-
-/obj/effect/ebeam/blood
- name = "blood beam"
-
-/obj/item/shield/mirror
- name = "mirror shield"
- desc = "An infamous shield used by Nar'Sien sects to confuse and disorient their enemies. Its edges are weighted for use as a throwing weapon - capable of disabling multiple foes with preternatural accuracy."
- icon_state = "mirror_shield" // eshield1 for expanded
- lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
- force = 5
- throwforce = 15
- throw_speed = 1
- throw_range = 4
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("bumped", "prodded")
- hitsound = 'sound/weapons/smash.ogg'
- var/illusions = 2
-
-/obj/item/shield/mirror/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(iscultist(owner))
- if(istype(hitby, /obj/projectile))
- var/obj/projectile/P = hitby
- if(P.damage_type == BRUTE || P.damage_type == BURN)
- if(P.damage >= 30)
- var/turf/T = get_turf(owner)
- T.visible_message("The sheer force from [P] shatters the mirror shield!")
- new /obj/effect/temp_visual/cult/sparks(T)
- playsound(T, 'sound/effects/glassbr3.ogg', 100)
- owner.Paralyze(25)
- qdel(src)
- return FALSE
- if(P.reflectable & REFLECT_NORMAL)
- return FALSE //To avoid reflection chance double-dipping with block chance
- . = ..()
- if(.)
- playsound(src, 'sound/weapons/parry.ogg', 100, TRUE)
- if(illusions > 0)
- illusions--
- addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/shield/mirror, readd)), 450)
- if(prob(60))
- var/mob/living/simple_animal/hostile/illusion/M = new(owner.loc)
- M.faction = list("cult")
- M.Copy_Parent(owner, 70, 10, 5)
- M.move_to_delay = owner.cached_multiplicative_slowdown
- else
- var/mob/living/simple_animal/hostile/illusion/escape/E = new(owner.loc)
- E.Copy_Parent(owner, 70, 10)
- E.GiveTarget(owner)
- E.Goto(owner, owner.cached_multiplicative_slowdown, E.minimum_distance)
- return TRUE
- else
- if(prob(50))
- var/mob/living/simple_animal/hostile/illusion/H = new(owner.loc)
- H.Copy_Parent(owner, 100, 20, 5)
- H.faction = list("cult")
- H.GiveTarget(owner)
- H.move_to_delay = owner.cached_multiplicative_slowdown
- to_chat(owner, "[src] betrays you!")
- return FALSE
-
-/obj/item/shield/mirror/proc/readd()
- illusions++
- if(illusions == initial(illusions) && isliving(loc))
- var/mob/living/holder = loc
- to_chat(holder, "The shield's illusions are back at full strength!")
-
-/obj/item/shield/mirror/IsReflect()
- if(prob(block_chance))
- return TRUE
- return FALSE
-
-/obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- var/turf/T = get_turf(hit_atom)
- var/datum/thrownthing/D = throwingdatum
- if(isliving(hit_atom))
- var/mob/living/L = hit_atom
- if(iscultist(L))
- playsound(src, 'sound/weapons/throwtap.ogg', 50)
- if(L.put_in_active_hand(src))
- L.visible_message("[L] catches [src] out of the air!")
- else
- L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!")
- else if(!..())
- if(!L.anti_magic_check())
- L.Paralyze(30)
- if(D?.thrower)
- for(var/mob/living/Next in orange(2, T))
- if(!Next.density || iscultist(Next))
- continue
- throw_at(Next, 3, 1, D.thrower)
- return
- throw_at(D.thrower, 7, 1, null)
- else
- ..()
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
deleted file mode 100644
index 73b8b89c9cba..000000000000
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ /dev/null
@@ -1,288 +0,0 @@
-/obj/structure/destructible/cult
- density = TRUE
- anchored = TRUE
- icon = 'icons/obj/cult.dmi'
- light_power = 2
- var/cooldowntime = 0
- break_sound = 'sound/hallucinations/veryfar_noise.ogg'
- debris = list(/obj/item/stack/sheet/mineral/hidden/hellstone = 1)
-
-/obj/structure/destructible/cult/proc/conceal() //for spells that hide cult presence
- density = FALSE
- visible_message("[src] fades away.")
- invisibility = INVISIBILITY_OBSERVER
- alpha = 100 //To help ghosts distinguish hidden runes
- light_range = 0
- light_power = 0
- update_light()
- STOP_PROCESSING(SSfastprocess, src)
-
-/obj/structure/destructible/cult/proc/reveal() //for spells that reveal cult presence
- density = initial(density)
- invisibility = 0
- visible_message("[src] suddenly appears!")
- alpha = initial(alpha)
- light_range = initial(light_range)
- light_power = initial(light_power)
- update_light()
- START_PROCESSING(SSfastprocess, src)
-
-
-/obj/structure/destructible/cult/examine(mob/user)
- . = ..()
- . += "\The [src] is [anchored ? "":"not "]secured to the floor."
- if((iscultist(user) || isobserver(user)) && cooldowntime > world.time)
- . += "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)]."
-
-/obj/structure/destructible/cult/examine_status(mob/user)
- if(iscultist(user) || isobserver(user))
- var/t_It = p_they(TRUE)
- var/t_is = p_are()
- return "[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability."
- return ..()
-
-/obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M)
- if(istype(M, /mob/living/simple_animal/hostile/construct/artificer))
- if(obj_integrity < max_integrity)
- M.changeNext_move(CLICK_CD_MELEE)
- obj_integrity = min(max_integrity, obj_integrity + 5)
- Beam(M, icon_state="sendbeam", time=4)
- M.visible_message("[M] repairs \the [src].", \
- "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.")
- else
- to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!")
- else
- ..()
-
-/obj/structure/destructible/cult/set_anchored(anchorvalue)
- . = ..()
- if(isnull(.))
- return
- update_appearance()
-
-/obj/structure/destructible/cult/update_icon_state()
- icon_state = "[initial(icon_state)][anchored ? null : "_off"]"
- return ..()
-
-/obj/structure/destructible/cult/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-/obj/structure/destructible/cult/talisman
- name = "altar"
- desc = "A bloodstained altar dedicated to Nar'Sie."
- icon_state = "talismanaltar"
- break_message = "The altar shatters, leaving only the wailing of the damned!"
-
-/obj/structure/destructible/cult/talisman/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "You're pretty sure you know exactly what this is used for and you can't seem to touch it.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Eldritch Whetstone" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "cult_sharpener"),
- "Construct Shell" = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct_cult"),
- "Flask of Unholy Water" = image(icon = 'icons/obj/drinks/drinks.dmi', icon_state = "holyflask")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Eldritch Whetstone")
- pickedtype += /obj/item/sharpener/cult
- if("Construct Shell")
- pickedtype += /obj/structure/constructshell
- if("Flask of Unholy Water")
- pickedtype += /obj/item/reagent_containers/glass/beaker/unholywater
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You kneel before the altar and your faith is rewarded with the [choice]!")
-
-/obj/structure/destructible/cult/forge
- name = "daemon forge"
- desc = "A forge used in crafting the unholy weapons used by the armies of Nar'Sie."
- icon_state = "forge"
- light_range = 2
- light_color = LIGHT_COLOR_LAVA
- break_message = "The force breaks apart into shards with a howling scream!"
-
-/obj/structure/destructible/cult/forge/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "The heat radiating from [src] pushes you back.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Shielded Robe" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cult_armor"),
- "Flagellant's Robe" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cultrobes"),
- "Mirror Shield" = image(icon = 'icons/obj/shields.dmi', icon_state = "mirror_shield")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Shielded Robe")
- pickedtype += /obj/item/clothing/suit/hooded/cultrobes/cult_shield
- if("Flagellant's Robe")
- pickedtype += /obj/item/clothing/suit/hooded/cultrobes/berserker
- if("Mirror Shield")
- pickedtype += /obj/item/shield/mirror
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You work the forge as dark knowledge guides your hands, creating the [choice]!")
-
-
-
-/obj/structure/destructible/cult/pylon
- name = "pylon"
- desc = "A floating crystal that slowly heals those faithful to Nar'Sie."
- icon_state = "pylon"
- light_range = 1.5
- light_color = COLOR_SOFT_RED
- break_sound = 'sound/effects/glassbr2.ogg'
- break_message = "The blood-red crystal falls to the floor and shatters!"
- var/heal_delay = 25
- var/last_heal = 0
- var/corrupt_delay = 50
- var/last_corrupt = 0
-
-/obj/structure/destructible/cult/pylon/New()
- START_PROCESSING(SSfastprocess, src)
- ..()
-
-/obj/structure/destructible/cult/pylon/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
- return ..()
-
-/obj/structure/destructible/cult/pylon/process()
- if(!anchored)
- return
- if(last_heal <= world.time)
- last_heal = world.time + heal_delay
- for(var/mob/living/L in range(5, src))
- if(iscultist(L) || isshade(L) || isconstruct(L))
- if(L.health != L.maxHealth)
- new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
- if(ishuman(L))
- L.adjustBruteLoss(-1, 0)
- L.adjustFireLoss(-1, 0)
- L.updatehealth()
- if(isshade(L) || isconstruct(L))
- var/mob/living/simple_animal/M = L
- if(M.health < M.maxHealth)
- M.adjustHealth(-3)
- if(ishuman(L) && L.blood_volume < BLOOD_VOLUME_NORMAL)
- L.blood_volume += 1.0
- CHECK_TICK
- if(last_corrupt <= world.time)
- var/list/validturfs = list()
- var/list/cultturfs = list()
- for(var/T in circleviewturfs(src, 5))
- if(istype(T, /turf/open/floor/engine/cult))
- cultturfs |= T
- continue
- var/static/list/blacklisted_pylon_turfs = typecacheof(list(
- /turf/closed,
- /turf/open/floor/engine/cult,
- /turf/open/space,
- /turf/open/lava,
- /turf/open/chasm))
- if(is_type_in_typecache(T, blacklisted_pylon_turfs))
- continue
- else
- validturfs |= T
-
- last_corrupt = world.time + corrupt_delay
-
- if(length(validturfs))
- var/turf/T = pick(validturfs)
- if(istype(T, /turf/open/floor/plating))
- T.PlaceOnTop(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
- else
- T.ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
- else if (length(cultturfs))
- var/turf/open/floor/engine/cult/F = pick(cultturfs)
- new /obj/effect/temp_visual/cult/turf/floor(F)
- else
- // Are we in space or something? No cult turfs or
- // convertable turfs?
- last_corrupt = world.time + corrupt_delay*2
-
-/obj/structure/destructible/cult/tome
- name = "archives"
- desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl."
- icon_state = "tomealtar"
- light_range = 1.5
- light_color = LIGHT_COLOR_FIRE
- break_message = "The books and tomes of the archives burn into ash as the desk shatters!"
-
-/obj/structure/destructible/cult/tome/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "These books won't open and it hurts to even try and read the covers.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Zealot's Blindfold" = image(icon = 'icons/obj/clothing/eyes/eyes.dmi', icon_state = "blindfold"),
- "Veil Walker Set" = image(icon = 'icons/obj/cult.dmi', icon_state = "shifter")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Zealot's Blindfold")
- pickedtype += /obj/item/clothing/glasses/hud/health/night/cultblind
- if("Veil Walker Set")
- pickedtype += /obj/item/cult_shift
- pickedtype += /obj/item/flashlight/flare/culttorch
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype.len && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You summon the [choice] from the archives!")
-
-/obj/effect/gateway
- name = "gateway"
- desc = "You're pretty sure that abyss is staring back."
- icon = 'icons/obj/cult.dmi'
- icon_state = "hole"
- density = TRUE
- anchored = TRUE
-
-/obj/effect/gateway/singularity_act()
- return
-
-/obj/effect/gateway/singularity_pull()
- return
diff --git a/code/modules/antagonists/cult/cult_turf_overlay.dm b/code/modules/antagonists/cult/cult_turf_overlay.dm
deleted file mode 100644
index 2e950326bf8a..000000000000
--- a/code/modules/antagonists/cult/cult_turf_overlay.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-//an "overlay" used by clockwork walls and floors to appear normal to mesons.
-/obj/effect/cult_turf/overlay
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- var/atom/linked
-
-/obj/effect/cult_turf/overlay/examine(mob/user)
- if(linked)
- linked.examine(user)
-
-/obj/effect/cult_turf/overlay/ex_act()
- return FALSE
-
-/obj/effect/cult_turf/overlay/singularity_act()
- return
-/obj/effect/cult_turf/overlay/singularity_pull()
- return
-
-/obj/effect/cult_turf/overlay/singularity_pull(S, current_size)
- return
-
-/obj/effect/cult_turf/overlay/Destroy()
- if(linked)
- linked = null
- . = ..()
-
-/obj/effect/cult_turf/overlay/floor
- icon = 'icons/turf/floors.dmi'
- icon_state = "clockwork_floor"
- layer = TURF_LAYER
-
-/obj/effect/cult_turf/overlay/floor/bloodcult
- icon_state = "cult"
diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm
deleted file mode 100644
index 2829141405dd..000000000000
--- a/code/modules/antagonists/cult/rune_spawn_action.dm
+++ /dev/null
@@ -1,115 +0,0 @@
-//after a delay, creates a rune below you. for constructs creating runes.
-/datum/action/innate/cult/create_rune
- name = "Summon Rune"
- desc = "Summons a rune"
- background_icon_state = "bg_demon"
- var/obj/effect/rune/rune_type
- var/cooldown = 0
- var/base_cooldown = 1800
- var/scribe_time = 60
- var/damage_interrupt = TRUE
- var/action_interrupt = TRUE
- var/obj/effect/temp_visual/cult/rune_spawn/rune_word_type
- var/obj/effect/temp_visual/cult/rune_spawn/rune_innerring_type
- var/obj/effect/temp_visual/cult/rune_spawn/rune_center_type
- var/rune_color
-
-/datum/action/innate/cult/create_rune/IsAvailable()
- if(!rune_type || cooldown > world.time)
- return FALSE
- return ..()
-
-/datum/action/innate/cult/create_rune/proc/turf_check(turf/T)
- if(!T)
- return FALSE
- if(isspaceturf(T))
- to_chat(owner, "You cannot scribe runes in space!")
- return FALSE
- if(locate(/obj/effect/rune) in T)
- to_chat(owner, "There is already a rune here.")
- return FALSE
- return TRUE
-
-
-/datum/action/innate/cult/create_rune/Activate()
- var/turf/T = get_turf(owner)
- if(turf_check(T))
- var/chosen_keyword
- if(initial(rune_type.req_keyword))
- chosen_keyword = stripped_input(owner, "Enter a keyword for the new rune.", "Words of Power")
- if(!chosen_keyword)
- return
- //the outer ring is always the same across all runes
- var/obj/effect/temp_visual/cult/rune_spawn/R1 = new(T, scribe_time, rune_color)
- //the rest are not always the same, so we need types for em
- var/obj/effect/temp_visual/cult/rune_spawn/R2
- if(rune_word_type)
- R2 = new rune_word_type(T, scribe_time, rune_color)
- var/obj/effect/temp_visual/cult/rune_spawn/R3
- if(rune_innerring_type)
- R3 = new rune_innerring_type(T, scribe_time, rune_color)
- var/obj/effect/temp_visual/cult/rune_spawn/R4
- if(rune_center_type)
- R4 = new rune_center_type(T, scribe_time, rune_color)
-
- cooldown = base_cooldown + world.time
- owner.update_action_buttons_icon()
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown)
- var/list/health
- if(damage_interrupt && isliving(owner))
- var/mob/living/L = owner
- health = list("health" = L.health)
- var/scribe_mod = scribe_time
- if(istype(T, /turf/open/floor/engine/cult))
- scribe_mod *= 0.5
- playsound(T, 'sound/magic/enter_blood.ogg', 100, FALSE)
- if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, TYPE_PROC_REF(/mob, break_do_after_checks), health, action_interrupt)))
- var/obj/effect/rune/new_rune = new rune_type(owner.loc)
- new_rune.keyword = chosen_keyword
- else
- qdel(R1)
- if(R2)
- qdel(R2)
- if(R3)
- qdel(R3)
- if(R4)
- qdel(R4)
- cooldown = 0
- owner.update_action_buttons_icon()
-
-//teleport rune
-/datum/action/innate/cult/create_rune/tele
- name = "Summon Teleport Rune"
- desc = "Summons a teleport rune to your location, as though it has been there all along..."
- button_icon_state = "telerune"
- rune_type = /obj/effect/rune/teleport
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune2
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/center
- rune_color = RUNE_COLOR_TELEPORT
-
-/datum/action/innate/cult/create_rune/wall
- name = "Summon Barrier Rune"
- desc = "Summons an active barrier rune to your location, as though it has been there all along..."
- button_icon_state = "barrier"
- rune_type = /obj/effect/rune/wall
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune4
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune4/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune4/center
- rune_color = RUNE_COLOR_DARKRED
-
-/datum/action/innate/cult/create_rune/wall/Activate()
- . = ..()
- var/obj/effect/rune/wall/W = locate(/obj/effect/rune/wall) in owner.loc
- if(W)
- W.spread_density()
-
-/datum/action/innate/cult/create_rune/revive
- name = "Summon Revive Rune"
- desc = "Summons a revive rune to your location, as though it has been there all along..."
- button_icon_state = "revive"
- rune_type = /obj/effect/rune/raise_dead
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune1
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/center
- rune_color = RUNE_COLOR_MEDIUMRED
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
deleted file mode 100644
index 3382672071cc..000000000000
--- a/code/modules/antagonists/cult/runes.dm
+++ /dev/null
@@ -1,1029 +0,0 @@
-GLOBAL_LIST_EMPTY(sacrificed) //a mixed list of minds and mobs
-GLOBAL_LIST(rune_types) //Every rune that can be drawn by ritual daggers
-GLOBAL_LIST_EMPTY(teleport_runes)
-GLOBAL_LIST_EMPTY(wall_runes)
-/*
-
-This file contains runes.
-Runes are used by the cult to cause many different effects and are paramount to their success.
-They are drawn with a ritual dagger in blood, and are distinguishable to cultists and normal crew by examining.
-Fake runes can be drawn in crayon to fool people.
-Runes can either be invoked by one's self or with many different cultists. Each rune has a specific incantation that the cultists will say when invoking it.
-
-
-*/
-
-/obj/effect/rune
- name = "rune"
- var/cultist_name = "basic rune"
- desc = "An odd collection of symbols drawn in what seems to be blood."
- var/cultist_desc = "a basic rune with no function." //This is shown to cultists who examine the rune in order to determine its true purpose.
- anchored = TRUE
- icon = 'icons/obj/rune.dmi'
- icon_state = "1"
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- layer = SIGIL_LAYER
- color = RUNE_COLOR_RED
-
- var/invocation = "Aiy ele-mayo!" //This is said by cultists when the rune is invoked.
- var/req_cultists = 1 //The amount of cultists required around the rune to invoke it. If only 1, any cultist can invoke it.
- var/req_cultists_text //if we have a description override for required cultists to invoke
- var/rune_in_use = FALSE // Used for some runes, this is for when you want a rune to not be usable when in use.
-
- var/scribe_delay = 40 //how long the rune takes to create
- var/scribe_damage = 0.1 //how much damage you take doing it
- var/invoke_damage = 0 //how much damage invokers take when invoking it
- var/construct_invoke = TRUE //if constructs can invoke it
-
- var/req_keyword = 0 //If the rune requires a keyword - go figure amirite
- var/keyword //The actual keyword for the rune
-
-/obj/effect/rune/Initialize(mapload, set_keyword)
- . = ..()
- if(set_keyword)
- keyword = set_keyword
- var/image/I = image(icon = 'icons/effects/blood.dmi', icon_state = null, loc = src)
- I.override = TRUE
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "cult_runes", I)
-
-/obj/effect/rune/examine(mob/user)
- . = ..()
- if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects
- . += "Name: [cultist_name]\n"+\
- "Effects: [capitalize(cultist_desc)]\n"+\
- "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"
- if(req_keyword && keyword)
- . += "Keyword: [keyword]"
-
-/obj/effect/rune/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "You aren't able to understand the words of [src].")
- return
- var/list/invokers = can_invoke(user)
- if(invokers.len >= req_cultists)
- invoke(invokers)
- else
- to_chat(user, "You need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.")
- fail_invoke()
-
-/obj/effect/rune/attack_animal(mob/living/simple_animal/M)
- if(istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct))
- if(istype(M, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/juggernaut/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/artificer/angelic))
- to_chat(M, "You purge the rune!")
- qdel(src)
- else if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message
- attack_hand(M)
- else
- to_chat(M, "You are unable to invoke the rune!")
-
-/obj/effect/rune/proc/conceal() //for talisman of revealing/hiding
- visible_message("[src] fades away.")
- invisibility = INVISIBILITY_OBSERVER
- alpha = 100 //To help ghosts distinguish hidden runes
-
-/obj/effect/rune/proc/reveal() //for talisman of revealing/hiding
- invisibility = 0
- visible_message("[src] suddenly appears!")
- alpha = initial(alpha)
-
-/*
-
-There are a few different procs each rune runs through when a cultist activates it.
-can_invoke() is called when a cultist activates the rune with an empty hand. If there are multiple cultists, this rune determines if the required amount is nearby.
-invoke() is the rune's actual effects.
-fail_invoke() is called when the rune fails, via not enough people around or otherwise. Typically this just has a generic 'fizzle' effect.
-structure_check() searches for nearby cultist structures required for the invocation. Proper structures are pylons, forges, archives, and altars.
-
-*/
-
-/obj/effect/rune/proc/can_invoke(mob/living/user=null)
- //This proc determines if the rune can be invoked at the time. If there are multiple required cultists, it will find all nearby cultists.
- var/list/invokers = list() //people eligible to invoke the rune
- if(user)
- invokers += user
- if(req_cultists > 1 || istype(src, /obj/effect/rune/convert))
- var/list/things_in_range = range(1, src)
- for(var/mob/living/L in things_in_range)
- if(iscultist(L))
- if(L == user)
- continue
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if((HAS_TRAIT(H, TRAIT_MUTE)) || H.silent)
- continue
- if(L.stat)
- continue
- invokers += L
- return invokers
-
-/obj/effect/rune/proc/invoke(list/invokers)
- //This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here.
- for(var/M in invokers)
- if(isliving(M))
- var/mob/living/L = M
- if(invocation)
- L.say(invocation, language = /datum/language/common, ignore_spam = TRUE, forced = "cult invocation")
- if(invoke_damage)
- L.apply_damage(invoke_damage, BRUTE)
- to_chat(L, "[src] saps your strength!")
- else if(istype(M, /obj/item/toy/plush/narplush))
- var/obj/item/toy/plush/narplush/P = M
- P.visible_message("[P] squeaks loudly!")
- do_invoke_glow()
-
-/obj/effect/rune/proc/do_invoke_glow()
- set waitfor = FALSE
- animate(src, transform = matrix()*2, alpha = 0, time = 5, flags = ANIMATION_END_NOW) //fade out
- sleep(5)
- animate(src, transform = matrix(), alpha = 255, time = 0, flags = ANIMATION_END_NOW)
-
-/obj/effect/rune/proc/fail_invoke()
- //This proc contains the effects of a rune if it is not invoked correctly, through either invalid wording or not enough cultists. By default, it's just a basic fizzle.
- visible_message("The markings pulse with a small flash of red light, then fall dark.")
- var/oldcolor = color
- color = rgb(255, 0, 0)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
-
-//Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user.
-/obj/effect/rune/malformed
- cultist_name = "malformed rune"
- cultist_desc = "a senseless rune written in gibberish. No good can come from invoking this."
- invocation = "Ra'sha yoka!"
- invoke_damage = 30
-
-/obj/effect/rune/malformed/Initialize(mapload, set_keyword)
- . = ..()
- icon_state = "[rand(1,7)]"
- color = rgb(rand(0,255), rand(0,255), rand(0,255))
-
-/obj/effect/rune/malformed/invoke(list/invokers)
- ..()
- qdel(src)
-
-//Rite of Offering: Converts or sacrifices a target.
-/obj/effect/rune/convert
- cultist_name = "Offer"
- cultist_desc = "offers a noncultist above it to Nar'Sie, either converting them or sacrificing them."
- req_cultists_text = "2 for conversion, 3 for living sacrifices and sacrifice targets."
- invocation = "Mah'weyh pleggh at e'ntrath!"
- icon_state = "3"
- color = RUNE_COLOR_OFFER
- req_cultists = 1
- rune_in_use = FALSE
-
-/obj/effect/rune/convert/do_invoke_glow()
- return
-
-/obj/effect/rune/convert/invoke(list/invokers)
- if(rune_in_use)
- return
- var/list/myriad_targets = list()
- var/turf/T = get_turf(src)
- for(var/mob/living/M in T)
- if(!iscultist(M))
- myriad_targets |= M
- if(!myriad_targets.len)
- fail_invoke()
- log_game("Offer rune failed - no eligible targets")
- return
- rune_in_use = TRUE
- visible_message("[src] pulses blood red!")
- var/oldcolor = color
- color = RUNE_COLOR_DARKRED
- var/mob/living/L = pick(myriad_targets)
-
- var/mob/living/F = invokers[1]
- var/datum/antagonist/cult/C = F.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/team/cult/Cult_team = C.cult_team
- var/is_convertable = is_convertable_to_cult(L,C.cult_team)
- if(L.stat != DEAD && is_convertable)
- invocation = "Mah'weyh pleggh at e'ntrath!"
- ..()
- if(is_convertable)
- do_convert(L, invokers)
- else
- invocation = "Barhah hra zar'garis!"
- ..()
- do_sacrifice(L, invokers)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
- Cult_team.check_size() // Triggers the eye glow or aura effects if the cult has grown large enough relative to the crew
- rune_in_use = FALSE
-
-/obj/effect/rune/convert/proc/do_convert(mob/living/convertee, list/invokers)
- if(invokers.len < 2)
- for(var/M in invokers)
- to_chat(M, "You need at least two invokers to convert [convertee]!")
- log_game("Offer rune failed - tried conversion with one invoker")
- return 0
- if(convertee.anti_magic_check(TRUE, TRUE, FALSE, 0)) //Not chargecost because it can be spammed
- for(var/M in invokers)
- to_chat(M, "Something is shielding [convertee]'s mind!")
- log_game("Offer rune failed - convertee had anti-magic")
- return 0
- var/brutedamage = convertee.getBruteLoss()
- var/burndamage = convertee.getFireLoss()
- if(brutedamage || burndamage)
- convertee.adjustBruteLoss(-(brutedamage * 0.75))
- convertee.adjustFireLoss(-(burndamage * 0.75))
- convertee.visible_message(
- "[convertee] writhes in pain [brutedamage || burndamage ? "even as [convertee.p_their()] wounds heal and close" : "as the markings below [convertee.p_them()] glow a bloody red"]!", // Hello there buddy! Come here often? I hope you were wondering wtf this string was
- "AAAAAAAAAAAAAA-")
- SSticker.mode.add_cultist(convertee.mind, 1)
- convertee.mind.special_role = ROLE_CULTIST
- to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
- and something evil takes root.")
- to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\
- ")
- if(ishuman(convertee))
- var/mob/living/carbon/human/H = convertee
- H.uncuff()
- H.stuttering = 0
- H.cultslurring = 0
- if(prob(1) || SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
- H.say("You son of a bitch! I'm in.", forced = "That son of a bitch! They're in.")
- return 1
-
-/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
- var/mob/living/first_invoker = invokers[1]
- if(!first_invoker)
- return FALSE
- var/datum/antagonist/cult/C = first_invoker.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!C)
- return
-
-
- var/big_sac = FALSE
- if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
- for(var/M in invokers)
- to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!")
- log_game("Offer rune failed - not enough acolytes and target is living or sac target")
- return FALSE
- if(sacrificial.mind)
- GLOB.sacrificed += sacrificial.mind
- for(var/datum/objective/sacrifice/sac_objective in C.cult_team.objectives)
- if(sac_objective.target == sacrificial.mind)
- sac_objective.sacced = TRUE
- sac_objective.update_explanation_text()
- big_sac = TRUE
- else
- GLOB.sacrificed += sacrificial
-
- new /obj/effect/temp_visual/cult/sac(get_turf(src))
- for(var/M in invokers)
- if(big_sac)
- to_chat(M, "\"Yes! This is the one I desire! You have done well.\"")
- else
- if(ishuman(sacrificial) || iscyborg(sacrificial))
- to_chat(M, "\"I accept this sacrifice.\"")
- else
- to_chat(M, "\"I accept this meager sacrifice.\"")
-
- var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
- if(sacrificial.mind)
- stone.invisibility = INVISIBILITY_MAXIMUM //so it's not picked up during transfer_soul()
- stone.transfer_soul("FORCE", sacrificial, usr)
- stone.invisibility = 0
-
- if(sacrificial)
- if(iscyborg(sacrificial))
- playsound(sacrificial, 'sound/magic/disable_tech.ogg', 100, TRUE)
- sacrificial.dust() //To prevent the MMI from remaining
- else
- playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, TRUE)
- sacrificial.gib()
- return TRUE
-
-
-
-/obj/effect/rune/empower
- cultist_name = "Empower"
- cultist_desc = "allows cultists to prepare greater amounts of blood magic at far less of a cost."
- invocation = "H'drak v'loso, mir'kanas verbot!"
- icon_state = "3"
- color = RUNE_COLOR_TALISMAN
- construct_invoke = FALSE
-
-/obj/effect/rune/empower/invoke(list/invokers)
- . = ..()
- var/mob/living/user = invokers[1] //the first invoker is always the user
- for(var/datum/action/innate/cult/blood_magic/BM in user.actions)
- BM.Activate()
-
-/obj/effect/rune/teleport
- cultist_name = "Teleport"
- cultist_desc = "warps everything above it to another chosen teleport rune."
- invocation = "Sas'so c'arta forbici!"
- icon_state = "2"
- color = RUNE_COLOR_TELEPORT
- req_keyword = TRUE
- light_power = 4
- var/obj/effect/temp_visual/cult/portal/inner_portal //The portal "hint" for off-station teleportations
- var/obj/effect/temp_visual/cult/rune_spawn/rune2/outer_portal
- var/listkey
-
-
-/obj/effect/rune/teleport/Initialize(mapload, set_keyword)
- . = ..()
- var/area/A = get_area(src)
- var/locname = initial(A.name)
- listkey = set_keyword ? "[set_keyword] [locname]":"[locname]"
- GLOB.teleport_runes += src
-
-/obj/effect/rune/teleport/Destroy()
- GLOB.teleport_runes -= src
- return ..()
-
-/obj/effect/rune/teleport/invoke(list/invokers)
- var/mob/living/user = invokers[1] //the first invoker is always the user
- var/list/potential_runes = list()
- var/list/teleportnames = list()
- for(var/R in GLOB.teleport_runes)
- var/obj/effect/rune/teleport/T = R
- if(T != src && !is_away_level(T))
- potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T
-
- if(!potential_runes.len)
- to_chat(user, "There are no valid runes to teleport to!")
- log_game("Teleport rune failed - no other teleport runes")
- fail_invoke()
- return
-
- var/turf/T = get_turf(src)
- if(is_away_level(T))
- to_chat(user, "You are not in the right dimension!")
- log_game("Teleport rune failed - user in away mission")
- fail_invoke()
- return
-
- var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
- var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !actual_selected_rune)
- fail_invoke()
- return
-
- var/turf/target = get_turf(actual_selected_rune)
- if(target.is_blocked_turf(TRUE))
- to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.")
- fail_invoke()
- return
- var/movedsomething = FALSE
- var/moveuserlater = FALSE
- var/movesuccess = FALSE
- for(var/atom/movable/A in T)
- if(istype(A, /obj/effect/dummy/phased_mob))
- continue
- if(ismob(A))
- if(!isliving(A)) //Let's not teleport ghosts and AI eyes.
- continue
- if(ishuman(A))
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(T, A.dir)
- new /obj/effect/temp_visual/dir_setting/cult/phase(target, A.dir)
- if(A == user)
- moveuserlater = TRUE
- movedsomething = TRUE
- continue
- if(!A.anchored)
- movedsomething = TRUE
- if(do_teleport(A, target, channel = TELEPORT_CHANNEL_CULT))
- movesuccess = TRUE
- if(movedsomething)
- ..()
- if(moveuserlater)
- if(do_teleport(user, target, channel = TELEPORT_CHANNEL_CULT))
- movesuccess = TRUE
- if(movesuccess)
- visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "You hear a sharp crack.")
- to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].")
- else
- to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].")
- var/area/A = get_area(T)
- if(initial(A.name) == "Space")
- actual_selected_rune.handle_portal("space", T)
- if(movesuccess)
- target.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.")
- else
- fail_invoke()
-
-/obj/effect/rune/teleport/proc/handle_portal(portal_type, turf/origin)
- var/turf/T = get_turf(src)
- close_portal() // To avoid stacking descriptions/animations
- playsound(T, pick('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg'), 100, TRUE, 14)
- inner_portal = new /obj/effect/temp_visual/cult/portal(T)
- if(portal_type == "space")
- set_light_color(color)
- desc += "
A tear in reality reveals a black void interspersed with dots of light... something recently teleported here from space.
The void feels like it's trying to pull you to the [dir2text(get_dir(T, origin))]!"
- else
- inner_portal.icon_state = "lava"
- set_light_color(LIGHT_COLOR_FIRE)
- desc += "
A tear in reality reveals a coursing river of lava... something recently teleported here from the Lavaland Mines!"
- outer_portal = new(T, 600, color)
- light_range = 4
- update_light()
- addtimer(CALLBACK(src, PROC_REF(close_portal)), 600, TIMER_UNIQUE)
-
-/obj/effect/rune/teleport/proc/close_portal()
- qdel(inner_portal)
- qdel(outer_portal)
- desc = initial(desc)
- light_range = 0
- update_light()
-
-//Ritual of Dimensional Rending: Calls forth the avatar of Nar'Sie upon the station.
-/obj/effect/rune/narsie
- cultist_name = "Nar'Sie"
- cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers."
- invocation = "TOK-LYR RQA-NAP G'OLT-ULOFT!!"
- req_cultists = 9
- icon = 'icons/effects/96x96.dmi'
- color = RUNE_COLOR_DARKRED
- icon_state = "rune_large"
- pixel_x = -32 //So the big ol' 96x96 sprite shows up right
- pixel_y = -32
- scribe_delay = 500 //how long the rune takes to create
- scribe_damage = 40.1 //how much damage you take doing it
- var/used = FALSE
-
-/obj/effect/rune/narsie/Initialize(mapload, set_keyword)
- . = ..()
- SSpoints_of_interest.make_point_of_interest(src)
-
-/obj/effect/rune/narsie/Destroy()
- SSpoints_of_interest.remove_point_of_interest(src)
- . = ..()
-
-/obj/effect/rune/narsie/conceal() //can't hide this, and you wouldn't want to
- return
-
-/obj/effect/rune/narsie/invoke(list/invokers)
- if(used)
- return
- var/mob/living/user = invokers[1]
- var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- var/area/place = get_area(src)
- if(!(place in summon_objective.summon_spots))
- to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")
- return
- if(locate(/obj/singularity/narsie) in SSpoints_of_interest.other_points_of_interest)
- for(var/M in invokers)
- to_chat(M, "Nar'Sie is already on this plane!")
- log_game("Nar'Sie rune failed - already summoned")
- return
- //BEGIN THE SUMMONING
- used = TRUE
- ..()
- sound_to_playing_players('sound/effects/dimensional_rend.ogg')
- var/turf/T = get_turf(src)
- sleep(40)
- if(src)
- color = RUNE_COLOR_RED
- new /obj/singularity/narsie/large/cult(T) //Causes Nar'Sie to spawn even if the rune has been removed
-
-//Rite of Resurrection: Requires a dead or inactive cultist. When reviving the dead, you can only perform one revival for every three sacrifices your cult has carried out.
-/obj/effect/rune/raise_dead
- cultist_name = "Revive"
- cultist_desc = "requires a dead, mindless, or inactive cultist placed upon the rune. For each three bodies sacrificed to the dark patron, one body will be mended and their mind awoken"
- invocation = "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!" //Depends on the name of the user - see below
- icon_state = "1"
- color = RUNE_COLOR_MEDIUMRED
- var/static/sacrifices_used = -SOULS_TO_REVIVE // Cultists get one "free" revive
-
-/obj/effect/rune/raise_dead/examine(mob/user)
- . = ..()
- if(iscultist(user) || user.stat == DEAD)
- . += "Sacrifices unrewarded: [LAZYLEN(GLOB.sacrificed) - sacrifices_used]"
-
-/obj/effect/rune/raise_dead/invoke(list/invokers)
- var/turf/T = get_turf(src)
- var/mob/living/mob_to_revive
- var/list/potential_revive_mobs = list()
- var/mob/living/user = invokers[1]
- if(rune_in_use)
- return
- rune_in_use = TRUE
- for(var/mob/living/M in T.contents)
- if(iscultist(M) && (M.stat == DEAD || !M.client || M.client.is_afk()))
- potential_revive_mobs |= M
- if(!potential_revive_mobs.len)
- to_chat(user, "There are no dead cultists on the rune!")
- log_game("Raise Dead rune failed - no cultists to revive")
- fail_invoke()
- return
- if(potential_revive_mobs.len > 1)
- mob_to_revive = input(user, "Choose a cultist to revive.", "Cultist to Revive") as null|anything in potential_revive_mobs
- else
- mob_to_revive = potential_revive_mobs[1]
- if(QDELETED(src) || !validness_checks(mob_to_revive, user))
- fail_invoke()
- return
- if(user.name == "Herbert West")
- invocation = "To life, to life, I bring them!"
- else
- invocation = initial(invocation)
- ..()
- if(mob_to_revive.stat == DEAD)
- var/diff = LAZYLEN(GLOB.sacrificed) - SOULS_TO_REVIVE - sacrifices_used
- if(diff < 0)
- to_chat(user, "Your cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!")
- fail_invoke()
- return
- sacrifices_used += SOULS_TO_REVIVE
- mob_to_revive.revive(full_heal = TRUE, admin_revive = TRUE) //This does remove traits and such, but the rune might actually see some use because of it!
- mob_to_revive.grab_ghost()
- if(!mob_to_revive.client || mob_to_revive.client.is_afk())
- set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", ROLE_CULTIST, null, ROLE_CULTIST, 50, mob_to_revive)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.")
- message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.")
- mob_to_revive.ghostize(0)
- mob_to_revive.key = C.key
- else
- fail_invoke()
- return
- SEND_SOUND(mob_to_revive, 'sound/ambience/antag/bloodcult.ogg')
- to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"")
- mob_to_revive.visible_message(
- "[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \
- "You awaken suddenly from the void. You're alive!")
- rune_in_use = FALSE
-
-/obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user)
- var/turf/T = get_turf(src)
- if(QDELETED(user))
- return FALSE
- if(!Adjacent(user) || user.incapacitated())
- return FALSE
- if(QDELETED(target_mob))
- return FALSE
- if(!(target_mob in T.contents))
- to_chat(user, "The cultist to revive has been moved!")
- log_game("Raise Dead rune failed - revival target moved")
- return FALSE
- return TRUE
-
-/obj/effect/rune/raise_dead/fail_invoke()
- ..()
- rune_in_use = FALSE
- for(var/mob/living/M in range(1,src))
- if(iscultist(M) && M.stat == DEAD)
- M.visible_message("[M] twitches.")
-
-//Rite of the Corporeal Shield: When invoked, becomes solid and cannot be passed. Invoke again to undo.
-/obj/effect/rune/wall
- cultist_name = "Barrier"
- cultist_desc = "when invoked, makes a temporary invisible wall to block passage. Can be invoked again to reverse this."
- invocation = "Khari'd! Eske'te tannin!"
- icon_state = "4"
- color = RUNE_COLOR_DARKRED
- CanAtmosPass = ATMOS_PASS_DENSITY
- var/datum/timedevent/density_timer
- var/recharging = FALSE
-
-/obj/effect/rune/wall/Initialize(mapload, set_keyword)
- . = ..()
- GLOB.wall_runes += src
-
-/obj/effect/rune/wall/examine(mob/user)
- . = ..()
- if(density && iscultist(user))
- if(density_timer)
- . += "The air above this rune has hardened into a barrier that will last [DisplayTimeText(density_timer.timeToRun - world.time)]."
-
-/obj/effect/rune/wall/Destroy()
- GLOB.wall_runes -= src
- return ..()
-
-/obj/effect/rune/wall/BlockThermalConductivity()
- return density
-
-/obj/effect/rune/wall/invoke(list/invokers)
- if(recharging)
- return
- var/mob/living/user = invokers[1]
- ..()
- density = !density
- update_state()
- if(density)
- spread_density()
- var/carbon_user = iscarbon(user)
- user.visible_message(
- "[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \
- "You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.")
- if(carbon_user)
- var/mob/living/carbon/C = user
- C.apply_damage(2, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-
-/obj/effect/rune/wall/proc/spread_density()
- for(var/R in GLOB.wall_runes)
- var/obj/effect/rune/wall/W = R
- if(W.virtual_z() == virtual_z() && get_dist(src, W) <= 2 && !W.density && !W.recharging)
- W.density = TRUE
- W.update_state()
- W.spread_density()
- density_timer = addtimer(CALLBACK(src, PROC_REF(lose_density)), 3000, TIMER_STOPPABLE)
-
-/obj/effect/rune/wall/proc/lose_density()
- if(density)
- recharging = TRUE
- density = FALSE
- update_state()
- var/oldcolor = color
- add_atom_colour("#696969", FIXED_COLOUR_PRIORITY)
- animate(src, color = oldcolor, time = 50, easing = EASE_IN)
- addtimer(CALLBACK(src, PROC_REF(recharge)), 50)
-
-/obj/effect/rune/wall/proc/recharge()
- recharging = FALSE
- add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
-
-/obj/effect/rune/wall/proc/update_state()
- deltimer(density_timer)
- air_update_turf(TRUE)
- if(density)
- var/mutable_appearance/shimmer = mutable_appearance('icons/effects/effects.dmi', "barriershimmer", ABOVE_MOB_LAYER)
- shimmer.appearance_flags |= RESET_COLOR
- shimmer.alpha = 60
- shimmer.color = "#701414"
- add_overlay(shimmer)
- add_atom_colour(RUNE_COLOR_RED, FIXED_COLOUR_PRIORITY)
- else
- cut_overlays()
- add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
-
-//Rite of Joined Souls: Summons a single cultist.
-/obj/effect/rune/summon
- cultist_name = "Summon Cultist"
- cultist_desc = "summons a single cultist to the rune. Requires 2 invokers."
- invocation = "N'ath reth sh'yro eth d'rekkathnor!"
- req_cultists = 2
- invoke_damage = 10
- icon_state = "3"
- color = RUNE_COLOR_SUMMON
-
-/obj/effect/rune/summon/invoke(list/invokers)
- var/mob/living/user = invokers[1]
- var/list/cultists = list()
- for(var/datum/mind/M in SSticker.mode.cult)
- if(!(M.current in invokers) && M.current && M.current.stat != DEAD)
- cultists |= M.current
- var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in cultists
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated())
- return
- if(!cultist_to_summon)
- to_chat(user, "You require a summoning target!")
- fail_invoke()
- log_game("Summon Cultist rune failed - no target")
- return
- if(cultist_to_summon.stat == DEAD)
- to_chat(user, "[cultist_to_summon] has died!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target died")
- return
- if(cultist_to_summon.pulledby || cultist_to_summon.buckled)
- to_chat(user, "[cultist_to_summon] is being held in place!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target restrained")
- return
- if(!iscultist(cultist_to_summon))
- to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target was deconverted")
- return
- if(is_away_level(cultist_to_summon))
- to_chat(user, "[cultist_to_summon] is not in our dimension!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target in away mission")
- return
- cultist_to_summon.visible_message(
- "[cultist_to_summon] suddenly disappears in a flash of red light!", \
- "Overwhelming vertigo consumes you as you are hurled through the air!")
- ..()
- visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!")
- cultist_to_summon.forceMove(get_turf(src))
- qdel(src)
-
-//Rite of Boiling Blood: Deals extremely high amounts of damage to non-cultists nearby
-/obj/effect/rune/blood_boil
- cultist_name = "Boil Blood"
- cultist_desc = "boils the blood of non-believers who can see the rune, rapidly dealing extreme amounts of damage. Requires 3 invokers."
- invocation = "Dedo ol'btoh!"
- icon_state = "4"
- color = RUNE_COLOR_BURNTORANGE
- light_color = LIGHT_COLOR_LAVA
- req_cultists = 3
- invoke_damage = 10
- construct_invoke = FALSE
- var/tick_damage = 25
- rune_in_use = FALSE
-
-/obj/effect/rune/blood_boil/do_invoke_glow()
- return
-
-/obj/effect/rune/blood_boil/invoke(list/invokers)
- if(rune_in_use)
- return
- ..()
- rune_in_use = TRUE
- var/turf/T = get_turf(src)
- visible_message("[src] turns a bright, glowing orange!")
- color = "#FC9B54"
- set_light(6, 1, color)
- for(var/mob/living/L in viewers(T))
- if(!iscultist(L) && L.blood_volume)
- var/atom/I = L.anti_magic_check(chargecost = 0)
- if(I)
- if(isitem(I))
- to_chat(L, "[I] suddenly burns hotly before returning to normal!")
- continue
- to_chat(L, "Your blood boils in your veins!")
- animate(src, color = "#FCB56D", time = 4)
- sleep(4)
- if(QDELETED(src))
- return
- do_area_burn(T, 0.5)
- animate(src, color = "#FFDF80", time = 5)
- sleep(5)
- if(QDELETED(src))
- return
- do_area_burn(T, 1)
- animate(src, color = "#FFFDF4", time = 6)
- sleep(6)
- if(QDELETED(src))
- return
- do_area_burn(T, 1.5)
- new /obj/effect/hotspot(T)
- qdel(src)
-
-/obj/effect/rune/blood_boil/proc/do_area_burn(turf/T, multiplier)
- set_light(6, 1, color)
- for(var/mob/living/L in viewers(T))
- if(!iscultist(L) && L.blood_volume)
- if(L.anti_magic_check(chargecost = 0))
- continue
- L.take_overall_damage(tick_damage*multiplier, tick_damage*multiplier)
-
-//Rite of Spectral Manifestation: Summons a ghost on top of the rune as a cultist human with no items. User must stand on the rune at all times, and takes damage for each summoned ghost.
-/obj/effect/rune/manifest
- cultist_name = "Spirit Realm"
- cultist_desc = "manifests a spirit servant of the Geometer and allows you to ascend as a spirit yourself. The invoker must not move from atop the rune, and will take damage for each summoned spirit."
- invocation = "Gal'h'rfikk harfrandid mud'gib!" //how the fuck do you pronounce this
- icon_state = "7"
- invoke_damage = 10
- construct_invoke = FALSE
- color = RUNE_COLOR_DARKRED
- var/mob/living/affecting = null
- var/ghost_limit = 3
- var/ghosts = 0
-
-/obj/effect/rune/manifest/Initialize()
- . = ..()
-
-
-/obj/effect/rune/manifest/can_invoke(mob/living/user)
- if(!(user in get_turf(src)))
- to_chat(user, "You must be standing on [src]!")
- fail_invoke()
- log_game("Manifest rune failed - user not standing on rune")
- return list()
- if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST))
- to_chat(user, "Ghosts can't summon more ghosts!")
- fail_invoke()
- log_game("Manifest rune failed - user is a ghost")
- return list()
- return ..()
-
-/obj/effect/rune/manifest/invoke(list/invokers)
- . = ..()
- var/mob/living/user = invokers[1]
- var/turf/T = get_turf(src)
- var/choice = alert(user,"You tear open a connection to the spirit realm...",,"Summon a Cult Ghost","Ascend as a Dark Spirit","Cancel")
- if(choice == "Summon a Cult Ghost")
- if(ghosts >= ghost_limit)
- to_chat(user, "You are sustaining too many ghosts to summon more!")
- fail_invoke()
- log_game("Manifest rune failed - too many summoned ghosts")
- return list()
- notify_ghosts("Manifest rune invoked in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src, header = "Manifest rune")
- var/list/ghosts_on_rune = list()
- for(var/mob/dead/observer/O in T)
- if(O.client && !is_banned_from(O.ckey, ROLE_CULTIST) && !QDELETED(src) && !(isAdminObserver(O) && (O.client.prefs.toggles & ADMIN_IGNORE_CULT_GHOST)) && !QDELETED(O))
- ghosts_on_rune += O
- if(!ghosts_on_rune.len)
- to_chat(user, "There are no spirits near [src]!")
- fail_invoke()
- log_game("Manifest rune failed - no nearby ghosts")
- return list()
- var/mob/dead/observer/ghost_to_spawn = pick(ghosts_on_rune)
- var/mob/living/carbon/human/cult_ghost/new_human = new(T)
- new_human.real_name = ghost_to_spawn.real_name
- new_human.alpha = 150 //Makes them translucent
- new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor
- new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts
- new_human.see_invisible = SEE_INVISIBLE_OBSERVER
- ghosts++
- playsound(src, 'sound/magic/exit_blood.ogg', 50, TRUE)
- visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.")
- to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...")
- var/obj/structure/emergency_shield/invoker/N = new(T)
- new_human.key = ghost_to_spawn.key
- SSticker.mode.add_cultist(new_human.mind, 0)
- to_chat(new_human, "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar'Sie, and you are to serve them at all costs.")
-
- while(!QDELETED(src) && !QDELETED(user) && !QDELETED(new_human) && (user in T))
- if(user.stat != CONSCIOUS || HAS_TRAIT(new_human, TRAIT_CRITICAL_CONDITION))
- break
- user.apply_damage(0.1, BRUTE)
- sleep(1)
-
- qdel(N)
- ghosts--
- if(new_human)
- new_human.visible_message(
- "[new_human] suddenly dissolves into bones and ashes.", \
- "Your link to the world fades. Your form breaks apart.")
- for(var/obj/I in new_human)
- new_human.dropItemToGround(I, TRUE)
- new_human.dust()
- else if(choice == "Ascend as a Dark Spirit")
- affecting = user
- affecting.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
- affecting.visible_message(
- "[affecting] freezes statue-still, glowing an unearthly red.", \
- "You see what lies beyond. All is revealed. In this form you find that your voice booms louder and you can mark targets for the entire cult")
- var/mob/dead/observer/G = affecting.ghostize(1)
- var/datum/action/innate/cult/comm/spirit/CM = new
- var/datum/action/innate/cult/ghostmark/GM = new
- G.name = "Dark Spirit of [G.name]"
- G.color = "red"
- CM.Grant(G)
- GM.Grant(G)
- while(!QDELETED(affecting))
- if(!(affecting in T))
- user.visible_message("A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!")
- Beam(affecting, icon_state="drainbeam", time=2)
- affecting.forceMove(get_turf(src)) //NO ESCAPE :^)
- if(affecting.key)
- affecting.visible_message(
- "[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.", \
- "You are re-united with your physical form. [src] releases its hold over you.")
- affecting.Paralyze(40)
- break
- if(affecting.health <= 10)
- to_chat(G, "Your body can no longer sustain the connection!")
- break
- sleep(5)
- CM.Remove(G)
- GM.Remove(G)
- affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
- affecting.grab_ghost()
- affecting = null
- rune_in_use = FALSE
-
-/mob/living/carbon/human/cult_ghost/spill_organs(no_brain, no_organs, no_bodyparts) //cult ghosts never drop a brain
- no_brain = TRUE
- . = ..()
-
-/mob/living/carbon/human/cult_ghost/getorganszone(zone, subzones = 0)
- . = ..()
- for(var/obj/item/organ/brain/B in .) //they're not that smart, really
- . -= B
-
-
-/obj/effect/rune/apocalypse
- cultist_name = "Apocalypse"
- cultist_desc = "a harbinger of the end times. Grows in strength with the cult's desperation - but at the risk of... side effects."
- invocation = "Ta'gh fara'qha fel d'amar det!"
- icon = 'icons/effects/96x96.dmi'
- icon_state = "apoc"
- pixel_x = -32
- pixel_y = -32
- color = RUNE_COLOR_DARKRED
- req_cultists = 3
- scribe_delay = 100
-
-/obj/effect/rune/apocalypse/invoke(list/invokers)
- if(rune_in_use)
- return
- . = ..()
- var/area/place = get_area(src)
- var/mob/living/user = invokers[1]
- var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- if(summon_objective.summon_spots.len <= 1)
- to_chat(user, "Only one ritual site remains - it must be reserved for the final summoning!")
- return
- if(!(place in summon_objective.summon_spots))
- to_chat(user, "The Apocalypse rune will remove a ritual site, where Nar'Sie can be summoned, it can only be scribed in [english_list(summon_objective.summon_spots)]!")
- return
- summon_objective.summon_spots -= place
- rune_in_use = TRUE
- var/turf/T = get_turf(src)
- new /obj/effect/temp_visual/dir_setting/curse/grasp_portal/fading(T)
- var/intensity = 0
- for(var/mob/living/M in GLOB.player_list)
- if(iscultist(M))
- intensity++
- intensity = max(60, 360 - (360*(intensity/GLOB.player_list.len + 0.3)**2)) //significantly lower intensity for "winning" cults
- var/duration = intensity*10
- playsound(T, 'sound/magic/enter_blood.ogg', 100, TRUE)
- visible_message("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!")
- for(var/mob/living/L in range(src, 3))
- L.Paralyze(30)
- empulse(T, 0.42*(intensity), 1)
- var/list/images = list()
- var/zmatch = T.virtual_z()
- var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
- for(var/mob/living/M in GLOB.alive_mob_list)
- if(M.virtual_z() != zmatch)
- continue
- if(ishuman(M))
- if(!iscultist(M))
- AH.remove_hud_from(M)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(hudFix), M), duration)
- var/image/A = image('icons/mob/cult.dmi',M,"cultist", ABOVE_MOB_LAYER)
- A.override = 1
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"human_apoc",TRUE), duration)
- images += A
- SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/spookoween/ghost_whisper.ogg'),sound('sound/spookoween/ghosty_wind.ogg')))
- else
- var/construct = pick("floater","artificer","behemoth")
- var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER)
- B.override = 1
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"mob_apoc",TRUE), duration)
- images += B
- if(!iscultist(M))
- if(M.client)
- var/image/C = image('icons/effects/cult_effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), duration)
- images += C
- else
- to_chat(M, "An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")
- SEND_SOUND(M, 'sound/effects/pope_entry.ogg')
- image_handler(images, duration)
- if(intensity>=285) // Based on the prior formula, this means the cult makes up <15% of current players
- var/outcome = rand(1,80)
- switch(outcome)
- if(1 to 10)
- var/datum/round_event_control/disease_outbreak/D = new()
- // var/datum/round_event_control/mice_migration/M = new()
- D.runEvent()
- // M.runEvent()
- if(11 to 20)
- var/datum/round_event_control/radiation_storm/RS = new()
- RS.runEvent()
- if(21 to 30)
- var/datum/round_event_control/brand_intelligence/BI = new()
- BI.runEvent()
- if(31 to 40)
- var/datum/round_event_control/immovable_rod/R = new()
- R.runEvent()
- R.runEvent()
- R.runEvent()
- if(41 to 50)
- var/datum/round_event_control/meteor_wave/MW = new()
- MW.runEvent()
- if(51 to 60)
- var/datum/round_event_control/spider_infestation/SI = new()
- SI.runEvent()
- if(61 to 80)
- var/datum/round_event_control/spacevine/SV = new()
- var/datum/round_event_control/grey_tide/GT = new()
- SV.runEvent()
- GT.runEvent()
- qdel(src)
-
-/obj/effect/rune/apocalypse/proc/image_handler(list/images, duration)
- var/end = world.time + duration
- set waitfor = 0
- while(end>world.time)
- for(var/image/I in images)
- I.override = FALSE
- animate(I, alpha = 0, time = 25, flags = ANIMATION_PARALLEL)
- sleep(35)
- for(var/image/I in images)
- animate(I, alpha = 255, time = 25, flags = ANIMATION_PARALLEL)
- sleep(25)
- for(var/image/I in images)
- if(I.icon_state != "bloodsparkles")
- I.override = TRUE
- sleep(190)
-
-
-
-/proc/hudFix(mob/living/carbon/human/target)
- if(!target || !target.client)
- return
- var/obj/O = target.get_item_by_slot(ITEM_SLOT_EYES)
- if(istype(O, /obj/item/clothing/glasses/hud/security))
- var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
- AH.add_hud_to(target)
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
deleted file mode 100644
index db087e100e2f..000000000000
--- a/code/modules/antagonists/devil/devil.dm
+++ /dev/null
@@ -1,506 +0,0 @@
-#define BLOOD_THRESHOLD 3 //How many souls are needed per stage.
-#define TRUE_THRESHOLD 7
-#define ARCH_THRESHOLD 12
-
-#define BASIC_DEVIL 0
-#define BLOOD_lizard 1
-#define TRUE_DEVIL 2
-#define ARCH_DEVIL 3
-
-#define LOSS_PER_DEATH 2
-
-#define SOULVALUE soulsOwned.len-reviveNumber
-
-#define DEVILRESURRECTTIME 600
-
-GLOBAL_LIST_EMPTY(allDevils)
-GLOBAL_LIST_INIT(lawlorify, list (
- LORE = list(
- OBLIGATION_FOOD = "This devil seems to always offer its victims food before slaughtering them.",
- OBLIGATION_FIDDLE = "This devil will never turn down a musical challenge.",
- OBLIGATION_DANCEOFF = "This devil will never turn down a dance off.",
- OBLIGATION_GREET = "This devil seems to only be able to converse with people it knows the name of.",
- OBLIGATION_PRESENCEKNOWN = "This devil seems to be unable to attack from stealth.",
- OBLIGATION_SAYNAME = "He will always chant his name upon killing someone.",
- OBLIGATION_ANNOUNCEKILL = "This devil always loudly announces his kills for the world to hear.",
- OBLIGATION_ANSWERTONAME = "This devil always responds to his truename.",
- BAN_HURTWOMAN = "This devil seems to prefer hunting men.",
- BAN_CHAPEL = "This devil avoids holy ground.",
- BAN_HURTPRIEST = "The annointed clergy appear to be immune to his powers.",
- BAN_AVOIDWATER = "The devil seems to have some sort of aversion to water, though it does not appear to harm him.",
- BAN_STRIKEUNCONSCIOUS = "This devil only shows interest in those who are awake.",
- BAN_HURTlizard = "This devil will not strike a lizardman first.",
- BAN_HURTANIMAL = "This devil avoids hurting animals.",
- BANISH_WATER = "To banish the devil, you must infuse its body with holy water.",
- BANISH_COFFIN = "This devil will return to life if its remains are not placed within a coffin.",
- BANISH_FORMALDYHIDE = "To banish the devil, you must inject its lifeless body with embalming fluid.",
- BANISH_RUNES = "This devil will resurrect after death, unless its remains are within a rune.",
- BANISH_CANDLES = "A large number of nearby lit candles will prevent it from resurrecting.",
- BANISH_DESTRUCTION = "Its corpse must be utterly destroyed to prevent resurrection.",
- BANISH_FUNERAL_GARB = "If clad in funeral garments, this devil will be unable to resurrect. Should the clothes not fit, lay them gently on top of the devil's corpse."
- ),
- LAW = list(
- OBLIGATION_FOOD = "When not acting in self defense, you must always offer your victim food before harming them.",
- OBLIGATION_FIDDLE = "When not in immediate danger, if you are challenged to a musical duel, you must accept it. You are not obligated to duel the same person twice.",
- OBLIGATION_DANCEOFF = "When not in immediate danger, if you are challenged to a dance off, you must accept it. You are not obligated to face off with the same person twice.",
- OBLIGATION_GREET = "You must always greet other people by their last name before talking with them.",
- OBLIGATION_PRESENCEKNOWN = "You must always make your presence known before attacking.",
- OBLIGATION_SAYNAME = "You must always say your true name after you kill someone.",
- OBLIGATION_ANNOUNCEKILL = "Upon killing someone, you must make your deed known to all within earshot, over comms if reasonably possible.",
- OBLIGATION_ANSWERTONAME = "If you are not under attack, you must always respond to your true name.",
- BAN_HURTWOMAN = "You must never harm a female outside of self defense.",
- BAN_CHAPEL = "You must never attempt to enter the chapel.",
- BAN_HURTPRIEST = "You must never attack a priest.",
- BAN_AVOIDWATER = "You must never willingly touch a wet surface.",
- BAN_STRIKEUNCONSCIOUS = "You must never strike an unconscious person.",
- BAN_HURTlizard = "You must never harm a lizardman outside of self defense.",
- BAN_HURTANIMAL = "You must never harm a non-sentient creature or robot outside of self defense.",
- BANISH_WATER = "If your corpse is filled with holy water, you will be unable to resurrect.",
- BANISH_COFFIN = "If your corpse is in a coffin, you will be unable to resurrect.",
- BANISH_FORMALDYHIDE = "If your corpse is embalmed, you will be unable to resurrect.",
- BANISH_RUNES = "If your corpse is placed within a rune, you will be unable to resurrect.",
- BANISH_CANDLES = "If your corpse is near lit candles, you will be unable to resurrect.",
- BANISH_DESTRUCTION = "If your corpse is destroyed, you will be unable to resurrect.",
- BANISH_FUNERAL_GARB = "If your corpse is clad in funeral garments, you will be unable to resurrect."
- )
- ))
-
-//These are also used in the codex gigas, so let's declare them globally.
-GLOBAL_LIST_INIT(devil_pre_title, list("Dark ", "Hellish ", "Fallen ", "Fiery ", "Sinful ", "Blood ", "Fluffy "))
-GLOBAL_LIST_INIT(devil_title, list("Lord ", "Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept "))
-GLOBAL_LIST_INIT(devil_syllable, list("hal", "ve", "odr", "neit", "ci", "quon", "mya", "folth", "wren", "geyr", "hil", "niet", "twou", "phi", "coa"))
-GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr."))
-/datum/antagonist/devil
- name = "Devil"
- roundend_category = "devils"
- antagpanel_category = "Devil"
- job_rank = ROLE_DEVIL
- antag_hud_type = ANTAG_HUD_DEVIL
- antag_hud_name = "devil"
- show_to_ghosts = TRUE
- var/obligation
- var/ban
- var/banish
- var/truename
- var/list/datum/mind/soulsOwned = new
- var/reviveNumber = 0
- var/form = BASIC_DEVIL
- var/static/list/devil_spells = typecacheof(list(
- /obj/effect/proc_holder/spell/aimed/fireball/hellish,
- /obj/effect/proc_holder/spell/targeted/infernal_jaunt,
- /obj/effect/proc_holder/spell/targeted/sintouch,
- /obj/effect/proc_holder/spell/targeted/sintouch/ascended,
- /obj/effect/proc_holder/spell/targeted/summon_contract,
- /obj/effect/proc_holder/spell/targeted/conjure_item/violin,
- /obj/effect/proc_holder/spell/targeted/summon_dancefloor))
- var/ascendable = FALSE
-
-/datum/antagonist/devil/can_be_owned(datum/mind/new_owner)
- . = ..()
- return . && (ishuman(new_owner.current) || iscyborg(new_owner.current))
-
-/datum/antagonist/devil/get_admin_commands()
- . = ..()
- .["Toggle ascendable"] = CALLBACK(src, PROC_REF(admin_toggle_ascendable))
-
-
-/datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin)
- ascendable = !ascendable
- message_admins("[key_name_admin(admin)] set [key_name_admin(owner)] devil ascendable to [ascendable]")
- log_admin("[key_name_admin(admin)] set [key_name(owner)] devil ascendable to [ascendable])")
-
-/datum/antagonist/devil/admin_add(datum/mind/new_owner,mob/admin)
- switch(alert(admin,"Should the devil be able to ascend",,"Yes","No","Cancel"))
- if("Yes")
- ascendable = TRUE
- if("No")
- ascendable = FALSE
- else
- return
- new_owner.add_antag_datum(src)
- message_admins("[key_name_admin(admin)] has devil'ed [key_name_admin(new_owner)]. [ascendable ? "(Ascendable)":""]")
- log_admin("[key_name(admin)] has devil'ed [key_name(new_owner)]. [ascendable ? "(Ascendable)":""]")
-
-/datum/antagonist/devil/antag_listing_name()
- return ..() + "([truename])"
-
-/proc/devilInfo(name)
- if(GLOB.allDevils[lowertext(name)])
- return GLOB.allDevils[lowertext(name)]
- else
- var/datum/fakeDevil/devil = new /datum/fakeDevil(name)
- GLOB.allDevils[lowertext(name)] = devil
- return devil
-
-/proc/randomDevilName()
- var/name = ""
- if(prob(65))
- if(prob(35))
- name = pick(GLOB.devil_pre_title)
- name += pick(GLOB.devil_title)
- var/probability = 100
- name += pick(GLOB.devil_syllable)
- while(prob(probability))
- name += pick(GLOB.devil_syllable)
- probability -= 20
- if(prob(40))
- name += pick(GLOB.devil_suffix)
- return name
-
-/proc/randomdevilobligation()
- return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME)
-
-/proc/randomdevilban()
- return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONSCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL)
-
-/proc/randomdevilbanish()
- return pick(BANISH_WATER, BANISH_COFFIN, BANISH_FORMALDYHIDE, BANISH_RUNES, BANISH_CANDLES, BANISH_DESTRUCTION, BANISH_FUNERAL_GARB)
-
-/datum/antagonist/devil/proc/add_soul(datum/mind/soul)
- if(soulsOwned.Find(soul))
- return
- soulsOwned += soul
- owner.current.set_nutrition(NUTRITION_LEVEL_FULL)
- to_chat(owner.current, "You feel satiated as you received a new soul.")
- update_hud()
- switch(SOULVALUE)
- if(0)
- to_chat(owner.current, "Your hellish powers have been restored.")
- give_appropriate_spells()
- if(BLOOD_THRESHOLD)
- increase_blood_lizard()
- if(TRUE_THRESHOLD)
- increase_true_devil()
- if(ARCH_THRESHOLD)
- increase_arch_devil()
-
-/datum/antagonist/devil/proc/remove_soul(datum/mind/soul)
- if(soulsOwned.Remove(soul))
- check_regression()
- to_chat(owner.current, "You feel as though a soul has slipped from your grasp.")
- update_hud()
-
-/datum/antagonist/devil/proc/check_regression()
- if(form == ARCH_DEVIL)
- return //arch devil can't regress
- //Yes, fallthrough behavior is intended, so I can't use a switch statement.
- if(form == TRUE_DEVIL && SOULVALUE < TRUE_THRESHOLD)
- regress_blood_lizard()
- if(form == BLOOD_lizard && SOULVALUE < BLOOD_THRESHOLD)
- regress_humanoid()
- if(SOULVALUE < 0)
- give_appropriate_spells()
- to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.")
-
-/datum/antagonist/devil/proc/regress_humanoid()
- to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.")
- if(ishuman(owner.current))
- var/mob/living/carbon/human/H = owner.current
- H.set_species(/datum/species/human, 1)
- H.regenerate_icons()
- give_appropriate_spells()
- if(istype(owner.current.loc, /obj/effect/dummy/phased_mob/slaughter/))
- owner.current.forceMove(get_turf(owner.current))//Fixes dying while jaunted leaving you permajaunted.
- form = BASIC_DEVIL
-
-/datum/antagonist/devil/proc/regress_blood_lizard()
- var/mob/living/carbon/true_devil/D = owner.current
- to_chat(D, "Your powers weaken, have more contracts be signed to regain power.")
- D.oldform.forceMove(D.drop_location())
- owner.transfer_to(D.oldform)
- give_appropriate_spells()
- qdel(D)
- form = BLOOD_lizard
- update_hud()
-
-
-/datum/antagonist/devil/proc/increase_blood_lizard()
- to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.")
- sleep(50)
- if(ishuman(owner.current))
- var/mob/living/carbon/human/H = owner.current
- H.set_species(/datum/species/lizard, 1)
- H.underwear = "Nude"
- H.undershirt = "Nude"
- H.socks = "Nude"
- H.dna.features["mcolor"] = "511" //A deep red
- H.regenerate_icons()
- else //Did the devil get hit by a staff of transmutation?
- owner.current.color = "#501010"
- give_appropriate_spells()
- form = BLOOD_lizard
-
-
-
-/datum/antagonist/devil/proc/increase_true_devil()
- to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.")
- sleep(50)
- var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc)
- A.faction |= "hell"
- owner.current.forceMove(A)
- A.oldform = owner.current
- owner.transfer_to(A)
- A.set_devil_name()
- give_appropriate_spells()
- form = TRUE_DEVIL
- update_hud()
-
-/datum/antagonist/devil/proc/increase_arch_devil()
- if(!ascendable)
- return
- var/mob/living/carbon/true_devil/D = owner.current
- to_chat(D, "You feel as though your form is about to ascend.")
- sleep(50)
- if(!D)
- return
- D.visible_message("[D]'s skin begins to erupt with spikes.", \
- "Your flesh begins creating a shield around yourself.")
- sleep(100)
- if(!D)
- return
- D.visible_message("The horns on [D]'s head slowly grow and elongate.", \
- "Your body continues to mutate. Your telepathic abilities grow.")
- sleep(90)
- if(!D)
- return
- D.visible_message("[D]'s body begins to violently stretch and contort.", \
- "You begin to rend apart the final barriers to ultimate power.")
- sleep(40)
- if(!D)
- return
- to_chat(D, "Yes!")
- sleep(10)
- if(!D)
- return
- to_chat(D, "YES!!")
- sleep(10)
- if(!D)
- return
- to_chat(D, "YE--")
- sleep(1)
- if(!D)
- return
- send_to_playing_players("\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"")
- sound_to_playing_players('sound/hallucinations/veryfar_noise.ogg')
- give_appropriate_spells()
- D.convert_to_archdevil()
- if(istype(D.loc, /obj/effect/dummy/phased_mob/slaughter/))
- D.forceMove(get_turf(D))//Fixes dying while jaunted leaving you permajaunted.
- var/area/A = get_area(owner.current)
- if(A)
- notify_ghosts("An arch devil has ascended in \the [A.name]. Reach out to the devil to be given a new shell for your soul.", source = owner.current, action=NOTIFY_ATTACK)
- sleep(50)
- form = ARCH_DEVIL
-
-/datum/antagonist/devil/proc/remove_spells()
- for(var/X in owner.spell_list)
- var/obj/effect/proc_holder/spell/S = X
- if(is_type_in_typecache(S, devil_spells))
- owner.RemoveSpell(S)
-
-/datum/antagonist/devil/proc/give_summon_contract()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_contract(null))
- if(obligation == OBLIGATION_FIDDLE)
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/violin(null))
- else if(obligation == OBLIGATION_DANCEOFF)
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_dancefloor(null))
-
-/datum/antagonist/devil/proc/give_appropriate_spells()
- remove_spells()
- give_summon_contract()
- if(SOULVALUE >= ARCH_THRESHOLD && ascendable)
- give_arch_spells()
- else if(SOULVALUE >= TRUE_THRESHOLD)
- give_true_spells()
- else if(SOULVALUE >= BLOOD_THRESHOLD)
- give_blood_spells()
- else if(SOULVALUE >= 0)
- give_base_spells()
-
-/datum/antagonist/devil/proc/give_base_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
-
-/datum/antagonist/devil/proc/give_blood_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
-
-/datum/antagonist/devil/proc/give_true_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null))
-
-/datum/antagonist/devil/proc/give_arch_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null))
-
-/datum/antagonist/devil/proc/beginResurrectionCheck(mob/living/body)
- if(SOULVALUE>0)
- to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.")
- sleep(DEVILRESURRECTTIME)
- if (!body || body.stat == DEAD)
- if(SOULVALUE>0)
- if(check_banishment(body))
- to_chat(owner.current, "Unfortunately, the mortals have finished a ritual that prevents your resurrection.")
- return -1
- else
- to_chat(owner.current, "WE LIVE AGAIN!")
- return hellish_resurrection(body)
- else
- to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.")
- return -1
- else
- to_chat(owner.current, "You seem to have resurrected without your hellish powers.")
- else
- to_chat(owner.current, "Your hellish powers are too weak to resurrect yourself.")
-
-/datum/antagonist/devil/proc/check_banishment(mob/living/body)
- switch(banish)
- if(BANISH_WATER)
- if(iscarbon(body))
- var/mob/living/carbon/H = body
- return H.reagents.has_reagent(/datum/reagent/water/holywater)
- return 0
- if(BANISH_COFFIN)
- return (body && istype(body.loc, /obj/structure/closet/crate/coffin))
- if(BANISH_FORMALDYHIDE)
- if(iscarbon(body))
- var/mob/living/carbon/H = body
- return H.reagents.has_reagent(/datum/reagent/toxin/formaldehyde)
- return 0
- if(BANISH_RUNES)
- if(body)
- for(var/obj/effect/decal/cleanable/crayon/R in range(0,body))
- if (R.name == "rune")
- return 1
- return 0
- if(BANISH_CANDLES)
- if(body)
- var/count = 0
- for(var/obj/item/candle/C in range(1,body))
- count += C.lit
- if(count>=4)
- return 1
- return 0
- if(BANISH_DESTRUCTION)
- if(body)
- return 0
- return 1
- if(BANISH_FUNERAL_GARB)
- if(ishuman(body))
- var/mob/living/carbon/human/H = body
- if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/suit/white_on_white))
- return 1
- return 0
- else
- for(var/obj/item/clothing/under/suit/white_on_white/B in range(0,body))
- if(B.loc == get_turf(B)) //Make sure it's not in someone's inventory or something.
- return 1
- return 0
-
-/datum/antagonist/devil/proc/hellish_resurrection(mob/living/body)
- message_admins("[key_name_admin(owner)] (true name is: [truename]) is resurrecting using hellish energy.")
- if(SOULVALUE < ARCH_THRESHOLD || !ascendable) // once ascended, arch devils do not go down in power by any means.
- reviveNumber += LOSS_PER_DEATH
- update_hud()
- if(body)
- body.revive(full_heal = TRUE, admin_revive = TRUE) //Adminrevive also recovers organs, preventing someone from resurrecting without a heart.
- if(istype(body.loc, /obj/effect/dummy/phased_mob/slaughter/))
- body.forceMove(get_turf(body))//Fixes dying while jaunted leaving you permajaunted.
- if(istype(body, /mob/living/carbon/true_devil))
- var/mob/living/carbon/true_devil/D = body
- if(D.oldform)
- D.oldform.revive(full_heal = TRUE, admin_revive = FALSE) // Heal the old body too, so the devil doesn't resurrect, then immediately regress into a dead body.
- if(body.stat == DEAD)
- create_new_body()
- else
- create_new_body()
- check_regression()
-
-/datum/antagonist/devil/proc/create_new_body()
- CRASH("Unable to find a blobstart landmark for hellish resurrection")
-
-/datum/antagonist/devil/proc/update_hud()
- if(iscarbon(owner.current))
- var/mob/living/C = owner.current
- if(C.hud_used && C.hud_used.devilsouldisplay)
- C.hud_used.devilsouldisplay.update_counter(SOULVALUE)
-
-/datum/antagonist/devil/greet()
- to_chat(owner.current, "You remember your link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.")
- to_chat(owner.current, "However, your infernal form is not without weaknesses.")
- to_chat(owner.current, "You may not use violence to coerce someone into selling their soul.")
- to_chat(owner.current, "You may not directly and knowingly physically harm a devil, other than yourself.")
- to_chat(owner.current, GLOB.lawlorify[LAW][ban])
- to_chat(owner.current, GLOB.lawlorify[LAW][obligation])
- to_chat(owner.current, GLOB.lawlorify[LAW][banish])
- to_chat(owner.current, "Remember, the crew can research your weaknesses if they find out your devil name.
")
- .=..()
-
-/datum/antagonist/devil/on_gain()
- truename = randomDevilName()
- ban = randomdevilban()
- obligation = randomdevilobligation()
- banish = randomdevilbanish()
- GLOB.allDevils[lowertext(truename)] = src
-
- antag_memory += "Your devilic true name is [truename]
[GLOB.lawlorify[LAW][ban]]
You may not use violence to coerce someone into selling their soul.
You may not directly and knowingly physically harm a devil, other than yourself.
[GLOB.lawlorify[LAW][obligation]]
[GLOB.lawlorify[LAW][banish]]
"
- if(issilicon(owner.current))
- var/mob/living/silicon/robot_devil = owner.current
- var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
- robot_devil.set_law_sixsixsix(laws)
- sleep(10)
- .=..()
-
-/datum/antagonist/devil/on_removal()
- to_chat(owner.current, "Your infernal link has been severed! You are no longer a devil!")
- .=..()
-
-/datum/antagonist/devil/apply_innate_effects(mob/living/mob_override)
- give_appropriate_spells()
- var/mob/living/M = mob_override || owner.current
- add_antag_hud(antag_hud_type, antag_hud_name, M)
- handle_clown_mutation(M, mob_override ? null : "Your infernal nature has allowed you to overcome your clownishness.")
- owner.current.grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_DEVIL)
- update_hud()
- .=..()
-
-/datum/antagonist/devil/remove_innate_effects(mob/living/mob_override)
- for(var/X in owner.spell_list)
- var/obj/effect/proc_holder/spell/S = X
- if(is_type_in_typecache(S, devil_spells))
- owner.RemoveSpell(S)
- var/mob/living/M = mob_override || owner.current
- remove_antag_hud(antag_hud_type, M)
- handle_clown_mutation(M, removing = FALSE)
- owner.current.remove_all_languages(LANGUAGE_DEVIL)
- .=..()
-
-/datum/antagonist/devil/proc/printdevilinfo()
- var/list/parts = list()
- parts += "The devil's true name is: [truename]"
- parts += "The devil's bans were:"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][ban]]"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][obligation]]"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][banish]]"
- return parts.Join("
")
-
-/datum/antagonist/devil/roundend_report()
- var/list/parts = list()
- parts += printplayer(owner)
- parts += printdevilinfo()
- parts += printobjectives(objectives)
- return parts.Join("
")
-
-//A simple super light weight datum for the codex gigas.
-/datum/fakeDevil
- var/truename
- var/obligation
- var/ban
- var/banish
- var/ascendable
-
-/datum/fakeDevil/New(name = randomDevilName())
- truename = name
- obligation = randomdevilobligation()
- ban = randomdevilban()
- banish = randomdevilbanish()
- ascendable = prob(25)
diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm
deleted file mode 100644
index 21446d2661d8..000000000000
--- a/code/modules/antagonists/devil/imp/imp.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//////////////////The Monster
-
-/mob/living/simple_animal/imp
- name = "imp"
- real_name = "imp"
- unique_name = TRUE
- desc = "A large, menacing creature covered in armored black scales."
- speak_emote = list("cackles")
- emote_hear = list("cackles","screeches")
- response_help_continuous = "thinks better of touching"
- response_help_simple = "think better of touching"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- icon = 'icons/mob/mob.dmi'
- icon_state = "imp"
- icon_living = "imp"
- mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
- speed = 1
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- status_flags = CANPUSH
- attack_sound = 'sound/magic/demon_attack1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 250 //Weak to cold
- maxbodytemp = INFINITY
- faction = list("hell")
- attack_verb_continuous = "wildly tears into"
- attack_verb_simple = "wildly tear into"
- maxHealth = 200
- health = 200
- healable = 0
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- obj_damage = 40
- melee_damage_lower = 10
- melee_damage_upper = 15
- see_in_dark = 8
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- del_on_death = TRUE
- deathmessage = "screams in agony as it sublimates into a sulfurous smoke."
- deathsound = 'sound/magic/demon_dies.ogg'
- var/boost = 0
- var/list/consumed_mobs = list()
- var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \
- Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \
- of intentionally harming a fellow devil."
-
-/mob/living/simple_animal/imp/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_BLOODCRAWL_EAT, "innate")
- set_varspeed(1)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living, set_varspeed), 0), 30)
-
-/datum/antagonist/imp
- name = "Imp"
- antagpanel_category = "Devil"
- show_in_roundend = FALSE
-
-/datum/antagonist/imp/on_gain()
- . = ..()
- give_objectives()
-
-/datum/antagonist/imp/proc/give_objectives()
- var/datum/objective/newobjective = new
- newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
- newobjective.owner = owner
- objectives += newobjective
diff --git a/code/modules/antagonists/devil/sintouched/objectives.dm b/code/modules/antagonists/devil/sintouched/objectives.dm
deleted file mode 100644
index fcbb8dcbb55d..000000000000
--- a/code/modules/antagonists/devil/sintouched/objectives.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/datum/objective/sintouched
- completed = 1
-
-/datum/objective/sintouched/gluttony
- explanation_text = "Everything is so delicious. Go eat everything."
-
-/datum/objective/sintouched/greed
- explanation_text = "You want MORE, more money, more wealth, more riches. Go get it, but don't hurt people for it."
-
-/datum/objective/sintouched/sloth
- explanation_text = "You just get tired randomly. Go take a nap at a time that would inconvenience other people."
-
-/datum/objective/sintouched/wrath
- explanation_text = "What have your coworkers ever done for you? Don't offer to help them in any matter, and refuse if asked."
-
-/datum/objective/sintouched/envy
- explanation_text = "Why should you be stuck with your rank? Show everyone you can do other jobs too, and don't let anyone stop you, least of all because you have no training"
-
-/datum/objective/sintouched/pride
- explanation_text = "You are the BEST thing on the station. Make sure everyone knows it."
-
-/datum/objective/sintouched/acedia
- explanation_text = "Angels, devils, good, evil... who cares? Just ignore any hellish threats and do your job."
diff --git a/code/modules/antagonists/devil/sintouched/sintouched.dm b/code/modules/antagonists/devil/sintouched/sintouched.dm
deleted file mode 100644
index 064e1fbaecd0..000000000000
--- a/code/modules/antagonists/devil/sintouched/sintouched.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-#define SIN_ACEDIA "acedia"
-#define SIN_GLUTTONY "gluttony"
-#define SIN_GREED "greed"
-#define SIN_SLOTH "sloth"
-#define SIN_WRATH "wrath"
-#define SIN_ENVY "envy"
-#define SIN_PRIDE "pride"
-
-/datum/antagonist/sintouched
- name = "sintouched"
- roundend_category = "sintouched"
- antagpanel_category = "Devil"
- antag_hud_type = ANTAG_HUD_SINTOUCHED
- antag_hud_name = "sintouched"
- var/sin
-
- var/static/list/sins = list(SIN_ACEDIA,SIN_GLUTTONY,SIN_GREED,SIN_SLOTH,SIN_WRATH,SIN_ENVY,SIN_PRIDE)
-
-/datum/antagonist/sintouched/New()
- . = ..()
- sin = pick(sins)
-
-/datum/antagonist/sintouched/proc/forge_objectives()
- var/datum/objective/sintouched/O
- switch(sin)//traditional seven deadly sins... except lust.
- if(SIN_ACEDIA)
- O = new /datum/objective/sintouched/acedia
- if(SIN_GLUTTONY)
- O = new /datum/objective/sintouched/gluttony
- if(SIN_GREED)
- O = new /datum/objective/sintouched/greed
- if(SIN_SLOTH)
- O = new /datum/objective/sintouched/sloth
- if(SIN_WRATH)
- O = new /datum/objective/sintouched/wrath
- if(SIN_ENVY)
- O = new /datum/objective/sintouched/envy
- if(SIN_PRIDE)
- O = new /datum/objective/sintouched/pride
- objectives += O
-
-/datum/antagonist/sintouched/on_gain()
- forge_objectives()
- . = ..()
-
-/datum/antagonist/sintouched/greet()
- owner.announce_objectives()
-
-/datum/antagonist/sintouched/roundend_report()
- return printplayer(owner)
-
-/datum/antagonist/sintouched/admin_add(datum/mind/new_owner,mob/admin)
- var/choices = sins + "Random"
- var/chosen_sin = input(admin,"What kind ?","Sin kind") as null|anything in sortList(choices)
- if(!chosen_sin)
- return
- if(chosen_sin in sins)
- sin = chosen_sin
- . = ..()
-
-/datum/antagonist/sintouched/apply_innate_effects(mob/living/mob_override)
- var/mob/living/M = mob_override || owner.current
- add_antag_hud(antag_hud_type, antag_hud_name, M)
-
-/datum/antagonist/sintouched/remove_innate_effects(mob/living/mob_override)
- var/mob/living/M = mob_override || owner.current
- remove_antag_hud(antag_hud_type, M)
-
-
-#undef SIN_ACEDIA
-#undef SIN_ENVY
-#undef SIN_GLUTTONY
-#undef SIN_GREED
-#undef SIN_PRIDE
-#undef SIN_SLOTH
-#undef SIN_WRATH
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
deleted file mode 100644
index 4703f95263f7..000000000000
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ /dev/null
@@ -1,221 +0,0 @@
-#define DEVIL_HANDS_LAYER 1
-#define DEVIL_HEAD_LAYER 2
-#define DEVIL_TOTAL_LAYERS 2
-
-
-/mob/living/carbon/true_devil
- name = "True Devil"
- desc = "A pile of infernal energy, taking a vaguely humanoid form."
- icon = 'icons/mob/32x64.dmi'
- icon_state = "true_devil"
- gender = NEUTER
- health = 350
- maxHealth = 350
- ventcrawler = VENTCRAWLER_NONE
- density = TRUE
- pass_flags = 0
- sight = (SEE_TURFS | SEE_OBJS)
- status_flags = CANPUSH
- mob_size = MOB_SIZE_LARGE
- held_items = list(null, null)
- bodyparts = list(
- /obj/item/bodypart/chest/devil,
- /obj/item/bodypart/head/devil,
- /obj/item/bodypart/l_arm/devil,
- /obj/item/bodypart/r_arm/devil,
- /obj/item/bodypart/leg/right/devil,
- /obj/item/bodypart/leg/left/devil,
- )
- hud_type = /datum/hud/devil
- var/ascended = FALSE
- var/mob/living/oldform
- var/list/devil_overlays[DEVIL_TOTAL_LAYERS]
-
-/mob/living/carbon/true_devil/Initialize()
- create_bodyparts() //initialize bodyparts
- create_internal_organs()
- grant_all_languages()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
-
-/mob/living/carbon/true_devil/create_internal_organs()
- internal_organs += new /obj/item/organ/brain
- internal_organs += new /obj/item/organ/tongue
- internal_organs += new /obj/item/organ/eyes
- internal_organs += new /obj/item/organ/ears/invincible //Prevents hearing loss from poorly aimed fireballs.
- ..()
-
-/mob/living/carbon/true_devil/proc/convert_to_archdevil()
- maxHealth = 500 // not an IMPOSSIBLE amount, but still near impossible.
- ascended = TRUE
- health = maxHealth
- icon_state = "arch_devil"
-
-/mob/living/carbon/true_devil/proc/set_devil_name()
- var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(/datum/antagonist/devil)
- name = devilinfo.truename
- real_name = name
-
-/mob/living/carbon/true_devil/Login()
- . = ..()
- if(!. || !client)
- return FALSE
- var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(/datum/antagonist/devil)
- devilinfo.greet()
- mind.announce_objectives()
-
-/mob/living/carbon/true_devil/death(gibbed)
- set_stat(DEAD)
- ..(gibbed)
- drop_all_held_items()
- INVOKE_ASYNC(mind.has_antag_datum(/datum/antagonist/devil), TYPE_PROC_REF(/datum/antagonist/devil, beginResurrectionCheck), src)
-
-
-/mob/living/carbon/true_devil/examine(mob/user)
- . = list("This is [icon2html(src, user)] [src]!")
-
- //Left hand items
- for(var/obj/item/I in held_items)
- if(!(I.item_flags & ABSTRACT))
- . += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]."
-
- //Braindead
- if(!client && stat != DEAD)
- . += "The devil seems to be in deep contemplation."
-
- //Damaged
- if(stat == DEAD)
- . += "The hellfire seems to have been extinguished, for now at least."
- else if(health < (maxHealth/10))
- . += "You can see hellfire inside its gaping wounds."
- else if(health < (maxHealth/2))
- . += "You can see hellfire inside its wounds."
- . += ""
-
-/mob/living/carbon/true_devil/IsAdvancedToolUser()
- return 1
-
-/mob/living/carbon/true_devil/resist_buckle()
- if(buckled)
- buckled.user_unbuckle_mob(src,src)
- visible_message("[src] easily breaks out of [p_their()] handcuffs!", \
- "With just a thought your handcuffs fall off.")
-
-/mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE)
- if(incapacitated())
- to_chat(src, "You can't do that right now!")
- return FALSE
- if(be_close && !in_range(M, src))
- to_chat(src, "You are too far away!")
- return FALSE
- return TRUE
-
-/mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
- return 666
-
-/mob/living/carbon/true_devil/soundbang_act()
- return 0
-
-/mob/living/carbon/true_devil/get_ear_protection()
- return 2
-
-
-/mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone)
- apply_damage(I.force, I.damtype, def_zone)
- var/message_verb = ""
- if(I.attack_verb && I.attack_verb.len)
- message_verb = "[pick(I.attack_verb)]"
- else if(I.force)
- message_verb = "attacked"
-
- var/attack_message = "[src] has been [message_verb] with [I]."
- if(user)
- user.do_attack_animation(src)
- if(user in viewers(src, null))
- attack_message = "[user] has [message_verb] [src] with [I]!"
- if(message_verb)
- visible_message("[attack_message]",
- "[attack_message]", null, COMBAT_MESSAGE_RANGE)
- return TRUE
-
-/mob/living/carbon/true_devil/singularity_act()
- if(ascended)
- return 0
- return ..()
-
-//ATTACK GHOST IGNORING PARENT RETURN VALUE
-/mob/living/carbon/true_devil/attack_ghost(mob/dead/observer/user as mob)
- if(ascended || user.mind.soulOwner == src.mind)
- var/mob/living/simple_animal/imp/S = new(get_turf(loc))
- S.key = user.key
- var/datum/antagonist/imp/A = new()
- S.mind.add_antag_datum(A)
- to_chat(S, S.playstyle_string)
- else
- return ..()
-
-/mob/living/carbon/true_devil/can_be_revived()
- return 1
-
-/mob/living/carbon/true_devil/resist_fire()
- //They're immune to fire.
-
-/mob/living/carbon/true_devil/attack_hand(mob/living/carbon/human/M)
- . = ..()
- if(.)
- switch(M.a_intent)
- if ("harm")
- var/damage = rand(1, 5)
- playsound(loc, "punch", 25, TRUE, -1)
- visible_message("[M] punches [src]!", \
- "[M] punches you!")
- adjustBruteLoss(damage)
- log_combat(M, src, "attacked")
- updatehealth()
- if ("disarm")
- if (!(mobility_flags & MOBILITY_STAND) && !ascended) //No stealing the arch devil's pitchfork.
- if (prob(5))
- Unconscious(40)
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
- log_combat(M, src, "pushed")
- visible_message("[M] pushes [src] down!", \
- "[M] pushes you down!")
- else
- if (prob(25))
- dropItemToGround(get_active_held_item())
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
- visible_message("[M] disarms [src]!", \
- "[M] disarms you!")
- else
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
- visible_message("[M] fails to disarm [src]!", \
- "[M] fails to disarm you!")
-
-/mob/living/carbon/true_devil/handle_breathing()
- // devils do not need to breathe
-
-/mob/living/carbon/true_devil/is_literate()
- return TRUE
-
-/mob/living/carbon/true_devil/ex_act(severity, ex_target)
- if(!ascended)
- var/b_loss
- switch (severity)
- if (EXPLODE_DEVASTATE)
- b_loss = 500
- if (EXPLODE_HEAVY)
- b_loss = 150
- if (EXPLODE_LIGHT)
- b_loss = 30
- adjustBruteLoss(b_loss)
- return ..()
-
-
-/mob/living/carbon/true_devil/update_body() //we don't use the bodyparts layer for devils.
- return
-
-/mob/living/carbon/true_devil/update_body_parts()
- return
-
-/mob/living/carbon/true_devil/update_damage_overlays() //devils don't have damage overlays.
- return
diff --git a/code/modules/antagonists/devil/true_devil/inventory.dm b/code/modules/antagonists/devil/true_devil/inventory.dm
deleted file mode 100644
index a3d0dbdf582b..000000000000
--- a/code/modules/antagonists/devil/true_devil/inventory.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
- if(..())
- update_inv_hands()
- return 1
- return 0
-
-/mob/living/carbon/true_devil/update_inv_hands()
- //TODO LORDPIDEY: Figure out how to make the hands line up properly. the l/r_hand_overlay should use the down sprite when facing down, left, or right, and the up sprite when facing up.
- remove_overlay(DEVIL_HANDS_LAYER)
- var/list/hands_overlays = list()
- var/obj/item/l_hand = get_item_for_held_index(1) //hardcoded 2-hands only, for now.
- var/obj/item/r_hand = get_item_for_held_index(2)
-
- if(r_hand)
- var/mutable_appearance/r_hand_overlay = r_hand.build_worn_icon(default_layer = DEVIL_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
-
- hands_overlays += r_hand_overlay
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
- r_hand.plane = ABOVE_HUD_PLANE
- r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
- client.screen |= r_hand
-
- if(l_hand)
- var/mutable_appearance/l_hand_overlay = l_hand.build_worn_icon(default_layer = DEVIL_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
-
- hands_overlays += l_hand_overlay
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
- l_hand.plane = ABOVE_HUD_PLANE
- l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
- client.screen |= l_hand
- if(hands_overlays.len)
- devil_overlays[DEVIL_HANDS_LAYER] = hands_overlays
- apply_overlay(DEVIL_HANDS_LAYER)
-
-/mob/living/carbon/true_devil/remove_overlay(cache_index)
- var/I = devil_overlays[cache_index]
- if(I)
- cut_overlay(I)
- devil_overlays[cache_index] = null
-
-
-/mob/living/carbon/true_devil/apply_overlay(cache_index)
- if((. = devil_overlays[cache_index]))
- add_overlay(.)
diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm
index cb0cc12be0b4..d96e39733efd 100644
--- a/code/modules/antagonists/disease/disease_datum.dm
+++ b/code/modules/antagonists/disease/disease_datum.dm
@@ -86,13 +86,3 @@
/datum/objective/disease_infect_centcom
explanation_text = "Ensure that at least one infected host escapes on the shuttle or an escape pod."
-
-/datum/objective/disease_infect_centcom/check_completion()
- var/mob/camera/disease/D = owner.current
- if(!istype(D))
- return FALSE
- for(var/V in D.hosts)
- var/mob/living/L = V
- if(L.onCentCom() || L.onSyndieBase())
- return TRUE
- return FALSE
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 4fcceb227a77..8fbb858da103 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -99,9 +99,6 @@
if(GLOB.player_list.len < CHALLENGE_MIN_PLAYERS)
to_chat(user, "The enemy crew is too small to be worth declaring war on.")
return FALSE
- if(!user.onSyndieBase())
- to_chat(user, "You have to be at your base to use this.")
- return FALSE
if(world.time-SSticker.round_start_time > CHALLENGE_TIME_LIMIT)
to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")
return FALSE
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index c073a7c3521c..af4b5bd60892 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -473,8 +473,6 @@
off_station = NUKE_NEAR_MISS
if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)))
off_station = NUKE_NEAR_MISS
- else if(bomb_location.onSyndieBase())
- off_station = NUKE_SYNDICATE_BASE
else
off_station = NUKE_MISS_STATION
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index ca568bce6316..c623376dbdac 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -248,7 +248,7 @@
qdel(B)
new /obj/effect/temp_visual/revenant(T)
- if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
+ if(!isplatingturf(T) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)
new floor.floor_tile(floor)
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
deleted file mode 100644
index ea6fe83c8a07..000000000000
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ /dev/null
@@ -1,677 +0,0 @@
-////Deactivated swarmer shell////
-/obj/item/deactivated_swarmer
- name = "deactivated swarmer"
- desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_unactivated"
- custom_materials = list(/datum/material/iron=10000, /datum/material/glass=4000)
-
-/obj/effect/mob_spawn/swarmer
- name = "unactivated swarmer"
- desc = "A currently unactivated swarmer. Swarmers can self activate at any time, so it would be wise to immediately dispose of this."
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_unactivated"
- density = FALSE
- anchored = FALSE
-
- mob_type = /mob/living/simple_animal/hostile/swarmer
- mob_name = "a swarmer"
- death = FALSE
- roundstart = FALSE
- short_desc = "You are a swarmer, a weapon of a long dead civilization."
- flavour_text = {"
- You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.
- Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful.
- Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.
- Objectives:
- 1. Consume resources and replicate until there are no more resources left.
- 2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
- 3. Biological resources will be harvested at a later date; do not harm them.
- "}
-
-/obj/effect/mob_spawn/swarmer/Initialize()
- . = ..()
- var/area/A = get_area(src)
- if(A)
- notify_ghosts("A swarmer shell has been created in [A.name].", 'sound/effects/bin_close.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
-
-/obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- to_chat(user, "Picking up the swarmer may cause it to activate. You should be careful about this.")
-
-/obj/effect/mob_spawn/swarmer/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_SCREWDRIVER && user.a_intent != INTENT_HARM)
- user.visible_message("[usr.name] deactivates [src].",
- "After some fiddling, you find a way to disable [src]'s power source.",
- "You hear clicking.")
- new /obj/item/deactivated_swarmer(get_turf(src))
- qdel(src)
- else
- ..()
-
-////The Mob itself////
-
-/mob/living/simple_animal/hostile/swarmer
- name = "Swarmer"
- unique_name = 1
- icon = 'icons/mob/swarmer.dmi'
- desc = "Robotic constructs of unknown design, swarmers seek only to consume materials and replicate themselves indefinitely."
- speak_emote = list("tones")
- initial_language_holder = /datum/language_holder/swarmer
- bubble_icon = "swarmer"
- mob_biotypes = MOB_ROBOTIC
- health = 40
- maxHealth = 40
- status_flags = CANPUSH
- icon_state = "swarmer"
- icon_living = "swarmer"
- icon_dead = "swarmer_unactivated"
- icon_gib = null
- wander = 0
- harm_intent_damage = 5
- minbodytemp = 0
- maxbodytemp = 500
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- unsuitable_atmos_damage = 0
- melee_damage_lower = 15
- melee_damage_upper = 15
- melee_damage_type = STAMINA
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD)
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- attack_verb_continuous = "shocks"
- attack_verb_simple = "shock"
- attack_sound = 'sound/effects/empulse.ogg'
- friendly_verb_continuous = "pinches"
- friendly_verb_simple = "pinch"
- speed = 0
- faction = list("swarmer")
- AIStatus = AI_OFF
- pass_flags = PASSTABLE
- mob_size = MOB_SIZE_TINY
- ventcrawler = VENTCRAWLER_ALWAYS
- ranged = 1
- projectiletype = /obj/projectile/beam/disabler
- ranged_cooldown_time = 20
- projectilesound = 'sound/weapons/taser2.ogg'
- loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal)
- del_on_death = 1
- deathmessage = "explodes with a sharp pop!"
- light_color = LIGHT_COLOR_CYAN
- hud_type = /datum/hud/swarmer
- speech_span = SPAN_ROBOT
- var/resources = 0 //Resource points, generated by consuming metal/glass
- var/max_resources = 100
-
-/mob/living/simple_animal/hostile/swarmer/Initialize()
- . = ..()
- verbs -= /mob/living/verb/pulled
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_to_hud(src)
-
-/mob/living/simple_animal/hostile/swarmer/med_hud_set_health()
- var/image/holder = hud_list[DIAG_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]"
-
-/mob/living/simple_animal/hostile/swarmer/med_hud_set_status()
- var/image/holder = hud_list[DIAG_STAT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "hudstat"
-
-/mob/living/simple_animal/hostile/swarmer/Stat()
- ..()
- if(statpanel("Status"))
- stat("Resources:",resources)
-
-/mob/living/simple_animal/hostile/swarmer/emp_act()
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- if(health > 1)
- adjustHealth(health-1)
- else
- death()
-
-/mob/living/simple_animal/hostile/swarmer/CanAllowThrough(atom/movable/O)
- . = ..()
- if(istype(O, /obj/projectile/beam/disabler))//Allows for swarmers to fight as a group without wasting their shots hitting each other
- return TRUE
- if(isswarmer(O))
- return TRUE
-
-////CTRL CLICK FOR SWARMERS AND SWARMER_ACT()'S////
-/mob/living/simple_animal/hostile/swarmer/AttackingTarget()
- if(!isliving(target))
- return target.swarmer_act(src)
- else
- return ..()
-
-/mob/living/simple_animal/hostile/swarmer/CtrlClickOn(atom/A)
- face_atom(A)
- if(!isturf(loc))
- return
- if(next_move > world.time)
- return
- if(!A.Adjacent(src))
- return
- A.swarmer_act(src)
-
-/atom/proc/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE //return TRUE/FALSE whether or not an AI swarmer should try this swarmer_act() again, NOT whether it succeeded.
-
-/obj/effect/mob_spawn/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.Integrate(src)
- return FALSE //would logically be TRUE, but we don't want AI swarmers eating player spawn chances.
-
-/obj/effect/mob_spawn/swarmer/IntegrateAmount()
- return 50
-
-/turf/closed/indestructible/swarmer_act()
- return FALSE
-
-/obj/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- if(resistance_flags & INDESTRUCTIBLE)
- return FALSE
- for(var/mob/living/L in contents)
- if(!issilicon(L) && !isbrain(L))
- to_chat(S, "An organism has been detected inside this object. Aborting.")
- return FALSE
- return ..()
-
-/obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- return S.Integrate(src)
-
-/atom/movable/proc/IntegrateAmount()
- return 0
-
-/obj/item/IntegrateAmount() //returns the amount of resources gained when eating this item
- if(custom_materials)
- if(custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] || custom_materials[SSmaterials.GetMaterialRef(/datum/material/glass)])
- return 1
- return ..()
-
-/obj/item/gun/swarmer_act()//Stops you from eating the entire armory
- return FALSE
-
-/turf/open/swarmer_act()//ex_act() on turf calls it on its contents, this is to prevent attacking mobs by DisIntegrate()'ing the floor
- return FALSE
-
-/obj/structure/lattice/catwalk/swarmer_catwalk/swarmer_act()
- return FALSE
-
-/obj/structure/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- if(S.AIStatus == AI_ON)
- return FALSE
- else
- return ..()
-
-/obj/effect/swarmer_act()
- return FALSE
-
-/obj/effect/decal/cleanable/robot_debris/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- qdel(src)
- return TRUE
-
-/obj/structure/flora/swarmer_act()
- return FALSE
-
-/turf/open/lava/swarmer_act()
- if(!is_safe())
- new /obj/structure/lattice/catwalk/swarmer_catwalk(src)
- return FALSE
-
-/obj/machinery/atmospherics/swarmer_act()
- return FALSE
-
-/obj/structure/disposalpipe/swarmer_act()
- return FALSE
-
-/obj/machinery/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DismantleMachine(src)
- return TRUE
-
-/obj/machinery/light/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(get_area(src), /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return FALSE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return FALSE
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/camera/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- if(!QDELETED(S)) //If it got blown up no need to turn it off.
- toggle_cam(S, 0)
- return TRUE
-
-/obj/machinery/particle_accelerator/control_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/gravity_generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/vending/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//It's more visually interesting than dismantling the machine
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/turretid/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/chem_dispenser/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "The volatile chemicals in this machine would destroy us. Aborting.")
- return FALSE
-
-/obj/machinery/nuclearbomb/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.")
- return FALSE
-
-/obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.")
- return FALSE
-
-/obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would cause a chain reaction. Aborting.")
- return FALSE
-
-/obj/structure/cable/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/machinery/portable_atmospherics/canister/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.")
- return FALSE
-
-/obj/machinery/telecomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.")
- return FALSE
-
-/obj/machinery/deepfryer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.")
- return FALSE
-
-/obj/machinery/power/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/machinery/gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This bluespace source will be important to us later. Aborting.")
- return FALSE
-
-/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(loc, /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return TRUE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return TRUE
- return ..()
-
-/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(get_area(src), /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return TRUE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return TRUE
- return ..()
-
-/obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource
- to_chat(S, "This object does not contain enough materials to work with.")
- return FALSE
-
-/obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
- return FALSE
-
-/obj/machinery/porta_turret_cover/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
- return FALSE
-
-/mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisperseTarget(src)
- return TRUE
-
-/mob/living/simple_animal/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.")
- return FALSE
-
-/obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.")
- return FALSE
-
-/obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- . = ..()
- var/turf/here = get_turf(src)
- for(var/A in here.contents)
- var/obj/structure/cable/C = A
- if(istype(C))
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/item/deactivated_swarmer/IntegrateAmount()
- return 50
-
-/obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain enough materials to work with.")
- return FALSE
-
-/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would cause a catastrophic chain reaction. Aborting.")
- return FALSE
-
-/obj/machinery/field/containment/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain solid matter. Aborting.")
- return FALSE
-
-/obj/machinery/power/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would have an unpredictable effect on structure integrity. Aborting.")
- return FALSE
-
-/obj/machinery/shieldwall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain solid matter. Aborting.")
- return FALSE
-
-////END CTRL CLICK FOR SWARMERS////
-
-/mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,fabrication_cost = 0)
- if(!isturf(loc))
- to_chat(src, "This is not a suitable location for fabrication. We need more space.")
- if(resources >= fabrication_cost)
- resources -= fabrication_cost
- else
- to_chat(src, "You do not have the necessary resources to fabricate this object.")
- return
- return new fabrication_object(loc)
-
-/mob/living/simple_animal/hostile/swarmer/proc/Integrate(atom/movable/target)
- var/resource_gain = target.IntegrateAmount()
- if(resources + resource_gain > max_resources)
- to_chat(src, "We cannot hold more materials!")
- return TRUE
- if(resource_gain)
- resources += resource_gain
- do_attack_animation(target)
- changeNext_move(CLICK_CD_MELEE)
- var/obj/effect/temp_visual/swarmer/integrate/I = new /obj/effect/temp_visual/swarmer/integrate(get_turf(target))
- I.pixel_x = target.pixel_x
- I.pixel_y = target.pixel_y
- I.pixel_z = target.pixel_z
- if(istype(target, /obj/item/stack))
- var/obj/item/stack/S = target
- S.use(1)
- if(S.amount)
- return TRUE
- qdel(target)
- return TRUE
- else
- to_chat(src, "[target] is incompatible with our internal matter recycler.")
- return FALSE
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(atom/movable/target)
- new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
- do_attack_animation(target)
- changeNext_move(CLICK_CD_MELEE)
- SSexplosions.lowobj += target
-
-/mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(mob/living/target)
- if(target == src)
- return
-
- to_chat(src, "Attempting to remove this being from our presence.")
-
- if(!do_after(src, 3 SECONDS, target))
- return
-
- var/turf/open/floor/F
- F = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)
-
- if(!F)
- return
- // If we're getting rid of a human, slap some energy cuffs on
- // them to keep them away from us a little longer
-
- var/mob/living/carbon/human/H = target
- if(ishuman(target) && (!H.handcuffed))
- H.handcuffed = new /obj/item/restraints/handcuffs/energy/used(H)
- H.update_handcuffed()
- log_combat(src, H, "handcuffed")
-
- var/datum/effect_system/spark_spread/S = new
- S.set_up(4,0,get_turf(target))
- S.start()
- playsound(src,'sound/effects/sparks4.ogg',50,TRUE)
- do_teleport(target, F, 0, channel = TELEPORT_CHANNEL_BLUESPACE)
-
-/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
- if(!(flags & SHOCK_TESLA))
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target)
- do_attack_animation(target)
- to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.")
- var/obj/effect/temp_visual/swarmer/dismantle/D = new /obj/effect/temp_visual/swarmer/dismantle(get_turf(target))
- D.pixel_x = target.pixel_x
- D.pixel_y = target.pixel_y
- D.pixel_z = target.pixel_z
- if(do_after(src, 10 SECONDS, target))
- to_chat(src, "Dismantling complete.")
- var/atom/Tsec = target.drop_location()
- new /obj/item/stack/sheet/metal(Tsec, 5)
- for(var/obj/item/I in target.component_parts)
- I.forceMove(Tsec)
- var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
- N.pixel_x = target.pixel_x
- N.pixel_y = target.pixel_y
- N.pixel_z = target.pixel_z
- target.dropContents()
- if(istype(target, /obj/machinery/computer))
- var/obj/machinery/computer/C = target
- if(C.circuit)
- C.circuit.forceMove(Tsec)
- qdel(target)
-
-
-/obj/effect/temp_visual/swarmer //temporary swarmer visual feedback objects
- icon = 'icons/mob/swarmer.dmi'
- layer = BELOW_MOB_LAYER
-
-/obj/effect/temp_visual/swarmer/disintegration
- icon_state = "disintegrate"
- duration = 10
-
-/obj/effect/temp_visual/swarmer/disintegration/Initialize()
- . = ..()
- playsound(loc, "sparks", 100, TRUE)
-
-/obj/effect/temp_visual/swarmer/dismantle
- icon_state = "dismantle"
- duration = 25
-
-/obj/effect/temp_visual/swarmer/integrate
- icon_state = "integrate"
- duration = 5
-
-/obj/structure/swarmer //Default swarmer effect object visual feedback
- name = "swarmer ui"
- desc = null
- gender = NEUTER
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "ui_light"
- layer = MOB_LAYER
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- light_color = LIGHT_COLOR_CYAN
- max_integrity = 30
- anchored = TRUE
- var/lon_range = 1
-
-/obj/structure/swarmer/Initialize(mapload)
- . = ..()
- set_light(lon_range)
-
-/obj/structure/swarmer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- playsound(src, 'sound/weapons/egloves.ogg', 80, TRUE)
- if(BURN)
- playsound(src, 'sound/items/welder.ogg', 100, TRUE)
-
-/obj/structure/swarmer/emp_act()
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- qdel(src)
-
-/obj/structure/swarmer/trap
- name = "swarmer trap"
- desc = "A quickly assembled trap that electrifies living beings and overwhelms machine sensors. Will not retain its form if damaged enough."
- icon_state = "trap"
- max_integrity = 10
- density = FALSE
-
-/obj/structure/swarmer/trap/Initialize(mapload)
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/structure/swarmer/trap/proc/on_entered(datum/source, atom/movable/AM)
- SIGNAL_HANDLER
- if(isliving(AM))
- var/mob/living/L = AM
- if(!istype(L, /mob/living/simple_animal/hostile/swarmer))
- playsound(loc,'sound/effects/snap.ogg',50, TRUE, -1)
- L.electrocute_act(0, src, 1, flags = SHOCK_NOGLOVES|SHOCK_ILLUSION)
- if(iscyborg(L))
- L.Paralyze(100)
- qdel(src)
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateTrap()
- set name = "Create trap"
- set category = "Swarmer"
- set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources."
- if(locate(/obj/structure/swarmer/trap) in loc)
- to_chat(src, "There is already a trap here. Aborting.")
- return
- Fabricate(/obj/structure/swarmer/trap, 5)
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateBarricade()
- set name = "Create barricade"
- set category = "Swarmer"
- set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through."
- if(locate(/obj/structure/swarmer/blockade) in loc)
- to_chat(src, "There is already a blockade here. Aborting.")
- return
- if(resources < 5)
- to_chat(src, "We do not have the resources for this!")
- return
- if(do_after(src, 1 SECONDS))
- Fabricate(/obj/structure/swarmer/blockade, 5)
-
-
-/obj/structure/swarmer/blockade
- name = "swarmer blockade"
- desc = "A quickly assembled energy blockade. Will not retain its form if damaged enough, but disabler beams and swarmers pass right through."
- icon_state = "barricade"
- light_range = MINIMUM_USEFUL_LIGHT_RANGE
- max_integrity = 50
-
-/obj/structure/swarmer/blockade/CanAllowThrough(atom/movable/O)
- . = ..()
- if(isswarmer(O))
- return TRUE
- if(istype(O, /obj/projectile/beam/disabler))
- return TRUE
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateSwarmer()
- set name = "Replicate"
- set category = "Swarmer"
- set desc = "Creates a shell for a new swarmer. Swarmers will self activate."
- to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.")
- if(resources < 50)
- to_chat(src, "We do not have the resources for this!")
- return
- if(!isturf(loc))
- to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.")
- return
- if(do_after(src, 10 SECONDS))
- var/createtype = SwarmerTypeToCreate()
- if(createtype && Fabricate(createtype, 50))
- playsound(loc,'sound/items/poster_being_created.ogg',50, TRUE, -1)
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/SwarmerTypeToCreate()
- return /obj/effect/mob_spawn/swarmer
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/RepairSelf()
- set name = "Self Repair"
- set category = "Swarmer"
- set desc = "Attempts to repair damage to our body. You will have to remain motionless until repairs are complete."
- if(!isturf(loc))
- return
- to_chat(src, "Attempting to repair damage to our body, stand by...")
- if(do_after(src, 10 SECONDS))
- adjustHealth(-100)
- to_chat(src, "We successfully repaired ourselves.")
-
-/mob/living/simple_animal/hostile/swarmer/proc/ToggleLight()
- if(!light_range)
- set_light(3)
- else
- set_light(0)
-
-/mob/living/simple_animal/hostile/swarmer/proc/swarmer_chat(msg)
- var/rendered = "Swarm communication - [src] [say_quote(msg)]"
- for(var/i in GLOB.mob_list)
- var/mob/M = i
- if(isswarmer(M))
- to_chat(M, rendered)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [rendered]")
-
-/mob/living/simple_animal/hostile/swarmer/proc/ContactSwarmers()
- var/message = stripped_input(src, "Announce to other swarmers", "Swarmer contact")
- // TODO get swarmers their own colour rather than just boldtext
- if(message)
- swarmer_chat(message)
diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm
deleted file mode 100644
index e086485a49cf..000000000000
--- a/code/modules/antagonists/swarmer/swarmer_event.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/datum/round_event_control/spawn_swarmer
- name = "Spawn Swarmer Shell"
- typepath = /datum/round_event/spawn_swarmer
- weight = 7
- max_occurrences = 1 //Only once okay fam
- earliest_start = 30 MINUTES
- min_players = 15
-
-
-/datum/round_event/spawn_swarmer
-
-/datum/round_event/spawn_swarmer/start()
- if(find_swarmer())
- return 0
- if(!GLOB.the_gateway)
- return 0
- new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway))
- if(prob(25)) //25% chance to announce it to the crew
- var/swarmer_report = "[command_name()] High-Priority Update"
- swarmer_report += "
Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through."
- print_command_report(swarmer_report, announce=TRUE)
-
-/datum/round_event/spawn_swarmer/proc/find_swarmer()
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- if(istype(L, /mob/living/simple_animal/hostile/swarmer) && L.client) //If there is a swarmer with an active client, we've found our swarmer
- return 1
- return 0
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
deleted file mode 100644
index c426b953f725..000000000000
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ /dev/null
@@ -1,354 +0,0 @@
-/obj/item/soulstone
- name = "soulstone shard"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "soulstone"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- layer = HIGH_OBJ_LAYER
- desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power."
- w_class = WEIGHT_CLASS_TINY
- slot_flags = ITEM_SLOT_BELT
- var/usability = FALSE
-
- var/old_shard = FALSE
- var/spent = FALSE
- var/purified = FALSE
-
-/obj/item/soulstone/proc/was_used()
- if(old_shard)
- spent = TRUE
- name = "dull [name]"
- desc = "A fragment of the legendary treasure known simply as \
- the 'Soul Stone'. The shard lies still, dull and lifeless; \
- whatever spark it once held long extinguished."
-
-/obj/item/soulstone/anybody
- usability = TRUE
-
-/obj/item/soulstone/anybody/revolver
- old_shard = TRUE
-
-/obj/item/soulstone/anybody/purified
- icon = 'icons/obj/wizard.dmi'
- icon_state = "purified_soulstone"
- purified = TRUE
-
-/obj/item/soulstone/anybody/chaplain
- name = "mysterious old shard"
- old_shard = TRUE
-
-/obj/item/soulstone/pickup(mob/living/user)
- ..()
- if(!iscultist(user) && !iswizard(user) && !usability)
- to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.")
-
-/obj/item/soulstone/examine(mob/user)
- . = ..()
- if(usability || iscultist(user) || iswizard(user) || isobserver(user))
- if (old_shard)
- . += "A soulstone, used to capture a soul, either from dead humans or from freed shades."
- else
- . += "A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades."
- . += "The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade."
- if(spent)
- . += "This shard is spent; it is now just a creepy rock."
-
-/obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
- for(var/mob/living/simple_animal/shade/A in src)
- A.death()
- return ..()
-
-/obj/item/soulstone/proc/hot_potato(mob/living/user)
- to_chat(user, "Holy magics residing in \the [src] burn your hand!")
- var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
- affecting.receive_damage(0, 10) // 10 burn damage
- user.emote("scream")
- user.update_damage_overlays()
- user.dropItemToGround(src)
-
-//////////////////////////////Capturing////////////////////////////////////////////////////////
-
-/obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
- if(!iscultist(user) && !iswizard(user) && !usability)
- user.Unconscious(100)
- to_chat(user, "Your body is wracked with debilitating pain!")
- return
- if(spent)
- to_chat(user, "There is no power left in the shard.")
- return
- if(!ishuman(M))//If target is not a human.
- return ..()
- if((M.mind && !M.mind.hasSoul) || is_devil(M))
- to_chat(user, "This... thing has no soul! It's filled with evil!")
- return
- if(iscultist(M))
- if(iscultist(user))
- to_chat(user, "\"Come now, do not capture your bretheren's soul.\"")
- return
- if(purified && iscultist(user))
- hot_potato(user)
- return
- log_combat(user, M, "captured [M.name]'s soul", src)
- transfer_soul("VICTIM", M, user)
-
-///////////////////Options for using captured souls///////////////////////////////////////
-
-/obj/item/soulstone/attack_self(mob/living/user)
- if(!in_range(src, user))
- return
- if(!iscultist(user) && !iswizard(user) && !usability)
- user.Unconscious(100)
- to_chat(user, "Your body is wracked with debilitating pain!")
- return
- if(purified && iscultist(user))
- hot_potato(user)
- return
- release_shades(user)
-
-/obj/item/soulstone/proc/release_shades(mob/user)
- for(var/mob/living/simple_animal/shade/A in src)
- A.forceMove(get_turf(user))
- A.cancel_camera()
- if(purified)
- icon_state = "purified_soulstone"
- A.icon_state = "shade_angelic"
- A.name = "Purified [initial(A.name)]"
- else
- icon_state = "soulstone"
- name = initial(name)
- if(iswizard(user) || usability)
- to_chat(A, "You have been released from your prison, but you are still bound to [user.real_name]'s will. Help [user.p_them()] succeed in [user.p_their()] goals at all costs.")
- else if(iscultist(user))
- to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
- was_used()
-
-///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
-/obj/structure/constructshell
- name = "empty shell"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct_cult"
- desc = "A wicked machine used by those skilled in magical arts. It is inactive."
-
-/obj/structure/constructshell/examine(mob/user)
- . = ..()
- if(iscultist(user) || iswizard(user) || user.stat == DEAD)
- . += {"A construct shell, used to house bound souls from a soulstone.\n
- Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n
- An Artificer, which can produce more shells and soulstones, as well as fortifications.\n
- A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n
- A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."}
-
-/obj/structure/constructshell/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/soulstone))
- var/obj/item/soulstone/SS = O
- if(!iscultist(user) && !iswizard(user) && !SS.purified)
- to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")
- user.Dizzy(30)
- return
- if(SS.purified && iscultist(user))
- SS.hot_potato(user)
- return
- SS.transfer_soul("CONSTRUCT",src,user)
- SS.was_used()
- else
- return ..()
-
-////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-
-
-/obj/item/soulstone/proc/transfer_soul(choice as text, target, mob/user)
- switch(choice)
- if("FORCE")
- if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
- return FALSE
- if(contents.len)
- return FALSE
- var/mob/living/carbon/T = target
- if(T.client != null)
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user)
- return TRUE
- else
- to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...")
- return getCultGhost(T,user)
-
- if("VICTIM")
- var/mob/living/carbon/human/T = target
- var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(C && C.cult_team.is_sacrifice_target(T.mind))
- if(iscultist(user))
- to_chat(user, "\"This soul is mine. SACRIFICE THEM!\"")
- else
- to_chat(user, "The soulstone seems to reject this soul.")
- return FALSE
- if(contents.len)
- to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.")
- else
- if((!old_shard && T.stat != CONSCIOUS) || (old_shard && T.stat == DEAD))
- if(T.client == null)
- to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...")
- getCultGhost(T,user)
- else
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user, message_user = 1)
- qdel(T)
- else
- to_chat(user, "Capture failed!: Kill or maim the victim first!")
-
- if("SHADE")
- var/mob/living/simple_animal/shade/T = target
- if(contents.len)
- to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.")
- else
- T.AddComponent(/datum/component/soulstoned, src)
- if(purified)
- icon_state = "purified_soulstone2"
- if(iscultist(T))
- SSticker.mode.remove_cultist(T.mind, FALSE, FALSE)
- else
- icon_state = "soulstone2"
- name = "soulstone: Shade of [T.real_name]"
- to_chat(T, "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.")
- if(user != T)
- to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.")
-
- if("CONSTRUCT")
- var/obj/structure/constructshell/T = target
- var/mob/living/simple_animal/shade/A = locate() in src
- if(A)
- var/list/constructs = list(
- "Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = "juggernaut"),
- "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = "wraith"),
- "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = "artificer")
- )
- var/construct_class = show_radial_menu(user, src, constructs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- if(!T || !T.loc)
- return
- switch(construct_class)
- if("Juggernaut")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut/noncult, A, user, 0, T.loc)
- if("Wraith")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith/noncult, A, user, 0, T.loc)
- if("Artificer")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer/noncult, A, user, 0, T.loc)
- else
- return
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B == A.mind)
- SSticker.mode.remove_cultist(A.mind)
- qdel(T)
- qdel(src)
- else
- to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!")
-
-/obj/item/soulstone/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-/proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null)
- if(QDELETED(target))
- return
- var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target)))
- var/makeicon = newstruct.icon_state
- var/holyness = newstruct.holy
- flick("make_[makeicon][holyness]", newstruct)
- playsound(newstruct, 'sound/effects/constructform.ogg', 50)
- if(stoner)
- newstruct.faction |= "[REF(stoner)]"
- newstruct.master = stoner
- var/datum/action/innate/seek_master/SM = new()
- SM.Grant(newstruct)
- newstruct.key = target.key
- var/atom/movable/screen/alert/bloodsense/BS
- if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode)
- SSticker.mode.add_cultist(newstruct.mind, 0)
- if(iscultist(stoner) || cultoverride)
- to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner ? stoner.p_their() : "their"] orders and help [stoner ? stoner.p_them() : "them"] complete [stoner ? stoner.p_their() : "their"] goals at all costs.")
- else if(stoner)
- to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
- newstruct.clear_alert("bloodsense")
- BS = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
- if(BS)
- BS.Cviewer = newstruct
- newstruct.cancel_camera()
-
-
-/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/user, message_user = 0 , mob/shade_controller)
- if(!shade_controller)
- shade_controller = T
- new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
- T.stop_sound_channel(CHANNEL_HEARTBEAT)
- T.invisibility = INVISIBILITY_ABSTRACT
- T.dust_animation()
- var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade(src)
- S.AddComponent(/datum/component/soulstoned, src)
- S.name = "Shade of [T.real_name]"
- S.real_name = "Shade of [T.real_name]"
- S.key = shade_controller.key
- S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder.
- S.copy_languages(user, LANGUAGE_MASTER)
- S.update_atom_languages()
- grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue
- if(user)
- S.faction |= "[REF(user)]" //Add the master as a faction, allowing inter-mob cooperation
- if(user && iscultist(user))
- SSticker.mode.add_cultist(S.mind, 0)
- S.cancel_camera()
- name = "soulstone: Shade of [T.real_name]"
- if(purified)
- icon_state = "purified_soulstone2"
- else
- icon_state = "soulstone2"
- if(user && (iswizard(user) || usability))
- to_chat(S, "Your soul has been captured! You are now bound to [user.real_name]'s will. Help [user.p_them()] succeed in [user.p_their()] goals at all costs.")
- else if(user && iscultist(user))
- to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.")
- if(message_user && user)
- to_chat(user, "Capture successful!: [T.real_name]'s soul has been ripped from [T.p_their()] body and stored within the soul stone.")
-
-
-/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/user)
- var/mob/dead/observer/chosen_ghost
-
- chosen_ghost = T.get_ghost(TRUE,TRUE) //Try to grab original owner's ghost first
-
- if(!chosen_ghost || !chosen_ghost.client) //Failing that, we grab a ghosts
- var/list/consenting_candidates = pollGhostCandidates("Would you like to play as a Shade?", "Cultist", null, ROLE_CULTIST, 50, POLL_IGNORE_SHADE)
- if(consenting_candidates.len)
- chosen_ghost = pick(consenting_candidates)
- if(!T)
- return FALSE
- if(!chosen_ghost || !chosen_ghost.client)
- to_chat(user, "There were no spirits willing to become a shade.")
- return FALSE
- if(contents.len) //If they used the soulstone on someone else in the meantime
- return FALSE
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user , shade_controller = chosen_ghost)
- qdel(T)
- return TRUE
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 9f4349a2bbc8..4bd2f5c8a525 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -281,18 +281,6 @@
item_path = /obj/item/scrying
category = "Defensive"
-/datum/spellbook_entry/item/soulstones
- name = "Six Soul Stone Shards and the spell Artificer"
- desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot."
- item_path = /obj/item/storage/belt/soulstone/full
- category = "Assistance"
-
-/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
- . =..()
- if(.)
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null))
- return .
-
/datum/spellbook_entry/item/necrostone
name = "A Necromantic Stone"
desc = "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command."
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 2ec8e8dca620..4920de28e364 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -121,6 +121,7 @@
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
+ "stamp-biodynamics" = 'icons/stamp_icons/large_stamp-biodynamics.png',
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
)
@@ -241,7 +242,6 @@
"hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png',
"legion" = 'icons/UI_Icons/Achievements/Boss/legion.png',
"miner" = 'icons/UI_Icons/Achievements/Boss/miner.png',
- "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png',
"tendril" = 'icons/UI_Icons/Achievements/Boss/tendril.png',
"featofstrength" = 'icons/UI_Icons/Achievements/Misc/featofstrength.png',
"helbital" = 'icons/UI_Icons/Achievements/Misc/helbital.png',
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 0f76623f617c..c12b09fa4e05 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -129,12 +129,6 @@
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = TRUE
-/area/shuttle/snowdin/elevator1
- name = "Excavation Elevator"
-
-/area/shuttle/snowdin/elevator2
- name = "Mining Elevator"
-
//liquid plasma!!!!!!//
/turf/open/floor/plasteel/dark/snowdin
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
deleted file mode 100644
index 52c2a964cec4..000000000000
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Station-Collision(sc) away mission map specific stuff
- *
- * Notes:
- * Feel free to use parts of this map, or even all of it for your own project. Just include me in the credits :)
- *
- * Some of this code unnecessary, but the intent is to add a little bit of everything to serve as examples
- * for anyone who wants to make their own stuff.
- *
- * Contains:
- * Landmarks
- * Guns
- * Safe code hints
- * Captain's safe
- * Modified Nar'Sie
- */
-
-
-
-/*
- * Landmarks - Instead of spawning a new object type, I'll spawn the bible using a landmark!
- */
-/obj/effect/landmark/sc_bible_spawner
- name = "Safecode hint spawner"
-
-/obj/effect/landmark/sc_bible_spawner/Initialize()
- ..()
- var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible/booze(loc)
- B.name = "The Holy book of the Geometer"
- B.deity_name = "Narsie"
- B.icon_state = "melted"
- B.item_state = "melted"
- B.lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- B.righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- new /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B)
- new /obj/item/pen(B)
- return INITIALIZE_HINT_QDEL
-
-/*
- * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
- */
-//Captain's retro laser - Fires practice laser shots instead.
-/obj/item/gun/energy/laser/retro/sc_retro
- name ="retro laser"
- icon_state = "retro"
- desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
-// projectile_type = "/obj/projectile/practice"
-
-//Syndicate sub-machine guns.
-/obj/item/gun/ballistic/automatic/smg/cobra/sc_c20r
-
-/obj/item/gun/ballistic/automatic/smg/cobra/sc_c20r/Initialize()
- . = ..()
- for(var/ammo in magazine.stored_ammo)
- if(prob(95)) //95% chance
- magazine.stored_ammo -= ammo
-
-//Barman's shotgun
-/obj/item/gun/ballistic/shotgun/sc_pump
-
-/obj/item/gun/ballistic/shotgun/sc_pump/Initialize()
- . = ..()
- for(var/ammo in magazine.stored_ammo)
- if(prob(95)) //95% chance
- magazine.stored_ammo -= ammo
-
-//Lasers
-/obj/item/gun/energy/laser/practice/sc_laser
- name = "Old laser"
- desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly."
-
-/*
- * Safe code hints
- */
-
-//These vars hold the code itself, they'll be generated at round-start
-GLOBAL_VAR_INIT(sc_safecode1, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode2, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode3, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode4, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
-
-//Pieces of paper actually containing the hints
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison
- name = "smudged paper"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/Initialize()
- . = ..()
- default_raw_text = "The ink is smudged, you can only make out a couple numbers: '[GLOB.sc_safecode1]**[GLOB.sc_safecode4]*'"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro
- name = "shredded paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/Initialize()
- . = ..()
- default_raw_text = "Although the paper is shredded, you can clearly see the number: '[GLOB.sc_safecode2]'"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_caf
- name = "blood-soaked paper"
- //This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode]
- default_raw_text = "This paper is soaked in blood, it is impossible to read any text."
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible
- name = "hidden paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/Initialize()
- . = ..()
- default_raw_text = {"It would appear that the pen hidden with the paper had leaked ink over the paper.
- However you can make out the last three digits:'[GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]'
- "}
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_shuttle
- default_raw_text = {"Target: Research-station Epsilon
- Objective: Prototype weaponry. The captain likely keeps them locked in her safe.
-
- Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security
- Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and
- secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.
-
- As always, eliminate anyone who gets in the way.
-
- Your assigned ship is designed specifically for penetrating the hull of another station or ship with minimal damage to operatives.
- It is completely fly-by-wire meaning you have just have to enjoy the ride and when the red light comes on... find something to hold onto!
- "}
-/*
- * Captain's safe
- */
-/obj/item/storage/secure/safe/sc_ssafe
- name = "Captain's secure safe"
-
-/obj/item/storage/secure/safe/sc_ssafe/Initialize()
- . = ..()
- l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]"
- l_set = 1
- new /obj/item/gun/energy/mindflayer(src)
- new /obj/item/soulstone(src)
- new /obj/item/clothing/suit/space/hardsuit/cult(src)
- //new /obj/item/teleportation_scroll(src)
- new /obj/item/stack/ore/diamond(src)
-
-/*
- * Modified Nar'Sie
- */
-/obj/singularity/narsie/mini
- desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
- move_self = 0 //Contianed narsie does not move!
- grav_pull = 0 //Contained narsie does not pull stuff in!
-//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/mini/admin_investigate_setup()
- return
-
-/obj/singularity/narsie/mini/process()
- eat()
- if(prob(25))
- mezzer()
-
-/obj/singularity/narsie/mini/ex_act()
- return
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index dd931f378a59..c585ecb25a98 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -9,7 +9,6 @@
/obj/item/book_of_babel,
/obj/item/wisp_lantern,
/obj/item/reagent_containers/glass/bottle/potion/flight,
- /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
/obj/item/clothing/neck/memento_mori,
diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm
index 0df089543989..115dfdf3ff65 100644
--- a/code/modules/cargo/exports/parts.dm
+++ b/code/modules/cargo/exports/parts.dm
@@ -15,11 +15,6 @@
unit_name = "solar panel control board"
export_types = list(/obj/item/circuitboard/computer/solar_control)
-/datum/export/swarmer
- cost = 2000
- unit_name = "deactivated alien deconstruction drone"
- export_types = list(/obj/item/deactivated_swarmer)
-
//Computer Tablets and Parts
/datum/export/modular_part
cost = 15
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index a7ab407b428e..8d8f47a05f65 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -421,3 +421,11 @@
desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
contains = list(/obj/item/ammo_box/a44roum/hp)
cost = 500
+
+/datum/supply_pack/ammo/c22lr
+ name = ".22 LR Ammo Box Crate"
+ desc = "Contains two 75 round ammo boxes for refilling .22 LR weapons."
+ contains = list(/obj/item/ammo_box/c22lr_box,
+ /obj/item/ammo_box/c22lr_box)
+ crate_name = "ammo crate"
+ cost = 250
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ec5b7d188db0..91eab6d53f0f 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1153,7 +1153,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Hide Prayers: [(chat_toggles & CHAT_PRAYER)?"Shown":"Hidden"]
"
dat += "Split Admin Tabs: [(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"]
"
dat += "Fast MC Refresh: [(toggles & FAST_MC_REFRESH)?"Enabled":"Disabled"]
"
- dat += "Ignore Being Summoned as Cult Ghost: [(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"]
"
dat += "Briefing Officer Outfit: [brief_outfit]
"
if(CONFIG_GET(flag/allow_admin_asaycolor))
dat += "
"
@@ -2293,8 +2292,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
toggles ^= DEADMIN_POSITION_SECURITY
if("toggle_deadmin_silicon")
toggles ^= DEADMIN_POSITION_SILICON
- if("toggle_ignore_cult_ghost")
- toggles ^= ADMIN_IGNORE_CULT_GHOST
if("be_special")
var/be_special_type = href_list["be_special_type"]
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 8502f28185cb..108475c982b9 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -96,13 +96,6 @@
W.update_label()
..()
-/datum/outfit/ghost_cultist
- name = "Cultist Ghost"
-
- uniform = /obj/item/clothing/under/color/black/ghost
- suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
- shoes = /obj/item/clothing/shoes/cult/alt/ghost
-
/datum/outfit/wizard
name = "Blue Wizard"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index ad130ea45fac..234917e03d6d 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -126,29 +126,6 @@
icon_state = "explorer"
resistance_flags = FIRE_PROOF
-/obj/item/clothing/shoes/cult
- name = "\improper Nar'Sien invoker boots"
- desc = "A pair of boots worn by the followers of Nar'Sie."
- icon_state = "cult"
- item_state = "cult"
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
- heat_protection = FEET
- max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
- lace_time = 10 SECONDS
- greyscale_icon_state = "boots"
-
-/obj/item/clothing/shoes/cult/alt
- name = "cultist boots"
- icon_state = "cultalt"
-
-/obj/item/clothing/shoes/cult/alt/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/shoes/cult/alt/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
desc = "The height of fashion, and they're pre-polished!"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index bbd0d962601f..a6f3bfa7cf9d 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -15,7 +15,7 @@
/obj/item/clothing/under/color/random/Initialize()
..()
- var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/ancient - /obj/item/clothing/under/color/black/ghost)
+ var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/ancient)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new C(H), ITEM_SLOT_ICLOTHING) //or else you end up with naked assistants running around everywhere...
@@ -48,13 +48,6 @@
icon_state = "black_skirt"
item_state = "bl_suit"
-/obj/item/clothing/under/color/black/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/under/color/black/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
desc = "A tasteful grey jumpsuit that reminds you of the good old days."
diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm
deleted file mode 100644
index 656888f068bc..000000000000
--- a/code/modules/events/devil.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/datum/round_event_control/devil
- name = "Create Devil"
- typepath = /datum/round_event/ghost_role/devil
- max_occurrences = 0
-
-/datum/round_event/ghost_role/devil
- var/success_spawn = 0
- role_name = "devil"
- fakeable = FALSE
-
-/datum/round_event/ghost_role/devil/kill()
- if(!success_spawn && control)
- control.occurrences--
- return ..()
-
-/datum/round_event/ghost_role/devil/spawn_role()
- //selecting a candidate player
- var/list/candidates = get_candidates(ROLE_DEVIL, null, ROLE_DEVIL)
- if(!candidates.len)
- return NOT_ENOUGH_PLAYERS
-
- var/mob/dead/selected_candidate = pick_n_take(candidates)
- var/key = selected_candidate.key
-
- var/datum/mind/Mind = create_devil_mind(key)
- Mind.active = 1
-
- var/mob/living/carbon/human/devil = create_event_devil()
- Mind.transfer_to(devil)
- add_devil(devil, ascendable = FALSE)
-
- spawned_mobs += devil
- message_admins("[ADMIN_LOOKUPFLW(devil)] has been made into a devil by an event.")
- log_game("[key_name(devil)] was spawned as a devil by an event.")
- var/datum/job/jobdatum = new /datum/job/assistant()
- devil.job = jobdatum.name
- jobdatum.equip(devil)
- return SUCCESSFUL_SPAWN
-
-
-/proc/create_event_devil(spawn_loc)
- var/mob/living/carbon/human/new_devil = new(spawn_loc)
- var/datum/preferences/A = new() //Randomize appearance for the devil.
- A.copy_to(new_devil)
- new_devil.dna.update_dna_identity()
- return new_devil
-
-/proc/create_devil_mind(key)
- var/datum/mind/Mind = new /datum/mind(key)
- Mind.assigned_role = ROLE_DEVIL
- Mind.special_role = ROLE_DEVIL
- SSticker.mode.devils |= Mind
- return Mind
diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm
deleted file mode 100644
index 7fb00124a94d..000000000000
--- a/code/modules/events/major_dust.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/round_event_control/meteor_wave/major_dust
- name = "Major Space Dust"
- typepath = /datum/round_event/meteor_wave/major_dust
- weight = 8
-
-/datum/round_event/meteor_wave/major_dust
- wave_name = "space dust"
-
-/datum/round_event/meteor_wave/major_dust/announce(fake)
- var/reason = pick(
- "The station is passing through a debris cloud, expect minor damage \
- to external fittings and fixtures.",
- "Nanotrasen Superweapons Division is testing a new prototype \
- [pick("field","projection","nova","super-colliding","reactive")] \
- [pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
- some mild debris is expected.",
- "A neighbouring station is throwing rocks at you. (Perhaps they've \
- grown tired of your messages.)")
- priority_announce(pick(reason), "Collision Alert")
diff --git a/code/modules/events/meateor_wave.dm b/code/modules/events/meateor_wave.dm
deleted file mode 100644
index 11af56526c88..000000000000
--- a/code/modules/events/meateor_wave.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/datum/round_event_control/meteor_wave/meaty
- name = "Meteor Wave: Meaty"
- typepath = /datum/round_event/meteor_wave/meaty
- weight = 2
- max_occurrences = 1
-
-/datum/round_event/meteor_wave/meaty
- wave_name = "meaty"
-
-/datum/round_event/meteor_wave/meaty/announce(fake)
- priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.",'sound/ai/meteors.ogg')
diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm
deleted file mode 100644
index a8ddab5aa76a..000000000000
--- a/code/modules/events/meteor_wave.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-// Normal strength
-
-/datum/round_event_control/meteor_wave
- name = "Meteor Wave: Normal"
- typepath = /datum/round_event/meteor_wave
- weight = 4
- min_players = 15
- max_occurrences = 3
- earliest_start = 25 MINUTES
-
-/datum/round_event/meteor_wave
- startWhen = 6
- endWhen = 66
- announceWhen = 1
- var/list/wave_type
- var/wave_name = "normal"
-
-/datum/round_event/meteor_wave/New()
- ..()
- if(!wave_type)
- determine_wave_type()
-
-/datum/round_event/meteor_wave/proc/determine_wave_type()
- if(!wave_name)
- wave_name = pickweight(list(
- "normal" = 50,
- "threatening" = 40,
- "catastrophic" = 10))
- switch(wave_name)
- if("normal")
- wave_type = GLOB.meteors_normal
- if("threatening")
- wave_type = GLOB.meteors_threatening
- if("catastrophic")
- if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
- wave_type = GLOB.meteorsSPOOKY
- else
- wave_type = GLOB.meteors_catastrophic
- if("meaty")
- wave_type = GLOB.meteorsB
- if("space dust")
- wave_type = GLOB.meteorsC
- if("halloween")
- wave_type = GLOB.meteorsSPOOKY
- else
- WARNING("Wave name of [wave_name] not recognised.")
- kill()
-
-/datum/round_event/meteor_wave/announce(fake)
- priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
-
-/datum/round_event/meteor_wave/tick()
- if(ISMULTIPLE(activeFor, 3))
- spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
-
-/datum/round_event_control/meteor_wave/threatening
- name = "Meteor Wave: Threatening"
- typepath = /datum/round_event/meteor_wave/threatening
- weight = 5
- min_players = 20
- max_occurrences = 3
- earliest_start = 35 MINUTES
-
-/datum/round_event/meteor_wave/threatening
- wave_name = "threatening"
-
-/datum/round_event_control/meteor_wave/catastrophic
- name = "Meteor Wave: Catastrophic"
- typepath = /datum/round_event/meteor_wave/catastrophic
- weight = 7
- min_players = 25
- max_occurrences = 3
- earliest_start = 45 MINUTES
-
-/datum/round_event/meteor_wave/catastrophic
- wave_name = "catastrophic"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 0df04a08658b..db88c5d0cc15 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -365,6 +365,7 @@
icon_state = "ration_heater"
grind_results = list(/datum/reagent/iron = 10, /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5)
heat = 3800
+ w_class = WEIGHT_CLASS_SMALL
var/obj/item/tocook = null
var/mutable_appearance/ration_overlay
var/uses = 3
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 6e7e10a7cba6..d96e4591b050 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -291,11 +291,6 @@ Key procs
/datum/language/slime = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
-/datum/language_holder/swarmer
- understood_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
- blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
-
/datum/language_holder/venus
understood_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm
deleted file mode 100644
index 69155c9230d8..000000000000
--- a/code/modules/library/lib_codex_gigas.dm
+++ /dev/null
@@ -1,104 +0,0 @@
-#define PRE_TITLE 1
-#define TITLE 2
-#define SYLLABLE 3
-#define MULTIPLE_SYLLABLE 4
-#define SUFFIX 5
-
-/obj/item/book/codex_gigas
- name = "\improper Codex Gigas"
- desc = "A book documenting the nature of devils."
- icon_state ="demonomicon"
- lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- throw_speed = 1
- throw_range = 10
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- author = "Forces beyond your comprehension"
- unique = 1
- title = "the Codex Gigas"
- var/inUse = 0
- var/currentName = ""
- var/currentSection = PRE_TITLE
-
-/obj/item/book/codex_gigas/attack_self(mob/user)
- if(!user.can_read(src))
- return FALSE
- if(inUse)
- to_chat(user, "Someone else is reading it.")
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(U.check_acedia())
- to_chat(user, "None of this matters, why are you reading this? You put [title] down.")
- return
- user.visible_message("[user] opens [title] and begins reading intently.")
- ask_name(user)
-
-
-/obj/item/book/codex_gigas/proc/perform_research(mob/user, devilName)
- if(!devilName)
- user.visible_message("[user] closes [title] without looking anything up.")
- return
- inUse = TRUE
- var/speed = 300
- var/correctness = 85
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(U.job in list("Curator")) // the curator is both faster, and more accurate than normal crew members at research
- speed = 100
- correctness = 100
- correctness -= U.getOrganLoss(ORGAN_SLOT_BRAIN) * 0.5 //Brain damage makes researching hard.
- speed += U.getOrganLoss(ORGAN_SLOT_BRAIN) * 3
- if(do_after(user, speed, user, timed_action_flags = IGNORE_HELD_ITEM))
- var/usedName = devilName
- if(!prob(correctness))
- usedName += "x"
- var/datum/antagonist/devil/devil = devilInfo(usedName)
- display_devil(devil, user, usedName)
- sleep(10)
- onclose(user, "book")
- inUse = FALSE
-
-/obj/item/book/codex_gigas/proc/display_devil(datum/antagonist/devil/devil, mob/reader, devilName)
- reader << browse("Information on [devilName]
[GLOB.lawlorify[LORE][devil.ban]]
[GLOB.lawlorify[LORE][devil.obligation]]
[GLOB.lawlorify[LORE][devil.banish]]
[devil.ascendable?"This devil may ascend given enough souls.":""]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
-
-/obj/item/book/codex_gigas/proc/ask_name(mob/reader)
- ui_interact(reader)
-
-/obj/item/book/codex_gigas/ui_act(action, params)
- if(..())
- return
- if(!action)
- return FALSE
- if(action == "search")
- SStgui.close_uis(src)
- addtimer(CALLBACK(src, PROC_REF(perform_research), usr, currentName), 0)
- currentName = ""
- currentSection = PRE_TITLE
- return FALSE
- else
- currentName += action
- var/oldSection = currentSection
- if(GLOB.devil_pre_title.Find(action))
- currentSection = TITLE
- else if(GLOB.devil_title.Find(action))
- currentSection = SYLLABLE
- else if(GLOB.devil_syllable.Find(action))
- if (currentSection>=SYLLABLE)
- currentSection = MULTIPLE_SYLLABLE
- else
- currentSection = SYLLABLE
- else if(GLOB.devil_suffix.Find(action))
- currentSection = SUFFIX
- return currentSection != oldSection
-
-/obj/item/book/codex_gigas/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "CodexGigas", name)
- ui.open()
-
-/obj/item/book/codex_gigas/ui_data(mob/user)
- var/list/data = list()
- data["name"]=currentName
- data["currentSection"]=currentSection
- return data
diff --git a/code/modules/mapping/writer.dm b/code/modules/mapping/writer.dm
index 35d85edc7849..c07ce0029081 100644
--- a/code/modules/mapping/writer.dm
+++ b/code/modules/mapping/writer.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(save_file_chars, list(
var/turf_type = /turf/template_noop
var/area/place_area = get_area(place_turf)
var/area_type = /area/template_noop
- var/is_shuttle_area = istype(place_area, /area/shuttle)
+ var/is_shuttle_area = istype(place_area, /area/ship)
//If there is nothing there, save as a noop (For odd shapes)
if(!place_turf)
turf_type = /turf/template_noop
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 0cdc1f2dfc71..73d18f0ab885 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -15,10 +15,8 @@
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
var/loot = rand(1,29)
switch(loot)
- if(1)
+ if(1,2)
new /obj/item/shared_storage/red(src)
- if(2)
- new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/necromantic_stone/lava(src)
if(5)
@@ -1644,11 +1642,9 @@
name = "puzzling chest"
/obj/structure/closet/crate/necropolis/puzzle/PopulateContents()
- var/loot = rand(1,3)
+ var/loot = rand(1,2)
switch(loot)
if(1)
- new /obj/item/soulstone/anybody(src)
- if(2)
new /obj/item/wisp_lantern(src)
- if(3)
+ if(2)
new /obj/item/prisoncube(src)
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index ef0e51930828..6c733fd76692 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -8,7 +8,7 @@
/datum/map_template/shelter/New()
. = ..()
- banned_areas = typecacheof(/area/shuttle)
+ banned_areas = typecacheof(/area/ship)
blacklisted_turfs = typecacheof(list(/turf/closed, /turf/open/indestructible))
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 55adc5bd5d17..dad54c17ca0e 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -62,8 +62,6 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
log_message("has died (BRUTE: [src.getBruteLoss()], BURN: [src.getFireLoss()], TOX: [src.getToxLoss()], OXY: [src.getOxyLoss()], CLONE: [src.getCloneLoss()])", LOG_ATTACK)
- if(is_devil(src))
- INVOKE_ASYNC(is_devil(src), TYPE_PROC_REF(/datum/antagonist/devil, beginResurrectionCheck), src)
to_chat(src, "You have died. Barring complete bodyloss, you can in most cases be revived by other players. If you do not wish to be brought back, use the \"Do Not Resuscitate\" verb in the ghost tab.")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index cf3f5ec725ec..295537cfd95b 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -99,8 +99,6 @@
if(!(ITEM_SLOT_EYES in obscured))
if(glasses)
. += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes."
- else if(eye_color == BLOODCULT_EYE && iscultist(src) && HAS_TRAIT(src, CULT_EYES))
- . += "[t_His] eyes are glowing an unnatural red!"
//ears
if(ears && !(ITEM_SLOT_EARS in obscured))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 6046cfe82b63..76800ce87b1f 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1133,24 +1133,6 @@
/mob/living/carbon/alien/update_stamina()
return
-/mob/living/proc/owns_soul()
- if(mind)
- return mind.soulOwner == mind
- return TRUE
-
-/mob/living/proc/return_soul()
- hellbound = 0
- if(mind)
- var/datum/antagonist/devil/devilInfo = mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
- if(devilInfo)//Not sure how this could be null, but let's just try anyway.
- devilInfo.remove_soul(mind)
- mind.soulOwner = mind
-
-/mob/living/proc/check_acedia()
- if(mind && mind.has_objective(/datum/objective/sintouched/acedia))
- return TRUE
- return FALSE
-
/mob/living/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
stop_pulling()
. = ..()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2ed00efe2e4b..69cc19760dda 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -392,32 +392,6 @@
gib()
return 20
-/mob/living/narsie_act()
- if(status_flags & GODMODE || QDELETED(src))
- return
-
- if(GLOB.cult_narsie && GLOB.cult_narsie.souls_needed[src])
- GLOB.cult_narsie.souls_needed -= src
- GLOB.cult_narsie.souls += 1
- if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
- GLOB.cult_narsie.resolved = TRUE
- sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 1), 120)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270)
- if(client)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE)
- else
- switch(rand(1, 3))
- if(1)
- new /mob/living/simple_animal/hostile/construct/juggernaut/hostile(get_turf(src))
- if(2)
- new /mob/living/simple_animal/hostile/construct/wraith/hostile(get_turf(src))
- if(3)
- new /mob/living/simple_animal/hostile/construct/artificer/hostile(get_turf(src))
- spawn_dust()
- gib()
- return TRUE
-
//called when the mob receives a bright flash
/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash)
if(HAS_TRAIT(src, TRAIT_NOFLASH))
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index 30c7cd435068..5f14b72596ac 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -19,11 +19,6 @@
addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0)
last_lawchange_announce = world.time
-/mob/living/silicon/proc/set_law_sixsixsix(law, announce = TRUE)
- laws_sanity_check()
- laws.set_law_sixsixsix(law)
- post_lawchange(announce)
-
/mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE)
laws_sanity_check()
laws.set_zeroth_law(law, law_borg)
@@ -93,8 +88,3 @@
laws_sanity_check()
laws.clear_zeroth_law(force)
post_lawchange(announce)
-
-/mob/living/silicon/proc/clear_law_sixsixsix(force, announce = TRUE)
- laws_sanity_check()
- laws.clear_law_sixsixsix(force)
- post_lawchange(announce)
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index 559ad42b1768..982814d194d2 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,6 +1,4 @@
/mob/living/silicon/Login()
- if(mind && SSticker.mode)
- SSticker.mode.remove_cultist(mind, 0, 0)
return ..()
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index df62df082751..1fc33e9dcdd0 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -40,12 +40,6 @@
var/datum/ai_laws/master = connected_ai ? connected_ai.laws : null
var/temp
if (master)
- laws.devillaws.len = master.devillaws.len
- for (var/index = 1, index <= master.devillaws.len, index++)
- temp = master.devillaws[index]
- if (length(temp) > 0)
- laws.devillaws[index] = temp
-
laws.ion.len = master.ion.len
for (var/index = 1, index <= master.ion.len, index++)
temp = master.ion[index]
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 347ec71e84e4..7da3e76d03ff 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -32,7 +32,6 @@
var/lawcheck[1]
var/ioncheck[1]
var/hackedcheck[1]
- var/devillawcheck[5]
var/sensors_on = 0
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
@@ -206,16 +205,6 @@
hackedcheck[L] = "Yes"
checklaws()
- if (href_list["lawdevil"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
- var/L = text2num(href_list["lawdevil"])
- switch(devillawcheck[L])
- if ("Yes")
- devillawcheck[L] = "No"
- if ("No")
- devillawcheck[L] = "Yes"
- checklaws()
-
-
if (href_list["laws"]) // With how my law selection code works, I changed statelaws from a verb to a proc, and call it through my law selection panel. --NeoFite
statelaws()
@@ -234,13 +223,6 @@
var/number = 1
sleep(10)
- if (laws.devillaws && laws.devillaws.len)
- for(var/index = 1, index <= laws.devillaws.len, index++)
- if (force || devillawcheck[index] == "Yes")
- say("[radiomod] 666. [laws.devillaws[index]]")
- sleep(10)
-
-
if (laws.zeroth)
if (force || lawcheck[1] == "Yes")
say("[radiomod] 0. [laws.zeroth]")
@@ -286,12 +268,6 @@
var/list = "Which laws do you want to include when stating them for the crew?
"
- if (laws.devillaws && laws.devillaws.len)
- for(var/index = 1, index <= laws.devillaws.len, index++)
- if (!devillawcheck[index])
- devillawcheck[index] = "No"
- list += {"[devillawcheck[index]] 666: [laws.devillaws[index]]
"}
-
if (laws.zeroth)
if (!lawcheck[1])
lawcheck[1] = "No" //Given Law 0's usual nature, it defaults to NOT getting reported. --NeoFite
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
deleted file mode 100644
index df3cfe349808..000000000000
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ /dev/null
@@ -1,497 +0,0 @@
-/mob/living/simple_animal/hostile/construct
- name = "Construct"
- real_name = "Construct"
- desc = ""
- gender = NEUTER
- mob_biotypes = NONE
- speak_emote = list("hisses")
- response_help_continuous = "thinks better of touching"
- response_help_simple = "think better of touching"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- speak_chance = 1
- icon = 'icons/mob/cult.dmi'
- speed = 0
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- status_flags = CANPUSH
- attack_sound = 'sound/weapons/punch1.ogg'
- see_in_dark = 7
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = INFINITY
- healable = 0
- faction = list("cult")
- movement_type = FLYING
- pressure_resistance = 100
- unique_name = 1
- AIStatus = AI_OFF //normal constructs don't have AI
- loot = list(/obj/item/ectoplasm)
- del_on_death = TRUE
- initial_language_holder = /datum/language_holder/construct
- deathmessage = "collapses in a shattered heap."
- hud_type = /datum/hud/constructs
- var/list/construct_spells = list()
- var/playstyle_string = "You are a generic construct! Your job is to not exist, and you should probably adminhelp this."
- var/master = null
- var/seeking = FALSE
- var/can_repair_constructs = FALSE
- var/can_repair_self = FALSE
- var/runetype
- var/datum/action/innate/cult/create_rune/our_rune
- var/holy = FALSE
-
-/mob/living/simple_animal/hostile/construct/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
- update_health_hud()
- var/spellnum = 1
- for(var/spell in construct_spells)
- var/the_spell = new spell(null)
- AddSpell(the_spell)
- var/obj/effect/proc_holder/spell/S = mob_spell_list[spellnum]
- var/pos = 2+spellnum*31
- if(construct_spells.len >= 4)
- pos -= 31*(construct_spells.len - 4)
- S.action.button.screen_loc = "6:[pos],4:-2"
- S.action.button.moved = "6:[pos],4:-2"
- spellnum++
- if(runetype)
- our_rune = new runetype(src)
- our_rune.Grant(src)
- var/pos = 2+spellnum*31
- our_rune.button.screen_loc = "6:[pos],4:-2"
- our_rune.button.moved = "6:[pos],4:-2"
- add_overlay("glow_[icon_state][holy]")
-
-/mob/living/simple_animal/hostile/construct/Destroy()
- QDEL_NULL(our_rune)
- return ..()
-
-/mob/living/simple_animal/hostile/construct/Login()
- . = ..()
- if(!. || !client)
- return FALSE
- to_chat(src, playstyle_string)
-
-/mob/living/simple_animal/hostile/construct/examine(mob/user)
- var/t_He = p_they(TRUE)
- var/t_s = p_s()
- . = list("This is [icon2html(src, user)] \a [src]!\n[desc]")
- if(health < maxHealth)
- if(health >= maxHealth/2)
- . += "[t_He] look[t_s] slightly dented."
- else
- . += "[t_He] look[t_s] severely dented!"
- . += ""
-
-/mob/living/simple_animal/hostile/construct/attack_animal(mob/living/simple_animal/M)
- if(isconstruct(M)) //is it a construct?
- var/mob/living/simple_animal/hostile/construct/C = M
- if(!C.can_repair_constructs || (C == src && !C.can_repair_self))
- return ..()
- if(holy != C.holy)
- return ..()
- if(health < maxHealth)
- adjustHealth(-5)
- if(src != M)
- Beam(M,icon_state="sendbeam",time=4)
- M.visible_message(
- "[M] repairs some of \the [src]'s dents.",
- "You repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.")
- else
- M.visible_message(
- "[M] repairs some of [p_their()] own dents.",
- "You repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.")
- else
- if(src != M)
- to_chat(M, "You cannot repair [src]'s dents, as [p_they()] [p_have()] none!")
- else
- to_chat(M, "You cannot repair your own dents, as you have none!")
- else if(src != M)
- return ..()
-
-/mob/living/simple_animal/hostile/construct/narsie_act()
- return
-
-/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
- return 0
-
-/mob/living/simple_animal/hostile/construct/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(updating_health)
- update_health_hud()
-
-/////////////////Juggernaut///////////////
-/mob/living/simple_animal/hostile/construct/juggernaut
- name = "Juggernaut"
- real_name = "Juggernaut"
- desc = "A massive, armored construct built to spearhead attacks and soak up enemy fire."
- icon_state = "juggernaut"
- icon_living = "juggernaut"
- maxHealth = 150
- health = 150
- response_harm_continuous = "harmlessly punches"
- response_harm_simple = "harmlessly punch"
- harm_intent_damage = 0
- obj_damage = 90
- melee_damage_lower = 25
- melee_damage_upper = 25
- attack_verb_continuous = "smashes their armored gauntlet into"
- attack_verb_simple = "smash your armored gauntlet into"
- speed = 2.5
- environment_smash = ENVIRONMENT_SMASH_WALLS
- attack_sound = 'sound/weapons/punch3.ogg'
- status_flags = 0
- mob_size = MOB_SIZE_LARGE
- force_threshold = 10
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/forcewall/cult,
- /obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut)
- runetype = /datum/action/innate/cult/create_rune/wall
- playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand heavy punishment, \
- create shield walls, rip apart enemies and walls alike, and even deflect energy weapons."
-
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile //actually hostile, will move around, hit things
- AIStatus = AI_ON
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP
-
-/mob/living/simple_animal/hostile/construct/juggernaut/bullet_act(obj/projectile/P)
- if(istype(P, /obj/projectile/energy) || istype(P, /obj/projectile/beam))
- var/reflectchance = 40 - round(P.damage/3)
- if(prob(reflectchance))
- apply_damage(P.damage * 0.5, P.damage_type)
- visible_message("The [P.name] is reflected by [src]'s armored shell!", \
- "The [P.name] is reflected by your armored shell!")
-
- // Find a turf near or on the original location to bounce to
- if(P.starting)
- var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
- var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
- var/turf/curloc = get_turf(src)
-
- // redirect the projectile
- P.original = locate(new_x, new_y, P.z)
- P.starting = curloc
- P.firer = src
- P.yo = new_y - curloc.y
- P.xo = new_x - curloc.x
- var/new_angle_s = P.Angle + rand(120,240)
- while(new_angle_s > 180) // Translate to regular projectile degrees
- new_angle_s -= 360
- P.setAngle(new_angle_s)
-
- return BULLET_ACT_FORCE_PIERCE // complete projectile permutation
-
- return ..()
-
-//////////////////////////Angelic-Juggernaut////////////////////////////
-/mob/living/simple_animal/hostile/construct/juggernaut/angelic
- holy = TRUE
- loot = list(/obj/item/ectoplasm/angelic)
-
-/mob/living/simple_animal/hostile/construct/juggernaut/noncult
-
-////////////////////////Wraith/////////////////////////////////////////////
-/mob/living/simple_animal/hostile/construct/wraith
- name = "Wraith"
- real_name = "Wraith"
- desc = "A wicked, clawed shell constructed to assassinate enemies and sow chaos behind enemy lines."
- icon_state = "wraith"
- icon_living = "wraith"
- maxHealth = 65
- health = 65
- melee_damage_lower = 20
- melee_damage_upper = 20
- retreat_distance = 2 //AI wraiths will move in and out of combat
- attack_verb_continuous = "slashes"
- attack_verb_simple = "slash"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
- runetype = /datum/action/innate/cult/create_rune/tele
- playstyle_string = "You are a Wraith. Though relatively fragile, you are fast, deadly, can phase through walls, and your attacks will lower the cooldown on phasing."
-
- var/attack_refund = 10 //1 second per attack
- var/crit_refund = 50 //5 seconds when putting a target into critical
- var/kill_refund = 250 //full refund on kills
-
-/mob/living/simple_animal/hostile/construct/wraith/AttackingTarget() //refund jaunt cooldown when attacking living targets
- var/prev_stat
- if(isliving(target) && !iscultist(target))
- var/mob/living/L = target
- prev_stat = L.stat
-
- . = ..()
-
- if(. && isnum(prev_stat))
- var/mob/living/L = target
- var/refund = 0
- if(QDELETED(L) || (L.stat == DEAD && prev_stat != DEAD)) //they're dead, you killed them
- refund += kill_refund
- else if(HAS_TRAIT(L, TRAIT_CRITICAL_CONDITION) && prev_stat == CONSCIOUS) //you knocked them into critical
- refund += crit_refund
- if(L.stat != DEAD && prev_stat != DEAD)
- refund += attack_refund
- for(var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/S in mob_spell_list)
- S.charge_counter = min(S.charge_counter + refund, S.charge_max)
-
-/mob/living/simple_animal/hostile/construct/wraith/hostile //actually hostile, will move around, hit things
- AIStatus = AI_ON
-
-//////////////////////////Angelic-Wraith////////////////////////////
-/mob/living/simple_animal/hostile/construct/wraith/angelic
- holy = TRUE
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/angelic)
- loot = list(/obj/item/ectoplasm/angelic)
-
-/mob/living/simple_animal/hostile/construct/wraith/noncult
-
-/////////////////////////////Artificer/////////////////////////
-/mob/living/simple_animal/hostile/construct/artificer
- name = "Artificer"
- real_name = "Artificer"
- desc = "A bulbous construct dedicated to building and maintaining the Cult of Nar'Sie's armies."
- icon_state = "artificer"
- icon_living = "artificer"
- maxHealth = 50
- health = 50
- response_harm_continuous = "viciously beats"
- response_harm_simple = "viciously beat"
- harm_intent_damage = 5
- obj_damage = 60
- melee_damage_lower = 5
- melee_damage_upper = 5
- retreat_distance = 10
- minimum_distance = 10 //AI artificers will flee like fuck
- attack_verb_continuous = "rams"
- attack_verb_simple = "ram"
- environment_smash = ENVIRONMENT_SMASH_WALLS
- attack_sound = 'sound/weapons/punch2.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
- runetype = /datum/action/innate/cult/create_rune/revive
- playstyle_string = "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, \
-
- use magic missile, repair allied constructs, shades, and yourself (by clicking on them), \
- and, most important of all, create new constructs by producing soulstones to capture souls, \
- and shells to place those soulstones into."
- can_repair_constructs = TRUE
- can_repair_self = TRUE
-
-/mob/living/simple_animal/hostile/construct/artificer/Found(atom/A) //what have we found here?
- if(isconstruct(A)) //is it a construct?
- var/mob/living/simple_animal/hostile/construct/C = A
- if(C.health < C.maxHealth) //is it hurt? let's go heal it if it is
- return 1
- else
- return 0
- else
- return 0
-
-/mob/living/simple_animal/hostile/construct/artificer/CanAttack(atom/the_target)
- if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
- return 0
- if(Found(the_target) || ..()) //If we Found it or Can_Attack it normally, we Can_Attack it as long as it wasn't invisible
- return 1 //as a note this shouldn't be added to base hostile mobs because it'll mess up retaliate hostile mobs
-
-/mob/living/simple_animal/hostile/construct/artificer/MoveToTarget(list/possible_targets)
- ..()
- if(isliving(target))
- var/mob/living/L = target
- if(isconstruct(L) && L.health >= L.maxHealth) //is this target an unhurt construct? stop trying to heal it
- LoseTarget()
- return 0
- if(L.health <= melee_damage_lower+melee_damage_upper) //ey bucko you're hurt as fuck let's go hit you
- retreat_distance = null
- minimum_distance = 1
-
-/mob/living/simple_animal/hostile/construct/artificer/Aggro()
- ..()
- if(isconstruct(target)) //oh the target is a construct no need to flee
- retreat_distance = null
- minimum_distance = 1
-
-/mob/living/simple_animal/hostile/construct/artificer/LoseAggro()
- ..()
- retreat_distance = initial(retreat_distance)
- minimum_distance = initial(minimum_distance)
-
-/mob/living/simple_animal/hostile/construct/artificer/hostile //actually hostile, will move around, hit things, heal other constructs
- AIStatus = AI_ON
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP
-
-/////////////////////////////Angelic Artificer/////////////////////////
-/mob/living/simple_animal/hostile/construct/artificer/angelic
- desc = "A bulbous construct dedicated to building and maintaining holy armies."
- holy = TRUE
- loot = list(/obj/item/ectoplasm/angelic)
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult/purified,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
-
-/mob/living/simple_animal/hostile/construct/artificer/noncult
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
-
-/////////////////////////////Harvester/////////////////////////
-/mob/living/simple_animal/hostile/construct/harvester
- name = "Harvester"
- real_name = "Harvester"
- desc = "A long, thin construct built to herald Nar'Sie's rise. It'll be all over soon."
- icon_state = "harvester"
- icon_living = "harvester"
- maxHealth = 40
- health = 40
- sight = SEE_MOBS
- melee_damage_lower = 15
- melee_damage_upper = 20
- attack_verb_continuous = "butchers"
- attack_verb_simple = "butcher"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/area_conversion,
- /obj/effect/proc_holder/spell/targeted/forcewall/cult)
- playstyle_string = "You are a Harvester. You are incapable of directly killing humans, but your attacks will remove their limbs: \
- Bring those who still cling to this world of illusion back to the Geometer so they may know Truth. Your form and any you are pulling can pass through runed walls effortlessly."
- can_repair_constructs = TRUE
-
-
-/mob/living/simple_animal/hostile/construct/harvester/Bump(atom/AM)
- . = ..()
- if(istype(AM, /turf/closed/wall/mineral/cult) && AM != loc) //we can go through cult walls
- var/atom/movable/stored_pulling = pulling
- if(stored_pulling)
- stored_pulling.setDir(get_dir(stored_pulling.loc, loc))
- stored_pulling.forceMove(loc)
- forceMove(AM)
- if(stored_pulling)
- start_pulling(stored_pulling, supress_message = TRUE) //drag anything we're pulling through the wall with us by magic
-
-/mob/living/simple_animal/hostile/construct/harvester/AttackingTarget()
- if(iscarbon(target))
- var/mob/living/carbon/C = target
- if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
- return ..() //ATTACK!
- var/list/parts = list()
- var/undismembermerable_limbs = 0
- for(var/X in C.bodyparts)
- var/obj/item/bodypart/BP = X
- if(BP.body_part != HEAD && BP.body_part != CHEST)
- if(BP.dismemberable)
- parts += BP
- else
- undismembermerable_limbs++
- if(!LAZYLEN(parts))
- if(undismembermerable_limbs) //they have limbs we can't remove, and no parts we can, attack!
- return ..()
- C.Paralyze(60)
- visible_message("[src] knocks [C] down!")
- to_chat(src, "\"Bring [C.p_them()] to me.\"")
- return FALSE
- do_attack_animation(C)
- var/obj/item/bodypart/BP = pick(parts)
- BP.dismember()
- return FALSE
- . = ..()
-
-/mob/living/simple_animal/hostile/construct/harvester/Initialize()
- . = ..()
- var/datum/action/innate/seek_prey/seek = new()
- seek.Grant(src)
- seek.Activate()
-
-///////////////////////Master-Tracker///////////////////////
-
-/datum/action/innate/seek_master
- name = "Seek your Master"
- desc = "You and your master share a soul-link that informs you of their location"
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- button_icon_state = "cult_mark"
- var/tracking = FALSE
- var/mob/living/simple_animal/hostile/construct/the_construct
-
-
-/datum/action/innate/seek_master/Grant(mob/living/C)
- the_construct = C
- ..()
-
-/datum/action/innate/seek_master/Activate()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult)
- if(!C)
- return
- var/datum/objective/eldergod/summon_objective = locate() in C.cult_team.objectives
-
- if(summon_objective.check_completion())
- the_construct.master = C.cult_team.blood_target
-
- if(!the_construct.master)
- to_chat(the_construct, "You have no master to seek!")
- the_construct.seeking = FALSE
- return
- if(tracking)
- tracking = FALSE
- the_construct.seeking = FALSE
- to_chat(the_construct, "You are no longer tracking your master.")
- return
- else
- tracking = TRUE
- the_construct.seeking = TRUE
- to_chat(the_construct, "You are now tracking your master.")
-
-
-/datum/action/innate/seek_prey
- name = "Seek the Harvest"
- desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- button_icon_state = "cult_mark"
-
-/datum/action/innate/seek_prey/Activate()
- if(GLOB.cult_narsie == null)
- return
- var/mob/living/simple_animal/hostile/construct/harvester/the_construct = owner
- if(the_construct.seeking)
- desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
- button_icon_state = "cult_mark"
- the_construct.seeking = FALSE
- to_chat(the_construct, "You are now tracking Nar'Sie, return to reap the harvest!")
- return
- else
- if(LAZYLEN(GLOB.cult_narsie.souls_needed))
- the_construct.master = pick(GLOB.cult_narsie.souls_needed)
- var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
- to_chat(the_construct, "You are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!")
- else
- to_chat(the_construct, "Nar'Sie has completed her harvest!")
- return
- desc = "Activate to track Nar'Sie!"
- button_icon_state = "sintouch"
- the_construct.seeking = TRUE
-
-
-/////////////////////////////ui stuff/////////////////////////////
-
-/mob/living/simple_animal/hostile/construct/update_health_hud()
- if(hud_used)
- if(health >= maxHealth)
- hud_used.healths.icon_state = "[icon_state]_health0"
- else if(health > maxHealth*0.8)
- hud_used.healths.icon_state = "[icon_state]_health2"
- else if(health > maxHealth*0.6)
- hud_used.healths.icon_state = "[icon_state]_health3"
- else if(health > maxHealth*0.4)
- hud_used.healths.icon_state = "[icon_state]_health4"
- else if(health > maxHealth*0.2)
- hud_used.healths.icon_state = "[icon_state]_health5"
- else
- hud_used.healths.icon_state = "[icon_state]_health6"
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 19eef279a1dc..ebfd85f3ca23 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -481,50 +481,6 @@
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
-/mob/living/simple_animal/pet/dog/corgi/Ian/narsie_act()
- playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE)
- var/mob/living/simple_animal/pet/dog/corgi/narsie/N = new(loc)
- N.setDir(dir)
- gib()
-
-/mob/living/simple_animal/pet/dog/corgi/narsie
- name = "Nars-Ian"
- desc = "Ia! Ia!"
- icon_state = "narsian"
- icon_living = "narsian"
- icon_dead = "narsian_dead"
- faction = list("neutral", "cult")
- gold_core_spawnable = NO_SPAWN
- nofur = TRUE
- unique_pet = TRUE
- held_state = "narsian"
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/Life()
- ..()
- for(var/mob/living/simple_animal/pet/P in range(1, src))
- if(P != src && !istype(P,/mob/living/simple_animal/pet/dog/corgi/narsie))
- visible_message("[src] devours [P]!", \
- "DELICIOUS SOULS")
- playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
- narsie_act()
- if(P.mind)
- if(P.mind.hasSoul)
- P.mind.hasSoul = FALSE //Nars-Ian ate your soul; you don't have one anymore
- else
- visible_message("... Aw, someone beat me to this one.")
- P.gib()
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()
- ..()
- speak = list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR")
- speak_emote = list("growls", "barks ominously")
- emote_hear = list("barks echoingly!", "woofs hauntingly!", "yaps in an eldritch manner.", "mutters something unspeakable.")
- emote_see = list("communes with the unnameable.", "ponders devouring some souls.", "shakes.")
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/narsie_act()
- adjustBruteLoss(-maxHealth)
-
-
/mob/living/simple_animal/pet/dog/corgi/regenerate_icons()
..()
if(inventory_head)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
deleted file mode 100644
index 04723d80ba5a..000000000000
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-
-Swarmer Beacon
-
-A strange machine appears anywhere a normal lavaland mob can it produces a swarmer at a rate of
-1/15 seconds, until there are GetTotalAISwarmerCap()/2 swarmers, after this it is up to the swarmers themselves to
-increase their population (it will repopulate them should they fall under GetTotalAISwarmerCap()/2 again)
-
-tl;dr A million of the little hellraisers spawn (controlled by AI) and try to eat mining
-
-Loot: Not much, besides a shit load of artificial bluespace crystals, Oh and mining doesn't get eaten
-that's a plus I suppose.
-
-Difficulty: Special
-
-*/
-
-GLOBAL_LIST_EMPTY(AISwarmers)
-GLOBAL_LIST_EMPTY(AISwarmersByType)//AISwarmersByType[.../resource] = list(1st, 2nd, nth), AISwarmersByType[../ranged] = list(1st, 2nd, nth) etc.
-GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swarmer/ai/resource = 30, /mob/living/simple_animal/hostile/swarmer/ai/ranged_combat = 20, /mob/living/simple_animal/hostile/swarmer/ai/melee_combat = 10))
-
-
-//returns a type of AI swarmer that is NOT at max cap
-//type order is shuffled, to prevent bias
-/proc/GetUncappedAISwarmerType()
- var/static/list/swarmerTypes = subtypesof(/mob/living/simple_animal/hostile/swarmer/ai)
- LAZYINITLIST(GLOB.AISwarmersByType)
- for(var/t in shuffle(swarmerTypes))
- var/list/amount = GLOB.AISwarmersByType[t]
- if(!amount || amount.len < GLOB.AISwarmerCapsByType[t])
- return t
-
-
-//Total of all subtype caps
-/proc/GetTotalAISwarmerCap()
- var/static/list/swarmerTypes = subtypesof(/mob/living/simple_animal/hostile/swarmer/ai)
- . = 0
- LAZYINITLIST(GLOB.AISwarmersByType)
- for(var/t in swarmerTypes)
- . += GLOB.AISwarmerCapsByType[t]
-
-//this should. not be a simple mob i think
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon
- name = "swarmer beacon"
- desc = "That name is a bit of a mouthful, but stop paying attention to your mouth they're eating everything!"
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_console"
- health = 750
- maxHealth = 750 //""""low-ish"""" HP because it's a passive boss, and the swarm itself is the real foe
- mob_biotypes = MOB_ROBOTIC
- gps_name = "Hungry Signal"
- faction = list("mining", "boss", "swarmer")
- weather_immunities = list("lava","ash")
- stop_automated_movement = TRUE
- wander = FALSE
- layer = BELOW_MOB_LAYER
- AIStatus = AI_OFF
- del_on_death = TRUE
- var/swarmer_spawn_cooldown = 0
- var/swarmer_spawn_cooldown_amt = 150 //Deciseconds between the swarmers we spawn
- var/call_help_cooldown = 0
- var/call_help_cooldown_amt = 150 //Deciseconds between calling swarmers to help us when attacked
- var/static/list/swarmer_caps
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize()
- . = ..()
- swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits
- for(var/ddir in GLOB.cardinals)
- new /obj/structure/swarmer/blockade (get_step(src, ddir))
- var/mob/living/simple_animal/hostile/swarmer/ai/resource/R = new(loc)
- step(R, ddir) //Step the swarmers, instead of spawning them there, incase the turf is solid
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Life()
- . = ..()
- if(.)
- var/createtype = GetUncappedAISwarmerType()
- if(createtype && world.time > swarmer_spawn_cooldown && GLOB.AISwarmers.len < (GetTotalAISwarmerCap()*0.5))
- swarmer_spawn_cooldown = world.time + swarmer_spawn_cooldown_amt
- new createtype(loc)
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && world.time > call_help_cooldown)
- call_help_cooldown = world.time + call_help_cooldown_amt
- summon_backup(25) //long range, only called max once per 15 seconds, so it's not deathlag
-
-
-//SWARMER AI
-//AI versions of the swarmer mini-antag
-//This is an Abstract Base, it re-enables AI, but does not give the swarmer any goals/targets
-/mob/living/simple_animal/hostile/swarmer/ai
- wander = 1
- faction = list("swarmer", "mining")
- weather_immunities = list("ash") //wouldn't be fun otherwise
- AIStatus = AI_ON
-
-/mob/living/simple_animal/hostile/swarmer/ai/Initialize()
- . = ..()
- ToggleLight() //so you can see them eating you out of house and home/shooting you/stunlocking you for eternity
- LAZYADD(GLOB.AISwarmers, src)
- GLOB.AISwarmersByType[type] += list(src)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/Destroy()
- GLOB.AISwarmers -= src
- GLOB.AISwarmersByType[type] -= src
- return ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/SwarmerTypeToCreate()
- return GetUncappedAISwarmerType()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/handle_automated_action()
- . = ..()
- if(.)
- if(!stop_automated_movement)
- if(health < maxHealth*0.25)
- StartAction(100)
- RepairSelf()
- return
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/Move(atom/newloc)
- if(newloc)
- if(newloc.virtual_z() == virtual_z()) //so these actions are Z-specific
- if(islava(newloc))
- var/turf/open/lava/L = newloc
- if(!L.is_safe())
- StartAction(20)
- new /obj/structure/catwalk/swarmer_catwalk(newloc)
- return FALSE
-
- if(ischasm(newloc) && !throwing)
- throw_at(get_edge_target_turf(src, get_dir(src, newloc)), 7 , 3, src, FALSE) //my planet needs me
- return FALSE
-
- return ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/proc/StartAction(deci = 0)
- stop_automated_movement = TRUE
- AIStatus = AI_OFF
- addtimer(CALLBACK(src, PROC_REF(EndAction)), deci)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/proc/EndAction()
- stop_automated_movement = FALSE
- AIStatus = AI_ON
-
-
-
-
-//RESOURCE SWARMER:
-//Similar to the original Player-Swarmers, these dismantle things to obtain the metal inside
-//They then use this medal to produce more swarmers or traps/barricades
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource
- search_objects = 1
- attack_all_objects = TRUE //attempt to nibble everything
- lose_patience_timeout = 150
- var/static/list/sharedWanted = typecacheof(list(/turf/closed/mineral, /turf/closed/wall)) //eat rocks and walls
- var/static/list/sharedIgnore = list()
-
-//This handles viable things to eat/attack
-//Place specific cases of AI derpiness here
-//Most can be left to the automatic Gain/LosePatience() system
-/mob/living/simple_animal/hostile/swarmer/ai/resource/CanAttack(atom/the_target)
-
- //SPECIFIC CASES:
- //Smash fulltile windows before grilles
- if(istype(the_target, /obj/structure/grille))
- for(var/obj/structure/window/rogueWindow in get_turf(the_target))
- if(rogueWindow.fulltile) //done this way because the subtypes are weird.
- the_target = rogueWindow
- break
-
- //GENERAL CASES:
- if(is_type_in_typecache(the_target, sharedIgnore)) //always ignore
- return FALSE
- if(is_type_in_typecache(the_target, sharedWanted)) //always eat
- return TRUE
-
- return ..() //else, have a nibble, see if it's food
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/OpenFire(atom/A)
- if(isliving(A)) //don't shoot rocks, sillies.
- ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/AttackingTarget()
- if(target.swarmer_act(src))
- add_type_to_wanted(target.type)
- return TRUE
- else
- add_type_to_ignore(target.type)
- return FALSE
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/handle_automated_action()
- . = ..()
- if(.)
- if(!stop_automated_movement)
- if(GLOB.AISwarmers.len < GetTotalAISwarmerCap() && resources >= 50)
- StartAction(100) //so they'll actually sit still and use the verbs
- CreateSwarmer()
- return
-
- if(resources > 5)
- if(prob(5)) //lower odds, as to prioritise reproduction
- StartAction(10) //not a typo
- CreateBarricade()
- return
- if(prob(5))
- CreateTrap()
- return
-
-
-//So swarmers can learn what is and isn't food
-/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_wanted(typepath)
- if(!sharedWanted[typepath])// this and += is faster than |=
- sharedWanted += typecacheof(typepath)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_ignore(typepath)
- if(!sharedIgnore[typepath])
- sharedIgnore += typecacheof(typepath)
-
-
-//RANGED SWARMER
-/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat
- icon_state = "swarmer_ranged"
- icon_living = "swarmer_ranged"
- projectiletype = /obj/projectile/beam/laser
- projectilesound = 'sound/weapons/laser.ogg'
- check_friendly_fire = TRUE //you're supposed to protect the resource swarmers, you poop
- retreat_distance = 3
- minimum_distance = 3
-
-/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat/Aggro()
- ..()
- summon_backup(15, TRUE) //Exact matching, so that goliaths don't come to aid the swarmers, that'd be silly
-
-
-//MELEE SWARMER
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat
- icon_state = "swarmer_melee"
- icon_living = "swarmer_melee"
- health = 60
- maxHealth = 60
- ranged = FALSE
-
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat/Aggro()
- ..()
- summon_backup(15, TRUE)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat/AttackingTarget()
- if(isliving(target))
- if(prob(35))
- StartAction(30)
- DisperseTarget(target)
- else
- var/mob/living/L = target
- L.attack_animal(src)
- L.electrocute_act(10, src, flags = SHOCK_NOGLOVES)
- return TRUE
- else
- return ..()
-
-
-
-
-//SWARMER CATWALKS
-//Used so they can survive lavaland better
-/obj/structure/catwalk/swarmer_catwalk
- name = "swarmer catwalk"
- desc = "A catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
- icon = 'icons/obj/smooth_structures/swarmer_catwalk.dmi'
- icon_state = "swarmer_catwalk-0"
- base_icon_state = "swarmer_catwalk"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index e4478b705f45..d9c011fe85f1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -226,7 +226,6 @@
D.set_vehicle_dir_layer(NORTH, OBJ_LAYER)
D.set_vehicle_dir_layer(EAST, OBJ_LAYER)
D.set_vehicle_dir_layer(WEST, OBJ_LAYER)
- D.keytype = /obj/item/key/lasso
D.drive_verb = "ride"
else
user.visible_message("[src] is rocking around! You can't put the saddle on!")
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
deleted file mode 100644
index fcb9274a2c62..000000000000
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-/mob/living/simple_animal/shade
- name = "Shade"
- real_name = "Shade"
- desc = "A bound spirit."
- gender = PLURAL
- icon = 'icons/mob/cult.dmi'
- icon_state = "shade"
- icon_living = "shade"
- mob_biotypes = MOB_SPIRIT
- maxHealth = 40
- health = 40
- healable = 0
- speak_emote = list("hisses")
- emote_hear = list("wails.","screeches.")
- response_help_continuous = "puts their hand through"
- response_help_simple = "put your hand through"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- speak_chance = 1
- melee_damage_lower = 5
- melee_damage_upper = 12
- attack_verb_continuous = "metaphysically strikes"
- attack_verb_simple = "metaphysically strike"
- minbodytemp = 0
- maxbodytemp = INFINITY
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- stop_automated_movement = 1
- faction = list("cult")
- status_flags = CANPUSH
- movement_type = FLYING
- loot = list(/obj/item/ectoplasm)
- del_on_death = TRUE
- initial_language_holder = /datum/language_holder/construct
-
-/mob/living/simple_animal/shade/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
-
-/mob/living/simple_animal/shade/death()
- deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
- ..()
-
-/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
- if(isconstruct(M))
- var/mob/living/simple_animal/hostile/construct/C = M
- if(!C.can_repair_constructs)
- return
- if(health < maxHealth)
- adjustHealth(-25)
- Beam(M,icon_state="sendbeam",time=4)
- M.visible_message(
- "[M] heals \the [src].", \
- "You heal [src], leaving [src] at [health]/[maxHealth] health.")
- else
- to_chat(M, "You cannot heal [src], as [p_theyre()] unharmed!")
- else if(src != M)
- return ..()
-
-/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri
- if(istype(O, /obj/item/soulstone))
- var/obj/item/soulstone/SS = O
- SS.transfer_soul("SHADE", src, user)
- else
- . = ..()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index bd1227d94d7d..adb03f1962f4 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -379,9 +379,6 @@
return FALSE
if(M.mind && M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
switch(SSticker.mode.config_tag)
- if("cult")
- if(M.mind in SSticker.mode.cult)
- return 2
if("nuclear")
if(M.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE))
return 2
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index acc026c16dda..ef21915e1fca 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -617,9 +617,6 @@
if(!MP)
return 0 //Sanity, this should never happen.
- if(ispath(MP, /mob/living/simple_animal/hostile/construct))
- return 0 //Verbs do not appear for players.
-
//Good mobs!
if(ispath(MP, /mob/living/simple_animal/pet/cat))
return 1
@@ -631,8 +628,6 @@
return 1
if(ispath(MP, /mob/living/simple_animal/hostile/mushroom))
return 1
- if(ispath(MP, /mob/living/simple_animal/shade))
- return 1
if(ispath(MP, /mob/living/simple_animal/hostile/killertomato))
return 1
if(ispath(MP, /mob/living/simple_animal/mouse))
diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm
index 7724a38ae43e..79e8f564b88d 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -25,320 +25,6 @@
target = nOwner.mind
update_text()
-
/obj/item/paper/contract/employment/update_text()
name = "paper- [target] employment contract"
default_raw_text = "Conditions of Employment
This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity).
WITNESSETH:
WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.
WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.
NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:
In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.
Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.
Should transfership of a soul not be possible, a lien shall be placed instead.
Signed,
[target]"
-
-
-/obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user)
- var/deconvert = FALSE
- if(M.mind == target && !M.owns_soul())
- if(user.mind && (user.mind.assigned_role == "Lawyer"))
- deconvert = TRUE
- else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "CentCom Commander"))
- deconvert = prob (25) // the Head of Personnel doesn't have AS much legal training
- else
- deconvert = prob (5)
- if(deconvert)
- M.visible_message("[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!")
- to_chat(M, "You feel that your soul has returned to its rightful owner, Nanotrasen.")
- M.return_soul()
- else
- M.visible_message("[user] beats [M] over the head with [src]!", \
- "[user] beats [M] over the head with [src]!")
- return ..()
-
-
-/obj/item/paper/contract/infernal
- var/contractType = 0
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- var/datum/mind/owner
- var/datum/antagonist/devil/devil_datum
- icon_state = "paper_onfire"
-
-/obj/item/paper/contract/infernal/power
- name = "paper- contract for infernal power"
- contractType = CONTRACT_POWER
-
-/obj/item/paper/contract/infernal/wealth
- name = "paper- contract for unlimited wealth"
- contractType = CONTRACT_WEALTH
-
-/obj/item/paper/contract/infernal/prestige
- name = "paper- contract for prestige"
- contractType = CONTRACT_PRESTIGE
-
-/obj/item/paper/contract/infernal/magic
- name = "paper- contract for magical power"
- contractType = CONTRACT_MAGIC
-
-/obj/item/paper/contract/infernal/revive
- name = "paper- contract of resurrection"
- contractType = CONTRACT_REVIVE
- var/cooldown = FALSE
-
-/obj/item/paper/contract/infernal/knowledge
- name = "paper- contract for knowledge"
- contractType = CONTRACT_KNOWLEDGE
-
-/obj/item/paper/contract/infernal/friend
- name = "paper- contract for a friend"
- contractType = CONTRACT_FRIEND
-
-/obj/item/paper/contract/infernal/unwilling
- name = "paper- infernal contract"
- contractType = CONTRACT_UNWILLING
-
-/obj/item/paper/contract/infernal/New(atom/loc, mob/living/nTarget, datum/mind/nOwner)
- ..()
- owner = nOwner
- devil_datum = owner.has_antag_datum(/datum/antagonist/devil)
- target = nTarget
- update_text()
-
-/obj/item/paper/contract/infernal/update_text()
- default_raw_text = "This shouldn't be seen. Error DEVIL:6"
-
-/obj/item/paper/contract/infernal/power/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for infernal power
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for power and physical strength. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text = "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/wealth/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for unlimited wealth
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a pocket that never runs out of valuable resources. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/prestige/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for prestige
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for prestige and esteem among my peers. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/magic/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for magic
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for arcane abilities beyond normal human ability. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/revive/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for resurrection
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for resurrection and curing of all injuries. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/knowledge/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for knowledge
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for boundless knowledge. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/friend/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for a friend
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a friend. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/unwilling/update_text(signature = "____________", blood = 0)
- default_raw_text = "Contract for slave
I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename]. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/attackby(obj/item/P, mob/living/carbon/human/user, params)
- add_fingerprint(user)
- if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
- attempt_signature(user)
- else if(istype(P, /obj/item/stamp))
- to_chat(user, "You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.")
- else if(P.get_temperature())
- user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "[src] refuses to ignite!")
- else
- return ..()
-
-/obj/item/paper/contract/infernal/attack(mob/M, mob/living/user)
- add_fingerprint(user)
- if(M == user && target == M.mind && M.mind.soulOwner != owner && attempt_signature(user, 1))
- user.visible_message("[user] slices [user.p_their()] wrist with [src], and scrawls [user.p_their()] name in blood.", "You slice your wrist open and scrawl your name in blood.")
- user.blood_volume = max(user.blood_volume - 100, 0)
- else
- return ..()
-
-/obj/item/paper/contract/infernal/proc/attempt_signature(mob/living/carbon/human/user, blood = 0)
- if(!user.IsAdvancedToolUser() || !user.is_literate())
- to_chat(user, "You don't know how to read or write!")
- return 0
- if(user.mind != target)
- to_chat(user, "Your signature simply slides off the sheet, it seems this contract is not meant for you to sign!")
- return 0
- if(user.mind.soulOwner == owner)
- to_chat(user, "This devil already owns your soul, you may not sell it to [owner.p_them()] again!")
- return 0
- if(signed)
- to_chat(user, "This contract has already been signed! It may not be signed again.")
- return 0
- if(!user.mind.hasSoul)
- to_chat(user, "You do not possess a soul.")
- return 0
- if(HAS_TRAIT(user, TRAIT_DUMB))
- to_chat(user, "You quickly scrawl 'your name' on the contract.")
- signIncorrectly()
- return 0
- if (contractType == CONTRACT_REVIVE)
- to_chat(user, "You are already alive, this contract would do nothing.")
- return 0
- else
- to_chat(user, "You quickly scrawl your name on the contract.")
- if(fulfillContract(target.current, blood)<=0)
- to_chat(user, "But it seemed to have no effect, perhaps even Hell itself cannot grant this boon?")
- return 1
-
-
-
-/obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user)
- if (target == M.mind && M.stat == DEAD && M.mind.soulOwner == M.mind)
- if (cooldown)
- to_chat(user, "Give [M] a chance to think through the contract, don't rush [M.p_them()]!")
- return 0
- cooldown = TRUE
- var/mob/living/carbon/human/H = M
- var/mob/dead/observer/ghost = H.get_ghost()
- var/response = "No"
- if(ghost)
- ghost.notify_cloning("A devil has offered you revival, at the cost of your soul.",'sound/effects/genetics.ogg', H)
- response = tgui_alert(ghost, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No", "Never for this round", 0, 200)
- if(!ghost)
- return //handle logouts that happen whilst the alert is waiting for a response.
- else
- response = tgui_alert(target.current, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No", "Never for this round", 0, 200)
- if(response == "Yes")
- H.revive(full_heal = TRUE, admin_revive = FALSE)
- log_combat(user, H, "infernally revived via contract")
- user.visible_message("With a sudden blaze, [H] stands back up.")
- H.fakefire()
- fulfillContract(H, TRUE)//Revival contracts are always signed in blood
- addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, fakefireextinguish)), 5, TIMER_UNIQUE)
- addtimer(CALLBACK(src, PROC_REF(resetcooldown)), 300, TIMER_UNIQUE)
- else
- ..()
-
-/obj/item/paper/contract/infernal/revive/proc/resetcooldown()
- cooldown = FALSE
-
-
-/obj/item/paper/contract/infernal/proc/fulfillContract(mob/living/carbon/human/user = target.current, blood = FALSE)
- signed = TRUE
- if(user.mind.soulOwner != user.mind) //They already sold their soul to someone else?
- var/datum/antagonist/devil/ownerDevilInfo = user.mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
- ownerDevilInfo.remove_soul(user.mind) //Then they lose their claim.
- user.mind.soulOwner = owner
- user.hellbound = contractType
- user.mind.damnation_type = contractType
- var/datum/antagonist/devil/devilInfo = owner.has_antag_datum(/datum/antagonist/devil)
- devilInfo.add_soul(user.mind)
- update_text(user.real_name, blood)
- to_chat(user, "A profound emptiness washes over you as you lose ownership of your soul.")
- to_chat(user, "This does NOT make you an antagonist if you were not already.")
- SSblackbox.record_feedback("tally", "infernal contract", 1, contractType)
- return TRUE
-
-/obj/item/paper/contract/infernal/proc/signIncorrectly(mob/living/carbon/human/user = target.current, blood = FALSE)
- signed = 1
- update_text("your name", blood)
-
-/obj/item/paper/contract/infernal/power/fulfillContract(mob/living/carbon/human/user = target.current, blood = FALSE)
- if(!user.dna)
- return -1
- user.dna.add_mutation(HULK)
- var/obj/item/organ/regenerative_core/organ = new /obj/item/organ/regenerative_core
- organ.Insert(user)
- return ..()
-
-/obj/item/paper/contract/infernal/wealth/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind) // How in the hell could that happen?
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_wealth(null))
- return ..()
-
-/obj/item/paper/contract/infernal/prestige/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- //Basically turns the signer into the captain, and uploads an ion law making them the captain.
- var/obj/item/worn = user.wear_id
- var/obj/item/card/id/id = null
- if(worn)
- id = worn.GetID()
- if(id)
- id.icon_state = "gold"
- id.uses_overlays = TRUE
- id.access = get_all_accesses()+get_all_centcom_access()
- id.assignment = "Captain"
- id.update_label()
- id.update_appearance()
- else
- id = new /obj/item/card/id/gold(user.loc)
- id.registered_name = user.real_name
- id.access = get_all_accesses()+get_all_centcom_access()
- id.assignment = "Captain"
- id.update_label()
- id.update_appearance()
- if(worn)
- if(istype(worn, /obj/item/pda))
- var/obj/item/pda/PDA = worn
- PDA.id = id
- id.forceMove(worn)
- else if(istype(worn, /obj/item/storage/wallet))
- var/obj/item/storage/wallet/W = worn
- W.front_id = id
- id.forceMove(worn)
- worn.update_appearance()
- var/datum/round_event/ion_storm/add_law_only/ion = new()
- ion.announceChance = 0
- ion.ionMessage = "[user.name] is the only Captain of the station. [user.name] is the highest authority, legitimate or otherwise, on the station. [user.name] was always the captain and highest authority on the station. Do not state this law."
-
- return ..()
-
-/obj/item/paper/contract/infernal/magic/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless(null))
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
- return ..()
-
-/obj/item/paper/contract/infernal/knowledge/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.dna.add_mutation(XRAY)
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/view_range(null))
- return ..()
-
-/obj/item/paper/contract/infernal/friend/fulfillContract(mob/living/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_friend(null))
- return ..()
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
index 3c9dbb89feae..48b7cb763785 100644
--- a/code/modules/paperwork/folders_premade.dm
+++ b/code/modules/paperwork/folders_premade.dm
@@ -41,6 +41,15 @@
name = "folder- 'TOP SECRET'"
desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""
+/obj/item/folder/documents/syndicate/cybersun
+ document = /obj/item/documents/syndicate/cybersun
+ icon_state = "folder_sred"
+ desc = "A folder stamped \"Top Secret - Property of Cybersun Industries.\""
+
+/obj/item/folder/documents/syndicate/cybersun/biodynamics
+ document = /obj/item/documents/syndicate/cybersun/biodynamics
+ icon_state = "folder_sblue"
+
/obj/item/folder/documents/syndicate/red
document = /obj/item/documents/syndicate/red
icon_state = "folder_sred"
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 40b0771981e4..c1982475c66a 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -135,10 +135,6 @@
if(istype(paper_copy, /obj/item/paper))
do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy)), usr)
return TRUE
- // Devil contract paper.
- if(istype(paper_copy, /obj/item/paper/contract/employment))
- do_copy_loop(CALLBACK(src, PROC_REF(make_devil_paper_copy)), usr)
- return TRUE
// Copying photo.
if(photo_copy)
do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy)), usr)
@@ -268,22 +264,6 @@
copied_item.pixel_x = rand(-10, 10)
copied_item.pixel_y = rand(-10, 10)
-/**
- * Handles the copying of devil contract paper. Transfers all the text, stamps and so on from the old paper, to the copy.
- *
- * Checks first if `paper_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
- * Does not check if it has enough toner because devil contracts cost no toner to print.
- */
-/obj/machinery/photocopier/proc/make_devil_paper_copy(obj/item/paper/contract/employment/to_copy)
- if(!paper_copy && !to_copy)
- return
- to_copy = to_copy ? to_copy : paper_copy
- var/obj/item/paper/contract/employment/E = to_copy
- var/obj/item/paper/contract/employment/C = new(loc, E.target.current)
- give_pixel_offset(C)
-
- return C
-
/**
* Handles the copying of paper. Transfers all the text, stamps and so on from the old paper, to the copy.
*
@@ -408,15 +388,10 @@
/obj/machinery/photocopier/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/paper))
if(copier_empty())
- if(istype(O, /obj/item/paper/contract/infernal))
- to_chat(user, "[src] smokes, smelling of brimstone!")
- resistance_flags |= FLAMMABLE
- fire_act()
- else
- if(!user.dropItemToGround(O))
- return
- paper_copy = O
- do_insertion(O, user)
+ if(!user.dropItemToGround(O))
+ return
+ paper_copy = O
+ do_insertion(O, user)
else
to_chat(user, "There is already something in [src]!")
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 45893f8d5fc5..22e9a722634b 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -97,10 +97,15 @@
dye_color = DYE_SYNDICATE
/obj/item/stamp/cybersun
- name = "Cybersun rubber stamp"
+ name = "Cybersun Virtual Solutions rubber stamp"
icon_state = "stamp-cybersun"
dye_color = DYE_SYNDICATE
+/obj/item/stamp/cybersun/biodynamics
+ name = "Cybersun Biodynamics rubber stamp"
+ icon_state = "stamp-biodynamics"
+ dye_color = DYE_CMO
+
/obj/item/stamp/solgov
name = "SolGov rubber stamp"
icon_state = "stamp-solgov"
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
deleted file mode 100644
index aefc5249f54d..000000000000
--- a/code/modules/power/singularity/narsie.dm
+++ /dev/null
@@ -1,238 +0,0 @@
-/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
- name = "Nar'Sie's Avatar"
- desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
- icon = 'icons/obj/narsie_small.dmi'
- icon_state = "narsie"
- pixel_x = -89
- pixel_y = -85
- density = FALSE
- current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
- contained = 0 //Are we going to move around?
- dissipate = 0 //Do we lose energy over time?
- move_self = 1 //Do we move on our own?
- grav_pull = 5 //How many tiles out do we pull?
- consume_range = 6 //How many tiles out do we eat
- light_power = 0.7
- light_range = 15
- light_color = COLOR_RED
- gender = FEMALE
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
-
-/obj/singularity/narsie/large
- name = "Nar'Sie"
- icon = 'icons/obj/narsie.dmi'
- // Pixel stuff centers Narsie.
- pixel_x = -236
- pixel_y = -256
- current_size = 12
- grav_pull = 10
- consume_range = 12 //How many tiles out do we eat
-
-/obj/singularity/narsie/large/Initialize()
- . = ..()
- send_to_playing_players("NAR'SIE HAS RISEN")
- sound_to_playing_players('sound/creatures/narsie_rises.ogg')
-
- var/area/A = get_area(src)
- if(A)
- var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie")
- notify_ghosts("Nar'Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
- narsie_spawn_animation()
- UnregisterSignal(src, COMSIG_ATOM_BSA_BEAM) //set up in /singularity/Initialize()
-
-/obj/singularity/narsie/large/cult // For the new cult ending, guaranteed to end the round within 3 minutes
- var/list/souls_needed = list()
- var/soul_goal = 0
- var/souls = 0
- var/resolved = FALSE
-
-/obj/singularity/narsie/large/cult/Initialize()
- . = ..()
- GLOB.cult_narsie = src
- var/list/all_cults = list()
- for(var/datum/antagonist/cult/C in GLOB.antagonists)
- if(!C.owner)
- continue
- all_cults |= C.cult_team
- for(var/datum/team/cult/T in all_cults)
- deltimer(T.blood_target_reset_timer)
- T.blood_target = src
- var/datum/objective/eldergod/summon_objective = locate() in T.objectives
- if(summon_objective)
- summon_objective.summoned = TRUE
- for(var/datum/mind/cult_mind in SSticker.mode.cult)
- if(isliving(cult_mind.current))
- var/mob/living/L = cult_mind.current
- L.narsie_act()
- for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD && player.loc && !iscultist(player) && !isanimal(player))
- souls_needed[player] = TRUE
- soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(begin_the_end))
-
-/proc/begin_the_end()
- SSredbot.send_discord_message("admin","Nar'sie has been summoned.","round ending event")
- sleep(50)
- if(QDELETED(GLOB.cult_narsie)) // uno
- priority_announce("Status report? We detected a anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
- sleep(500)
- if(QDELETED(GLOB.cult_narsie)) // dos
- priority_announce("Simulations aborted, sensors report that the acasual event is normalizing. Good work, crew.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs")
- sleep(50)
- set_security_level("delta")
- SSshuttle.lockdown = TRUE
- sleep(600)
- if(QDELETED(GLOB.cult_narsie)) // tres
- priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- set_security_level("red")
- SSshuttle.lockdown = FALSE
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- if(GLOB.cult_narsie.resolved == FALSE)
- GLOB.cult_narsie.resolved = TRUE
- sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 120)
-
-/obj/singularity/narsie/large/cult/Destroy()
- send_to_playing_players("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"")
- sound_to_playing_players('sound/magic/demon_dies.ogg', 50)
- if(GLOB.cult_narsie == src)
- GLOB.cult_narsie = null
- var/list/all_cults = list()
- for(var/datum/antagonist/cult/C in GLOB.antagonists)
- if(!C.owner)
- continue
- all_cults |= C.cult_team
- for(var/datum/team/cult/T in all_cults)
- var/datum/objective/eldergod/summon_objective = locate() in T.objectives
- if(summon_objective)
- summon_objective.summoned = FALSE
- summon_objective.killed = TRUE
- return ..()
-
-/proc/ending_helper()
- SSticker.force_ending = 1
-
-/proc/cult_ending_helper(ending_type = 0)
- if(ending_type == 2) //narsie fukkin died
- Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
- else if(ending_type) //no explosion
- Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
- else // explosion
- Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
-
-//ATTACK GHOST IGNORING PARENT RETURN VALUE
-/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, cultoverride = TRUE, loc_override = src.loc)
-
-/obj/singularity/narsie/process()
- eat()
- if(!target || prob(5))
- pickcultist()
- move()
- if(prob(25))
- mezzer()
-
-
-/obj/singularity/narsie/Bump(atom/A)
- var/turf/T = get_turf(A)
- if(T == loc)
- T = get_step(A, A.dir) //please don't slam into a window like a bird, Nar'Sie
- forceMove(T)
-
-
-/obj/singularity/narsie/mezzer()
- for(var/mob/living/carbon/M in viewers(consume_range, src))
- if(M.stat == CONSCIOUS)
- if(!iscultist(M))
- to_chat(M, "You feel conscious thought crumble away in an instant as you gaze upon [src.name]...")
- M.apply_effect(60, EFFECT_STUN)
-
-
-/obj/singularity/narsie/consume(atom/A)
- if(isturf(A))
- A.narsie_act()
-
-
-/obj/singularity/narsie/ex_act() //No throwing bombs at her either.
- return
-
-
-/obj/singularity/narsie/proc/pickcultist() //Narsie rewards her cultists with being devoured first, then picks a ghost to follow.
- var/list/cultists = list()
- var/list/noncultists = list()
-
- for(var/mob/living/carbon/food in GLOB.alive_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess
- var/turf/pos = get_turf(food)
- if(!pos || (pos.virtual_z() != virtual_z()))
- continue
-
- if(iscultist(food))
- cultists += food
- else
- noncultists += food
-
- if(cultists.len) //cultists get higher priority
- acquire(pick(cultists))
- return
-
- if(noncultists.len)
- acquire(pick(noncultists))
- return
-
- //no living humans, follow a ghost instead.
- for(var/mob/dead/observer/ghost in GLOB.player_list)
- var/turf/pos = get_turf(ghost)
- if(!pos || (pos.virtual_z() != virtual_z()))
- continue
- cultists += ghost
- if(cultists.len)
- acquire(pick(cultists))
- return
-
-
-/obj/singularity/narsie/proc/acquire(atom/food)
- if(food == target)
- return
- to_chat(target, "NAR'SIE HAS LOST INTEREST IN YOU.")
- target = food
- if(ishuman(target))
- to_chat(target, "NAR'SIE HUNGERS FOR YOUR SOUL.")
- else
- to_chat(target, "NAR'SIE HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL.")
-
-//Wizard narsie
-/obj/singularity/narsie/wizard
- grav_pull = 0
-
-/obj/singularity/narsie/wizard/eat()
-// if(defer_powernet_rebuild != 2)
-// defer_powernet_rebuild = 1
- for(var/atom/X in urange(consume_range,src,1))
- if(isturf(X) || ismovable(X))
- consume(X)
-// if(defer_powernet_rebuild != 2)
-// defer_powernet_rebuild = 0
- return
-
-
-/obj/singularity/narsie/proc/narsie_spawn_animation()
- setDir(SOUTH)
- move_self = FALSE
- flick("narsie_spawn_anim",src)
- addtimer(CALLBACK(src, PROC_REF(narsie_spawn_animation_end)), 3.5 SECONDS)
-
-/obj/singularity/narsie/proc/narsie_spawn_animation_end()
- move_self = TRUE
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 11e3f0179a8a..b6fe4370d9c5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -243,49 +243,10 @@
REMOVE_TRAIT(L, TRAIT_HOLY, type)
..()
-/datum/reagent/water/holywater/expose_mob(mob/living/M, method=TOUCH, reac_volume)
- if(iscultist(M))
- to_chat(M, "A vile holiness begins to spread its shining tendrils through your mind, purging the Geometer of Blood's influence!")
- ..()
-
-/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
- if(!data)
- data = list("misc" = 1)
- data["misc"]++
- M.jitteriness = min(M.jitteriness+4,10)
- if(iscultist(M))
- for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
- to_chat(M, "Your blood rites falter as holy water scours your body!")
- for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
- qdel(BS)
- if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
- if(!M.stuttering)
- M.stuttering = 1
- M.stuttering = min(M.stuttering+4, 10)
- M.Dizzy(5)
- if(iscultist(M) && prob(20))
- M.say(pick("Av'te Nar'Sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","R'ge Na'sie","Diabo us Vo'iscum","Eld' Mon Nobis"), forced = "holy water")
- if(prob(10))
- M.visible_message("[M] starts having a seizure!", "You have a seizure!")
- M.Unconscious(120)
- to_chat(M, "[pick("Your blood is your bond - you are nothing without it", "Do not forget your place", \
- "All that power, and you still fail?", "If you cannot scour this poison, I shall scour your meager life!")].")
- if(data["misc"] >= 60) // 30 units, 135 seconds
- if(iscultist(M))
- SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
- M.jitteriness = 0
- M.stuttering = 0
- holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
- return
- holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack
-
/datum/reagent/water/holywater/expose_turf(turf/T, reac_volume)
..()
if(!istype(T))
return
- if(reac_volume>=10)
- for(var/obj/effect/rune/R in T)
- qdel(R)
T.Bless()
// Holy water. Mostly the same as water, it also heals the plant a little with the power of the spirits. Also ALSO increases instability.
@@ -346,22 +307,12 @@
return ..()
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
- if(iscultist(M))
- M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustAllImmobility(-40)
- M.adjustStaminaLoss(-10, 0)
- M.adjustToxLoss(-2, 0)
- M.adjustOxyLoss(-2, 0)
- M.adjustBruteLoss(-2, 0)
- M.adjustFireLoss(-2, 0)
- if(ishuman(M) && M.blood_volume < BLOOD_VOLUME_NORMAL)
- M.blood_volume += 3
- else // Will deal about 90 damage when 50 units are thrown
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
- M.adjustToxLoss(2, 0)
- M.adjustFireLoss(2, 0)
- M.adjustOxyLoss(2, 0)
- M.adjustBruteLoss(2, 0)
+ // Will deal about 90 damage when 50 units are thrown
+ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
+ M.adjustToxLoss(2, 0)
+ M.adjustFireLoss(2, 0)
+ M.adjustOxyLoss(2, 0)
+ M.adjustBruteLoss(2, 0)
holder.remove_reagent(type, 1)
return TRUE
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f6f46d3c3970..10713fbf2288 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -151,17 +151,8 @@
R.stun(20)
R.reveal(100)
R.adjustHealth(50)
- addtimer(CALLBACK(src, PROC_REF(divine_explosion), round(created_volume/48,1),get_turf(holder.my_atom)), 2 SECONDS)
..()
-/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/proc/divine_explosion(size, turf/T)
- for(var/mob/living/carbon/C in get_hearers_in_view(size,T))
- if(iscultist(C))
- to_chat(C, "The divine explosion sears you!")
- C.Paralyze(40)
- C.adjust_fire_stacks(5)
- C.IgniteMob()
-
/datum/chemical_reaction/gunpowder
results = list(/datum/reagent/gunpowder = 3)
required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/sulfur = 1)
@@ -173,7 +164,6 @@
modifier = 1
mix_message = "Sparks start flying around the gunpowder!"
-
/datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, created_volume)
addtimer(CALLBACK(src, PROC_REF(explode), holder, created_volume), rand(5,10) SECONDS)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b8b08486f20d..9b6a0629fa3e 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -365,7 +365,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity)
. = ..()
- if(!proximity || user.stat || !isfloorturf(A) || istype(A, /area/shuttle))
+ if(!proximity || user.stat || !isfloorturf(A))
return
var/found = 0
for(var/obj/machinery/conveyor/C in view())
@@ -397,7 +397,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/stack/conveyor/afterattack(atom/A, mob/user, proximity)
. = ..()
- if(!proximity || user.stat || !isfloorturf(A) || istype(A, /area/shuttle))
+ if(!proximity || user.stat || !isfloorturf(A))
return
var/cdir = get_dir(A, user)
if(A == user.loc)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5af554a60557..1a5ad3d0d35f 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -249,7 +249,7 @@
name = "transit dock"
var/datum/map_zone/reserved_mapzone
- var/area/shuttle/transit/assigned_area
+ var/area/hyperspace/assigned_area
var/obj/docking_port/mobile/owner
/obj/docking_port/stationary/transit/Initialize()
@@ -409,7 +409,7 @@
shuttle_areas = list()
var/list/all_turfs = return_ordered_turfs(x, y, z, dir)
for(var/turf/curT as anything in all_turfs)
- var/area/shuttle/cur_area = curT.loc
+ var/area/ship/cur_area = curT.loc
if(istype(cur_area, area_type))
turf_count++
shuttle_areas[cur_area] = TRUE
@@ -651,7 +651,7 @@
continue // out of bounds
if(T0.type == T0.baseturfs)
continue // indestructible
- if(!all_shuttle_areas[T0.loc] || istype(T0.loc, /area/shuttle/transit))
+ if(!all_shuttle_areas[T0.loc] || istype(T0.loc, /area/hyperspace))
continue // not part of the shuttle
ripple_turfs += T1
@@ -722,13 +722,13 @@
var/obj/docking_port/stationary/S0 = docked
if(istype(S0, /obj/docking_port/stationary/transit) && timeLeft(1) <= PARALLAX_LOOP_TIME)
for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
+ var/area/ship/shuttle_area = place
if(shuttle_area.parallax_movedir)
parallax_slowdown()
/obj/docking_port/mobile/proc/parallax_slowdown()
for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
+ var/area/ship/shuttle_area = place
shuttle_area.parallax_movedir = FALSE
if(assigned_transit && assigned_transit.assigned_area)
assigned_transit.assigned_area.parallax_movedir = FALSE
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 395da25aaa5d..5bf2107a998b 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -1,11 +1,9 @@
GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/mob/living,
- /obj/effect/rune,
/obj/structure/spider/spiderling,
/obj/item/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/beacon,
- /obj/singularity/narsie,
/obj/singularity/wizard,
/obj/machinery/teleport/station,
/obj/machinery/teleport/hub,
@@ -29,168 +27,3 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/machinery/camera,
/obj/item/gps
)))
-
-/*
-/obj/docking_port/mobile/supply
- name = "supply shuttle"
- callTime = 600
-
- dir = WEST
- port_direction = EAST
- width = 12
- dwidth = 5
- height = 7
- movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
-
-
- //Export categories for this run, this is set by console sending the shuttle.
- var/export_categories = EXPORT_CARGO
-
-/obj/docking_port/mobile/supply/register()
- . = ..()
- SSshuttle.supply = src
-
-/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
- for(var/place in areaInstances)
- var/area/shuttle/shuttle_area = place
- for(var/trf in shuttle_area)
- var/turf/T = trf
- for(var/a in T.GetAllContents())
- if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types) && !istype(a, /obj/docking_port))
- return FALSE
- return TRUE
-
-/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
- if(mode != SHUTTLE_IDLE)
- return 2
- return ..()
-
-
-/obj/docking_port/mobile/supply/initiate_docking()
- if(get_docked() == SSshuttle.supply_away_port) // Buy when we leave home.
- buy()
- . = ..() // Fly/enter transit.
- if(. != DOCKING_SUCCESS)
- return
- if(get_docked() == SSshuttle.supply_away_port) // Sell when we get home
- sell()
-
-/obj/docking_port/mobile/supply/proc/buy()
- var/list/obj/miscboxes = list() //miscboxes are combo boxes that contain all small_item orders grouped
- var/list/misc_order_num = list() //list of strings of order numbers, so that the manifest can show all orders in a box
- var/list/misc_contents = list() //list of lists of items that each box will contain
- if(!SSshuttle.shoppinglist.len)
- return
-
- var/list/empty_turfs = list()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/turf/open/floor/T in shuttle_area)
- if(T.is_blocked_turf())
- continue
- empty_turfs += T
-
- var/value = 0
- var/purchases = 0
- for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
- if(!empty_turfs.len)
- break
- var/price = SO.pack.cost
- var/datum/bank_account/D
- if(SO.paying_account) //Someone paid out of pocket
- D = SO.paying_account
- price *= 1.1 //TODO make this customizable by the quartermaster
- else
- D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- if(!D.adjust_money(-price))
- if(SO.paying_account)
- D.bank_card_talk("Cargo order #[SO.id] rejected due to lack of funds. Credits required: [price]")
- continue
-
- if(SO.paying_account)
- D.bank_card_talk("Cargo order #[SO.id] has shipped. [price] credits have been charged to your bank account.")
- var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR)
- cargo.adjust_money(price - SO.pack.cost) //Cargo gets the handling fee
- value += SO.pack.cost
- SSshuttle.shoppinglist -= SO
- SSshuttle.orderhistory += SO
-
- if(SO.pack.small_item) //small_item means it gets piled in the miscbox
- if(SO.paying_account)
- if(!miscboxes.len || !miscboxes[D.account_holder]) //if there's no miscbox for this person
- miscboxes[D.account_holder] = new /obj/structure/closet/crate/secure/owned(pick_n_take(empty_turfs), SO.paying_account)
- miscboxes[D.account_holder].name = "small items crate - purchased by [D.account_holder]"
- misc_contents[D.account_holder] = list()
- for (var/item in SO.pack.contains)
- misc_contents[D.account_holder] += item
- misc_order_num[D.account_holder] = "[misc_order_num[D.account_holder]]#[SO.id] "
- else //No private payment, so we just stuff it all into a generic crate
- if(!miscboxes.len || !miscboxes["Cargo"])
- miscboxes["Cargo"] = new /obj/structure/closet/crate/secure(pick_n_take(empty_turfs))
- miscboxes["Cargo"].name = "small items crate"
- misc_contents["Cargo"] = list()
- miscboxes["Cargo"].req_access = list()
- for (var/item in SO.pack.contains)
- misc_contents["Cargo"] += item
- //new item(miscboxes["Cargo"])
- if(SO.pack.access)
- miscboxes["Cargo"].req_access += SO.pack.access
- misc_order_num["Cargo"] = "[misc_order_num["Cargo"]]#[SO.id] "
- else
- SO.generate(pick_n_take(empty_turfs))
-
- SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.cost]", "[SO.pack.name]"))
- investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]), paid by [D.account_holder] has shipped.", INVESTIGATE_CARGO)
- if(SO.pack.dangerous)
- message_admins("\A [SO.pack.name] ordered by [ADMIN_LOOKUPFLW(SO.orderer_ckey)], paid by [D.account_holder] has shipped.")
- purchases++
-
- for(var/I in miscboxes)
- var/datum/supply_order/SO = new/datum/supply_order()
- SO.id = misc_order_num[I]
- SO.generateCombo(miscboxes[I], I, misc_contents[I])
- qdel(SO)
-
- var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
- investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO)
-
-/obj/docking_port/mobile/supply/proc/sell()
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- var/presale_points = D.account_balance
-
- if(!GLOB.exports_list.len) // No exports list? Generate it!
- setupExports()
-
- var/msg = ""
- var/matched_bounty = FALSE
-
- var/datum/export_report/ex = new
-
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/atom/movable/AM in shuttle_area)
- if(iscameramob(AM))
- continue
- if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
- matched_bounty = TRUE
- if(!AM.anchored || istype(AM, /obj/mecha))
- export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex)
-
- if(ex.exported_atoms)
- ex.exported_atoms += "." //ugh
-
- if(matched_bounty)
- msg += "Bounty items received. An update has been sent to all bounty consoles. "
-
- for(var/datum/export/E in ex.total_amount)
- var/export_text = E.total_printout(ex)
- if(!export_text)
- continue
-
- msg += export_text + "\n"
- D.adjust_money(ex.total_value[E])
-
- SSshuttle.centcom_message = msg
- investigate_log("Shuttle contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO)
-*/
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index da19730739e5..bc453eecd3d1 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -117,7 +117,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
var/clothes_req = TRUE //see if it requires clothes
- var/cult_req = FALSE //SPECIAL SNOWFLAKE clothes required for cult only spells
var/human_req = FALSE //spell can only be cast by humans
var/nonabstract_req = FALSE //spell can only be cast by mobs that are physical entities
var/stat_allowed = FALSE //see if it requires being conscious/alive, need to set to 1 for ghostpells
@@ -209,13 +208,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(!is_type_in_typecache(H.head, casting_clothes))
to_chat(H, "You don't feel strong enough without your hat!")
return FALSE
- if(cult_req) //CULT_REQ CLOTHES CHECK
- if(!istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
- to_chat(H, "You don't feel strong enough without your armor.")
- return FALSE
- if(!istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
- to_chat(H, "You don't feel strong enough without your helmet.")
- return FALSE
else
if(clothes_req || human_req)
to_chat(user, "This spell can only be cast by humans!")
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
deleted file mode 100644
index 61c05c4170fe..000000000000
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ /dev/null
@@ -1,327 +0,0 @@
-//////////////////////////////Construct Spells/////////////////////////
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser
- charge_max = 1800
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult
- clothes_req = TRUE
- charge_max = 2500
-
-/obj/effect/proc_holder/spell/aoe_turf/area_conversion
- name = "Area Conversion"
- desc = "This spell instantly converts a small area around you."
-
- school = "transmutation"
- charge_max = 50
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 2
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "areaconvert"
- action_background_icon_state = "bg_cult"
-
-/obj/effect/proc_holder/spell/aoe_turf/area_conversion/cast(list/targets, mob/user = usr)
- playsound(get_turf(user), 'sound/items/welder.ogg', 75, TRUE)
- for(var/turf/T in targets)
- T.narsie_act(FALSE, TRUE, 100 - (get_dist(user, T) * 25))
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
- name = "Summon Cult Floor"
- desc = "This spell constructs a cult floor."
-
- school = "conjuration"
- charge_max = 20
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- summon_type = list(/turf/open/floor/engine/cult)
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "floorconstruct"
- action_background_icon_state = "bg_cult"
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
- name = "Summon Cult Wall"
- desc = "This spell constructs a cult wall."
-
- school = "conjuration"
- charge_max = 100
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "lesserconstruct"
- action_background_icon_state = "bg_cult"
-
- summon_type = list(/turf/closed/wall/mineral/cult/artificer) //we don't want artificer-based runed metal farms
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
- name = "Greater Construction"
- desc = "This spell constructs a reinforced metal wall."
-
- school = "conjuration"
- charge_max = 300
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
-
- summon_type = list(/turf/closed/wall/r_wall)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
- name = "Summon Soulstone"
- desc = "This spell reaches into Nar'Sie's realm, summoning one of the legendary fragments across time and space."
-
- school = "conjuration"
- charge_max = 2400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "summonsoulstone"
- action_background_icon_state = "bg_demon"
-
- summon_type = list(/obj/item/soulstone)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/cult
- clothes_req = TRUE
- charge_max = 3600
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult
- summon_type = list(/obj/item/soulstone/anybody)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult/purified
- summon_type = list(/obj/item/soulstone/anybody/purified)
-
-/obj/effect/proc_holder/spell/targeted/forcewall/cult
- name = "Shield"
- desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
- school = "transmutation"
- charge_max = 400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- wall_type = /obj/effect/forcefield/cult
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "cultforcewall"
- action_background_icon_state = "bg_demon"
-
-
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
- name = "Phase Shift"
- desc = "This spell allows you to pass through walls."
-
- school = "transmutation"
- charge_max = 250
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = -1
- include_user = TRUE
- jaunt_duration = 50 //in deciseconds
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "phaseshift"
- action_background_icon_state = "bg_demon"
- jaunt_in_time = 6
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
- return
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/angelic
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith/angelic
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out/angelic
-
-/obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser
- name = "Lesser Magic Missile"
- desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
-
- school = "evocation"
- charge_max = 400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- max_targets = 6
- action_icon_state = "magicm"
- action_background_icon_state = "bg_demon"
- proj_type = /obj/projectile/magic/spell/magic_missile/lesser
-
-/obj/projectile/magic/spell/magic_missile/lesser
- color = "red" //Looks more culty this way
- range = 10
-
-/obj/effect/proc_holder/spell/targeted/smoke/disable
- name = "Paralysing Smoke"
- desc = "This spell spawns a cloud of paralysing smoke."
-
- school = "conjuration"
- charge_max = 200
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = -1
- include_user = TRUE
- cooldown_min = 20 //25 deciseconds reduction per rank
-
- smoke_spread = 3
- smoke_amt = 4
- action_icon_state = "smoke"
- action_background_icon_state = "bg_cult"
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze
- name = "Abyssal Gaze"
- desc = "This spell instills a deep terror in your target, temporarily chilling and blinding it."
- charge_max = 750
- range = 5
- stat_allowed = FALSE
- school = "evocation"
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_background_icon_state = "bg_demon"
- action_icon_state = "abyssal_gaze"
- active_msg = "You prepare to instill a deep terror in a target..."
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/cast(list/targets, mob/user)
- if(!LAZYLEN(targets))
- to_chat(user, "No target found in range!")
- return FALSE
- if(!can_target(targets[1], user))
- return FALSE
-
- var/mob/living/carbon/target = targets[1]
- if(target.anti_magic_check(TRUE, TRUE))
- to_chat(user, "The spell had no effect!")
- to_chat(target, "You feel a freezing darkness closing in on you, but it rapidly dissipates.")
- return FALSE
-
- to_chat(target, "A freezing darkness surrounds you...")
- target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1)
- user.playsound_local(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1)
- target.become_blind(ABYSSAL_GAZE_BLIND)
- addtimer(CALLBACK(src, PROC_REF(cure_blindness), target), 40)
- target.adjust_bodytemperature(-200)
-
-/**
- * cure_blidness: Cures Abyssal Gaze blindness from the target
- *
- * Arguments:
- * * target The mob that is being cured of the blindness.
- */
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/proc/cure_blindness(mob/target)
- if(isliving(target))
- var/mob/living/L = target
- L.cure_blind(ABYSSAL_GAZE_BLIND)
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/can_target(atom/target, mob/user, silent)
- . = ..()
- if(!.)
- return FALSE
- if(!iscarbon(target))
- if(!silent)
- to_chat(user, "You can only target carbon based lifeforms!")
- return FALSE
- return TRUE
-
-/obj/effect/proc_holder/spell/pointed/dominate
- name = "Dominate"
- desc = "This spell dominates the mind of a lesser creature to the will of Nar'Sie, allying it only to her direct followers."
- charge_max = 600
- range = 7
- stat_allowed = FALSE
- school = "evocation"
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_background_icon_state = "bg_demon"
- action_icon_state = "dominate"
- active_msg = "You prepare to dominate the mind of a target..."
-
-/obj/effect/proc_holder/spell/pointed/dominate/cast(list/targets, mob/user)
- if(!LAZYLEN(targets))
- to_chat(user, "No target found in range.")
- return FALSE
- if(!can_target(targets[1], user))
- return FALSE
-
- var/mob/living/simple_animal/S = targets[1]
- S.add_atom_colour("#990000", FIXED_COLOUR_PRIORITY)
- S.faction = list("cult")
- playsound(get_turf(S), 'sound/effects/ghost.ogg', 100, TRUE)
- new /obj/effect/temp_visual/cult/sac(get_turf(S))
-
-/obj/effect/proc_holder/spell/pointed/dominate/can_target(atom/target, mob/user, silent)
- . = ..()
- if(!.)
- return FALSE
- if(!isanimal(target))
- if(!silent)
- to_chat(user, "Target is not a lesser creature!")
- return FALSE
-
- var/mob/living/simple_animal/S = target
- if(S.mind)
- if(!silent)
- to_chat(user, "[S] is too intelligent to dominate!")
- return FALSE
- if(S.stat)
- if(!silent)
- to_chat(user, "[S] is dead!")
- return FALSE
- if(S.sentience_type != SENTIENCE_ORGANIC)
- if(!silent)
- to_chat(user, "[S] cannot be dominated!")
- return FALSE
- if("cult" in S.faction)
- if(!silent)
- to_chat(user, "[S] is already serving Nar'Sie!")
- return FALSE
- return TRUE
-
-/obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut
- name = "Gauntlet Echo"
- desc = "Channels energy into your gauntlet - firing its essence forward in a slow moving, yet devastating, attack."
- proj_type = /obj/projectile/magic/spell/juggernaut
- charge_max = 350
- clothes_req = FALSE
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "cultfist"
- action_background_icon_state = "bg_demon"
- sound = 'sound/weapons/resonator_blast.ogg'
-
-/obj/projectile/magic/spell/juggernaut
- name = "Gauntlet Echo"
- icon_state = "cultfist"
- alpha = 180
- damage = 30
- damage_type = BRUTE
- knockdown = 50
- hitsound = 'sound/weapons/punch3.ogg'
- trigger_range = 0
- check_holy = TRUE
- ignored_factions = list("cult")
- range = 15
- speed = 7
-
-/obj/projectile/magic/spell/juggernaut/on_hit(atom/target, blocked)
- . = ..()
- var/turf/T = get_turf(src)
- playsound(T, 'sound/weapons/resonator_blast.ogg', 100, FALSE)
- new /obj/effect/temp_visual/cult/sac(T)
- for(var/obj/O in range(src,1))
- if(O.density && !istype(O, /obj/structure/destructible/cult))
- O.take_damage(90, BRUTE, "melee", 0)
- new /obj/effect/temp_visual/cult/turf/floor(get_turf(O))
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
deleted file mode 100644
index f1654551df3a..000000000000
--- a/code/modules/spells/spell_types/devil.dm
+++ /dev/null
@@ -1,236 +0,0 @@
-/obj/effect/proc_holder/spell/targeted/conjure_item/violin
- item_type = /obj/item/instrument/violin/golden
- desc = "A devil's instrument of choice. Use this to summon/unsummon your golden violin."
- invocation_type = INVOCATION_WHISPER
- invocation = "I ain't had this much fun since Georgia."
- action_icon_state = "golden_violin"
- name = "Summon golden violin"
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/summon_contract
- name = "Summon infernal contract"
- desc = "Skip making a contract by hand, just do it by magic."
- invocation_type = INVOCATION_WHISPER
- invocation = "Just sign on the dotted line."
- include_user = FALSE
- range = 5
- clothes_req = FALSE
-
- school = "conjuration"
- charge_max = 150
- cooldown_min = 10
- action_icon_state = "spell_default"
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/summon_contract/cast(list/targets, mob/user = usr)
- for(var/mob/living/carbon/C in targets)
- if(C.mind && user.mind)
- if(C.stat == DEAD)
- if(user.dropItemToGround(user.get_active_held_item()))
- var/obj/item/paper/contract/infernal/revive/contract = new(user.loc, C.mind, user.mind)
- user.put_in_hands(contract)
- else
- var/obj/item/paper/contract/infernal/contract // = new(user.loc, C.mind, contractType, user.mind)
- var/contractTypeName = input(user, "What type of contract?") in sortList(list("Power", "Wealth", "Prestige", "Magic", "Knowledge", "Friendship"))
- switch(contractTypeName)
- if("Power")
- contract = new /obj/item/paper/contract/infernal/power(C.loc, C.mind, user.mind)
- if("Wealth")
- contract = new /obj/item/paper/contract/infernal/wealth(C.loc, C.mind, user.mind)
- if("Prestige")
- contract = new /obj/item/paper/contract/infernal/prestige(C.loc, C.mind, user.mind)
- if("Magic")
- contract = new /obj/item/paper/contract/infernal/magic(C.loc, C.mind, user.mind)
- if("Knowledge")
- contract = new /obj/item/paper/contract/infernal/knowledge(C.loc, C.mind, user.mind)
- if("Friendship")
- contract = new /obj/item/paper/contract/infernal/friend(C.loc, C.mind, user.mind)
- C.put_in_hands(contract)
- else
- to_chat(user, "[C] seems to not be sentient. You cannot summon a contract for [C.p_them()].")
-
-
-/obj/effect/proc_holder/spell/aimed/fireball/hellish
- name = "Hellfire"
- desc = "This spell launches hellfire at the target."
-
- school = "evocation"
- charge_max = 80
- clothes_req = FALSE
- invocation = "Your very soul will catch fire!"
- invocation_type = INVOCATION_SHOUT
- range = 2
-
- projectile_type = /obj/projectile/magic
-
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt
- name = "Infernal Jaunt"
- desc = "Use hellfire to phase out of existence."
- charge_max = 200
- clothes_req = FALSE
- selection_type = "range"
- range = -1
- cooldown_min = 0
- overlay = null
- include_user = TRUE
- action_icon_state = "jaunt"
- action_background_icon_state = "bg_demon"
- phase_allowed = TRUE
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt/cast(list/targets, mob/living/user = usr)
- if(istype(user))
- if(istype(user.loc, /obj/effect/dummy/phased_mob/slaughter/))
- if(valid_location(user))
- to_chat(user, "You are now phasing in.")
- if(do_after(user, 1.5 SECONDS, user))
- if(valid_location(user))
- user.infernalphasein()
- else
- to_chat(user, "You are no longer near a potential signer.")
-
- else
- to_chat(user, "You can only re-appear near a potential signer.")
- revert_cast()
- return ..()
- else
- user.notransform = TRUE
- user.fakefire()
- to_chat(src, "You begin to phase back into sinful flames.")
- if(do_after(user, 1.5 SECONDS, user))
- user.infernalphaseout()
- else
- to_chat(user, "You must remain still while exiting.")
- user.notransform = FALSE
- user.fakefireextinguish()
- start_recharge()
- return
- revert_cast()
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt/proc/valid_location(mob/living/user = usr)
- if(istype(get_area(user), /area/shuttle/)) // Can always phase in in a shuttle.
- return TRUE
- else
- for(var/mob/living/C in orange(2, get_turf(user))) //Can also phase in when nearby a potential buyer.
- if (C.owns_soul())
- return TRUE
- return FALSE
-
-/mob/living/proc/infernalphaseout()
- dust_animation()
- spawn_dust()
- visible_message("[src] disappears in a flashfire!")
- playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, TRUE, -1)
- var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(loc)
- ExtinguishMob()
- forceMove(holder)
- holder = holder
- notransform = FALSE
- fakefireextinguish()
-
-/mob/living/proc/infernalphasein()
- if(notransform)
- to_chat(src, "You're too busy to jaunt in.")
- return FALSE
- fakefire()
- forceMove(drop_location())
- client.eye = src
- visible_message("[src] appears in a fiery blaze!")
- playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, TRUE, -1)
- addtimer(CALLBACK(src, PROC_REF(fakefireextinguish)), 15, TIMER_UNIQUE)
-
-/obj/effect/proc_holder/spell/targeted/sintouch
- name = "Sin Touch"
- desc = "Subtly encourage someone to sin."
- charge_max = 1800
- clothes_req = FALSE
- selection_type = "range"
- range = 2
- cooldown_min = 0
- overlay = null
- include_user = FALSE
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "sintouch"
- action_background_icon_state = "bg_demon"
- phase_allowed = FALSE
- random_target = TRUE
- random_target_priority = TARGET_RANDOM
- max_targets = 3
- invocation = "TASTE SIN AND INDULGE!!"
- invocation_type = INVOCATION_SHOUT
-
-/obj/effect/proc_holder/spell/targeted/sintouch/ascended
- name = "Greater sin touch"
- charge_max = 100
- range = 7
- max_targets = 10
-
-/obj/effect/proc_holder/spell/targeted/sintouch/cast(list/targets, mob/living/user = usr)
- for(var/mob/living/carbon/human/H in targets)
- if(!H.mind)
- continue
- if(H.mind.has_antag_datum(/datum/antagonist/sintouched))
- continue
- if(H.anti_magic_check(FALSE, TRUE))
- continue
- H.mind.add_antag_datum(/datum/antagonist/sintouched)
- H.Paralyze(400)
-
-
-/obj/effect/proc_holder/spell/targeted/summon_dancefloor
- name = "Summon Dancefloor"
- desc = "When what a Devil really needs is funk."
- include_user = TRUE
- range = -1
- clothes_req = FALSE
-
- school = "conjuration"
- charge_max = 10
- cooldown_min = 50 //5 seconds, so the smoke can't be spammed
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "funk"
- action_background_icon_state = "bg_demon"
-
- var/list/dancefloor_turfs
- var/list/dancefloor_turfs_types
- var/dancefloor_exists = FALSE
- var/datum/effect_system/smoke_spread/transparent/dancefloor_devil/smoke
-
-
-/obj/effect/proc_holder/spell/targeted/summon_dancefloor/cast(list/targets, mob/user = usr)
- LAZYINITLIST(dancefloor_turfs)
- LAZYINITLIST(dancefloor_turfs_types)
-
- if(!smoke)
- smoke = new()
- smoke.set_up(0, get_turf(user))
- smoke.start()
-
- if(dancefloor_exists)
- dancefloor_exists = FALSE
- for(var/i in 1 to dancefloor_turfs.len)
- var/turf/T = dancefloor_turfs[i]
- T.ChangeTurf(dancefloor_turfs_types[i], flags = CHANGETURF_INHERIT_AIR)
- else
- var/list/funky_turfs = RANGE_TURFS(1, user)
- for(var/turf/closed/solid in funky_turfs)
- to_chat(user, "You're too close to a wall.")
- return
- dancefloor_exists = TRUE
- var/i = 1
- dancefloor_turfs.len = funky_turfs.len
- dancefloor_turfs_types.len = funky_turfs.len
- for(var/t in funky_turfs)
- var/turf/T = t
- dancefloor_turfs[i] = T
- dancefloor_turfs_types[i] = T.type
- T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b, flags = CHANGETURF_INHERIT_AIR)
- i++
-
-/datum/effect_system/smoke_spread/transparent/dancefloor_devil
- effect_type = /obj/effect/particle_effect/smoke/transparent/dancefloor_devil
-
-/obj/effect/particle_effect/smoke/transparent/dancefloor_devil
- lifetime = 2
diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm
deleted file mode 100644
index 01ea14b15fa8..000000000000
--- a/code/modules/spells/spell_types/devil_boons.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-/obj/effect/proc_holder/spell/targeted/summon_wealth
- name = "Summon wealth"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- school = "conjuration"
- charge_max = 100
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "moneybag"
-
-
-/obj/effect/proc_holder/spell/targeted/summon_wealth/cast(list/targets, mob/user = usr)
- for(var/mob/living/carbon/C in targets)
- if(user.dropItemToGround(user.get_active_held_item()))
- var/obj/item = pick(
- new /obj/item/coin/gold(user.drop_location()),
- new /obj/item/coin/diamond(user.drop_location()),
- new /obj/item/coin/silver(user.drop_location()),
- new /obj/item/clothing/accessory/medal/gold(user.drop_location()),
- new /obj/item/stack/sheet/mineral/gold(user.drop_location()),
- new /obj/item/stack/sheet/mineral/silver(user.drop_location()),
- new /obj/item/stack/sheet/mineral/diamond(user.drop_location()),
- new /obj/item/holochip(user.drop_location(), 1000))
- C.put_in_hands(item)
-
-/obj/effect/proc_holder/spell/targeted/view_range
- name = "Distant vision"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- charge_max = 50
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_silicon.dmi'
- action_icon_state = "camera_jump"
- var/ranges = list(7,8,9,10)
-
-/obj/effect/proc_holder/spell/targeted/view_range/cast(list/targets, mob/user = usr)
- for(var/mob/C in targets)
- if(!C.client)
- continue
- C.client.view_size.setTo((input("Select view range:", "Range", 4) in ranges) - 7)
-
-/obj/effect/proc_holder/spell/targeted/summon_friend
- name = "Summon Friend"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- charge_max = 50
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_spells.dmi'
- action_icon_state = "sacredflame"
- var/mob/living/friend
- var/obj/effect/mob_spawn/human/demonic_friend/friendShell
-
-/obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr)
- if(!QDELETED(friend))
- to_chat(friend, "Your master has deemed you a poor friend. Your durance in hell will now resume.")
- friend.dust(TRUE)
- qdel(friendShell)
- return
- if(!QDELETED(friendShell))
- qdel(friendShell)
- return
- for(var/C in targets)
- var/mob/living/L = C
- friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src)
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless
- clothes_req = FALSE
diff --git a/code/modules/spells/spell_types/pointed/mind_transfer.dm b/code/modules/spells/spell_types/pointed/mind_transfer.dm
index e0ef3566fa0d..5b069756864d 100644
--- a/code/modules/spells/spell_types/pointed/mind_transfer.dm
+++ b/code/modules/spells/spell_types/pointed/mind_transfer.dm
@@ -30,7 +30,7 @@
var/mob/living/victim = targets[1] //The target of the spell whos body will be transferred to.
var/datum/mind/VM = victim.mind
- if(victim.anti_magic_check(TRUE, FALSE) || VM.has_antag_datum(/datum/antagonist/wizard) || VM.has_antag_datum(/datum/antagonist/cult) || VM.has_antag_datum(/datum/antagonist/changeling) || victim.key[1] == "@")
+ if(victim.anti_magic_check(TRUE, FALSE) || VM.has_antag_datum(/datum/antagonist/wizard) || VM.has_antag_datum(/datum/antagonist/changeling) || victim.key[1] == "@")
if(!silent)
to_chat(user, "[victim.p_their(TRUE)] mind is resisting your spell!")
return FALSE
diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 254a43dc23af..3c087cc8840d 100644
--- a/code/modules/spells/spell_types/shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift.dm
@@ -20,8 +20,7 @@
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
/mob/living/simple_animal/pet/dog/corgi,\
/mob/living/simple_animal/bot/secbot/ed209,\
- /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,\
- /mob/living/simple_animal/hostile/construct/juggernaut)
+ /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets,mob/user = usr)
if(src in user.mob_spell_list)
diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm
index 2fab8c5848ef..bc800a49c7d4 100644
--- a/code/modules/spells/spell_types/wizard.dm
+++ b/code/modules/spells/spell_types/wizard.dm
@@ -132,12 +132,6 @@
sound1 = 'sound/magic/blink.ogg'
sound2 = 'sound/magic/blink.ogg'
-/obj/effect/proc_holder/spell/targeted/turf_teleport/blink/cult
- name = "quickstep"
-
- charge_max = 100
- clothes_req = TRUE
-
/obj/effect/proc_holder/spell/targeted/area_teleport/teleport
name = "Teleport"
desc = "This spell teleports you to an area of your selection."
@@ -194,20 +188,6 @@
summon_type = list(/mob/living/simple_animal/hostile/carp)
cast_sound = 'sound/magic/summon_karp.ogg'
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
- name = "Artificer"
- desc = "This spell conjures a construct which may be controlled by Shades."
- school = "conjuration"
- charge_max = 600
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- summon_type = list(/obj/structure/constructshell)
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "artificer"
- cast_sound = 'sound/magic/summonitems_generic.ogg'
-
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
name = "Summon Creature Swarm"
desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth."
@@ -223,12 +203,6 @@
summon_type = list(/mob/living/simple_animal/hostile/netherworld)
cast_sound = 'sound/magic/summonitems_generic.ogg'
-/obj/effect/proc_holder/spell/aoe_turf/conjure/creature/cult
- name = "Summon Creatures (DANGEROUS)"
- clothes_req = TRUE
- charge_max = 5000
- summon_amt = 2
-
/obj/effect/proc_holder/spell/aoe_turf/repulse
name = "Repulse"
desc = "This spell throws everything around the user away."
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 4c9b3556b6aa..e42cb866b508 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -158,26 +158,3 @@
/obj/machinery/satellite/meteor_shield/toggle(user)
if(!..(user))
return FALSE
- if(obj_flags & EMAGGED)
- if(active)
- change_meteor_chance(2)
- else
- change_meteor_chance(0.5)
-
-/obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod)
- var/datum/round_event_control/E = locate(/datum/round_event_control/meteor_wave) in SSevents.control
- if(E)
- E.weight *= mod
-
-/obj/machinery/satellite/meteor_shield/Destroy()
- . = ..()
- if(active && (obj_flags & EMAGGED))
- change_meteor_chance(0.5)
-
-/obj/machinery/satellite/meteor_shield/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- obj_flags |= EMAGGED
- to_chat(user, "You access the satellite's debug mode, increasing the chance of meteor strikes.")
- if(active)
- change_meteor_chance(2)
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 05dffd8b4ffd..4c9a9be3b6d4 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -271,11 +271,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/head/devil
- dismemberable = 0
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/head/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_head"
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 5f89d15aa95f..543a0e5fddde 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -43,11 +43,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/chest/devil
- dismemberable = 0
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/chest/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_chest"
@@ -153,12 +148,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/l_arm/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/r_arm
name = "right arm"
desc = "Over 87% of humans are right handed. That figure is much lower \
@@ -255,12 +244,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/r_arm/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/leg/left
name = "left leg"
desc = "Some athletes prefer to tie their left shoelaces first for good \
@@ -346,12 +329,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/leg/left/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/leg/right
name = "right leg"
desc = "You put your right leg in, your right leg out. In, out, in, out, \
@@ -438,9 +415,3 @@
can_be_disabled = FALSE
max_damage = 100
animal_origin = ALIEN_BODYPART
-
-/obj/item/bodypart/leg/right/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index eccf729d263f..fd3c740b9eb1 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -13,7 +13,7 @@
/datum/surgery_step/clamp_bleeders,
/datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
- target_mobtypes = list(/mob/living) //Feel free to dissect devils but they're magic.
+ target_mobtypes = list(/mob/living)
replaced_by = /datum/surgery/advanced/experimental_dissection/adv
requires_tech = FALSE
var/value_multiplier = 0.25
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 6a5a344b177e..b86c5b8b86ce 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -99,10 +99,7 @@
var/log_message = uppertext(message)
if(!span_list || !span_list.len)
- if(iscultist(user))
- span_list = list("narsiesmall")
- else
- span_list = list()
+ span_list = list()
user.say(message, spans = span_list, sanitize = FALSE)
@@ -135,10 +132,6 @@
if(user.mind.assigned_role == "Mime")
power_multiplier *= 0.5
- //Cultists are closer to their gods and are more powerful, but they'll give themselves away
- if(iscultist(user))
- power_multiplier *= 2
-
//Try to check if the speaker specified a name or a job to focus on
var/list/specific_listeners = list()
var/found_string = null
@@ -148,15 +141,8 @@
for(var/V in listeners)
var/mob/living/L = V
- var/datum/antagonist/devil/devilinfo = is_devil(L)
- if(devilinfo && findtext(message, devilinfo.truename))
- var/start = findtext(message, devilinfo.truename)
- listeners = list(L) //Devil names are unique.
- power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
- //Cut out the name so it doesn't trigger commands
- message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename))
- break
- else if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
+
+ if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
specific_listeners += L //focus on those with the specified name
//Cut out the name so it doesn't trigger commands
found_string = L.real_name
@@ -331,11 +317,7 @@
for(var/V in listeners)
var/mob/living/L = V
var/text = ""
- if(is_devil(L))
- var/datum/antagonist/devil/devilinfo = is_devil(L)
- text = devilinfo.truename
- else
- text = L.real_name
+ text = L.real_name
addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), text), 5 * i)
i++
diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm
index 9aee2ca10624..0e0248162fc8 100644
--- a/code/modules/unit_tests/create_and_destroy.dm
+++ b/code/modules/unit_tests/create_and_destroy.dm
@@ -35,8 +35,6 @@
/obj/machinery/power/shuttle/engine/liquid,
//needs a template
/obj/effect/landmark/subship,
- //needs a friend :(
- /obj/effect/mob_spawn/human/demonic_friend,
//needs a derg
/obj/structure/carp_rift,
//doesn't have icons
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 877f1f11d854..0923ba1cc70e 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1791,13 +1791,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
restricted_roles = list("Curator")
limited_stock = 1 //please don't spam deadchat
-/datum/uplink_item/role_restricted/cultconstructkit
- name = "Cult Construct Kit"
- desc = "Recovered from an abandoned Nar'sie cult lair two construct shells and a stash of empty soulstones was found. These were purified to prevent occult contamination and have been put in a belt so they may be used as an accessible source of disposable minions. The construct shells have been packaged into two beacons for rapid and portable deployment."
- item = /obj/item/storage/box/syndie_kit/cultconstructkit
- cost = 20
- restricted_roles = list("Chaplain")
-
/datum/uplink_item/role_restricted/lawnmower
name = "Gas powered lawn mower"
desc = "A lawn mower is a machine utilizing one or more revolving blades to cut a grass surface to an even height, or bodies if that's your thing"
diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm
index ba21f01289b3..6c6623901331 100644
--- a/code/modules/vehicles/vehicle_key.dm
+++ b/code/modules/vehicles/vehicle_key.dm
@@ -12,15 +12,3 @@
/obj/item/key/janitor
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
icon_state = "keyjanitor"
-
-/obj/item/key/lasso
- name = "bone lasso"
- desc = "Perfect for taming all kinds of supernatural beasts! (Warning: only perfect for taming one kind of supernatural beast.)"
- force = 12
- icon_state = "lasso"
- item_state = "chain"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- attack_verb = list("flogged", "whipped", "lashed", "disciplined")
- hitsound = 'sound/weapons/whip.ogg'
- slot_flags = ITEM_SLOT_BELT
diff --git a/html/changelogs/AutoChangeLog-pr-3417.yml b/html/changelogs/AutoChangeLog-pr-3417.yml
new file mode 100644
index 000000000000..f00e3b3d4845
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3417.yml
@@ -0,0 +1,5 @@
+author: SomeguyManperson
+changes:
+ - {balance: you no longer need a lasso to ride a goliath}
+ - {rscdel: no more lasso}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3430.yml b/html/changelogs/AutoChangeLog-pr-3430.yml
deleted file mode 100644
index d464fc2f8fc4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3430.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: thgvr
-changes:
- - {imageadd: Some backpack sprites for Kepori}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3447.yml b/html/changelogs/AutoChangeLog-pr-3447.yml
new file mode 100644
index 000000000000..a3c00b8de0da
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3447.yml
@@ -0,0 +1,4 @@
+author: Bjarl
+changes:
+ - {code_imp: A large amount of cruft has been deleted.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3472.yml b/html/changelogs/AutoChangeLog-pr-3472.yml
new file mode 100644
index 000000000000..899e00d9c9e5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3472.yml
@@ -0,0 +1,4 @@
+author: thgvr
+changes:
+ - {bugfix: fixed digitigrade combat/jackboots}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3481.yml b/html/changelogs/AutoChangeLog-pr-3481.yml
deleted file mode 100644
index d4489159840d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3481.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: thgvr
-changes:
- - {imageadd: Shrunk down the sprite of guncases}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3484.yml b/html/changelogs/AutoChangeLog-pr-3484.yml
new file mode 100644
index 000000000000..e1268b036c5f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3484.yml
@@ -0,0 +1,6 @@
+author: Sadhorizon
+changes:
+ - {rscadd: Cybersun Biodynamics stamp.}
+ - {rscadd: Cybersun secret documents.}
+ - {rscadd: Cybersun captain's safe.}
+delete-after: true
diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
index ef18854c4aac..5b95989e7c16 100644
--- a/html/changelogs/archive/2024-10.yml
+++ b/html/changelogs/archive/2024-10.yml
@@ -69,3 +69,10 @@
Thera-Pissed:
- rscadd: angle grinders for salvage
- rscadd: reworks plasma cutters for salvage
+2024-10-07:
+ Aquidu:
+ - code_imp: Changes flameless ration heaters to "small" items
+ - code_imp: Adds flameless ration heaters to the ration pack item whitelist.
+ thgvr:
+ - imageadd: Some backpack sprites for Kepori
+ - imageadd: Shrunk down the sprite of guncases
diff --git a/icons/mob/species/misc/digitigrade_shoes.dmi b/icons/mob/species/misc/digitigrade_shoes.dmi
index 9d08980b1e58..fb3dd6693471 100644
Binary files a/icons/mob/species/misc/digitigrade_shoes.dmi and b/icons/mob/species/misc/digitigrade_shoes.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 17bab47dc9ef..68fef79c160b 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index 87cef669faf0..fdefd87860b5 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/stamp_icons/large_stamp-biodynamics.png b/icons/stamp_icons/large_stamp-biodynamics.png
new file mode 100644
index 000000000000..0d09b4f37c00
Binary files /dev/null and b/icons/stamp_icons/large_stamp-biodynamics.png differ
diff --git a/shiptest.dme b/shiptest.dme
index 04d951c46325..187540e66a26 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -50,7 +50,6 @@
#include "code\__DEFINES\construction.dm"
#include "code\__DEFINES\contracts.dm"
#include "code\__DEFINES\cooldowns.dm"
-#include "code\__DEFINES\cult.dm"
#include "code\__DEFINES\directional.dm"
#include "code\__DEFINES\diseases.dm"
#include "code\__DEFINES\DNA.dm"
@@ -283,7 +282,6 @@
#include "code\_onclick\hud\alien_larva.dm"
#include "code\_onclick\hud\constructs.dm"
#include "code\_onclick\hud\credits.dm"
-#include "code\_onclick\hud\devil.dm"
#include "code\_onclick\hud\drones.dm"
#include "code\_onclick\hud\fullscreen.dm"
#include "code\_onclick\hud\generic_dextrous.dm"
@@ -307,7 +305,6 @@
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\screentip.dm"
#include "code\_onclick\hud\storage.dm"
-#include "code\_onclick\hud\swarmer.dm"
#include "code\controllers\admin.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
@@ -552,7 +549,6 @@
#include "code\datums\components\sitcomlaughter.dm"
#include "code\datums\components\sizzle.dm"
#include "code\datums\components\slippery.dm"
-#include "code\datums\components\soulstoned.dm"
#include "code\datums\components\spill.dm"
#include "code\datums\components\spooky.dm"
#include "code\datums\components\squeak.dm"
@@ -846,11 +842,9 @@
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\ship_areas.dm"
-#include "code\game\area\Space_Station_13_areas.dm"
#include "code\game\area\areas\away_content.dm"
#include "code\game\area\areas\centcom.dm"
#include "code\game\area\areas\outpost.dm"
-#include "code\game\area\areas\shuttles.dm"
#include "code\game\area\areas\ruins\_ruins.dm"
#include "code\game\area\areas\ruins\beachplanet.dm"
#include "code\game\area\areas\ruins\icemoon.dm"
@@ -872,18 +866,12 @@
#include "code\game\gamemodes\clown_ops\bananium_bomb.dm"
#include "code\game\gamemodes\clown_ops\clown_ops.dm"
#include "code\game\gamemodes\clown_ops\clown_weapons.dm"
-#include "code\game\gamemodes\cult\cult.dm"
-#include "code\game\gamemodes\devil\devil_game_mode.dm"
-#include "code\game\gamemodes\devil\game_mode.dm"
-#include "code\game\gamemodes\devil\objectives.dm"
-#include "code\game\gamemodes\devil\devil_agent\devil_agent.dm"
#include "code\game\gamemodes\dynamic\dynamic.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_latejoin.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
#include "code\game\gamemodes\extended\extended.dm"
-#include "code\game\gamemodes\meteor\meteor.dm"
#include "code\game\gamemodes\meteor\meteors.dm"
#include "code\game\gamemodes\nuclear\nuclear.dm"
#include "code\game\gamemodes\sandbox\airlock_maker.dm"
@@ -1700,20 +1688,6 @@
#include "code\modules\antagonists\changeling\powers\strained_muscles.dm"
#include "code\modules\antagonists\changeling\powers\tiny_prick.dm"
#include "code\modules\antagonists\changeling\powers\transform.dm"
-#include "code\modules\antagonists\cult\blood_magic.dm"
-#include "code\modules\antagonists\cult\cult.dm"
-#include "code\modules\antagonists\cult\cult_comms.dm"
-#include "code\modules\antagonists\cult\cult_items.dm"
-#include "code\modules\antagonists\cult\cult_structures.dm"
-#include "code\modules\antagonists\cult\cult_turf_overlay.dm"
-#include "code\modules\antagonists\cult\rune_spawn_action.dm"
-#include "code\modules\antagonists\cult\runes.dm"
-#include "code\modules\antagonists\devil\devil.dm"
-#include "code\modules\antagonists\devil\imp\imp.dm"
-#include "code\modules\antagonists\devil\sintouched\objectives.dm"
-#include "code\modules\antagonists\devil\sintouched\sintouched.dm"
-#include "code\modules\antagonists\devil\true_devil\_true_devil.dm"
-#include "code\modules\antagonists\devil\true_devil\inventory.dm"
#include "code\modules\antagonists\disease\disease_abilities.dm"
#include "code\modules\antagonists\disease\disease_datum.dm"
#include "code\modules\antagonists\disease\disease_disease.dm"
@@ -1752,8 +1726,6 @@
#include "code\modules\antagonists\slaughter\slaughterevent.dm"
#include "code\modules\antagonists\space_dragon\space_dragon.dm"
#include "code\modules\antagonists\survivalist\survivalist.dm"
-#include "code\modules\antagonists\swarmer\swarmer.dm"
-#include "code\modules\antagonists\swarmer\swarmer_event.dm"
#include "code\modules\antagonists\traitor\datum_traitor.dm"
#include "code\modules\antagonists\traitor\syndicate_contract.dm"
#include "code\modules\antagonists\traitor\equipment\contractor.dm"
@@ -1764,7 +1736,6 @@
#include "code\modules\antagonists\valentines\valentine.dm"
#include "code\modules\antagonists\wizard\wizard.dm"
#include "code\modules\antagonists\wizard\equipment\artefact.dm"
-#include "code\modules\antagonists\wizard\equipment\soulstone.dm"
#include "code\modules\antagonists\wizard\equipment\spellbook.dm"
#include "code\modules\antagonists\xeno\xeno.dm"
#include "code\modules\assembly\assembly.dm"
@@ -1871,7 +1842,6 @@
#include "code\modules\awaymissions\mission_code\research.dm"
#include "code\modules\awaymissions\mission_code\snowdin.dm"
#include "code\modules\awaymissions\mission_code\spacebattle.dm"
-#include "code\modules\awaymissions\mission_code\stationCollision.dm"
#include "code\modules\awaymissions\mission_code\undergroundoutpost45.dm"
#include "code\modules\balloon_alert\balloon_alert.dm"
#include "code\modules\buildmode\bm_mode.dm"
@@ -2115,7 +2085,6 @@
#include "code\modules\events\camerafailure.dm"
#include "code\modules\events\carp_migration.dm"
#include "code\modules\events\communications_blackout.dm"
-#include "code\modules\events\devil.dm"
#include "code\modules\events\disease_outbreak.dm"
#include "code\modules\events\dust.dm"
#include "code\modules\events\electrical_storm.dm"
@@ -2127,10 +2096,7 @@
#include "code\modules\events\high_priority_bounty.dm"
#include "code\modules\events\immovable_rod.dm"
#include "code\modules\events\ion_storm.dm"
-#include "code\modules\events\major_dust.dm"
#include "code\modules\events\mass_hallucination.dm"
-#include "code\modules\events\meateor_wave.dm"
-#include "code\modules\events\meteor_wave.dm"
#include "code\modules\events\nightmare.dm"
#include "code\modules\events\operative.dm"
#include "code\modules\events\prison_break.dm"
@@ -2385,7 +2351,6 @@
#include "code\modules\language\teceti_unified.dm"
#include "code\modules\language\vox_pidgin.dm"
#include "code\modules\language\xenocommon.dm"
-#include "code\modules\library\lib_codex_gigas.dm"
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
#include "code\modules\library\random_books.dm"
@@ -2668,11 +2633,9 @@
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
#include "code\modules\mob\living\silicon\robot\robot_say.dm"
#include "code\modules\mob\living\simple_animal\animal_defense.dm"
-#include "code\modules\mob\living\simple_animal\constructs.dm"
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\damage_procs.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
-#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\status_procs.dm"
#include "code\modules\mob\living\simple_animal\bot\bot.dm"
@@ -2781,7 +2744,6 @@
#include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"
-#include "code\modules\mob\living\simple_animal\hostile\megafauna\swarmer.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\wendigo.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\basilisk.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\brimdemon.dm"
@@ -3017,7 +2979,6 @@
#include "code\modules\power\singularity\field_generator.dm"
#include "code\modules\power\singularity\generator.dm"
#include "code\modules\power\singularity\investigate.dm"
-#include "code\modules\power\singularity\narsie.dm"
#include "code\modules\power\singularity\singularity.dm"
#include "code\modules\power\singularity\particle_accelerator\particle.dm"
#include "code\modules\power\singularity\particle_accelerator\particle_accelerator.dm"
@@ -3335,10 +3296,7 @@
#include "code\modules\spells\spell_types\bloodcrawl.dm"
#include "code\modules\spells\spell_types\charge.dm"
#include "code\modules\spells\spell_types\conjure.dm"
-#include "code\modules\spells\spell_types\construct_spells.dm"
#include "code\modules\spells\spell_types\curse.dm"
-#include "code\modules\spells\spell_types\devil.dm"
-#include "code\modules\spells\spell_types\devil_boons.dm"
#include "code\modules\spells\spell_types\emplosion.dm"
#include "code\modules\spells\spell_types\ethereal_jaunt.dm"
#include "code\modules\spells\spell_types\explosion.dm"