max_lum) continue
+ turfs += T
+
+ if(!turfs.len)
+ usr << "\red You cannot find darkness to step to."
+ return
+
+ var/turf/picked = pick(turfs)
+
+ if(!picked || !isturf(picked))
+ return
+ M.current.ExtinguishMob()
+ if(M.current.buckled)
+ M.current.buckled.unbuckle()
+ var/atom/movable/overlay/animation = new /atom/movable/overlay( get_turf(usr) )
+ animation.name = usr.name
+ animation.density = 0
+ animation.anchored = 1
+ animation.icon = usr.icon
+ animation.alpha = 127
+ animation.layer = 5
+ //animation.master = src
+ usr.loc = picked
+ spawn(10)
+ del(animation)
+ M.current.remove_vampire_blood(30)
+ M.current.verbs -= /client/proc/vampire_shadowstep
+ spawn(20)
+ M.current.verbs += /client/proc/vampire_shadowstep
+
+/mob/proc/remove_vampire_blood(amount = 0)
+ var/bloodold
+ if(!mind || !mind.vampire)
+ return
+ bloodold = mind.vampire.bloodusable
+ mind.vampire.bloodusable = max(0, (mind.vampire.bloodusable - amount))
+ if(bloodold != mind.vampire.bloodusable)
+ src << "\blue You have [mind.vampire.bloodusable] left to use."
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
new file mode 100644
index 00000000000..ace9429c751
--- /dev/null
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -0,0 +1,206 @@
+
+/////////Apprentice Contract//////////
+
+/obj/item/weapon/contract
+ name = "contract"
+ desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state ="scroll2"
+ throw_speed = 1
+ throw_range = 5
+ w_class = 1.0
+ var/used = 0
+ flags = FPRINT | TABLEPASS
+
+
+/obj/item/weapon/contract/attack_self(mob/user as mob)
+ user.set_machine(src)
+ var/dat
+ if(used)
+ dat = "You have already summoned your apprentice.
"
+ else
+ dat = "Contract of Apprenticeship:
"
+ dat += "Using this contract, you may summon an apprentice to aid you on your mission.
"
+ dat += "If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.
"
+ dat += "Which school of magic is your apprentice studying?:
"
+ dat += "Destruction
"
+ dat += "Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.
"
+ dat += "Bluespace Manipulation
"
+ dat += "Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.
"
+ dat += "Healing
"
+ dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
"
+ dat += "Robeless
"
+ dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
"
+ user << browse(dat, "window=radio")
+ onclose(user, "radio")
+ return
+
+
+/obj/item/weapon/contract/Topic(href, href_list)
+ ..()
+ var/mob/living/carbon/human/H = usr
+
+ if(H.stat || H.restrained())
+ return
+ if(!istype(H, /mob/living/carbon/human))
+ return 1
+
+ if(loc == H || (in_range(src, H) && istype(loc, /turf)))
+ H.set_machine(src)
+ if(href_list["school"])
+ if (used)
+ H << "You already used this contract!"
+ return
+ var/list/candidates = get_candidates(BE_WIZARD)
+ if(candidates.len)
+ src.used = 1
+ var/client/C = pick(candidates)
+ new /obj/effect/effect/harmless_smoke(H.loc)
+ var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc)
+ M.key = C.key
+ M << "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals."
+ switch(href_list["school"])
+ if("destruction")
+ M.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(M)
+ M.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(M)
+ M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball."
+ if("bluespace")
+ M.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(M)
+ M.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(M)
+ M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt."
+ if("healing")
+ M.spell_list += new /obj/effect/proc_holder/spell/targeted/charge(M)
+ M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(M)
+ M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand)
+ M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall."
+ if("robeless")
+ M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(M)
+ M.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(M)
+ M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap."
+ M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
+ M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform)
+ M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
+ M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(M), slot_r_store)
+ var/wizard_name_first = pick(wizard_first)
+ var/wizard_name_second = pick(wizard_second)
+ var/randomname = "[wizard_name_first] [wizard_name_second]"
+ var/newname = copytext(sanitize(input(M, "You are the wizard's apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
+
+ if (!newname)
+ newname = randomname
+ M.mind.name = newname
+ M.real_name = newname
+ M.name = newname
+ var/datum/objective/protect/new_objective = new /datum/objective/protect
+ new_objective.owner = M:mind
+ new_objective:target = H:mind
+ new_objective.explanation_text = "Protect [H.real_name], the wizard."
+ M.mind.objectives += new_objective
+ ticker.mode.traitors += M.mind
+ M.mind.special_role = "apprentice"
+
+ else
+ H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later."
+ return
+
+
+///////////////////////////Veil Render//////////////////////
+
+/obj/item/weapon/veilrender
+ name = "veil render"
+ desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "render"
+ item_state = "render"
+ flags = FPRINT | TABLEPASS
+ force = 15
+ throwforce = 10
+ w_class = 3
+ var/charged = 1
+
+/obj/effect/rend
+ name = "tear in the fabric of reality"
+ desc = "You should run now"
+ icon = 'icons/obj/biomass.dmi'
+ icon_state = "rift"
+ density = 1
+ unacidable = 1
+ anchored = 1.0
+
+/obj/effect/rend/New()
+ spawn(50)
+ new /obj/machinery/singularity/narsie/wizard(get_turf(src))
+ del(src)
+ return
+ return
+
+/obj/item/weapon/veilrender/attack_self(mob/user as mob)
+ if(charged == 1)
+ new /obj/effect/rend(get_turf(usr))
+ charged = 0
+ visible_message("\red [src] hums with power as [usr] deals a blow to reality itself!")
+ else
+ user << "\red The unearthly energies that powered the blade are now dormant."
+
+
+
+/obj/item/weapon/veilrender/vealrender
+ name = "veal render"
+ desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm."
+
+/obj/item/weapon/veilrender/vealrender/attack_self(mob/user as mob)
+ if(charged)
+ new /obj/effect/rend/cow(get_turf(usr))
+ charged = 0
+ visible_message("\red [src] hums with power as [usr] deals a blow to hunger itself!")
+ else
+ user << "\red The unearthly energies that powered the blade are now dormant."
+
+/obj/effect/rend/cow
+ desc = "Reverberates with the sound of ten thousand moos."
+ var/cowsleft = 20
+
+/obj/effect/rend/cow/New()
+ processing_objects.Add(src)
+ return
+
+/obj/effect/rend/cow/process()
+ if(locate(/mob) in loc) return
+ new /mob/living/simple_animal/cow(loc)
+ cowsleft--
+ if(cowsleft <= 0)
+ del src
+
+/obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob)
+ if(istype(I, /obj/item/weapon/nullrod))
+ visible_message("\red [I] strikes a blow against \the [src], banishing it!")
+ spawn(1)
+ del src
+ return
+ ..()
+
+
+/////////////////////////////////////////Scrying///////////////////
+
+/obj/item/weapon/scrying
+ name = "scrying orb"
+ desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means."
+ icon = 'icons/obj/projectiles.dmi'
+ icon_state ="bluespace"
+ throw_speed = 7
+ throw_range = 15
+ throwforce = 15
+ damtype = BURN
+ force = 15
+ flags = FPRINT | TABLEPASS
+ hitsound = 'sound/items/welder2.ogg'
+
+/obj/item/weapon/scrying/attack_self(mob/user as mob)
+ user << "\blue You can see...everything!"
+ visible_message("\red [usr] stares into [src], their eyes glazing over.")
+ user.ghostize(1)
+ return
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index e39cb1fdf34..ba5f062ada4 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -1,62 +1,111 @@
-/mob/proc/rightandwrong()
- usr << "You summoned guns!"
- message_admins("[key_name_admin(usr, 1)] summoned guns!")
+/mob/proc/rightandwrong(var/summon_type) //0 = Summon Guns, 1 = Summon Magic
+ usr << "You summoned [summon_type ? "magic" : "guns"]!"
+ message_admins("[key_name_admin(usr, 1)] summoned [summon_type ? "magic" : "guns"]!")
for(var/mob/living/carbon/human/H in player_list)
if(H.stat == 2 || !(H.client)) continue
- if(is_special_character(H)) continue
- if(prob(25))
+ if(H.mind)
+ if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice") continue
+ if(prob(25) && !(H.mind in ticker.mode.traitors))
ticker.mode.traitors += H.mind
H.mind.special_role = "traitor"
var/datum/objective/survive/survive = new
survive.owner = H.mind
H.mind.objectives += survive
+ H.attack_log += "\[[time_stamp()]\] Was made into a survivor, and trusts no one!"
H << "You are the survivor! Your own safety matters above all else, trust no one and kill anyone who gets in your way. However, armed as you are, now would be the perfect time to settle that score or grab that pair of yellow gloves you've been eyeing..."
var/obj_count = 1
for(var/datum/objective/OBJ in H.mind.objectives)
H << "Objective #[obj_count]: [OBJ.explanation_text]"
obj_count++
- var/randomize = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw")
- switch (randomize)
- if("taser")
- new /obj/item/weapon/gun/energy/taser(get_turf(H))
- if("egun")
- new /obj/item/weapon/gun/energy/gun(get_turf(H))
- if("laser")
- new /obj/item/weapon/gun/energy/laser(get_turf(H))
- if("revolver")
- new /obj/item/weapon/gun/projectile/revolver(get_turf(H))
- if("detective")
- new /obj/item/weapon/gun/projectile/revolver/detective(get_turf(H))
- if("smg")
- new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H))
- if("nuclear")
- new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H))
- if("deagle")
- new /obj/item/weapon/gun/projectile/automatic/deagle/camo(get_turf(H))
- if("gyrojet")
- new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H))
- if("pulse")
- new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H))
- if("silenced")
- new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H))
- new /obj/item/weapon/silencer(get_turf(H))
- if("cannon")
- new /obj/item/weapon/gun/energy/lasercannon(get_turf(H))
- if("doublebarrel")
- new /obj/item/weapon/gun/projectile/revolver/doublebarrel/(get_turf(H))
- if("shotgun")
- new /obj/item/weapon/gun/projectile/shotgun/(get_turf(H))
- if("combatshotgun")
- new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H))
- if("mateba")
- new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
- if("smg")
- new /obj/item/weapon/gun/projectile/automatic(get_turf(H))
- if("uzi")
- new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H))
- if("crossbow")
- new /obj/item/weapon/gun/energy/crossbow(get_turf(H))
- if("saw")
- new /obj/item/weapon/gun/projectile/automatic/l6_saw(get_turf(H))
\ No newline at end of file
+ var/randomizeguns = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw")
+ var/randomizemagic = pick("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge","wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying")
+ if(!summon_type)
+ switch (randomizeguns)
+ if("taser")
+ new /obj/item/weapon/gun/energy/taser(get_turf(H))
+ if("egun")
+ new /obj/item/weapon/gun/energy/gun(get_turf(H))
+ if("laser")
+ new /obj/item/weapon/gun/energy/laser(get_turf(H))
+ if("revolver")
+ new /obj/item/weapon/gun/projectile/revolver(get_turf(H))
+ if("detective")
+ new /obj/item/weapon/gun/projectile/revolver/detective(get_turf(H))
+ if("smg")
+ new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H))
+ if("nuclear")
+ new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H))
+ if("deagle")
+ new /obj/item/weapon/gun/projectile/automatic/deagle/camo(get_turf(H))
+ if("gyrojet")
+ new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H))
+ if("pulse")
+ new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H))
+ if("silenced")
+ new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H))
+ new /obj/item/weapon/silencer(get_turf(H))
+ if("cannon")
+ new /obj/item/weapon/gun/energy/lasercannon(get_turf(H))
+ if("doublebarrel")
+ new /obj/item/weapon/gun/projectile/revolver/doublebarrel(get_turf(H))
+ if("shotgun")
+ new /obj/item/weapon/gun/projectile/shotgun/(get_turf(H))
+ if("combatshotgun")
+ new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H))
+ if("mateba")
+ new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
+ if("smg")
+ new /obj/item/weapon/gun/projectile/automatic(get_turf(H))
+ if("uzi")
+ new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H))
+ if("crossbow")
+ new /obj/item/weapon/gun/energy/crossbow(get_turf(H))
+ if("saw")
+ new /obj/item/weapon/gun/projectile/automatic/l6_saw(get_turf(H))
+ else
+ switch (randomizemagic)
+ if("fireball")
+ new /obj/item/weapon/spellbook/oneuse/fireball(get_turf(H))
+ if("smoke")
+ new /obj/item/weapon/spellbook/oneuse/smoke(get_turf(H))
+ if("blind")
+ new /obj/item/weapon/spellbook/oneuse/blind(get_turf(H))
+ if("mindswap")
+ new /obj/item/weapon/spellbook/oneuse/mindswap(get_turf(H))
+ if("forcewall")
+ new /obj/item/weapon/spellbook/oneuse/forcewall(get_turf(H))
+ if("knock")
+ new /obj/item/weapon/spellbook/oneuse/knock(get_turf(H))
+ if("horsemask")
+ new /obj/item/weapon/spellbook/oneuse/horsemask(get_turf(H))
+ if("charge")
+ new /obj/item/weapon/spellbook/oneuse/charge(get_turf(H))
+ if("wandnothing")
+ new /obj/item/weapon/gun/magic/wand(get_turf(H))
+ if("wanddeath")
+ new /obj/item/weapon/gun/magic/wand/death(get_turf(H))
+ if("wandresurrection")
+ new /obj/item/weapon/gun/magic/wand/resurrection(get_turf(H))
+ if("wandpolymorph")
+ new /obj/item/weapon/gun/magic/wand/polymorph(get_turf(H))
+ if("wandteleport")
+ new /obj/item/weapon/gun/magic/wand/teleport(get_turf(H))
+ if("wanddoor")
+ new /obj/item/weapon/gun/magic/wand/door(get_turf(H))
+ if("staffchange")
+ new /obj/item/weapon/gun/magic/staff/change(get_turf(H))
+ if("staffhealing")
+ new /obj/item/weapon/gun/magic/staff/healing(get_turf(H))
+ if("armor")
+ new /obj/item/clothing/suit/space/rig/wizard(get_turf(H))
+ new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H))
+ if("scrying")
+ new /obj/item/weapon/scrying(get_turf(H))
+ if (!(XRAY in H.mutations))
+ H.mutations.Add(XRAY)
+ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
+ H.see_in_dark = 8
+ H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ H << "\blue The walls suddenly disappear."
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 70c655ce576..4ed953d36e4 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -19,9 +19,15 @@
if(istype(M, /mob/living/carbon/human/dummy))
return..()
+ if(M.has_brain_worms()) //Borer stuff - RR
+ user << "This being is corrupted by an alien intelligence and cannot be soul trapped."
+ return..()
+
M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey]) (JMP)")
+
+ log_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey])")
+
transfer_soul("VICTIM", M, user)
return
@@ -173,9 +179,8 @@
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
del(T)
- Z << "You are playing a Juggernaut. Though slow, you can withstand extreme punishment, and rip apart enemies and walls alike."
+ Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
- Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall(Z)
Z.cancel_camera()
del(C)
@@ -189,9 +194,8 @@
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
del(T)
- Z << "You are playing a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls."
+ Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
- Z.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift(Z)
Z.cancel_camera()
del(C)
@@ -205,12 +209,8 @@
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
del(T)
- Z << "You are playing an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, repair allied constructs (by clicking on them), and even create new constructs"
+ Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
- Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser(Z)
- Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wall(Z)
- Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/floor(Z)
- Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone(Z)
Z.cancel_camera()
del(C)
else
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index ff19ce77648..375a5129c4a 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -12,6 +12,19 @@
var/max_uses = 5
var/op = 1
+/obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob)
+ if(istype(O, /obj/item/weapon/contract))
+ var/obj/item/weapon/contract/contract = O
+ if(contract.used)
+ 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++
+ del (O)
+
+
+
/obj/item/weapon/spellbook/attack_self(mob/user as mob)
user.set_machine(src)
@@ -24,39 +37,89 @@
dat += "
"
dat += "Memorize which spell:
"
dat += "The number after the spell name is the cooldown time.
"
- dat += "Magic Missile (10)
"
+
+ dat += "Magic Missile (15)
"
+ dat += "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.
"
+
dat += "Fireball (10)
"
- //dat += "Disintegrate (60)
"
+ dat += "This spell fires a fireball in the direction you're facing and does not require wizard garb. Be careful not to fire it at people that are standing next to you.
"
+
+ dat += "Disintegrate (60)
"
+ dat += "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.
"
+
dat += "Disable Technology (60)
"
+ dat += "This spell disables all weapons, cameras and most other technology in range.
"
+
dat += "Smoke (10)
"
+ dat += "This spell spawns a cloud of choking smoke at your location and does not require wizard garb.
"
+
dat += "Blind (30)
"
+ dat += "This spell temporarly blinds a single person and does not require wizard garb.
"
+
dat += "Mind Transfer (60)
"
+ dat += "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process.
"
+
dat += "Forcewall (10)
"
+ dat += "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb.
"
+
dat += "Blink (2)
"
+ dat += "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.
"
+
dat += "Teleport (60)
"
+ dat += "This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.
"
+
dat += "Mutate (60)
"
- dat += "Ethereal Jaunt (60)
"
+ dat += "This spell causes you to turn into a hulk and gain telekinesis for a short while.
"
+
+ dat += "Ethereal Jaunt (30)
"
+ dat += "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.
"
+
dat += "Knock (10)
"
+ dat += "This spell opens nearby doors and does not require wizard garb.
"
+
dat += "Curse of the Horseman (15)
"
-// if(op)
-// dat += "Summon Guns (One time use, global spell)
"
+ dat += "This spell will curse a person to wear an unremovable horse mask (it has glue on the inside) and speak like a horse. It does not require wizard garb.
"
+
+ dat += "Flesh to Stone (60)
"
+ dat += "This spell will curse a person to immediately turn into an unmoving statue. The effect will eventually wear off if the statue is not destroyed.
"
+
+ dat += "Summon Guns (One time use, global spell)
"
+ dat += "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!
"
+
+ dat += "Summon Magic (One time use, global spell)
"
+ dat += "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time.
"
+
dat += "
"
dat += "Artefacts:
"
dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
"
dat += "It is recommended that only experienced wizards attempt to wield such artefacts.
"
dat += "
"
+
dat += "Staff of Change
"
+ dat += "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
"
dat += "
"
- dat += "Mental Focus
"
- dat += "
"
+
dat += "Six Soul Stone Shards and the spell Artificer
"
+ dat += "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.
"
dat += "
"
+
dat += "Mastercrafted Armor Set
"
+ dat += "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
"
dat += "
"
+
dat += "Staff of Animation
"
+ dat += "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines.
"
dat += "
"
- if(op)
- dat += "Re-memorize Spells
"
+
+ dat += "Contract of Apprenticeship
"
+ dat += "A magical contract binding an apprentice wizard to your service, using it will summon them to your side.
"
+ dat += "
"
+
+ dat += "Scrying Orb
"
+ dat += "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.
"
+
+ dat += "
"
+ dat += "Re-memorize Spells
"
user << browse(dat, "window=radio")
onclose(user, "radio")
return
@@ -70,6 +133,10 @@
if(!istype(H, /mob/living/carbon/human))
return 1
+ if(H.mind.special_role == "apprentice")
+ temp = "If you got caught sneaking a peak from your teacher's spellbook, you'd likely be expelled from the Wizard Academy. Better not."
+ return
+
if(loc == H || (in_range(src, H) && istype(loc, /turf)))
H.set_machine(src)
if(href_list["spell_choice"])
@@ -86,14 +153,36 @@
uses--
/*
*/
- var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", summonguns = "Summon Guns", staffchange = "Staff of Change", mentalfocus = "Mental Focus", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation")
+ var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", fleshtostone = "Flesh to Stone", summonguns = "Summon Guns", summonmagic = "Summon Magic", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation")
var/already_knows = 0
for(var/obj/effect/proc_holder/spell/aspell in H.spell_list)
- if(available_spells[href_list["spell_choice"]] == aspell.name)
+ if(available_spells[href_list["spell_choice"]] == initial(aspell.name))
already_knows = 1
- temp = "You already know that spell."
- uses++
- break
+ if(aspell.spell_level >= aspell.level_max)
+ temp = "This spell cannot be improved further."
+ uses++
+ break
+ 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)
+ temp = "You have improved [aspell.name] into Efficient [aspell.name]."
+ aspell.name = "Efficient [aspell.name]"
+ if(2)
+ temp = "You have further improved [aspell.name] into Quickened [aspell.name]."
+ aspell.name = "Quickened [aspell.name]"
+ if(3)
+ temp = "You have further improved [aspell.name] into Free [aspell.name]."
+ aspell.name = "Free [aspell.name]"
+ if(4)
+ temp = "You have further improved [aspell.name] into Instant [aspell.name]."
+ aspell.name = "Instant [aspell.name]"
+ if(aspell.spell_level >= aspell.level_max)
+ temp += " This spell cannot be strengthened any further."
/*
*/
if(!already_knows)
@@ -101,79 +190,83 @@
if("magicmissile")
feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(H)
- temp = "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage."
+ temp = "You have learned magic missile."
if("fireball")
feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(H)
- temp = "This spell fires a fireball in the direction you're facing and does not require wizard garb. Be careful not to fire it at people that are standing next to you."
+ temp = "You have learned fireball."
if("disintegrate")
feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(H)
- temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown."
+ temp = "You have learned disintegrate."
if("disabletech")
feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(H)
- temp = "This spell disables all weapons, cameras and most other technology in range."
+ temp = "You have learned disable technology."
if("smoke")
feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(H)
- temp = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
+ temp = "You have learned smoke."
if("blind")
feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(H)
- temp = "This spell temporarly blinds a single person and does not require wizard garb."
+ temp = "You have learned blind."
if("mindswap")
feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(H)
- temp = "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process."
+ temp = "You have learned mindswap."
if("forcewall")
feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(H)
- temp = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
+ temp = "You have learned forcewall."
if("blink")
feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(H)
- temp = "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience."
+ temp = "You have learned blink."
if("teleport")
feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(H)
- temp = "This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable."
+ temp = "You have learned teleport."
if("mutate")
feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(H)
- temp = "This spell causes you to turn into a hulk and gain telekinesis for a short while."
+ temp = "You have learned mutate."
if("etherealjaunt")
feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(H)
- temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
+ temp = "You have learned ethereal jaunt."
if("knock")
feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(H)
- temp = "This spell opens nearby doors and does not require wizard garb."
+ temp = "You have learned knock."
if("horseman")
feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
H.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(H)
- temp = "This spell will curse a person to wear an unremovable horse mask (it has glue on the inside) and speak like a horse. It does not require a wizard garb. Do note the curse will disintegrate the target's current mask if they are wearing one."
+ temp = "You have learned curse of the horseman."
+ if("fleshtostone")
+ feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
+ H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(H)
+ temp = "You have learned flesh to stone."
if("summonguns")
feedback_add_details("wizard_spell_learned","SG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.rightandwrong()
+ H.rightandwrong(0)
max_uses--
- temp = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!"
+ temp = "You have cast summon guns."
+ if("summonmagic")
+ feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
+ H.rightandwrong(1)
+ max_uses--
+ temp = "You have cast summon magic."
if("staffchange")
feedback_add_details("wizard_spell_learned","ST") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- new /obj/item/weapon/gun/energy/staff(get_turf(H))
- temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
- max_uses--
- if("mentalfocus")
- feedback_add_details("wizard_spell_learned","MF") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- new /obj/item/weapon/gun/energy/staff/focus(get_turf(H))
- temp = "An artefact that channels the will of the user into destructive bolts of force."
+ new /obj/item/weapon/gun/magic/staff/change(get_turf(H))
+ temp = "You have purchased a staff of change."
max_uses--
if("soulstone")
feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H))
H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(H)
- temp = "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."
+ temp = "You have purchased a belt full of soulstones and have learned the artificer spell."
max_uses--
if("armor")
feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
@@ -181,12 +274,28 @@
new /obj/item/clothing/gloves/purple(get_turf(H))//To complete the outfit
new /obj/item/clothing/suit/space/rig/wizard(get_turf(H))
new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H))
- temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space."
+ temp = "You have purchased a suit of wizard armor."
max_uses--
if("staffanimation")
feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- new /obj/item/weapon/gun/energy/staff/animate(get_turf(H))
- temp = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
+ new /obj/item/weapon/gun/magic/staff/animate(get_turf(H))
+ temp = "You have purchased a staff of animation."
+ max_uses--
+ if("contract")
+ feedback_add_details("wizard_spell_learned","CT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
+ new /obj/item/weapon/contract(get_turf(H))
+ temp = "You have purchased a contract of apprenticeship."
+ max_uses--
+ if("scrying")
+ feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
+ new /obj/item/weapon/scrying(get_turf(H))
+ if (!(XRAY in H.mutations))
+ H.mutations.Add(XRAY)
+ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
+ H.see_in_dark = 8
+ H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ H << "\blue The walls suddenly disappear."
+ temp = "You have purchased a scrying orb, and gained x-ray vision."
max_uses--
else
if(href_list["temp"])
@@ -194,3 +303,154 @@
attack_self(H)
return
+
+//Single Use Spellbooks//
+
+/obj/item/weapon/spellbook/oneuse
+ var/spell = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile //just a placeholder to avoid runtimes if someone spawned the generic
+ var/spellname = "sandbox"
+ var/used = 0
+ name = "spellbook of "
+ uses = 1
+ max_uses = 1
+ desc = "This template spellbook was never meant for the eyes of man..."
+
+/obj/item/weapon/spellbook/oneuse/New()
+ ..()
+ name += spellname
+
+/obj/item/weapon/spellbook/oneuse/attack_self(mob/user as mob)
+ var/obj/effect/proc_holder/spell/S = new spell
+ for(var/obj/effect/proc_holder/spell/knownspell in user.spell_list)
+ if(knownspell.type == S.type)
+ if(user.mind)
+ if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard")
+ user <<"You're already far more versed in this spell than this flimsy how-to book can provide."
+ else
+ user <<"You've already read this one."
+ return
+ if(used)
+ recoil(user)
+ else
+ user.spell_list += S
+ user <<"you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!"
+ onlearned(user)
+
+/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user as mob)
+ user.visible_message("[src] glows in a black light!")
+
+/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user as mob)
+ used = 1
+ user.visible_message("[src] glows dark for a second!")
+
+/obj/item/weapon/spellbook/oneuse/attackby()
+ return
+
+/obj/item/weapon/spellbook/oneuse/fireball
+ spell = /obj/effect/proc_holder/spell/dumbfire/fireball
+ spellname = "fireball"
+ icon_state ="bookfireball"
+ desc = "This book feels warm to the touch."
+
+/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob)
+ ..()
+ explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+ del(src)
+
+/obj/item/weapon/spellbook/oneuse/smoke
+ spell = /obj/effect/proc_holder/spell/targeted/smoke
+ spellname = "smoke"
+ icon_state ="booksmoke"
+ desc = "This book is overflowing with the dank arts."
+
+/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob)
+ ..()
+ user <<"Your stomach rumbles..."
+ if(user.nutrition)
+ user.nutrition -= 200
+ if(user.nutrition <= 0)
+ user.nutrition = 0
+
+/obj/item/weapon/spellbook/oneuse/blind
+ spell = /obj/effect/proc_holder/spell/targeted/trigger/blind
+ spellname = "blind"
+ icon_state ="bookblind"
+ desc = "This book looks blurry, no matter how you look at it."
+
+/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob)
+ ..()
+ user <<"You go blind!"
+ user.eye_blind = 10
+
+/obj/item/weapon/spellbook/oneuse/mindswap
+ spell = /obj/effect/proc_holder/spell/targeted/mind_transfer
+ spellname = "mindswap"
+ icon_state ="bookmindswap"
+ desc = "This book's cover is pristine, though its pages look ragged and torn."
+
+/obj/item/weapon/spellbook/oneuse/mindswap/onlearned()
+ spellname = pick("fireball","smoke","blind","forcewall","knock","horses","charge")
+ icon_state = "book[spellname]"
+ name = "spellbook of [spellname]" //Note, desc doesn't change by design
+ ..()
+
+/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user as mob)
+ ..()
+ user <<"You suddenly don't feel like yourself!"
+ wabbajack(user)
+
+/obj/item/weapon/spellbook/oneuse/forcewall
+ spell = /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
+ spellname = "forcewall"
+ icon_state ="bookforcewall"
+ desc = "This book has a dedication to mimes everywhere inside the front cover."
+
+/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob)
+ ..()
+ user <<"You suddenly feel very solid!"
+ var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user)
+ S.timer = 30
+ user.drop_item()
+
+
+/obj/item/weapon/spellbook/oneuse/knock
+ spell = /obj/effect/proc_holder/spell/aoe_turf/knock
+ spellname = "knock"
+ icon_state ="bookknock"
+ desc = "This book is hard to hold closed properly."
+
+/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob)
+ ..()
+ user <<"You're knocked down!"
+ user.Stun(20)
+ user.Weaken(20)
+
+/obj/item/weapon/spellbook/oneuse/horsemask
+ spell = /obj/effect/proc_holder/spell/targeted/horsemask
+ spellname = "horses"
+ icon_state ="bookhorses"
+ desc = "This book is more horse than your mind has room for."
+
+/obj/item/weapon/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob)
+ if(istype(user, /mob/living/carbon/human))
+ user <<"HOR-SIE HAS RISEN"
+ var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
+ magichead.canremove = 0 //curses!
+ magichead.flags_inv = null //so you can still see their face
+ magichead.voicechange = 1 //NEEEEIIGHH
+ user.drop_from_inventory(user.wear_mask)
+ user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
+ del(src)
+ else
+ user <<"I say thee neigh"
+
+/obj/item/weapon/spellbook/oneuse/charge
+ spell = /obj/effect/proc_holder/spell/targeted/charge
+ spellname = "charging"
+ icon_state ="bookcharge"
+ desc = "This book is made of 100% post-consumer wizard."
+
+/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob)
+ ..()
+ user <<"[src] suddenly feels very warm!"
+ empulse(src, 1, 1)
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/veilrender.dm b/code/game/gamemodes/wizard/veilrender.dm
deleted file mode 100644
index 225158465fa..00000000000
--- a/code/game/gamemodes/wizard/veilrender.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/obj/item/weapon/veilrender
- name = "veil render"
- desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- item_state = "render"
- flags = FPRINT | TABLEPASS
- force = 15
- throwforce = 10
- w_class = 3
- var/charged = 1
-
-
-/obj/effect/rend
- name = "Tear in the fabric of reality"
- desc = "You should run now"
- icon = 'icons/obj/biomass.dmi'
- icon_state = "rift"
- density = 1
- unacidable = 1
- anchored = 1.0
-
-
-/obj/effect/rend/New()
- spawn(50)
- new /obj/machinery/singularity/narsie/wizard(get_turf(src))
- del(src)
- return
- return
-
-
-/obj/item/weapon/veilrender/attack_self(mob/user as mob)
- if(charged == 1)
- new /obj/effect/rend(get_turf(usr))
- charged = 0
- visible_message("\red [src] hums with power as [usr] deals a blow to reality itself!")
- else
- user << "\red The unearthly energies that powered the blade are now dormant"
-
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index add8ee00a66..6bc076304c6 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -1,4 +1,3 @@
-
/datum/game_mode
var/list/datum/mind/wizards = list()
@@ -18,7 +17,6 @@
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
-
/datum/game_mode/wizard/announce()
world << "The current game mode is - Wizard!"
world << "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!"
@@ -31,6 +29,7 @@
if(possible_wizards.len==0)
return 0
var/datum/mind/wizard = pick(possible_wizards)
+
wizards += wizard
modePlayer += wizard
wizard.assigned_role = "MODE" //So they aren't chosen for other jobs.
@@ -41,15 +40,16 @@
return 0
return 1
-
/datum/game_mode/wizard/pre_setup()
- for(var/datum/mind/wizard in wizards)
- wizard.current.loc = pick(wizardstart)
+ for(var/datum/mind/wiz in wizards)
+ wiz.current.loc = pick(wizardstart)
+
return 1
/datum/game_mode/wizard/post_setup()
for(var/datum/mind/wizard in wizards)
+ log_game("[wizard.key] (ckey) has been selected as a Wizard")
forge_wizard_objectives(wizard)
//learn_basic_spells(wizard.current)
equip_wizard(wizard.current)
@@ -86,7 +86,7 @@
escape_objective.owner = wizard
wizard.objectives += escape_objective
- if(61 to 100)
+ if(61 to 85)
var/datum/objective/assassinate/kill_objective = new
kill_objective.owner = wizard
kill_objective.find_target()
@@ -169,8 +169,7 @@
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(wizard_mob), slot_back)
- if(wizard_mob.backbag == 4) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(wizard_mob), slot_back)
- wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box(wizard_mob), slot_in_backpack)
+ wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack)
// wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/scrying_gem(wizard_mob), slot_l_store) For scrying gem.
wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store)
wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand)
@@ -188,6 +187,7 @@
return ..()
var/wizards_alive = 0
+ var/traitors_alive = 0
for(var/datum/mind/wizard in wizards)
if(!istype(wizard.current,/mob/living/carbon))
continue
@@ -195,7 +195,15 @@
continue
wizards_alive++
- if (wizards_alive)
+ if(!wizards_alive)
+ for(var/datum/mind/traitor in traitors)
+ if(!istype(traitor.current,/mob/living/carbon))
+ continue
+ if(traitor.current.stat==2)
+ continue
+ traitors_alive++
+
+ if (wizards_alive || traitors_alive)
return ..()
else
finished = 1
@@ -213,18 +221,18 @@
/datum/game_mode/proc/auto_declare_completion_wizard()
if(wizards.len)
- var/text = "The wizards/witches were:"
+ var/text = "
the wizards/witches were:"
for(var/datum/mind/wizard in wizards)
- text += "
[wizard.key] was [wizard.name] ("
+ text += "
[wizard.key] was [wizard.name] ("
if(wizard.current)
if(wizard.current.stat == DEAD)
text += "died"
else
text += "survived"
if(wizard.current.real_name != wizard.name)
- text += " as [wizard.current.real_name]"
+ text += " as [wizard.current.real_name]"
else
text += "body destroyed"
text += ")"
@@ -247,6 +255,15 @@
else
text += "
The wizard has failed!"
feedback_add_details("wizard_success","FAIL")
+ if(wizard.current && wizard.current.spell_list)
+ text += "
[wizard.name] used the following spells: "
+ var/i = 1
+ for(var/obj/effect/proc_holder/spell/S in wizard.current.spell_list)
+ text += "[S.name]"
+ if(wizard.current.spell_list.len > i)
+ text += ", "
+ i++
+ text += "
"
world << text
return 1
diff --git a/code/game/gamemodes/xenos/xenos.dm b/code/game/gamemodes/xenos/xenos.dm
new file mode 100644
index 00000000000..0dea8e90573
--- /dev/null
+++ b/code/game/gamemodes/xenos/xenos.dm
@@ -0,0 +1,146 @@
+/datum/game_mode
+ var/list/datum/mind/xenos = list()
+
+
+/datum/game_mode/xenos
+ name = "xenos"
+ config_tag = "xenos"
+ required_players = 15
+ recommended_players = 20
+ required_players_secret = 15
+ required_enemies = 3
+ recommended_enemies = 5
+
+ var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
+ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
+
+ var/list/raid_objectives = list() //Raid objectives.
+
+/datum/game_mode/xenos/announce()
+ world << "The current game mode is - Xenos!"
+ world << "There is a \red Xenos Attack\black on the station. You can't let them take over!"
+
+/datum/game_mode/xenos/can_start()
+
+ if(!..())
+ return 0
+
+ var/list/candidates = get_players_for_role(BE_ALIEN)
+ var/playersready = 0
+ var/xenos_num
+ for(var/mob/new_player/player in player_list)
+ if((player.client)&&(player.ready))
+ playersready += 1
+
+
+ //Check that we have enough alien candidates
+ if(candidates.len < required_enemies)
+ return 0
+ if (playersready < recommended_players)
+ xenos_num = required_enemies
+ if (playersready >= recommended_players)
+ xenos_num = recommended_enemies
+
+ //Grab candidates randomly until we have enough.
+ while(xenos_num > 0)
+ var/datum/mind/new_xenos = pick(candidates)
+ xenos += new_xenos
+ candidates -= new_xenos
+ xenos_num--
+
+ for(var/datum/mind/xeno in xenos)
+ xeno.assigned_role = "MODE"
+ xeno.special_role = "Alien"
+ return 1
+
+/datum/game_mode/xenos/pre_setup()
+ return 1
+
+/datum/game_mode/xenos/post_setup()
+
+ var/list/turf/xenos_spawn = list()
+
+ for(var/obj/effect/landmark/A in landmarks_list)
+ if(A.name == "Xenos-Spawn")
+ xenos_spawn += get_turf(A)
+ del(A)
+ continue
+
+ var/xenoai_selected = 0
+ var/xenoborg_selected=0
+ var/xenoqueen_selected=0
+ var/spawnpos = 1
+
+ for(var/datum/mind/xeno_mind in xenos)
+ if(spawnpos > xenos_spawn.len)
+ spawnpos = 1
+ xeno_mind.current.loc = xenos_spawn[spawnpos]
+//XenoAI selection
+ if(!xenoai_selected)
+ var/mob/living/silicon/ai/O = new(xeno_mind.current.loc, base_law_type,,1)//No MMI but safety is in effect.
+ O.invisibility = 0
+ O.aiRestorePowerRoutine = 0
+
+ if(xeno_mind.current)
+ xeno_mind.transfer_to(O)
+ O.mind.original = O
+ else
+ O.key = xeno_mind.current.key
+ del(xeno_mind)
+ var/obj/loc_landmark
+ for(var/obj/effect/landmark/start/sloc in landmarks_list)
+ if (sloc.name == "XenoAI")
+ loc_landmark = sloc
+ O.loc = loc_landmark.loc
+ O.icon_state = "ai-alien"
+ O.verbs.Remove(/mob/living/silicon/ai/verb/pick_icon)
+ O.laws = new /datum/ai_laws/alienmov
+ O.name = "Alien AI"
+ xenoai_selected = 1
+ spawnpos++
+ continue
+//XenoQueen Selection
+ if(!xenoqueen_selected)
+ var/mob/living/carbon/alien/humanoid/queen/large/O = new(xeno_mind.current.loc)
+ if(xeno_mind.current)
+ xeno_mind.transfer_to(O)
+ else
+ O.key = xeno_mind.current.key
+ del(xeno_mind)
+ xenoqueen_selected = 1
+ spawnpos++
+ continue
+//XenoBorg Selection
+ if(!xenoborg_selected)
+ var/mob/living/silicon/robot/O = new(xeno_mind.current.loc,0,0,1)
+ O.mmi = new /obj/item/device/mmi(O)
+ O.mmi.alien = 1
+ O.mmi.transfer_identity(xeno_mind.current)//Does not transfer key/client.
+ O.cell = new(O)
+ O.cell.maxcharge = 15000
+ O.cell.charge = 15000
+ O.gender = xeno_mind.current.gender
+ O.invisibility = 0
+
+ O.key = xeno_mind.current.key
+ del(xeno_mind)
+ O.job = "Alien Cyborg"
+ O.name = "Alien Cyborg"
+
+ xenoborg_selected = 1
+ spawnpos++
+ continue
+//Additional larvas if playercount > 20
+ else
+ var/mob/living/carbon/alien/larva/O = new(xeno_mind.current.loc)
+ if(xeno_mind.current)
+ xeno_mind.transfer_to(O)
+ else
+ O.key = xeno_mind.current.key
+ del(xeno_mind)
+ spawnpos++
+
+ spawn (rand(waittime_l, waittime_h))
+ send_intercept()
+
+ return ..()
\ No newline at end of file
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 95987ded83a..2399dc4aaba 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -128,7 +128,7 @@
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
- H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/ntcane(H.back), slot_in_backpack)
+ H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded/ntcane(H.back), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack)
H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform)
H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 81a4338e733..154bbd047d7 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -11,6 +11,11 @@
density = 1
var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
+/obj/machinery/sleep_console/process()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ src.updateUsrDialog()
+ return
/obj/machinery/sleep_console/ex_act(severity)
switch(severity)
@@ -72,10 +77,11 @@
if(occupant.reagents)
for(var/chemical in connected.available_chemicals)
dat += "[connected.available_chemicals[chemical]]: [occupant.reagents.get_reagent_amount(chemical)] units
"
- dat += "
Refresh meter readings each second
"
+ dat += "Refresh Meter Readings
"
if(src.connected.beaker)
+ dat += "
Remove Beaker
"
if(src.connected.filtering)
- dat += "
Stop Dialysis
"
+ dat += "Stop Dialysis
"
dat += text("Output Beaker has [] units of free space remaining
", src.connected.beaker.reagents.maximum_volume - src.connected.beaker.reagents.total_volume)
else
dat += "
Start Dialysis
"
@@ -85,8 +91,8 @@
for(var/chemical in connected.available_chemicals)
dat += "Inject [connected.available_chemicals[chemical]]: "
for(var/amount in connected.amounts)
- dat += "[amount] units "
- dat += "
"
+ dat += "[amount] units
"
+ dat += "
Eject Patient"
else
dat += "The sleeper is empty."
dat += text("
Close", user)
@@ -108,19 +114,21 @@
src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
else
usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!"
+ src.updateUsrDialog()
if (href_list["refresh"])
src.updateUsrDialog()
+ if (href_list["removebeaker"])
+ src.connected.remove_beaker()
+ src.updateUsrDialog()
if (href_list["togglefilter"])
src.connected.toggle_filter()
src.updateUsrDialog()
+ if (href_list["ejectify"])
+ src.connected.eject()
+ src.updateUsrDialog()
src.add_fingerprint(usr)
return
-/obj/machinery/sleep_console/process()
- if(stat & (NOPOWER|BROKEN))
- return
- src.updateUsrDialog()
- return
/obj/machinery/sleep_console/power_change()
return
@@ -144,7 +152,7 @@
anchored = 1
var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
var/mob/living/carbon/human/occupant = null
- var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "dermaline" = "Dermaline", "bicaridine" = "Bicaridine", "dexalin" = "Dexalin")
+ var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
var/amounts = list(10, 20)
var/obj/item/weapon/reagent_containers/glass/beaker = null
var/filtering = 0
@@ -192,6 +200,7 @@
user.drop_item()
G.loc = src
user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
+ src.updateUsrDialog()
return
else
user << "\red The sleeper has a beaker already."
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 28f9bfe4126..31640d7cf1d 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -249,6 +249,9 @@
dat += text("Paralysis Summary %: [] ([] seconds left!)
", occupant.paralysis, round(occupant.paralysis / 4))
dat += text("Body Temperature: [occupant.bodytemperature-T0C]°C ([occupant.bodytemperature*1.8-459.67]°F)
")
+ if(occupant.has_brain_worms())
+ dat += "Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.
"
+
if(occupant.vessel)
var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
var/blood_percent = blood_volume / 560
@@ -278,6 +281,7 @@
var/AN = ""
var/open = ""
var/infected = ""
+ var/robot = ""
var/imp = ""
var/bled = ""
var/splint = ""
@@ -294,6 +298,8 @@
bled = "Bleeding:"
if(e.status & ORGAN_BROKEN)
AN = "[e.broken_description]:"
+ if(e.status & ORGAN_ROBOT)
+ robot = "Prosthetic:"
if(e.open)
open = "Open:"
if(e.implants.len)
@@ -301,16 +307,25 @@
if(!AN && !open && !infected & !imp)
AN = "None:"
if(!(e.status & ORGAN_DESTROYED))
- dat += "[e.display_name] | [e.burn_dam] | [e.brute_dam] | [bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured] | "
+ dat += "[e.display_name] | [e.burn_dam] | [e.brute_dam] | [robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured] | "
else
dat += "[e.display_name] | - | - | Not Found | "
dat += ""
for(var/organ_name in occupant.internal_organs)
var/datum/organ/internal/i = occupant.internal_organs[organ_name]
+ var/mech = ""
+ if(i.robotic == 1)
+ mech = "Assisted:"
+ if(i.robotic == 2)
+ mech = "Mechanical:"
dat += ""
- dat += "| [i.name] | N/A | [i.damage] | None: | "
+ dat += "[i.name] | N/A | [i.damage] | None:[mech] | | "
dat += "
"
dat += ""
+ if(occupant.sdisabilities & BLIND)
+ dat += text("Cataracts detected.
")
+ if(occupant.sdisabilities & NEARSIGHTED)
+ dat += text("Retinal misalignment detected.
")
else
dat += "\The [src] is empty."
else
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 6cbdea01e46..557c54e74ad 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -96,7 +96,8 @@
var/screen = AALARM_SCREEN_MAIN
var/area_uid
var/area/alarm_area
- var/danger_level = 0
+ var/local_danger_level = 0
+ var/alarmActivated = 0 // Manually activated (independent from danger level)
var/danger_averted_confidence=0
var/buildstage = 2 //2 is built, 1 is building, 0 is frame.
@@ -226,10 +227,8 @@
target_temperature = T0C + MIN_TEMPERATURE
var/datum/gas_mixture/gas = location.remove_air(0.25*environment.total_moles)
- var/heat_capacity = 0
- if(gas)
- heat_capacity = gas.heat_capacity()
- var/energy_used = min( abs( heat_capacity*(gas.temperature - target_temperature) ), MAX_ENERGY_CHANGE)
+ var/heat_capacity = gas.heat_capacity()
+ var/energy_used = max( abs( heat_capacity*(gas.temperature - target_temperature) ), MAX_ENERGY_CHANGE)
//Use power. Assuming that each power unit represents 1000 watts....
use_power(energy_used/1000, ENVIRON)
@@ -247,15 +246,15 @@
visible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
"You hear a click as a faint electronic humming stops.")
- var/old_level = danger_level
- danger_level = overall_danger_level()
- if(danger_level < old_level)
+ var/old_level = local_danger_level
+ var/new_danger = calculate_local_danger_level()
+ if(new_danger < old_level)
danger_averted_confidence++
// Only change danger level if:
// we're going up a level
- // OR if we're going down a level and have sufficient confidence (prevents doors smashing open and closed).
- if (old_level < danger_level || (danger_averted_confidence >= 5 && danger_level < old_level))
- refresh_danger_level()
+ // OR if we're going down a level and have sufficient confidence (prevents spamming update_icon).
+ if (old_level < new_danger || (danger_averted_confidence >= 5 && new_danger < old_level))
+ setDangerLevel(new_danger)
update_icon()
danger_averted_confidence=0 // Reset counter.
@@ -269,7 +268,7 @@
if(RCON_NO)
remote_control = 0
if(RCON_AUTO)
- if(danger_level == 2)
+ if(local_danger_level == 2)
remote_control = 1
else
remote_control = 0
@@ -279,7 +278,7 @@
updateDialog()
return
-/obj/machinery/alarm/proc/overall_danger_level()
+/obj/machinery/alarm/proc/calculate_local_danger_level()
var/turf/simulated/location = loc
if(!istype(location)) return//returns if loc is not simulated
@@ -335,7 +334,8 @@
if((stat & (NOPOWER|BROKEN)) || shorted)
icon_state = "alarmp"
return
- switch(max(danger_level, alarm_area.atmosalm))
+
+ switch(max(local_danger_level, alarm_area.atmosalm-1))
if (0)
icon_state = "alarm0"
if (1)
@@ -344,7 +344,7 @@
icon_state = "alarm1"
/obj/machinery/alarm/receive_signal(datum/signal/signal)
- if(stat & (NOPOWER|BROKEN))
+ if(stat & (NOPOWER|BROKEN) || !alarm_area)
return
if (alarm_area.master_air_alarm != src)
if (master_is_operating())
@@ -457,23 +457,14 @@
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list("power"= 0) )
-/obj/machinery/alarm/proc/apply_danger_level(var/new_danger_level)
- if (alarm_area.atmosalert(new_danger_level))
+// This sets our danger level, and, if it's changed, forces a new election of danger levels.
+/obj/machinery/alarm/proc/setDangerLevel(var/new_danger_level)
+ if(local_danger_level==new_danger_level)
+ return
+ local_danger_level=new_danger_level
+ if(alarm_area.updateDangerLevel())
post_alert(new_danger_level)
- if(danger_level > 1)
- air_doors_close(0)
- else
- air_doors_open(0)
-
- update_icon()
-
- for (var/area/A in alarm_area.related)
- for (var/obj/machinery/alarm/AA in A)
- if ( !(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.danger_level != new_danger_level)
- AA.danger_level=new_danger_level
- AA.update_icon()
-
/obj/machinery/alarm/proc/post_alert(alert_level)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(alarm_frequency)
if(!frequency)
@@ -494,15 +485,6 @@
frequency.post_signal(src, alert_signal)
-/obj/machinery/alarm/proc/refresh_danger_level()
- var/level = 0
- for (var/area/A in alarm_area.related)
- for (var/obj/machinery/alarm/AA in A)
- if ( !(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted)
- if (AA.danger_level > level)
- level = AA.danger_level
- apply_danger_level(level)
-
/obj/machinery/alarm/proc/air_doors_close(manual)
var/area/A = get_area(src)
if(!A.master.air_doors_activated)
@@ -601,9 +583,8 @@
apply_mode()
if(AALARM_WIRE_AALARM)
-
- if (alarm_area.atmosalert(2))
- apply_danger_level(2)
+ alarmActivated=1
+ alarm_area.updateDangerLevel()
spawn(1)
updateUsrDialog()
update_icon()
@@ -665,8 +646,8 @@
apply_mode()
if(AALARM_WIRE_AALARM)
- if (alarm_area.atmosalert(0))
- apply_danger_level(0)
+ alarmActivated=0
+ alarm_area.updateDangerLevel()
spawn(1)
updateUsrDialog()
update_icon()
@@ -767,10 +748,11 @@
data["danger"]=danger
return data
-
/obj/machinery/alarm/proc/get_nano_data(mob/user, fromAtmosConsole=0)
+
var/data[0]
data["air"]=ui_air_status()
+ data["alarmActivated"]=alarmActivated || local_danger_level==2
data["sensors"]=TLV
data["locked"]=fromAtmosConsole || (!(istype(user, /mob/living/silicon)) && locked)
data["rcon"]=rcon_setting
@@ -818,11 +800,13 @@
data["scrubbers"]=scrubbers
return data
+
/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
if(user.stat && !isobserver(user))
return
var/list/data=src.get_nano_data(user,FALSE)
+
if (!ui) // no ui has been passed, so we'll search for one
{
ui = nanomanager.get_open_ui(user, src, ui_key)
@@ -888,288 +872,6 @@
ui_interact(user)
return
-/*
-/obj/machinery/alarm/proc/return_text(mob/user)
- if(!(istype(user, /mob/living/silicon)) && locked)
- return "\The [src][return_status()]
[rcon_text()]
(Swipe ID card to unlock interface)"
- else
- return "\The [src][return_status()]
[rcon_text()]
[return_controls()]"
-
-/obj/machinery/alarm/proc/return_status()
- var/turf/location = get_turf(src)
- var/datum/gas_mixture/environment = location.return_air()
- var/total = environment.oxygen + environment.carbon_dioxide + environment.toxins + environment.nitrogen
- var/output = "Air Status:
"
-
- if(total == 0)
- output += "Warning: Cannot obtain air sample for analysis."
- return output
-
- output += {"
-
-"}
-
- var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume
-
- var/list/current_settings = TLV["pressure"]
- var/environment_pressure = environment.return_pressure()
- var/pressure_dangerlevel = get_danger_level(environment_pressure, current_settings)
-
- current_settings = TLV["oxygen"]
- var/oxygen_dangerlevel = get_danger_level(environment.oxygen*partial_pressure, current_settings)
- var/oxygen_percent = round(environment.oxygen / total * 100, 2)
-
- current_settings = TLV["carbon_dioxide"]
- var/co2_dangerlevel = get_danger_level(environment.carbon_dioxide*partial_pressure, current_settings)
- var/co2_percent = round(environment.carbon_dioxide / total * 100, 2)
-
- current_settings = TLV["plasma"]
- var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings)
- var/plasma_percent = round(environment.toxins / total * 100, 2)
-
- current_settings = TLV["other"]
- var/other_moles = 0.0
- for(var/datum/gas/G in environment.trace_gases)
- other_moles+=G.moles
- var/other_dangerlevel = get_danger_level(other_moles*partial_pressure, current_settings)
-
- current_settings = TLV["temperature"]
- var/temperature_dangerlevel = get_danger_level(environment.temperature, current_settings)
-
- output += {"
-Pressure: [environment_pressure]kPa
-Oxygen: [oxygen_percent]%
-Carbon dioxide: [co2_percent]%
-Toxins: [plasma_percent]%
-"}
- if (other_dangerlevel==2)
- output += "Notice: High Concentration of Unknown Particles Detected
"
- else if (other_dangerlevel==1)
- output += "Notice: Low Concentration of Unknown Particles Detected
"
-
- output += "Temperature: [environment.temperature]K ([round(environment.temperature - T0C, 0.1)]C)
"
-
- //Overall status
- output += "Local Status: "
- switch(max(pressure_dangerlevel,oxygen_dangerlevel,co2_dangerlevel,plasma_dangerlevel,other_dangerlevel,temperature_dangerlevel))
- if(2)
- output += "DANGER: Internals Required"
- if(1)
- output += "Caution"
- if(0)
- if(alarm_area.atmosalm)
- output += {"Caution: Atmos alert in area"}
- else
- output += {"Optimal"}
-
- return output
-
-/obj/machinery/alarm/proc/rcon_text()
- var/dat = "Remote Control:
"
- if(rcon_setting == RCON_NO)
- dat += "Off"
- else
- dat += "Off"
- dat += " | "
- if(rcon_setting == RCON_AUTO)
- dat += "Auto"
- else
- dat += "Auto"
- dat += " | "
- if(rcon_setting == RCON_YES)
- dat += "On"
- else
- dat += "On | "
-
- //Hackish, I know. I didn't feel like bothering to rework all of this.
- dat += "Thermostat:
[target_temperature - T0C]C |
"
-
- return dat
-
-/obj/machinery/alarm/proc/fmtScrubberGasStatus(var/id_tag,var/code,var/list/data)
- var/label=replacetext(uppertext(code),"2","2")
- if(code=="tox")
- label="Plasma"
- return "[label]"
-
-/obj/machinery/alarm/proc/return_controls()
- var/output = ""//"[alarm_zone] Air [name]
"
-
- switch(screen)
- if (AALARM_SCREEN_MAIN)
- if(alarm_area.atmosalm)
- output += "Reset - Atmospheric Alarm
"
- else
- output += "Activate - Atmospheric Alarm
"
-
- output += {"
-Scrubbers Control
-Vents Control
-Set environmentals mode
-Sensor Settings
-
-"}
- if (mode==AALARM_MODE_PANIC)
- output += "PANIC SYPHON ACTIVE
Turn syphoning off"
- else
- output += "ACTIVATE PANIC SYPHON IN AREA"
-
-
- if (AALARM_SCREEN_VENT)
- var/sensor_data = ""
- if(alarm_area.air_vent_names.len)
- for(var/id_tag in alarm_area.air_vent_names)
- var/long_name = alarm_area.air_vent_names[id_tag]
- var/list/data = alarm_area.air_vent_info[id_tag]
- if(!data)
- continue;
- var/state = ""
-
- sensor_data += {"
-[long_name][state]
-Operating:
-[data["power"]?"on":"off"]
-
-Pressure checks:
-external
-internal
-
-External pressure bound:
--
--
--
--
-[data["external"]]
-+
-+
-+
-+
- (reset)
-
-"}
- if (data["direction"] == "siphon")
- sensor_data += {"
-Direction:
-siphoning
-
-"}
- sensor_data += {"
"}
- else
- sensor_data = "No vents connected.
"
- output = {"Main menu
[sensor_data]"}
- if (AALARM_SCREEN_SCRUB)
- var/sensor_data = ""
- if(alarm_area.air_scrub_names.len)
- for(var/id_tag in alarm_area.air_scrub_names)
- var/long_name = alarm_area.air_scrub_names[id_tag]
- var/list/data = alarm_area.air_scrub_info[id_tag]
- if(!data)
- continue;
- var/state = ""
-
- sensor_data += {"
-[long_name][state]
-Operating:
-[data["power"]?"on":"off"]
-Type:
-[data["scrubbing"]?"scrubbing":"syphoning"]
-"}
-
- if(data["scrubbing"])
- sensor_data += {"
-Filtering:
-[fmtScrubberGasStatus(id_tag,"co2",data)],
-[fmtScrubberGasStatus(id_tag,"tox",data)],
-[fmtScrubberGasStatus(id_tag,"n2o",data)],
-[fmtScrubberGasStatus(id_tag,"o2",data)]
-
-"}
- sensor_data += {"
-Panic syphon: [data["panic"]?"PANIC SYPHON ACTIVATED":""]
-Dea":"red'>A")]ctivate
-
-"}
- else
- sensor_data = "No scrubbers connected.
"
- output = {"Main menu
[sensor_data]"}
-
- if (AALARM_SCREEN_MODE)
- output += "Main menu
Air machinery mode for the area:"
- var/list/modes = list(
- AALARM_MODE_SCRUBBING = "Filtering - Scrubs out contaminants",\
- AALARM_MODE_REPLACEMENT = "Replace Air - Siphons out air while replacing",\
- AALARM_MODE_PANIC = "Panic - Siphons air out of the room",\
- AALARM_MODE_CYCLE = "Cycle - Siphons air before replacing",\
- AALARM_MODE_FILL = "Fill - Shuts off scrubbers and opens vents",\
- AALARM_MODE_OFF = "Off - Shuts off vents and scrubbers",)
- for (var/m=1,m<=modes.len,m++)
- if (mode==m)
- output += "- [modes[m]] (selected)
"
- else
- output += "- [modes[m]]
"
- output += {"
-
Sensor presets:
(Note, this only sets sensors, air supplied to vents must still be changed.)"}
- var/list/presets = list(
- AALARM_PRESET_HUMAN = "Human - Checks for Oxygen and Nitrogen",\
- AALARM_PRESET_VOX = "Vox - Checks for Nitrogen only",\
- AALARM_PRESET_SERVER = "Coldroom - For server rooms and freezers")
- for(var/p=1;p<=presets.len;p++)
- if (preset==p)
- output += "- [presets[p]] (selected)
"
- else
- output += "- [presets[p]]
"
- output += "
"
-
- if (AALARM_SCREEN_SENSORS)
- output += {"
-Main menu
-Alarm thresholds:
-Partial pressure for gases
-
- | min2 | min1 | max1 | max2 |
|---|
-"}
- var/list/gases = list(
- "oxygen" = "O2",
- "carbon_dioxide" = "CO2",
- "plasma" = "Toxin",
- "other" = "Other",)
-
- var/list/selected
- for (var/g in gases)
- output += "| [gases[g]] | "
- selected = TLV[g]
- for(var/i = 1, i <= 4, i++)
- output += "[selected[i] >= 0 ? selected[i] :"OFF"] | "
- output += "
|---|
"
-
- selected = TLV["pressure"]
- output += " | Pressure | "
- for(var/i = 1, i <= 4, i++)
- output += "[selected[i] >= 0 ? selected[i] :"OFF"] | "
- output += "
|---|
"
-
- selected = TLV["temperature"]
- output += "| Temperature | "
- for(var/i = 1, i <= 4, i++)
- output += "[selected[i] >= 0 ? selected[i] :"OFF"] | "
- output += "
|---|
"
-
- return output
-*/
/obj/machinery/alarm/Topic(href, href_list)
var/changed=0
@@ -1225,8 +927,8 @@ table tr:first-child th:first-child { border: none;}
var/threshold = text2num(href_list["var"])
var/list/selected = TLV[env]
var/list/thresholds = list("lower bound", "low warning", "high warning", "upper bound")
- var/newval = input("Enter [thresholds[threshold]] for [env]", "Alarm triggers", selected[threshold]) as null|num
- if (isnull(newval) || ..() || (locked && issilicon(usr)))
+ var/newval = input("Enter [thresholds[threshold]] for [env]", "Alarm triggers", selected[threshold]) as num|null
+ if (isnull(newval) || ..() || (locked && !issilicon(usr)))
return
if (newval<0)
selected[threshold] = -1.0
@@ -1287,14 +989,14 @@ table tr:first-child th:first-child { border: none;}
*/
if(href_list["atmos_alarm"])
- if (alarm_area.atmosalert(2))
- apply_danger_level(2)
+ alarmActivated=1
+ alarm_area.updateDangerLevel()
update_icon()
changed=1
if(href_list["atmos_reset"])
- if (alarm_area.atmosalert(0))
- apply_danger_level(0)
+ alarmActivated=0
+ alarm_area.updateDangerLevel()
update_icon()
changed=1
@@ -1446,6 +1148,7 @@ table tr:first-child th:first-child { border: none;}
usr << "It is not wired."
if (buildstage < 1)
usr << "The circuit is missing."
+
/*
AIR ALARM CIRCUIT
Just a object used in constructing air alarms
@@ -1525,8 +1228,6 @@ FIRE ALARM
var/wiresexposed = 0
var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone
- var/area/A
-
/obj/machinery/firealarm/update_icon()
if(wiresexposed)
@@ -1656,38 +1357,49 @@ FIRE ALARM
stat |= NOPOWER
update_icon()
-
-/obj/machinery/firealarm/New()
- ..()
-
-
-/obj/machinery/firealarm/attack_hand(var/mob/user as mob)
- if(stat & BROKEN)
+/obj/machinery/firealarm/attack_hand(mob/user as mob)
+ if((user.stat && !isobserver(user)) || stat & (NOPOWER|BROKEN))
return
- ui_interact(user)
+ if (buildstage != 2)
+ return
-/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "fire_alarm")
- A = src.loc.loc
- if(stat & (BROKEN|NOPOWER)) return
- if(user.stat || user.restrained()) return
- var/data[0]
- data["working"] = working
- data["time"] = round(time)
- data["timing"] = timing
- data["securityLevel"] = uppertext(get_security_level())
- data["fire"] = A.fire
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key)
- if (!ui)
- ui = new(user, src, ui_key, "firealarm.tmpl", "Fire Alarm", 375, 250)
- ui.set_initial_data(data)
- ui.set_auto_update(1)
- ui.open()
+ user.set_machine(src)
+ var/area/A = src.loc
+ var/d1
+ var/d2
+ if (istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon))
+ A = A.loc
+
+ if (A.fire)
+ d1 = text("Reset - Lockdown", src)
+ else
+ d1 = text("Alarm - Lockdown", src)
+ if (src.timing)
+ d2 = text("Stop Time Lock", src)
+ else
+ d2 = text("Initiate Time Lock", src)
+ var/second = round(src.time) % 60
+ var/minute = (round(src.time) - second) / 60
+ var/dat = "Fire alarm [d1]\n
The current alert level is: [get_security_level()]