"
if(viable_occupant)
temp_html += "
1
"
var/len = length(viable_occupant.dna.struc_enzymes)
@@ -809,7 +809,7 @@
if(istype(buffer_slot))
buffer_slot.Cut()
if("transferbuffer")
- if(num && viable_occupant)
+ if(num && viable_occupant && viable_occupant.stat != DEAD)
num = Clamp(num, 1, NUMBER_OF_BUFFERS)
var/list/buffer_slot = buffer[num]
if(istype(buffer_slot)) //15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage
@@ -954,7 +954,7 @@
//value in range 1 to values. values must be greater than 0
//all arguments assumed to be positive integers
-proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
+/proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
var/width = round((16**blocksize)/values)
if(value < 1)
value = 1
@@ -962,7 +962,7 @@ proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
return num2hex(value, blocksize)
//value is hex
-proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE)
+/proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE)
var/width = round((16**blocksize)/values)
value = round(hex2num(value) / width) + 1
if(value > values)
diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm
index 16373621412..502d4300932 100644
--- a/code/game/gamemodes/abduction/abduction.dm
+++ b/code/game/gamemodes/abduction/abduction.dm
@@ -13,6 +13,7 @@
var/list/datum/mind/agents = list()
var/list/datum/objective/team_objectives = list()
var/list/team_names = list()
+ var/finished = 0
/datum/game_mode/abduction/announce()
world << "
The current game mode is - Abduction!"
@@ -63,11 +64,11 @@
agent = preset_agent
- scientist.assigned_role = "MODE"
+ scientist.assigned_role = "Abductor"
scientist.special_role = "Abductor"
log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.")
- agent.assigned_role = "MODE"
+ agent.assigned_role = "Abductor"
agent.special_role = "Abductor"
log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.")
@@ -258,11 +259,14 @@
/datum/game_mode/abduction/check_finished()
- for(var/team_number=1,team_number<=teams,team_number++)
- var/obj/machinery/abductor/console/con = get_team_console(team_number)
- var/datum/objective/objective = team_objectives[team_number]
- if (con.experiment.points > objective.target_amount)
- return 1
+ if(!finished)
+ for(var/team_number=1,team_number<=teams,team_number++)
+ var/obj/machinery/abductor/console/con = get_team_console(team_number)
+ var/datum/objective/objective = team_objectives[team_number]
+ if (con.experiment.points > objective.target_amount)
+ SSshuttle.emergency.request(null, 0.5)
+ finished = 1
+ return ..()
return ..()
/datum/game_mode/abduction/declare_completion()
@@ -297,7 +301,7 @@
world << printobjectives(abductee.mind)
/datum/game_mode/proc/auto_declare_completion_abduction()
- if(abductors.len)
+ if(abductors.len && ticker.mode.config_tag != "abduction") // no repeating for the gamemode
world << "
The Abductors were:"
for(var/datum/mind/M in abductors)
world << "
Abductor [M.current ? M.current.name : "Abductor"]([M.key])"
@@ -332,15 +336,15 @@
// OBJECTIVES
-datum/objective/experiment
+/datum/objective/experiment
dangerrating = 10
target_amount = 6
var/team
-datum/objective/experiment/New()
+/datum/objective/experiment/New()
explanation_text = "Experiment on [target_amount] humans"
-datum/objective/experiment/check_completion()
+/datum/objective/experiment/check_completion()
if(!owner.current || !ishuman(owner.current))
return 0
var/mob/living/carbon/human/H = owner.current
@@ -356,21 +360,21 @@ datum/objective/experiment/check_completion()
return 0
return 0
-datum/objective/abductee
+/datum/objective/abductee
dangerrating = 5
completed = 1
-datum/objective/abductee/steal
+/datum/objective/abductee/steal
explanation_text = "Steal all"
-datum/objective/abductee/steal/New()
+/datum/objective/abductee/steal/New()
var/target = pick(list("Pets","Lights","Monkeys","Fruits","Shoes","Soap Bars"))
explanation_text+=" [target]"
-datum/objective/abductee/capture
+/datum/objective/abductee/capture
explanation_text = "Capture"
-datum/objective/abductee/capture/New()
+/datum/objective/abductee/capture/New()
var/list/jobs = SSjob.occupations
for(var/datum/job/J in jobs)
if(J.current_positions < 1)
@@ -381,8 +385,8 @@ datum/objective/abductee/capture/New()
else
explanation_text += " someone."
-datum/objective/abductee/shuttle
+/datum/objective/abductee/shuttle
explanation_text = "You must escape the station! Get the shuttle called!"
-datum/objective/abductee/noclone
+/datum/objective/abductee/noclone
explanation_text = "Don't allow anyone to be cloned."
\ No newline at end of file
diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm
index 17f7416f268..ccb60820159 100644
--- a/code/game/gamemodes/abduction/gland.dm
+++ b/code/game/gamemodes/abduction/gland.dm
@@ -50,7 +50,7 @@
uses = -1
icon_state = "health"
-obj/item/gland/heals/activate()
+/obj/item/gland/heals/activate()
host << "
You feel weird."
host.adjustBruteLoss(-20)
host.adjustOxyLoss(-20)
@@ -62,7 +62,7 @@ obj/item/gland/heals/activate()
uses = -1
icon_state = "slime"
-obj/item/gland/slime/activate()
+/obj/item/gland/slime/activate()
host << "
You feel weird."
host.visible_message("
[host] vomits on the floor!", \
diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm
index 371011323df..3d79a64b56b 100644
--- a/code/game/gamemodes/abduction/machinery/experiment.dm
+++ b/code/game/gamemodes/abduction/machinery/experiment.dm
@@ -7,7 +7,8 @@
anchored = 1
state_open = 1
var/points = 0
- var/list/history = new
+ var/list/history = list()
+ var/list/abductee_minds = list()
var/flash = " - || - "
var/obj/machinery/abductor/console/console
@@ -18,9 +19,6 @@
return
close_machine(target)
-/obj/machinery/abductor/experiment/allow_drop()
- return 0
-
/obj/machinery/abductor/experiment/attack_hand(mob/user)
if(..())
return
@@ -143,8 +141,9 @@
if(!GlandTest)
say("Experimental dissection not detected!")
return "
No glands detected!"
- if(H.mind != null || H.ckey != null)
+ if(H.mind != null && H.ckey != null)
history += H
+ abductee_minds += H.mind
say("Processing Specimen...")
sleep(5)
switch(text2num(type))
@@ -190,15 +189,14 @@
var/area/A
if(console && console.pad && console.pad.teleport_target)
A = console.pad.teleport_target
- else
- A = teleportlocs[pick(teleportlocs)]
- TeleportToArea(H,A)
+ if(A.safe) // right now crew areas are safe - being locked behind closed doors is not fun
+ TeleportToArea(H,A)
+ //Area not chosen / It's not safe area - teleport to arrivals
+ H.forceMove(pick(latejoin))
+
/obj/machinery/abductor/experiment/update_icon()
if(state_open)
icon_state = "experiment-open"
else
icon_state = "experiment"
-
-/obj/machinery/abductor/experiment/say_quote(text)
- return "beeps, \"[text]\""
\ No newline at end of file
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 9e7b7328442..c629c157f98 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -137,6 +137,7 @@ var/list/blob_nodes = list()
core.overmind.mind.name = blob.name
infected_crew -= blob
infected_crew += core.overmind.mind
+ core.overmind.mind.special_role = "Blob Overmind"
/datum/game_mode/blob/post_setup()
diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm
index 8259d39a940..743196fbb2a 100644
--- a/code/game/gamemodes/blob/blob_finish.dm
+++ b/code/game/gamemodes/blob/blob_finish.dm
@@ -13,9 +13,7 @@
priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
return ..()
return 1
- if(station_was_nuked)//Nuke went off
- return 1
- return 0
+ return ..()
/datum/game_mode/blob/declare_completion()
@@ -42,7 +40,7 @@
..()
return 1
-datum/game_mode/proc/auto_declare_completion_blob()
+/datum/game_mode/proc/auto_declare_completion_blob()
if(istype(ticker.mode,/datum/game_mode/blob) )
var/datum/game_mode/blob/blob_mode = src
if(blob_mode.infected_crew.len)
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index 4988e1cedea..bf8822c40f5 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -106,6 +106,8 @@
B.blob_core = src
src.overmind = B
color = overmind.blob_reagent_datum.color
+ if(B.mind && !B.mind.special_role)
+ B.mind.special_role = "Blob Overmind"
spawn(0)
if(is_offspring)
B.verbs -= /mob/camera/blob/verb/split_consciousness
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 2ca962f00df..840e16b90f5 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -65,12 +65,12 @@
/mob/camera/blob/proc/update_health()
if(blob_core)
- hud_used.blobhealthdisplay.maptext = "
[blob_core.health]
"
+ hud_used.blobhealthdisplay.maptext = "
[round(blob_core.health)]
"
/mob/camera/blob/proc/add_points(var/points)
if(points != 0)
blob_points = Clamp(blob_points + points, 0, max_blob_points)
- hud_used.blobpwrdisplay.maptext = "
[src.blob_points]
"
+ hud_used.blobpwrdisplay.maptext = "
[round(src.blob_points)]
"
/mob/camera/blob/say(var/message)
if (!message)
diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm
index 51e51392e59..9ce3ed0590a 100644
--- a/code/game/gamemodes/changeling/changeling_power.dm
+++ b/code/game/gamemodes/changeling/changeling_power.dm
@@ -61,7 +61,7 @@
if(req_stat < user.stat)
user << "
We are incapacitated."
return 0
- if((user.status_flags & FAKEDEATH) && name!="Revive")
+ if((user.status_flags & FAKEDEATH) && name != "Regenerate")
user << "
We are incapacitated."
return 0
if(c.geneticdamage > max_genetic_damage)
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index e8caa412086..7989c3fe92a 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -393,6 +393,9 @@ var/list/sting_paths
for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
if(!(p.dna_cost == 0 && keep_free_powers))
mind.changeling.purchasedpowers -= p
+ if(istype(p,/obj/effect/proc_holder/changeling/augmented_eyesight))
+ permanent_sight_flags -= SEE_MOBS
+ sight -= SEE_MOBS
if(hud_used)
hud_used.lingstingdisplay.icon_state = null
hud_used.lingstingdisplay.invisibility = 101
diff --git a/code/game/gamemodes/changeling/powers/adrenaline.dm b/code/game/gamemodes/changeling/powers/adrenaline.dm
new file mode 100644
index 00000000000..ed7496be1d2
--- /dev/null
+++ b/code/game/gamemodes/changeling/powers/adrenaline.dm
@@ -0,0 +1,56 @@
+/obj/effect/proc_holder/changeling/adrenaline
+ name = "Adrenaline Sacs"
+ desc = "We evolve additional sacs of adrenaline throughout our body."
+ helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body."
+ chemical_cost = 30
+ dna_cost = 2
+ req_human = 1
+ req_stat = UNCONSCIOUS
+
+//Recover from stuns.
+/obj/effect/proc_holder/changeling/adrenaline/sting_action(var/mob/living/user)
+ user << "
Energy rushes through us.[user.lying ? " We arise." : ""]"
+ user.stat = 0
+ user.SetParalysis(0)
+ user.SetStunned(0)
+ user.SetWeakened(0)
+ user.lying = 0
+ user.update_canmove()
+ user.reagents.add_reagent("changelingAdrenaline", 10)
+ user.reagents.add_reagent("changelingAdrenaline2", 2) //For a really quick burst of speed
+ user.adjustStaminaLoss(-75)
+ feedback_add_details("changeling_powers","UNS")
+ return 1
+
+/datum/reagent/medicine/changelingAdrenaline
+ name = "Adrenaline"
+ id = "changelingAdrenaline"
+ description = "Reduces stun times. Also deals toxin damage at high amounts."
+ color = "#C8A5DC"
+ overdose_threshold = 30
+
+/datum/reagent/medicine/changelingAdrenaline/on_mob_life(var/mob/living/M as mob)
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ M.adjustStaminaLoss(-1)
+ ..()
+ return
+
+/datum/reagent/medicine/changelingAdrenaline/overdose_process(var/mob/living/M as mob)
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+/datum/reagent/medicine/changelingAdrenaline2
+ name = "Adrenaline"
+ id = "changelingAdrenaline2"
+ description = "Drastically increases movement speed."
+ color = "#C8A5DC"
+ metabolization_rate = 1
+
+/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(var/mob/living/M as mob)
+ M.status_flags |= GOTTAGOREALLYFAST
+ M.adjustToxLoss(2)
+ ..()
+ return
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index e76ed33827c..66dcd7c20b9 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -14,13 +14,15 @@
if(active)
user << "
We feel a minute twitch in our eyes, and darkness creeps away."
user.weakeyes = 1
+ user.sight |= SEE_MOBS
+ user.permanent_sight_flags |= SEE_MOBS
+ user.see_in_dark = 8
+ user.see_invisible = SEE_INVISIBLE_MINIMUM
else
user << "
Our vision dulls. Shadows gather."
- user.sight -= SEE_MOBS
user.weakeyes = 0
- while(active)
- user.see_in_dark = 8
- user.see_invisible = 2
- user.sight |= SEE_MOBS
- sleep(1) //BAD THINGS HAPPEN WITHOUT THIS.
+ user.sight -= SEE_MOBS
+ user.permanent_sight_flags -= SEE_MOBS
+ user.see_in_dark = 0
+ user.see_invisible = SEE_INVISIBLE_LIVING
return 1
diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm
deleted file mode 100644
index 107bf5a96f8..00000000000
--- a/code/game/gamemodes/changeling/powers/epinephrine.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/obj/effect/proc_holder/changeling/epinephrine
- name = "Epinephrine Overdose"
- desc = "We evolve additional sacs of adrenaline throughout our body."
- helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body."
- chemical_cost = 30
- dna_cost = 2
- req_human = 1
- req_stat = UNCONSCIOUS
-
-//Recover from stuns.
-/obj/effect/proc_holder/changeling/epinephrine/sting_action(var/mob/living/user)
-
- if(user.lying)
- user << "
We arise."
- else
- user << "
Adrenaline rushes through us."
- user.stat = 0
- user.SetParalysis(0)
- user.SetStunned(0)
- user.SetWeakened(0)
- user.lying = 0
- user.update_canmove()
- user.reagents.add_reagent("synaptizine", 20)
- user.adjustStaminaLoss(-75)
-
- feedback_add_details("changeling_powers","UNS")
- return 1
diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index d9a7b33254b..f09eeceb54d 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -1,5 +1,5 @@
/obj/effect/proc_holder/changeling/fakedeath
- name = "Revival Stasis"
+ name = "Regenerative Stasis"
desc = "We fall into a stasis, allowing us to regenerate and trick our enemies."
chemical_cost = 15
dna_cost = 0
@@ -10,27 +10,25 @@
//Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
/obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user)
-
user << "
We begin our stasis, preparing energy to arise once more."
-
user.status_flags |= FAKEDEATH //play dead
user.update_canmove()
-
if(user.stat != DEAD)
user.emote("deathgasp")
user.tod = worldtime2text()
-
spawn(800)
if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
user << "
We are ready to regenerate."
user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
-
feedback_add_details("changeling_powers","FD")
return 1
/obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user)
if(user.status_flags & FAKEDEATH)
+ user << "
We are already regenerating."
return
- if(!user.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
- return
+ if(!user.stat) //Confirmation for living changelings if they want to fake their death
+ switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No"))
+ if("No")
+ return
return ..()
\ No newline at end of file
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index c96fc387697..fc897feff6b 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -108,7 +108,7 @@
/obj/effect/proc_holder/changeling/weapon/arm_blade
name = "Arm Blade"
desc = "We reform one of our arms into a deadly blade."
- helptext = "Cannot be used while in lesser form."
+ helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form."
chemical_cost = 20
dna_cost = 2
genetic_damage = 10
@@ -176,7 +176,7 @@
/obj/effect/proc_holder/changeling/weapon/shield
name = "Organic Shield"
desc = "We reform one of our arms into a hard shield."
- helptext = "Organic tissue cannot resist damage forever, the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
+ helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
chemical_cost = 20
dna_cost = 1
genetic_damage = 12
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 0acb082e057..7e9aaa79c37 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -1,15 +1,13 @@
/obj/effect/proc_holder/changeling/revive
- name = "Revive"
+ name = "Regenerate"
desc = "We regenerate, healing all damage from our form."
req_stat = DEAD
//Revive from revival stasis
/obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user)
-
if(user.stat == DEAD)
dead_mob_list -= user
living_mob_list += user
- user.stat = CONSCIOUS
user.tod = null
user.setToxLoss(0)
user.setOxyLoss(0)
@@ -25,11 +23,11 @@
H.restore_blood()
H.remove_all_embedded_objects()
user << "
We have regenerated."
-
user.status_flags &= ~(FAKEDEATH)
user.update_canmove()
user.mind.changeling.purchasedpowers -= src
user.med_hud_set_status()
user.med_hud_set_health()
feedback_add_details("changeling_powers","CR")
+ user.stat = CONSCIOUS
return 1
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index 2309d3ed850..936f3f47662 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -40,7 +40,7 @@
return
if(get_dist(user, target) > (user.mind.changeling.sting_range))
return //sanity check as AStar is still throwing insane stunts
- if(!AStar(user.loc, target.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, user.mind.changeling.sting_range))
+ if(!AStar(user.loc, target.loc, null, /turf/proc/Distance, user.mind.changeling.sting_range))
return //hope this ancient magic still works
if(target.mind && target.mind.changeling)
sting_feedback(user,target)
@@ -96,7 +96,7 @@
feedback_add_details("changeling_powers","TS")
return 1
-obj/effect/proc_holder/changeling/sting/extract_dna
+/obj/effect/proc_holder/changeling/sting/extract_dna
name = "Extract DNA Sting"
desc = "We stealthily sting a target and extract their DNA."
helptext = "Will give you the DNA of your target, allowing you to transform into them."
@@ -115,7 +115,7 @@ obj/effect/proc_holder/changeling/sting/extract_dna
feedback_add_details("changeling_powers","ED")
return 1
-obj/effect/proc_holder/changeling/sting/mute
+/obj/effect/proc_holder/changeling/sting/mute
name = "Mute Sting"
desc = "We silently sting a human, completely silencing them for a short time."
helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
@@ -129,7 +129,7 @@ obj/effect/proc_holder/changeling/sting/mute
feedback_add_details("changeling_powers","MS")
return 1
-obj/effect/proc_holder/changeling/sting/blind
+/obj/effect/proc_holder/changeling/sting/blind
name = "Blind Sting"
desc = "Temporarily blinds the target."
helptext = "This sting completely blinds a target for a short time."
@@ -146,7 +146,7 @@ obj/effect/proc_holder/changeling/sting/blind
feedback_add_details("changeling_powers","BS")
return 1
-obj/effect/proc_holder/changeling/sting/LSD
+/obj/effect/proc_holder/changeling/sting/LSD
name = "Hallucination Sting"
desc = "Causes terror in the target."
helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds."
@@ -162,7 +162,7 @@ obj/effect/proc_holder/changeling/sting/LSD
feedback_add_details("changeling_powers","HS")
return 1
-obj/effect/proc_holder/changeling/sting/cryo
+/obj/effect/proc_holder/changeling/sting/cryo
name = "Cryogenic Sting"
desc = "We silently sting a human with a cocktail of chemicals that freeze them."
helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index 1a228ff3c4d..2e0b22314b8 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -39,11 +39,6 @@
else
num_changelings = max(1, min(num_players(), changeling_amount/2))
- for(var/datum/mind/player in possible_changelings)
- for(var/job in restricted_jobs)//Removing robots from the list
- if(player.assigned_role == job)
- possible_changelings -= player
-
if(possible_changelings.len>0)
for(var/j = 0, j < num_changelings, j++)
if(!possible_changelings.len) break
@@ -51,6 +46,7 @@
possible_changelings -= changeling
changelings += changeling
modePlayer += changelings
+ changeling.restricted_roles = restricted_jobs
return ..()
else
return 0
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 2379f32d40e..990e9d1bdb5 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -33,9 +33,9 @@
user.whisper(message)
for(var/mob/M in mob_list)
if(iscultist(M) || (M in dead_mob_list))
- if(clear)
- M << "
Acolyte [user]: [message]"
- else
+ if(clear || !ishuman(user))
+ M << "
[(ishuman(user) ? "Acolyte" : "Construct")] [user]: [message]"
+ else //Emergency comms
M << "
Acolyte ???: [message]"
@@ -174,6 +174,10 @@
else
mob << "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others."
mob.update_icons()
+ if(where == "backpack")
+ var/obj/item/weapon/storage/B = mob.back
+ B.orient2hud(mob)
+ B.show_to(mob)
return 1
@@ -296,7 +300,7 @@
acolytes_survived = 0
for(var/datum/mind/cult_mind in cult)
if (cult_mind.current && cult_mind.current.stat != DEAD)
- if(cult_mind.current.onCentcom())
+ if(cult_mind.current.onCentcom() || cult_mind.current.onSyndieBase())
acolytes_survived++
if(acolytes_survived>=acolytes_needed)
return 0
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 8b4c4015d4d..059f9b1ca2b 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -912,9 +912,6 @@ var/list/sacrificed = list()
continue
M.take_overall_damage(51,51)
M << "
Your blood boils!"
- if(prob(5))
- spawn(5)
- M.gib()
for(var/obj/effect/rune/R in view(src))
if(prob(10))
explosion(R.loc, -1, 0, 1, 5)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 2a5b66cbe45..4bfeecb2247 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -175,7 +175,7 @@
return 1
if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags
if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place
- for(var/mob/living/Player in mob_list)
+ for(var/mob/Player in mob_list)
if(Player.mind)
if(Player.mind.special_role)
continuous_sanity_checked = 1
@@ -184,13 +184,14 @@
message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.")
config.continuous[config_tag] = 1
config.midround_antag[config_tag] = 0
+ SSshuttle.emergencyNoEscape = 0
return 0
if(living_antag_player && living_antag_player.mind && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
- for(var/mob/living/Player in living_mob_list)
+ for(var/mob/Player in living_mob_list)
if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player))
if(Player.mind.special_role) //Someone's still antaging!
living_antag_player = Player
@@ -417,7 +418,7 @@
//////////////////////////
//Reports player logouts//
//////////////////////////
-proc/display_roundstart_logout_report()
+/proc/display_roundstart_logout_report()
var/msg = "
Roundstart logout report\n\n"
for(var/mob/living/L in mob_list)
diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index 021a85bfb07..6967dc894c7 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -320,7 +320,7 @@
if(gang_mind.current)
if(gang_mind.current.stat == DEAD || isbrain(gang_mind.current))
text += "died"
- else if(gang_mind.current.z != ZLEVEL_STATION)
+ else if(gang_mind.current.z > ZLEVEL_STATION)
text += "fled the station"
else
text += "survived"
@@ -373,22 +373,22 @@
//Calculate and report influence growth
ticker.mode.message_gangtools(ticker.mode.A_tools,"
[gang_name("A")] Gang Status Report:")
- var/A_new = min(100,A + 15 + ticker.mode.A_territory.len)
+ var/A_new = min(999,A + 15 + ticker.mode.A_territory.len)
var/A_message = ""
if(A_new != A)
A_message += "Your gang has gained
[A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories."
- if(A_new == 100)
- A_message += "Maximum influence reached."
+ if(A_new == 999)
+ A_message += " You cannot gain any more influence without spending some with this device."
A = A_new
ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0)
ticker.mode.message_gangtools(ticker.mode.B_tools,"
[gang_name("B")] Gang Status Report:")
- var/B_new = min(100,B + 15 + ticker.mode.B_territory.len)
+ var/B_new = min(999,B + 15 + ticker.mode.B_territory.len)
var/B_message = ""
if(B_new != B)
B_message += "Your gang has gained
[B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories."
- if(B_new == 100)
- B_message += "Maximum influence reached."
+ if(B_new == 999)
+ B_message += " You cannot gain any more influence without spending some with this device."
B = B_new
ticker.mode.message_gangtools(ticker.mode.B_tools,B_message,0)
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index b5576eab127..5ef07cdcbf5 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -270,65 +270,71 @@
mod_pick_name = "cyborgtransformer"
description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside."
cost = 100
-
power_type = /mob/living/silicon/ai/proc/place_transformer
+ var/list/turfOverlays = list()
+
+/datum/AI_Module/large/place_cyborg_transformer/New()
+ for(var/i=0;i<3;i++)
+ var/image/I = image("icon"='icons/turf/overlays.dmi')
+ turfOverlays += I
+ ..()
/mob/living/silicon/ai/proc/place_transformer()
set name = "Place Robotic Factory"
set category = "Malfunction"
-
- if(!eyeobj)
+ if(!canPlaceTransformer())
return
-
- if(!isturf(src.loc)) // AI must be in it's core.
- return
-
- var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in src.current_modules
- if(!PCT)
- return
-
- if(PCT.uses < 1)
- src << "Out of uses."
- return
-
- if(!canUseTopic())
- return
-
- var/sure = alert(src, "Make sure the room it is in is big enough, there is camera vision and that there is a 1x3 area for the machine. Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No")
- if(sure != "Yes")
- return
-
- // Make sure there is enough room.
- var/turf/middle = get_turf(eyeobj.loc)
- var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z))
-
- var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor."
-
- var/datum/camerachunk/C = cameranet.getCameraChunk(middle.x, middle.y, middle.z)
- if(!C.visibleTurfs[middle])
- alert(src, "We cannot get camera vision of this location.")
- return
-
- for(var/T in turfs)
-
- // Make sure the turfs are clear and the correct type.
- if(!istype(T, /turf/simulated/floor))
- alert(src, alert_msg)
+ var/sure = alert(src, "Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No")
+ if(sure == "Yes")
+ if(!canPlaceTransformer())
return
+ var/turf/T = get_turf(eyeobj)
+ new /obj/machinery/transformer/conveyor(T)
+ playsound(T, 'sound/effects/phasein.ogg', 100, 1)
+ var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules
+ PCT.uses --
+ can_shunt = 0
+ src << "
You cannot shunt anymore."
- var/turf/simulated/floor/F = T
- for(var/atom/movable/AM in F.contents)
- if(AM.density)
- alert(src, alert_msg)
- return
-
- // All clear, place the transformer
- new /obj/machinery/transformer/conveyor(middle)
- playsound(middle, 'sound/effects/phasein.ogg', 100, 1)
- src.can_shunt = 0
- PCT.uses -= 1
- src << "
You cannot shunt anymore."
-
+/mob/living/silicon/ai/proc/canPlaceTransformer()
+ if(!eyeobj || !isturf(src.loc) || !canUseTopic())
+ return
+ var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules
+ if(!PCT || PCT.uses < 1)
+ alert(src, "Out of uses.")
+ return
+ var/turf/middle = get_turf(eyeobj)
+ var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z))
+ var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor."
+ var/success = 1
+ if(turfs.len == 3)
+ for(var/n=1;n<4,n++)
+ var/fail
+ var/turf/T = turfs[n]
+ if(!istype(T, /turf/simulated/floor))
+ fail = 1
+ var/datum/camerachunk/C = cameranet.getCameraChunk(T.x, T.y, T.z)
+ if(!C.visibleTurfs[T])
+ alert_msg = "We cannot get camera vision of this location."
+ fail = 1
+ for(var/atom/movable/AM in T.contents)
+ if(AM.density)
+ fail = 1
+ var/image/I = PCT.turfOverlays[n]
+ I.loc = T
+ client.images += I
+ if(fail)
+ success = 0
+ I.icon_state = "redOverlay"
+ else
+ I.icon_state = "greenOverlay"
+ spawn(30)
+ if(client && (I.loc == T))
+ client.images -= I
+ if(success)
+ return 1
+ alert(src, alert_msg)
+ return
/datum/AI_Module/small/blackout
module_name = "Blackout"
diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm
index 9a9197dcfee..f08f4e58d4e 100644
--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -48,7 +48,7 @@
if (malf_ai.len < required_enemies)
return 0
for(var/datum/mind/ai_mind in malf_ai)
- ai_mind.assigned_role = "MODE"
+ ai_mind.assigned_role = "malfunctioning AI"
ai_mind.special_role = "malfunctioning AI"//So they actually have a special role/N
log_game("[ai_mind.key] (ckey) has been selected as a malf AI")
return 1
@@ -57,33 +57,16 @@
/datum/game_mode/malfunction/post_setup()
for(var/datum/mind/AI_mind in malf_ai)
if(malf_ai.len < 1)
- world << "Uh oh, its malfunction and there is no AI! Please report this."
- world << "Rebooting world in 5 seconds."
-
- feedback_set_details("end_error","malf - no AI")
-
- if(blackbox)
- blackbox.save_all_data_to_sql()
- sleep(50)
- world.Reboot()
+ world.Reboot("No AI during Malfunction.", "end_error", "malf - no AI", 50)
return
AI_mind.current.verbs += /mob/living/silicon/ai/proc/choose_modules
AI_mind.current:laws = new /datum/ai_laws/malfunction
AI_mind.current:malf_picker = new /datum/module_picker
AI_mind.current:show_laws()
-
greet_malf(AI_mind)
-
AI_mind.special_role = "malfunction"
-
AI_mind.current.verbs += /datum/game_mode/malfunction/proc/takeover
AI_mind.current.verbs += /mob/living/silicon/ai/proc/ai_cancel_call
-
-/* AI_mind.current.icon_state = "ai-malf"
- spawn(10)
- if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes")
- AI_mind.current.icon_state = "ai-malf2"
-*/
SSshuttle.emergencyNoEscape = 1
..()
@@ -179,6 +162,7 @@
priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
SSshuttle.emergencyNoEscape = 0
malf_mode_declared = 0
+ continuous_sanity_checked = 1
if(get_security_level() == "delta")
set_security_level("red")
return ..()
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index 2d3e4e1c380..cceb0c6a622 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -34,6 +34,8 @@
if(player.onCentcom())
text += "
[player.real_name] escaped to the safety of Centcom."
+ else if(player.onSyndieBase())
+ text += "
[player.real_name] escaped to the (relative) safety of Syndicate Space."
else
text += "
[player.real_name] survived but is stranded without any hope of rescue."
diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm
index a8791d20d77..18a62827b4f 100644
--- a/code/game/gamemodes/monkey/monkey.dm
+++ b/code/game/gamemodes/monkey/monkey.dm
@@ -71,6 +71,7 @@
if(!round_converted)
for(var/datum/mind/monkey_mind in ape_infectees)
+ continuous_sanity_checked = 1
if(monkey_mind.current && monkey_mind.current.stat != DEAD)
return 0
@@ -88,7 +89,7 @@
var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
for(var/mob/living/carbon/monkey/M in living_mob_list)
if (M.HasDisease(D))
- if(M.onCentcom())
+ if(M.onCentcom() || M.onSyndieBase())
escaped_monkeys++
if(escaped_monkeys >= monkeys_to_win)
return 1
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index bf5d11dcbc5..7d8a51b32eb 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -40,7 +40,7 @@
agent_number--
for(var/datum/mind/synd_mind in syndicates)
- synd_mind.assigned_role = "MODE"
+ synd_mind.assigned_role = "Syndicate"
synd_mind.special_role = "Syndicate"//So they actually have a special role/N
log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative")
return 1
@@ -201,6 +201,15 @@
return 0
return 1
+/datum/game_mode/nuclear/check_finished() //to be called by ticker
+ if(replacementmode && round_converted == 2)
+ return replacementmode.check_finished()
+ if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked)
+ return 1
+ if(are_operatives_dead())
+ if(bomb_set) //snaaaaaaaaaake! It's not over yet!
+ return 0
+ ..()
/datum/game_mode/nuclear/declare_completion()
var/disk_rescued = 1
@@ -237,7 +246,7 @@
world << "
[syndicate_name()] operatives have earned Darwin Award!"
world << "
[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!"
- else if ( disk_rescued && are_operatives_dead())
+ else if ((disk_rescued || SSshuttle.emergency.mode < SHUTTLE_ENDGAME) && are_operatives_dead())
feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead")
world << "
Crew Major Victory!"
world << "
The Research Staff has saved the disc and killed the [syndicate_name()] Operatives"
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 7c34125c02c..2629d2bfce2 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -208,21 +208,10 @@ var/bomb_set
ticker.mode:nukes_left --
else
world << "
The station was destoyed by the nuclear blast!"
-
ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated.
//kinda shit but I couldn't get permission to do what I wanted to do.
-
if(!ticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is
- world << "
Resetting in 30 seconds!"
-
- feedback_set_details("end_error","nuke - unhandled ending")
-
- if(blackbox)
- blackbox.save_all_data_to_sql()
- sleep(300)
- log_game("Rebooting due to nuclear detonation")
- kick_clients_in_lobby("
The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
- world.Reboot()
+ world.Reboot("Station destroyed by Nuclear Device.", "end_error", "nuke - unhandled ending")
return
return
@@ -246,6 +235,7 @@ This is here to make the tiles around the station mininuke change when it's arme
/obj/item/weapon/disk/nuclear
name = "nuclear authentication disk"
desc = "Better keep this safe."
+ icon = 'icons/obj/items.dmi'
icon_state = "nucleardisk"
item_state = "card-id"
w_class = 1.0
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 9f0eee8e881..34097634102 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -1,4 +1,4 @@
-datum/objective
+/datum/objective
var/datum/mind/owner = null //Who owns the objective.
var/explanation_text = "Nothing" //What that person is supposed to do.
var/datum/mind/target = null //If they are focused on a particular person.
@@ -7,23 +7,23 @@ datum/objective
var/dangerrating = 0 //How hard the objective is, essentially. Used for dishing out objectives and checking overall victory.
var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
-datum/objective/New(var/text)
+/datum/objective/New(var/text)
if(text)
explanation_text = text
-datum/objective/proc/check_completion()
+/datum/objective/proc/check_completion()
return completed
-datum/objective/proc/is_unique_objective(possible_target)
+/datum/objective/proc/is_unique_objective(possible_target)
for(var/datum/objective/O in owner.objectives)
if(istype(O, type) && O.get_target() == possible_target)
return 0
return 1
-datum/objective/proc/get_target()
+/datum/objective/proc/get_target()
return target
-datum/objective/proc/find_target()
+/datum/objective/proc/find_target()
var/list/possible_targets = list()
for(var/datum/mind/possible_target in ticker.minds)
if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != 2) && is_unique_objective(possible_target))
@@ -33,36 +33,36 @@ datum/objective/proc/find_target()
update_explanation_text()
return target
-datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned.
+/datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned.
for(var/datum/mind/possible_target in ticker.minds)
if((possible_target != owner) && ishuman(possible_target.current) && ((role_type ? possible_target.special_role : possible_target.assigned_role) == role) )
target = possible_target
break
update_explanation_text()
-datum/objective/proc/update_explanation_text()
+/datum/objective/proc/update_explanation_text()
//Default does nothing, override where needed
-datum/objective/assassinate
+/datum/objective/assassinate
var/target_role_type=0
dangerrating = 10
martyr_compatible = 1
-datum/objective/assassinate/find_target_by_role(role, role_type=0)
+/datum/objective/assassinate/find_target_by_role(role, role_type=0)
target_role_type = role_type
..(role, role_type)
return target
-datum/objective/assassinate/check_completion()
+/datum/objective/assassinate/check_completion()
if(target && target.current)
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
return 0
return 1
-datum/objective/assassinate/update_explanation_text()
+/datum/objective/assassinate/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
@@ -71,26 +71,26 @@ datum/objective/assassinate/update_explanation_text()
-datum/objective/mutiny
+/datum/objective/mutiny
var/target_role_type=0
martyr_compatible = 1
-datum/objective/mutiny/find_target_by_role(role, role_type=0)
+/datum/objective/mutiny/find_target_by_role(role, role_type=0)
target_role_type = role_type
..(role, role_type)
return target
-datum/objective/mutiny/check_completion()
+/datum/objective/mutiny/check_completion()
if(target && target.current)
if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey || !target.current.client)
return 1
var/turf/T = get_turf(target.current)
- if(T && (T.z != ZLEVEL_STATION)) //If they leave the station they count as dead for this
+ if(T && (T.z > ZLEVEL_STATION) || target.current.client.is_afk()) //If they leave the station or go afk they count as dead for this
return 2
return 0
return 1
-datum/objective/mutiny/update_explanation_text()
+/datum/objective/mutiny/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Assassinate or exile [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
@@ -99,25 +99,25 @@ datum/objective/mutiny/update_explanation_text()
-datum/objective/maroon
+/datum/objective/maroon
var/target_role_type=0
dangerrating = 5
martyr_compatible = 1
-datum/objective/maroon/find_target_by_role(role, role_type=0)
+/datum/objective/maroon/find_target_by_role(role, role_type=0)
target_role_type = role_type
..(role, role_type)
return target
-datum/objective/maroon/check_completion()
+/datum/objective/maroon/check_completion()
if(target && target.current)
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
- if(target.current.onCentcom())
+ if(target.current.onCentcom() || target.current.onSyndieBase())
return 0
return 1
-datum/objective/maroon/update_explanation_text()
+/datum/objective/maroon/update_explanation_text()
if(target && target.current)
explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive."
else
@@ -125,16 +125,16 @@ datum/objective/maroon/update_explanation_text()
-datum/objective/debrain//I want braaaainssss
+/datum/objective/debrain//I want braaaainssss
var/target_role_type=0
dangerrating = 20
-datum/objective/debrain/find_target_by_role(role, role_type=0)
+/datum/objective/debrain/find_target_by_role(role, role_type=0)
target_role_type = role_type
..(role, role_type)
return target
-datum/objective/debrain/check_completion()
+/datum/objective/debrain/check_completion()
if(!target)//If it's a free objective.
return 1
if( !owner.current || owner.current.stat==DEAD )//If you're otherwise dead.
@@ -148,7 +148,7 @@ datum/objective/debrain/check_completion()
return 1
return 0
-datum/objective/debrain/update_explanation_text()
+/datum/objective/debrain/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Steal the brain of [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
@@ -157,17 +157,17 @@ datum/objective/debrain/update_explanation_text()
-datum/objective/protect//The opposite of killing a dude.
+/datum/objective/protect//The opposite of killing a dude.
var/target_role_type=0
dangerrating = 10
martyr_compatible = 1
-datum/objective/protect/find_target_by_role(role, role_type=0)
+/datum/objective/protect/find_target_by_role(role, role_type=0)
target_role_type = role_type
..(role, role_type)
return target
-datum/objective/protect/check_completion()
+/datum/objective/protect/check_completion()
if(!target) //If it's a free objective.
return 1
if(target.current)
@@ -176,7 +176,7 @@ datum/objective/protect/check_completion()
return 1
return 0
-datum/objective/protect/update_explanation_text()
+/datum/objective/protect/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Protect [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
@@ -185,12 +185,12 @@ datum/objective/protect/update_explanation_text()
-datum/objective/hijack
+/datum/objective/hijack
explanation_text = "Hijack the emergency shuttle by escaping alone."
dangerrating = 25
martyr_compatible = 0 //Technically you won't get both anyway.
-datum/objective/hijack/check_completion()
+/datum/objective/hijack/check_completion()
if(!owner.current || owner.current.stat)
return 0
if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME)
@@ -209,16 +209,17 @@ datum/objective/hijack/check_completion()
if(/mob/living/silicon/ai, /mob/living/silicon/pai)
continue
if(get_area(player) == A)
- return 0
+ if(!player.mind.special_role && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red))
+ return 0
return 1
-datum/objective/block
+/datum/objective/block
explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
dangerrating = 25
martyr_compatible = 1
-datum/objective/block/check_completion()
+/datum/objective/block/check_completion()
if(!istype(owner.current, /mob/living/silicon))
return 0
if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME)
@@ -237,11 +238,11 @@ datum/objective/block/check_completion()
return 1
-datum/objective/escape
+/datum/objective/escape
explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody."
dangerrating = 5
-datum/objective/escape/check_completion()
+/datum/objective/escape/check_completion()
if(issilicon(owner.current))
return 0
if(isbrain(owner.current))
@@ -254,24 +255,24 @@ datum/objective/escape/check_completion()
if(!location)
return 0
- if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph
+ if(istype(location, /turf/simulated/floor/plasteel/shuttle/red)) // Fails traitors if they are in the shuttle brig -- Polymorph
return 0
- if(location.onCentcom())
+ if(location.onCentcom() || location.onSyndieBase())
return 1
return 0
-datum/objective/escape/escape_with_identity
+/datum/objective/escape/escape_with_identity
dangerrating = 10
var/target_real_name // Has to be stored because the target's real_name can change over the course of the round
var/target_missing_id
-datum/objective/escape/escape_with_identity/find_target()
+/datum/objective/escape/escape_with_identity/find_target()
target = ..()
update_explanation_text()
-datum/objective/escape/escape_with_identity/update_explanation_text()
+/datum/objective/escape/escape_with_identity/update_explanation_text()
if(target && target.current)
target_real_name = target.current.real_name
explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role]"
@@ -287,7 +288,7 @@ datum/objective/escape/escape_with_identity/update_explanation_text()
else
explanation_text = "Free Objective."
-datum/objective/escape/escape_with_identity/check_completion()
+/datum/objective/escape/escape_with_identity/check_completion()
if(!target_real_name)
return 1
if(!ishuman(owner.current))
@@ -300,11 +301,11 @@ datum/objective/escape/escape_with_identity/check_completion()
return 0
-datum/objective/survive
+/datum/objective/survive
explanation_text = "Stay alive until the end."
dangerrating = 3
-datum/objective/survive/check_completion()
+/datum/objective/survive/check_completion()
if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current))
return 0 //Brains no longer win survive objectives. --NEO
if(!is_special_character(owner.current)) //This fails borg'd traitors
@@ -312,11 +313,11 @@ datum/objective/survive/check_completion()
return 1
-datum/objective/martyr
+/datum/objective/martyr
explanation_text = "Die a glorious death."
dangerrating = 1
-datum/objective/martyr/check_completion()
+/datum/objective/martyr/check_completion()
if(!owner.current) //Gibbed, etc.
return 1
if(owner.current && owner.current.stat == DEAD) //You're dead! Yay!
@@ -324,34 +325,34 @@ datum/objective/martyr/check_completion()
return 0
-datum/objective/nuclear
+/datum/objective/nuclear
explanation_text = "Destroy the station with a nuclear device."
martyr_compatible = 1
var/global/list/possible_items = list()
-datum/objective/steal
+/datum/objective/steal
var/datum/objective_item/targetinfo = null //Save the chosen item datum so we can access it later.
var/obj/item/steal_target = null //Needed for custom objectives (they're just items, not datums).
dangerrating = 5 //Overridden by the individual item's difficulty, but defaults to 5 for custom objectives.
martyr_compatible = 0
-datum/objective/steal/get_target()
+/datum/objective/steal/get_target()
return steal_target
-datum/objective/steal/New()
+/datum/objective/steal/New()
..()
if(!possible_items.len)//Only need to fill the list when it's needed.
init_subtypes(/datum/objective_item/steal,possible_items)
-datum/objective/steal/find_target()
+/datum/objective/steal/find_target()
var/approved_targets = list()
for(var/datum/objective_item/possible_item in possible_items)
if(is_unique_objective(possible_item.targetitem))
approved_targets += possible_item
return set_target(safepick(possible_items))
-datum/objective/steal/proc/set_target(var/datum/objective_item/item)
+/datum/objective/steal/proc/set_target(var/datum/objective_item/item)
if(item)
targetinfo = item
@@ -363,7 +364,7 @@ datum/objective/steal/proc/set_target(var/datum/objective_item/item)
explanation_text = "Free objective"
return
-datum/objective/steal/proc/select_target() //For admins setting objectives manually.
+/datum/objective/steal/proc/select_target() //For admins setting objectives manually.
var/list/possible_items_all = possible_items+"custom"
var/new_target = input("Select target:", "Objective target", steal_target) as null|anything in possible_items_all
if (!new_target) return
@@ -383,7 +384,7 @@ datum/objective/steal/proc/select_target() //For admins setting objectives manua
set_target(new_target)
return steal_target
-datum/objective/steal/check_completion()
+/datum/objective/steal/check_completion()
if(!steal_target) return 1
if(!isliving(owner.current)) return 0
var/list/all_items = owner.current.GetAllContents() //this should get things in cheesewheels, books, etc.
@@ -401,23 +402,23 @@ datum/objective/steal/check_completion()
return 0
var/global/list/possible_items_special = list()
-datum/objective/steal/special //ninjas are so special they get their own subtype good for them
+/datum/objective/steal/special //ninjas are so special they get their own subtype good for them
-datum/objective/steal/special/New()
+/datum/objective/steal/special/New()
..()
if(!possible_items_special.len)
init_subtypes(/datum/objective_item/special,possible_items)
init_subtypes(/datum/objective_item/stack,possible_items)
-datum/objective/steal/special/find_target()
+/datum/objective/steal/special/find_target()
return set_target(pick(possible_items_special))
-datum/objective/steal/exchange
+/datum/objective/steal/exchange
dangerrating = 10
-datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent)
+/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent)
target = otheragent
if(faction == "red")
targetinfo = new/datum/objective_item/unique/docs_blue
@@ -427,7 +428,7 @@ datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent)
steal_target = targetinfo.targetitem
-datum/objective/steal/exchange/update_explanation_text()
+/datum/objective/steal/exchange/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Acquire [targetinfo.name] held by [target.name], the [target.assigned_role] and syndicate agent"
@@ -435,10 +436,10 @@ datum/objective/steal/exchange/update_explanation_text()
explanation_text = "Free Objective"
-datum/objective/steal/exchange/backstab
+/datum/objective/steal/exchange/backstab
dangerrating = 3
-datum/objective/steal/exchange/backstab/set_faction(var/faction)
+/datum/objective/steal/exchange/backstab/set_faction(var/faction)
if(faction == "red")
targetinfo = new/datum/objective_item/unique/docs_red
else if(faction == "blue")
@@ -447,15 +448,15 @@ datum/objective/steal/exchange/backstab/set_faction(var/faction)
steal_target = targetinfo.targetitem
-datum/objective/download
+/datum/objective/download
dangerrating = 10
-datum/objective/download/proc/gen_amount_goal()
+/datum/objective/download/proc/gen_amount_goal()
target_amount = rand(10,20)
explanation_text = "Download [target_amount] research level\s."
return target_amount
-datum/objective/download/check_completion()//NINJACODE
+/datum/objective/download/check_completion()//NINJACODE
if(!ishuman(owner.current))
return 0
@@ -483,15 +484,15 @@ datum/objective/download/check_completion()//NINJACODE
-datum/objective/capture
+/datum/objective/capture
dangerrating = 10
-datum/objective/capture/proc/gen_amount_goal()
+/datum/objective/capture/proc/gen_amount_goal()
target_amount = rand(5,10)
explanation_text = "Accumulate [target_amount] capture point\s. It is better if they remain relatively unharmed."
return target_amount
-datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth.
+/datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth.
var/captured_amount = 0
var/area/centcom/holding/A = locate()
for(var/mob/living/carbon/human/M in A)//Humans.
@@ -523,10 +524,10 @@ datum/objective/capture/check_completion()//Basically runs through all the mobs
-datum/objective/absorb
+/datum/objective/absorb
dangerrating = 10
-datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
+/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
target_amount = rand (lowbound,highbound)
if (ticker)
var/n_p = 1 //autowin
@@ -543,7 +544,7 @@ datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
explanation_text = "Extract [target_amount] compatible genome\s."
return target_amount
-datum/objective/absorb/check_completion()
+/datum/objective/absorb/check_completion()
if(owner && owner.changeling && owner.changeling.absorbed_dna && (owner.changeling.absorbedcount >= target_amount))
return 1
else
@@ -551,25 +552,25 @@ datum/objective/absorb/check_completion()
-datum/objective/destroy
+/datum/objective/destroy
dangerrating = 10
martyr_compatible = 1
-datum/objective/destroy/find_target()
+/datum/objective/destroy/find_target()
var/list/possible_targets = active_ais(1)
var/mob/living/silicon/ai/target_ai = pick(possible_targets)
target = target_ai.mind
update_explanation_text()
return target
-datum/objective/destroy/check_completion()
+/datum/objective/destroy/check_completion()
if(target && target.current)
if(target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
return 0
return 1
-datum/objective/destroy/update_explanation_text()
+/datum/objective/destroy/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Destroy [target.name], the experimental AI."
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index ca69a926263..44da2ef735d 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -1,126 +1,126 @@
//Contains the target item datums for Steal objectives.
-datum/objective_item
+/datum/objective_item
var/name = "A silly bike horn! Honk!"
var/targetitem = /obj/item/weapon/bikehorn //typepath of the objective item
var/difficulty = 9001 //vaguely how hard it is to do this objective
var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc)
var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints)
-datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc)
+/datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc)
return 1
-datum/objective_item/steal/caplaser
+/datum/objective_item/steal/caplaser
name = "the captain's antique laser gun"
targetitem = /obj/item/weapon/gun/energy/laser/captain
difficulty = 5
excludefromjob = list("Captain")
-datum/objective_item/steal/hoslaser
+/datum/objective_item/steal/hoslaser
name = "the head of security's personal laser gun"
targetitem = /obj/item/weapon/gun/energy/gun/hos
difficulty = 10
excludefromjob = list("Head Of Security")
-datum/objective_item/steal/handtele
+/datum/objective_item/steal/handtele
name = "a hand teleporter"
targetitem = /obj/item/weapon/hand_tele
difficulty = 5
excludefromjob = list("Captain")
-datum/objective_item/steal/rcd
+/datum/objective_item/steal/rcd
name = "a rapid-construction-device"
targetitem = /obj/item/weapon/rcd
difficulty = 3
excludefromjob = list("Chief Engineer", "Quartermaster", "Cargo Technician")
-datum/objective_item/steal/jetpack
+/datum/objective_item/steal/jetpack
name = "a jetpack"
targetitem = /obj/item/weapon/tank/jetpack
difficulty = 3
excludefromjob = list("Chief Engineer")
-datum/objective_item/steal/magboots
+/datum/objective_item/steal/magboots
name = "the chief engineer's advanced magnetic boots"
targetitem = /obj/item/clothing/shoes/magboots/advance
difficulty = 5
excludefromjob = list("Chief Engineer")
-datum/objective_item/steal/corgimeat
+/datum/objective_item/steal/corgimeat
name = "a piece of corgi meat"
targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
difficulty = 5
excludefromjob = list("Head of Personnel", "Quartermaster", "Cargo Technician") //>hurting your little buddy ever
-datum/objective_item/steal/capmedal
+/datum/objective_item/steal/capmedal
name = "the medal of captaincy"
targetitem = /obj/item/clothing/tie/medal/gold/captain
difficulty = 5
excludefromjob = list("Captain")
-datum/objective_item/steal/hypo
+/datum/objective_item/steal/hypo
name = "the hypospray"
targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO
difficulty = 5
excludefromjob = list("Chief Medical Officer")
-datum/objective_item/steal/nukedisc
+/datum/objective_item/steal/nukedisc
name = "the nuclear authentication disk"
targetitem = /obj/item/weapon/disk/nuclear
difficulty = 5
excludefromjob = list("Captain")
-datum/objective_item/steal/ablative
+/datum/objective_item/steal/ablative
name = "an ablative armor vest"
targetitem = /obj/item/clothing/suit/armor/laserproof
difficulty = 3
excludefromjob = list("Head of Security", "Warden")
-datum/objective_item/steal/reactive
+/datum/objective_item/steal/reactive
name = "the reactive teleport armor"
targetitem = /obj/item/clothing/suit/armor/reactive
difficulty = 5
excludefromjob = list("Research Director")
-datum/objective_item/steal/documents
+/datum/objective_item/steal/documents
name = "any set of secret documents of any organization"
targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
difficulty = 5
//Items with special checks!
-datum/objective_item/steal/plasma
+/datum/objective_item/steal/plasma
name = "28 moles of plasma (full tank)"
targetitem = /obj/item/weapon/tank
difficulty = 3
excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician")
-datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T)
+/datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T)
var/target_amount = text2num(name)
var/found_amount = 0
found_amount += T.air_contents.toxins
return found_amount>=target_amount
-datum/objective_item/steal/functionalai
+/datum/objective_item/steal/functionalai
name = "a functional AI"
targetitem = /obj/item/device/aicard
difficulty = 20 //beyond the impossible
-datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C)
+/datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C)
for(var/mob/living/silicon/ai/A in C)
if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card.
return 1
return 0
-datum/objective_item/steal/blueprints
+/datum/objective_item/steal/blueprints
name = "the station blueprints"
targetitem = /obj/item/areaeditor/blueprints
difficulty = 10
excludefromjob = list("Chief Engineer")
altitems = list(/obj/item/weapon/photo)
-datum/objective_item/blueprints/check_special_completion(var/obj/item/I)
+/datum/objective_item/blueprints/check_special_completion(var/obj/item/I)
if(istype(I, /obj/item/areaeditor/blueprints))
return 1
if(istype(I, /obj/item/weapon/photo))
@@ -129,66 +129,66 @@ datum/objective_item/blueprints/check_special_completion(var/obj/item/I)
return 1
return 0
-datum/objective_item/steal/slime
+/datum/objective_item/steal/slime
name = "an unused sample of slime extract"
targetitem = /obj/item/slime_extract
difficulty = 3
excludefromjob = list("Research Director","Scientist")
-datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E)
+/datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E)
if(E.Uses > 0)
return 1
return 0
//Unique Objectives
-datum/objective_item/unique/docs_red
+/datum/objective_item/unique/docs_red
name = "the \"Red\" secret documents"
targetitem = /obj/item/documents/syndicate/red
difficulty = 10
-datum/objective_item/unique/docs_blue
+/datum/objective_item/unique/docs_blue
name = "the \"Blue\" secret documents"
targetitem = /obj/item/documents/syndicate/blue
difficulty = 10
//Old ninja objectives.
-datum/objective_item/special/pinpointer
+/datum/objective_item/special/pinpointer
name = "the captain's pinpointer"
targetitem = /obj/item/weapon/pinpointer
difficulty = 10
-datum/objective_item/special/aegun
+/datum/objective_item/special/aegun
name = "an advanced energy gun"
targetitem = /obj/item/weapon/gun/energy/gun/nuclear
difficulty = 10
-datum/objective_item/special/ddrill
+/datum/objective_item/special/ddrill
name = "a diamond drill"
targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill
difficulty = 10
-datum/objective_item/special/boh
+/datum/objective_item/special/boh
name = "a bag of holding"
targetitem = /obj/item/weapon/storage/backpack/holding
difficulty = 10
-datum/objective_item/special/hypercell
+/datum/objective_item/special/hypercell
name = "a hyper-capacity cell"
targetitem = /obj/item/weapon/stock_parts/cell/hyper
difficulty = 5
-datum/objective_item/special/laserpointer
+/datum/objective_item/special/laserpointer
name = "a laser pointer"
targetitem = /obj/item/device/laser_pointer
difficulty = 5
//Stack objectives get their own subtype
-datum/objective_item/stack
+/datum/objective_item/stack
name = "5 cardboards"
targetitem = /obj/item/stack/sheet/cardboard
difficulty = 9001
-datum/objective_item/stack/check_special_completion(var/obj/item/stack/S)
+/datum/objective_item/stack/check_special_completion(var/obj/item/stack/S)
var/target_amount = text2num(name)
var/found_amount = 0
@@ -196,17 +196,17 @@ datum/objective_item/stack/check_special_completion(var/obj/item/stack/S)
found_amount = S.amount
return found_amount>=target_amount
-datum/objective_item/stack/diamond
+/datum/objective_item/stack/diamond
name = "10 diamonds"
targetitem = /obj/item/stack/sheet/mineral/diamond
difficulty = 10
-datum/objective_item/stack/gold
+/datum/objective_item/stack/gold
name = "50 gold bars"
targetitem = /obj/item/stack/sheet/mineral/gold
difficulty = 15
-datum/objective_item/stack/uranium
+/datum/objective_item/stack/uranium
name = "25 refined uranium bars"
targetitem = /obj/item/stack/sheet/mineral/uranium
difficulty = 10
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index c86abe88512..b1cabe16cec 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -44,12 +44,6 @@
if(config.protect_assistant_from_antagonist)
restricted_jobs += "Assistant"
- var/head_check = 0
- for(var/mob/new_player/player in player_list)
- if(player.mind.assigned_role in command_positions)
- head_check = 1
- break
-
for (var/i=1 to max_headrevs)
if (antag_candidates.len==0)
break
@@ -58,7 +52,7 @@
head_revolutionaries += lenin
lenin.restricted_roles = restricted_jobs
- if((head_revolutionaries.len < required_enemies)||(!head_check))
+ if(head_revolutionaries.len < required_enemies)
return 0
return 1
@@ -345,7 +339,7 @@
if(headrev.current)
if(headrev.current.stat == DEAD)
text += "died"
- else if(headrev.current.z != ZLEVEL_STATION)
+ else if(headrev.current.z > ZLEVEL_STATION)
text += "fled the station"
else
text += "survived the revolution"
@@ -369,7 +363,7 @@
if(rev.current)
if(rev.current.stat == DEAD || isbrain(rev.current))
text += "died"
- else if(rev.current.z != ZLEVEL_STATION)
+ else if(rev.current.z > ZLEVEL_STATION)
text += "fled the station"
else
text += "survived the revolution"
@@ -395,7 +389,7 @@
if(head.current)
if(head.current.stat == DEAD || isbrain(head.current))
text += "died"
- else if(head.current.z != ZLEVEL_STATION)
+ else if(head.current.z > ZLEVEL_STATION)
text += "fled the station"
else
text += "survived the revolution"
diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm
index 7a8f7beb7c7..597064a68f0 100644
--- a/code/game/gamemodes/sandbox/airlock_maker.dm
+++ b/code/game/gamemodes/sandbox/airlock_maker.dm
@@ -4,15 +4,15 @@
-Sayu
*/
-obj/structure/door_assembly
+/obj/structure/door_assembly
var/datum/airlock_maker/maker = null
-obj/structure/door_assembly/attack_hand()
+/obj/structure/door_assembly/attack_hand()
..()
if(maker)
maker.interact()
-datum/airlock_maker
+/datum/airlock_maker
var/obj/structure/door_assembly/linked = null
var/list/access_used = null
@@ -23,7 +23,7 @@ datum/airlock_maker
var/doorname = "airlock"
-datum/airlock_maker/New(var/atom/target_loc)
+/datum/airlock_maker/New(var/atom/target_loc)
linked = new(target_loc)
linked.maker = src
linked.anchored = 0
@@ -31,7 +31,7 @@ datum/airlock_maker/New(var/atom/target_loc)
interact()
-datum/airlock_maker/proc/linkpretty(href,desc,active)
+/datum/airlock_maker/proc/linkpretty(href,desc,active)
if(!desc)
var/static/list/defaults = list("No","Yes")
desc = defaults[active+1]
@@ -39,7 +39,7 @@ datum/airlock_maker/proc/linkpretty(href,desc,active)
return "
[desc]"
return "
[desc]"
-datum/airlock_maker/proc/interact()
+/datum/airlock_maker/proc/interact()
var/list/leftcolumn = list()
var/list/rightcolumn = list()
leftcolumn += "
Required Access"
@@ -68,7 +68,7 @@ datum/airlock_maker/proc/interact()
dat += "
Finalize Airlock Construction |
Cancel and Destroy Airlock"
usr << browse(dat,"window=airlockmaker")
-datum/airlock_maker/Topic(var/href,var/list/href_list)
+/datum/airlock_maker/Topic(var/href,var/list/href_list)
if(!usr) return
if(!src || !linked || !linked.loc)
usr << browse(null,"window=airlockmaker")
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
index 976b992f2be..c55ada2a766 100644
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -2,21 +2,21 @@
var/hsboxspawn = 1
-mob
+/mob
var/datum/hSB/sandbox = null
-mob/proc/CanBuild()
+/mob/proc/CanBuild()
if(master_mode == "sandbox")
sandbox = new/datum/hSB
sandbox.owner = src.ckey
if(src.client.holder)
sandbox.admin = 1
verbs += new/mob/proc/sandbox_panel
-mob/proc/sandbox_panel()
+/mob/proc/sandbox_panel()
set name = "Sandbox Panel"
if(sandbox)
sandbox.update()
-datum/hSB
+/datum/hSB
var/owner = null
var/admin = 0
@@ -32,7 +32,7 @@ datum/hSB
/obj/item/device/uplink/hidden, /obj/item/smallDelivery, /obj/item/missile,/obj/item/projectile,
/obj/item/borg/sight,/obj/item/borg/overdrive,/obj/item/borg/stun,/obj/item/weapon/robot_module)
-datum/hSB/proc/update()
+/datum/hSB/proc/update()
var/global/list/hrefs = list(
"Space Gear",
"Suit Up (Space Travel Gear)" = "hsbsuit",
@@ -101,7 +101,7 @@ datum/hSB/proc/update()
usr << browse(hsbinfo, "window=hsbpanel")
-datum/hSB/Topic(href, href_list)
+/datum/hSB/Topic(href, href_list)
if(!usr || !src || !(src.owner == usr.ckey))
if(usr)
usr << browse(null,"window=sandbox")
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 853e56ba38f..7bd0a665f3f 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -167,6 +167,8 @@ Made by Xhuis
world << "
The shadowlings have been killed by the crew!"
else if(!check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE)
world << "
The crew has escaped the station before the shadowlings could ascend!"
+ else
+ world << "
The shadowlings have failed!"
..()
return 1
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index a21f41baa54..d6abcab574f 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -355,14 +355,14 @@
S.start()
qdel(B)
-datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls
+/datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls
name = "!(%@ ERROR )!@$"
id = "blindness_smoke"
description = "<::ERROR::> CANNOT ANALYZE REAGENT <::ERROR::>"
color = "#000000" //Complete black (RGB: 0, 0, 0)
metabolization_rate = 100 //lel
-datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob)
+/datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!is_shadow_or_thrall(M))
M << "
You breathe in the black smoke, and your eyes burn horribly!"
diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm
index 7e4fb0e05fd..d614da9b9ca 100644
--- a/code/game/gamemodes/traitor/double_agents.dm
+++ b/code/game/gamemodes/traitor/double_agents.dm
@@ -5,6 +5,7 @@
required_players = 25
required_enemies = 5
recommended_enemies = 8
+ reroll_friendly = 0
traitor_name = "double agent"
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 5a4040d9242..6c7b57edd47 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -348,9 +348,9 @@
var/obj/item/weapon/folder/syndicate/folder
if(owner == exchange_red)
- folder = new/obj/item/weapon/folder/syndicate/red(mob.locs)
+ folder = new/obj/item/weapon/folder/syndicate/red(mob.loc)
else
- folder = new/obj/item/weapon/folder/syndicate/blue(mob.locs)
+ folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc)
var/list/slots = list (
"backpack" = slot_in_backpack,
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index cfe5bdcc276..3fb8fe34f4b 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -13,16 +13,17 @@
throwforce = 10
w_class = 3
hitsound = 'sound/weapons/bladeslice.ogg'
- var/charged = 1
+ var/charges = 1
var/spawn_type = /obj/singularity/narsie/wizard
var/spawn_amt = 1
var/activate_descriptor = "reality"
var/rend_desc = "You should run now."
+ var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning
/obj/item/weapon/veilrender/attack_self(mob/user as mob)
- if(charged)
- new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc)
- charged = 0
+ if(charges > 0)
+ new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc, spawn_fast)
+ charges--
user.visible_message("
[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!")
else
user << "
The unearthly energies that powered the blade are now dormant."
@@ -37,17 +38,20 @@
anchored = 1.0
var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies
var/spawn_amt_left = 20
+ var/spawn_fast = 0
-/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc)
+/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast)
src.spawn_path = spawn_type
src.spawn_amt_left = spawn_amt
src.desc = desc
+ src.spawn_fast = spawn_fast
SSobj.processing |= src
return
/obj/effect/rend/process()
- if(locate(/mob) in loc)
- return
+ if(!spawn_fast)
+ if(locate(/mob) in loc)
+ return
new spawn_path(loc)
spawn_amt_left--
if(spawn_amt_left <= 0)
@@ -136,21 +140,10 @@
hardset_dna(M, null, null, null, null, /datum/species/skeleton)
M.revive()
spooky_scaries |= M
- M << "
You have been revived by [user.real_name]!"
- M << "
They are your master now, assist them even if it costs you your new life!"
+ M << "
You have been revived by [user.real_name]!"
+ M << "
They are your master now, assist them even if it costs you your new life!"
- if(prob(33))
- equip_roman_skeleton(M)
-
- var/mob/living/carbon/human/master = user
-
- var/datum/objective/protect/protect_master = new /datum/objective/protect
- protect_master.owner = M.mind
- protect_master.target = master.mind
- protect_master.explanation_text = "Protect [master.real_name], your master."
- M.mind.objectives += protect_master
- ticker.mode.traitors += M.mind
- M.mind.special_role = "skeleton-thrall"
+ equip_roman_skeleton(M)
desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]"
@@ -163,7 +156,7 @@
spooky_scaries.Remove(X)
continue
var/mob/living/carbon/human/H = X
- if(H.stat)
+ if(H.stat == DEAD)
spooky_scaries.Remove(X)
continue
listclearnulls(spooky_scaries)
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index 4503908cccc..603c2ff0d88 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -2,8 +2,8 @@
/proc/rightandwrong(var/summon_type, var/mob/user, var/survivor_probability) //0 = Summon Guns, 1 = Summon Magic
var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg")
- var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying", "necromantic","staffdoor", "special")
- var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos")
+ var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor", "special")
+ var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic")
if(user) //in this case either someone holding a spellbook or a badmin
user << "
You summoned [summon_type ? "magic" : "guns"]!"
@@ -87,6 +87,7 @@
if("car")
var/obj/item/weapon/gun/projectile/automatic/m90/gat = new(get_turf(H))
gat.pin = new /obj/item/device/firing_pin
+ playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1)
else
switch (randomizemagic)
@@ -133,8 +134,6 @@
if (!(H.dna.check_mutation(XRAY)))
H.dna.add_mutation(XRAY)
H << "
The walls suddenly disappear."
- if("necromantic")
- new /obj/item/device/necromantic_stone(get_turf(H))
if("special")
magiclist -= "special" //only one super OP item per summoning max
switch (randomizemagicspecial)
@@ -148,7 +147,11 @@
new /obj/item/weapon/antag_spawner/contract(get_turf(H))
if("staffchaos")
new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H))
+ if("necromantic")
+ new /obj/item/device/necromantic_stone(get_turf(H))
H << "
You suddenly feel lucky."
+ playsound(get_turf(H),'sound/magic/Summon_Magic.ogg', 50, 1)
+
/proc/summonevents()
if(!SSevent.wizardmode)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 7f8ade33d02..351f87f9c37 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -188,7 +188,7 @@
return
-proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0)
+/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0)
var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target))
newstruct.faction |= "\ref[stoner]"
newstruct.key = target.key
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 3d30ba9e242..8a58076e663 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -1,3 +1,383 @@
+/datum/spellbook_entry
+ var/name = "Entry Name"
+
+ var/spell_type = null
+ var/desc = ""
+ var/category = "Offensive Spells"
+ var/log_name = "XX" //What it shows up as in logs
+ var/cost = 1
+ var/refundable = 1
+ var/surplus = -1 // -1 for infinite, not used by anything atm
+ var/obj/effect/proc_holder/spell/S = null //Since spellbooks can be used by only one person anyway we can track the actual spell
+ var/buy_word = "Learn"
+
+/datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied
+ return 1
+/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances
+ if(book.uses
= aspell.level_max)
+ user << "This spell cannot be improved further."
+ return 0
+ else
+ aspell.name = initial(aspell.name)
+ aspell.spell_level++
+ aspell.charge_max = round(initial(aspell.charge_max) - aspell.spell_level * (initial(aspell.charge_max) - aspell.cooldown_min)/ aspell.level_max)
+ if(aspell.charge_max < aspell.charge_counter)
+ aspell.charge_counter = aspell.charge_max
+ switch(aspell.spell_level)
+ if(1)
+ user << "You have improved [aspell.name] into Efficient [aspell.name]."
+ aspell.name = "Efficient [aspell.name]"
+ if(2)
+ user << "You have further improved [aspell.name] into Quickened [aspell.name]."
+ aspell.name = "Quickened [aspell.name]"
+ if(3)
+ user << "You have further improved [aspell.name] into Free [aspell.name]."
+ aspell.name = "Free [aspell.name]"
+ if(4)
+ user << "You have further improved [aspell.name] into Instant [aspell.name]."
+ aspell.name = "Instant [aspell.name]"
+ if(aspell.spell_level >= aspell.level_max)
+ user << "This spell cannot be strengthened any further."
+ return 1
+ //No same spell found - just learn it
+ feedback_add_details("wizard_spell_learned",log_name)
+ user.mind.AddSpell(S)
+ user << "You have learned [S.name]."
+ return 1
+
+/datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ if(!refundable)
+ return 0
+ if(!S)
+ S = new spell_type()
+ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list)
+ if(initial(S.name) == initial(aspell.name))
+ return 1
+ return 0
+
+/datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure
+ var/area/wizard_station/A = locate()
+ if(!(user in A.contents))
+ user << "You can only refund spells at the wizard lair"
+ return -1
+ if(!S)
+ S = new spell_type()
+ var/spell_levels = 0
+ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list)
+ if(initial(S.name) == initial(aspell.name))
+ spell_levels = aspell.spell_level
+ user.mind.spell_list.Remove(aspell)
+ del(S)
+ return cost * (spell_levels+1)
+ return -1
+/datum/spellbook_entry/proc/GetInfo()
+ if(!S)
+ S = new spell_type()
+ var/dat =""
+ dat += "[initial(S.name)]"
+ if(S.charge_type == "recharge")
+ dat += " Cooldown:[S.charge_max/10]"
+ dat += " Cost:[cost]
"
+ dat += "[S.desc][desc]
"
+ dat += "[S.clothes_req?"Needs wizard garb":"Can be cast without wizard garb"]
"
+ return dat
+
+/datum/spellbook_entry/fireball
+ name = "Fireball"
+ spell_type = /obj/effect/proc_holder/spell/dumbfire/fireball
+ log_name = "FB"
+
+/datum/spellbook_entry/magicm
+ name = "Magic Missile"
+ spell_type = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile
+ log_name = "MM"
+
+/datum/spellbook_entry/disintegrate
+ name = "Disintegrate"
+ spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate
+ log_name = "DG"
+
+/datum/spellbook_entry/disabletech
+ name = "Disable Tech"
+ spell_type = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech
+ log_name = "DT"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/repulse
+ name = "Repulse"
+ spell_type = /obj/effect/proc_holder/spell/aoe_turf/repulse
+ log_name = "RP"
+
+/datum/spellbook_entry/smoke
+ name = "Smoke"
+ spell_type = /obj/effect/proc_holder/spell/targeted/smoke
+ log_name = "SM"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/blind
+ name = "Blind"
+ spell_type = /obj/effect/proc_holder/spell/targeted/trigger/blind
+ log_name = "BD"
+
+/datum/spellbook_entry/mindswap
+ name = "Mindswap"
+ spell_type = /obj/effect/proc_holder/spell/targeted/mind_transfer
+ log_name = "MT"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/forcewall
+ name = "Force Wall"
+ spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
+ log_name = "FW"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/blink
+ name = "Blink"
+ spell_type = /obj/effect/proc_holder/spell/targeted/turf_teleport/blink
+ log_name = "BL"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/teleport
+ name = "Teleport"
+ spell_type = /obj/effect/proc_holder/spell/targeted/area_teleport/teleport
+ log_name = "TP"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/mutate
+ name = "Mutate"
+ spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate
+ log_name = "MU"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/jaunt
+ name = "Ethereal Jaunt"
+ spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt
+ log_name = "EJ"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/knock
+ name = "Knock"
+ spell_type = /obj/effect/proc_holder/spell/aoe_turf/knock
+ log_name = "KN"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/fleshtostone
+ name = "Flesh to Stone"
+ spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone
+ log_name = "FS"
+
+/datum/spellbook_entry/summonitem
+ name = "Summon Item"
+ spell_type = /obj/effect/proc_holder/spell/targeted/summonitem
+ log_name = "IS"
+ category = "Utility Spells"
+
+/datum/spellbook_entry/lightningbolt
+ name = "Lightning Bolt"
+ spell_type = /obj/effect/proc_holder/spell/targeted/lightning
+ log_name = "LB"
+
+/datum/spellbook_entry/barnyard
+ name = "Barnyard Curse"
+ spell_type = /obj/effect/proc_holder/spell/targeted/barnyardcurse
+ log_name = "BC"
+
+/datum/spellbook_entry/item
+ name = "Buy Item"
+ category = "Artifacts"
+ refundable = 0
+ buy_word = "Summon"
+ var/item_path= null
+
+
+/datum/spellbook_entry/item/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ new item_path(get_turf(user))
+ feedback_add_details("wizard_spell_learned",log_name)
+ return 1
+
+/datum/spellbook_entry/item/GetInfo()
+ var/dat =""
+ dat += "[name]"
+ dat += " Cost:[cost]
"
+ dat += "[desc]
"
+ if(surplus>=0)
+ dat += "[surplus] left.
"
+ return dat
+
+/datum/spellbook_entry/item/staffchange
+ name = "Staff of Change"
+ desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
+ item_path = /obj/item/weapon/gun/magic/staff/change
+ log_name = "ST"
+
+/datum/spellbook_entry/item/staffanimation
+ name = "Staff of Animation"
+ desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines."
+ item_path = /obj/item/weapon/gun/magic/staff/animate
+ log_name = "SA"
+
+/datum/spellbook_entry/item/staffchaos
+ name = "Staff of Chaos"
+ desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended."
+ item_path = /obj/item/weapon/gun/magic/staff/chaos
+ log_name = "SC"
+
+/datum/spellbook_entry/item/staffdoor
+ name = "Staff of Door Creation"
+ desc = "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass."
+ item_path = /obj/item/weapon/gun/magic/staff/door
+ log_name = "SD"
+
+/datum/spellbook_entry/item/scryingorb
+ name = "Scrying Orb"
+ desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision."
+ item_path = /obj/item/weapon/gun/magic/staff/chaos
+ log_name = "SO"
+
+/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ if(..())
+ if (!(user.dna.check_mutation(XRAY)))
+ user.dna.add_mutation(XRAY)
+ return 1
+
+/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/weapon/storage/belt/soulstone/full
+ log_name = "SS"
+
+/datum/spellbook_entry/item/soulstones/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/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."
+ item_path = /obj/item/device/necromantic_stone
+ log_name = "NS"
+
+/datum/spellbook_entry/item/wands
+ name = "Wand Assortment"
+ desc = "A collection of wands that allow for a wide variety of utility. Wands do not recharge, so be conservative in use. Comes in a handy belt."
+ item_path = /obj/item/weapon/storage/belt/wands/full
+ log_name = "WA"
+
+/datum/spellbook_entry/item/armor
+ name = "Mastercrafted Armor Set"
+ desc = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space."
+ item_path = /obj/item/clothing/suit/space/hardsuit/wizard
+ log_name = "HS"
+
+/datum/spellbook_entry/item/armor/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ . = ..()
+ if(.)
+ new /obj/item/clothing/shoes/sandal(get_turf(user)) //In case they've lost them.
+ new /obj/item/clothing/gloves/color/purple(get_turf(user))//To complete the outfit
+
+/datum/spellbook_entry/item/contract
+ name = "Contract of Apprenticeship"
+ desc = "A magical contract binding an apprentice wizard to your service, using it will summon them to your side."
+ item_path = /obj/item/weapon/antag_spawner/contract
+ log_name = "CT"
+
+/datum/spellbook_entry/summon
+ name = "Summon Stuff"
+ category = "Rituals"
+ refundable = 0
+ buy_word = "Cast"
+ var/active = 0
+
+/datum/spellbook_entry/summon/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ return ..() && !active
+
+/datum/spellbook_entry/summon/GetInfo()
+ var/dat =""
+ dat += "[name]"
+ if(cost>0)
+ dat += " Cost:[cost]
"
+ else
+ dat += " No Cost
"
+ dat += "[desc]
"
+ if(active)
+ dat += "Already cast!
"
+ return dat
+
+/datum/spellbook_entry/summon/guns
+ name = "Summon Guns"
+ category = "Challenges"
+ desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!"
+ cost = 0
+ log_name = "SG"
+
+/datum/spellbook_entry/summon/guns/IsAvailible()
+ return !config.no_summon_guns
+
+/datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ feedback_add_details("wizard_spell_learned",log_name)
+ rightandwrong(0, user, 0)
+ book.uses += 1
+ active = 1
+ playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1)
+ user << "You have cast summon guns and gained an extra charge for your spellbook."
+ return 1
+
+/datum/spellbook_entry/summon/magic
+ name = "Summon Magic"
+ category = "Challenges"
+ desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time."
+ cost = 0
+ log_name = "SU"
+
+/datum/spellbook_entry/summon/magic/IsAvailible()
+ return !config.no_summon_magic
+
+/datum/spellbook_entry/summon/magic/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ feedback_add_details("wizard_spell_learned",log_name)
+ rightandwrong(1, user, 0)
+ book.uses += 1
+ active = 1
+ playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1)
+ user << "You have cast summon magic and gained an extra charge for your spellbook."
+ return 1
+
+/datum/spellbook_entry/summon/events
+ name = "Summon Events"
+ desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events."
+ cost = 1
+ log_name = "SE"
+ var/times = 0
+
+/datum/spellbook_entry/summon/events/IsAvailible()
+ return (ticker.mode.name != "ragin' mages" && !config.no_summon_events)
+
+/datum/spellbook_entry/summon/events/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ feedback_add_details("wizard_spell_learned",log_name)
+ summonevents()
+ times++
+ playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1)
+ user << "You have cast summon events."
+ return 1
+
+/datum/spellbook_entry/summon/events/GetInfo()
+ . = ..()
+ if(times>0)
+ . += "You cast it [times] times.
"
+ return .
+
+
+
/obj/item/weapon/spellbook
name = "spell book"
desc = "The legendary book of spells of the wizard."
@@ -8,11 +388,24 @@
w_class = 1.0
var/uses = 5
var/temp = null
- var/max_uses = 5
var/op = 1
- var/activepage
- var/list/active_challenges = list()
+ var/tab = null
var/mob/living/carbon/human/owner
+ var/list/datum/spellbook_entry/entries = list()
+ var/list/categories = list()
+
+/obj/item/weapon/spellbook/New()
+ ..()
+ var/entry_types = typesof(/datum/spellbook_entry) - /datum/spellbook_entry - /datum/spellbook_entry/item - /datum/spellbook_entry/summon
+ for(var/T in entry_types)
+ var/datum/spellbook_entry/E = new T
+ if(E.IsAvailible())
+ entries |= E
+ categories |= E.category
+ else
+ del(E)
+ tab = categories[1]
+
/obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/weapon/antag_spawner/contract))
@@ -21,12 +414,49 @@
user << "The contract has been used, you can't get your points back now!"
else
user << "You feed the contract back into the spellbook, refunding your points."
- src.max_uses++
src.uses++
qdel(O)
+/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category)
+ var/dat = ""
+ switch(category)
+ if("Offensive Spells")
+ dat += "Spells that can be reused endlessly.
"
+ dat += "The number after the spell name is the cooldown time.
"
+ dat += "You can reduce this number by spending more points on the spell.
"
+ if("Utility Spells")
+ dat += "Spells that can be reused endlessly.
"
+ dat += "The number after the spell name is the cooldown time.
"
+ dat += "You can reduce this number by spending more points on the spell.
"
+ if("Artifacts")
+ dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of uses.
"
+ dat += "These items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased.
"
+ if("Challenges")
+ dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
"
+ dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
"
+ if("Rituals")
+ dat += "These powerful spells change the very fabric of reality. Not always in your favour.
"
+ return dat
-
+/obj/item/weapon/spellbook/proc/wrap(var/content)
+ var/dat = ""
+ dat +="Spellbook"
+ dat += {"
+
+
+
+ "}
+ dat += {"[content]