"
-
- usr << browse(out, "window=edit_memory[src];size=500x600")
-
-
-/datum/mind/Topic(href, href_list)
- if(!check_rights(R_ADMIN)) return
-
- if (href_list["role_edit"])
- var/new_role = input("Select new role", "Assigned role", assigned_role) as null|anything in get_all_jobs()
- if (!new_role) return
- assigned_role = new_role
-
- else if (href_list["memory_edit"])
- var/new_memo = copytext(sanitize(input("Write new memory", "Memory", memory) as null|message),1,MAX_MESSAGE_LEN)
- if (isnull(new_memo)) return
- memory = new_memo
-
- else if (href_list["obj_edit"] || href_list["obj_add"])
- var/datum/objective/objective
- var/objective_pos
- var/def_value
-
- if (href_list["obj_edit"])
- objective = locate(href_list["obj_edit"])
- if (!objective) return
- objective_pos = objectives.Find(objective)
-
- //Text strings are easy to manipulate. Revised for simplicity.
- var/temp_obj_type = "[objective.type]"//Convert path into a text string.
- def_value = copytext(temp_obj_type, 19)//Convert last part of path into an objective keyword.
- if(!def_value)//If it's a custom objective, it will be an empty string.
- def_value = "custom"
-
- var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom","follower block (HOG)","build (HOG)","deicide (HOG)", "follower escape (HOG)", "sacrifice prophet (HOG)")
- if (!new_obj_type) return
-
- var/datum/objective/new_objective = null
-
- switch (new_obj_type)
- if ("assassinate","protect","debrain","maroon")
- var/list/possible_targets = list("Free objective")
- for(var/datum/mind/possible_target in ticker.minds)
- if ((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
- possible_targets += possible_target.current
-
- var/mob/def_target = null
- var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/maroon)
- if (objective&&(objective.type in objective_list) && objective:target)
- def_target = objective:target.current
-
- var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
- if (!new_target) return
-
- var/objective_path = text2path("/datum/objective/[new_obj_type]")
- if (new_target == "Free objective")
- new_objective = new objective_path
- new_objective.owner = src
- new_objective:target = null
- new_objective.explanation_text = "Free objective"
- else
- new_objective = new objective_path
- new_objective.owner = src
- new_objective:target = new_target:mind
- //Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
- new_objective.update_explanation_text()
-
- if ("destroy")
- var/list/possible_targets = active_ais(1)
- if(possible_targets.len)
- var/mob/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
- new_objective = new /datum/objective/destroy
- new_objective.target = new_target.mind
- new_objective.owner = src
- new_objective.update_explanation_text()
- else
- usr << "No active AIs with minds"
-
- if ("prevent")
- new_objective = new /datum/objective/block
- new_objective.owner = src
-
- if ("hijack")
- new_objective = new /datum/objective/hijack
- new_objective.owner = src
-
- if ("escape")
- new_objective = new /datum/objective/escape
- new_objective.owner = src
-
- if ("survive")
- new_objective = new /datum/objective/survive
- new_objective.owner = src
-
- if("martyr")
- new_objective = new /datum/objective/martyr
- new_objective.owner = src
-
- if ("nuclear")
- new_objective = new /datum/objective/nuclear
- new_objective.owner = src
-
- if ("steal")
- if (!istype(objective, /datum/objective/steal))
- new_objective = new /datum/objective/steal
- new_objective.owner = src
- else
- new_objective = objective
- var/datum/objective/steal/steal = new_objective
- if (!steal.select_target())
- return
-
- if("download","capture","absorb")
- var/def_num
- if(objective&&objective.type==text2path("/datum/objective/[new_obj_type]"))
- def_num = objective.target_amount
-
- var/target_number = input("Input target number:", "Objective", def_num) as num|null
- if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
- return
-
- switch(new_obj_type)
- if("download")
- new_objective = new /datum/objective/download
- new_objective.explanation_text = "Download [target_number] research levels."
- if("capture")
- new_objective = new /datum/objective/capture
- new_objective.explanation_text = "Capture [target_number] lifeforms with an energy net. Live, rare specimens are worth more."
- if("absorb")
- new_objective = new /datum/objective/absorb
- new_objective.explanation_text = "Absorb [target_number] compatible genomes."
- new_objective.owner = src
- new_objective.target_amount = target_number
-
- if("follower block (HOG)")
- new_objective = new /datum/objective/follower_block
- new_objective.owner = src
- if("build (HOG)")
- new_objective = new /datum/objective/build
- new_objective.owner = src
- if("deicide (HOG)")
- new_objective = new /datum/objective/deicide
- new_objective.owner = src
- if("follower escape (HOG)")
- new_objective = new /datum/objective/escape_followers
- new_objective.owner = src
- if("sacrifice prophet (HOG)")
- new_objective = new /datum/objective/sacrifice_prophet
- new_objective.owner = src
-
- if ("custom")
- var/expl = stripped_input(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "")
- if (!expl) return
- new_objective = new /datum/objective
- new_objective.owner = src
- new_objective.explanation_text = expl
-
- if (!new_objective) return
-
- if (objective)
- objectives -= objective
- objectives.Insert(objective_pos, new_objective)
- message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]")
- log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]")
- else
- objectives += new_objective
- message_admins("[key_name_admin(usr)] added a new objective for [current]: [new_objective.explanation_text]")
- log_admin("[key_name(usr)] added a new objective for [current]: [new_objective.explanation_text]")
-
- else if (href_list["obj_delete"])
- var/datum/objective/objective = locate(href_list["obj_delete"])
- if(!istype(objective)) return
- objectives -= objective
- message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
- log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")
-
- else if(href_list["obj_completed"])
- var/datum/objective/objective = locate(href_list["obj_completed"])
- if(!istype(objective)) return
- objective.completed = !objective.completed
- log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]")
-
- else if (href_list["handofgod"])
- switch(href_list["handofgod"])
- if("clear") //wipe handofgod status
- if((src in ticker.mode.red_deity_followers) || (src in ticker.mode.blue_deity_followers) || (src in ticker.mode.red_deity_prophets) || (src in ticker.mode.blue_deity_prophets))
- remove_hog_follower_prophet()
- current << "You have been brainwashed... again! Your faith is no more!"
- message_admins("[key_name_admin(usr)] has de-hand of god'ed [current].")
- log_admin("[key_name(usr)] has de-hand of god'ed [current].")
-
- if("red follower")
- make_Handofgod_follower("red")
- message_admins("[key_name_admin(usr)] has red follower'ed [current].")
- log_admin("[key_name(usr)] has red follower'ed [current].")
-
- if("red prophet")
- make_Handofgod_prophet("red")
- message_admins("[key_name_admin(usr)] has red prophet'ed [current].")
- log_admin("[key_name(usr)] has red prophet'ed [current].")
-
- if("blue follower")
- make_Handofgod_follower("blue")
- message_admins("[key_name_admin(usr)] has blue follower'ed [current].")
- log_admin("[key_name(usr)] has blue follower'ed [current].")
-
- if("blue prophet")
- make_Handofgod_prophet("blue")
- message_admins("[key_name_admin(usr)] has blue prophet'ed [current].")
- log_admin("[key_name(usr)] has blue prophet'ed [current].")
-
- if("red god")
- make_Handofgod_god("red")
- message_admins("[key_name_admin(usr)] has red god'ed [current].")
- log_admin("[key_name(usr)] has red god'ed [current].")
-
- if("blue god")
- make_Handofgod_god("blue")
- message_admins("[key_name_admin(usr)] has blue god'ed [current].")
- log_admin("[key_name(usr)] has blue god'ed [current].")
-
-
- else if (href_list["revolution"])
- switch(href_list["revolution"])
- if("clear")
- remove_rev()
- current << "You have been brainwashed! You are no longer a revolutionary!"
- message_admins("[key_name_admin(usr)] has de-rev'ed [current].")
- log_admin("[key_name(usr)] has de-rev'ed [current].")
- if("rev")
- if(src in ticker.mode.head_revolutionaries)
- ticker.mode.head_revolutionaries -= src
- ticker.mode.update_rev_icons_removed(src)
- current << "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!"
- else if(!(src in ticker.mode.revolutionaries))
- current << " You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!"
- else
- return
- ticker.mode.revolutionaries += src
- ticker.mode.update_rev_icons_added(src)
- special_role = "Revolutionary"
- message_admins("[key_name_admin(usr)] has rev'ed [current].")
- log_admin("[key_name(usr)] has rev'ed [current].")
-
- if("headrev")
- if(src in ticker.mode.revolutionaries)
- ticker.mode.revolutionaries -= src
- ticker.mode.update_rev_icons_removed(src)
- current << "You have proved your devotion to revoltion! Yea are a head revolutionary now!"
- else if(!(src in ticker.mode.head_revolutionaries))
- current << "You are a member of the revolutionaries' leadership now!"
- else
- return
- if (ticker.mode.head_revolutionaries.len>0)
- // copy targets
- var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
- if (valid_head)
- for (var/datum/objective/mutiny/O in valid_head.objectives)
- var/datum/objective/mutiny/rev_obj = new
- rev_obj.owner = src
- rev_obj.target = O.target
- rev_obj.explanation_text = "Assassinate [O.target.name], the [O.target.assigned_role]."
- objectives += rev_obj
- ticker.mode.greet_revolutionary(src,0)
- ticker.mode.head_revolutionaries += src
- ticker.mode.update_rev_icons_added(src)
- special_role = "Head Revolutionary"
- message_admins("[key_name_admin(usr)] has head-rev'ed [current].")
- log_admin("[key_name(usr)] has head-rev'ed [current].")
-
- if("autoobjectives")
- ticker.mode.forge_revolutionary_objectives(src)
- ticker.mode.greet_revolutionary(src,0)
- usr << "The objectives for revolution have been generated and shown to [key]"
-
- if("flash")
- if (!ticker.mode.equip_revolutionary(current))
- usr << "Spawning flash failed!"
-
- if("takeflash")
- var/list/L = current.get_contents()
- var/obj/item/device/assembly/flash/flash = locate() in L
- if (!flash)
- usr << "Deleting flash failed!"
- qdel(flash)
-
- if("repairflash")
- var/list/L = current.get_contents()
- var/obj/item/device/assembly/flash/flash = locate() in L
- if (!flash)
- usr << "Repairing flash failed!"
- else
- flash.crit_fail = 0
- flash.update_icon()
-
-
-
-//////////////////// GANG MODE
-
- else if (href_list["gang"])
- switch(href_list["gang"])
- if("clear")
- remove_gang()
- message_admins("[key_name_admin(usr)] has de-gang'ed [current].")
- log_admin("[key_name(usr)] has de-gang'ed [current].")
-
- if("equip")
- switch(ticker.mode.equip_gang(current,gang_datum))
- if(1)
- usr << "Unable to equip territory spraycan!"
- if(2)
- usr << "Unable to equip recruitment pen and spraycan!"
- if(3)
- usr << "Unable to equip gangtool, pen, and spraycan!"
-
- if("takeequip")
- var/list/L = current.get_contents()
- for(var/obj/item/weapon/pen/gang/pen in L)
- qdel(pen)
- for(var/obj/item/device/gangtool/gangtool in L)
- qdel(gangtool)
- for(var/obj/item/toy/crayon/spraycan/gang/SC in L)
- qdel(SC)
-
- if("new")
- if(gang_colors_pool.len)
- var/list/names = list("Random") + gang_name_pool
- var/gangname = input("Pick a gang name.","Select Name") as null|anything in names
- if(gangname && gang_colors_pool.len) //Check again just in case another admin made max gangs at the same time
- if(!(gangname in gang_name_pool))
- gangname = null
- var/datum/gang/newgang = new(null,gangname)
- ticker.mode.gangs += newgang
- message_admins("[key_name_admin(usr)] has created the [newgang.name] Gang.")
- log_admin("[key_name(usr)] has created the [newgang.name] Gang.")
-
- else if (href_list["gangboss"])
- var/datum/gang/G = locate(href_list["gangboss"]) in ticker.mode.gangs
- if(!G || (src in G.bosses))
- return
- ticker.mode.remove_gangster(src,0,2,1)
- G.bosses += src
- gang_datum = G
- special_role = "[G.name] Gang Boss"
- G.add_gang_hud(src)
- current << "You are a [G.name] Gang Boss!"
- message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang leadership.")
- log_admin("[key_name(usr)] has added [current] to the [G.name] Gang leadership.")
- ticker.mode.forge_gang_objectives(src)
- ticker.mode.greet_gang(src,0)
-
- else if (href_list["gangster"])
- var/datum/gang/G = locate(href_list["gangster"]) in ticker.mode.gangs
- if(!G || (src in G.gangsters))
- return
- ticker.mode.remove_gangster(src,0,2,1)
- ticker.mode.add_gangster(src,G,0)
- message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang (A).")
- log_admin("[key_name(usr)] has added [current] to the [G.name] Gang (A).")
-
-/////////////////////////////////
-
-
-
- else if (href_list["cult"])
- switch(href_list["cult"])
- if("clear")
- remove_cultist()
- current << "You have been brainwashed! You are no longer a cultist!"
- message_admins("[key_name_admin(usr)] has de-cult'ed [current].")
- log_admin("[key_name(usr)] has de-cult'ed [current].")
- if("cultist")
- if(!(src in ticker.mode.cult))
- ticker.mode.add_cultist(src)
- message_admins("[key_name_admin(usr)] has cult'ed [current].")
- log_admin("[key_name(usr)] has cult'ed [current].")
- if("equip")
- if (!ticker.mode.equip_cultist(current))
- usr << "equip_cultist() failed! [current]'s starting equipment will be incomplete."
-
- else if (href_list["wizard"])
- switch(href_list["wizard"])
- if("clear")
- remove_wizard()
- current << "You have been brainwashed! You are no longer a wizard!"
- log_admin("[key_name(usr)] has de-wizard'ed [current].")
- if("wizard")
- if(!(src in ticker.mode.wizards))
- ticker.mode.wizards += src
- special_role = "Wizard"
- //ticker.mode.learn_basic_spells(current)
- current << "You are the Space Wizard!"
- message_admins("[key_name_admin(usr)] has wizard'ed [current].")
- log_admin("[key_name(usr)] has wizard'ed [current].")
- if("lair")
- current.loc = pick(wizardstart)
- if("dressup")
- ticker.mode.equip_wizard(current)
- if("name")
- ticker.mode.name_wizard(current)
- if("autoobjectives")
- ticker.mode.forge_wizard_objectives(src)
- usr << "The objectives for wizard [key] have been generated. You can edit them and anounce manually."
-
- else if (href_list["changeling"])
- switch(href_list["changeling"])
- if("clear")
- remove_changeling()
- current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!"
- message_admins("[key_name_admin(usr)] has de-changeling'ed [current].")
- log_admin("[key_name(usr)] has de-changeling'ed [current].")
- if("changeling")
- if(!(src in ticker.mode.changelings))
- ticker.mode.changelings += src
- current.make_changeling()
- special_role = "Changeling"
- current << "Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!"
- message_admins("[key_name_admin(usr)] has changeling'ed [current].")
- log_admin("[key_name(usr)] has changeling'ed [current].")
- if("autoobjectives")
- ticker.mode.forge_changeling_objectives(src)
- usr << "The objectives for changeling [key] have been generated. You can edit them and anounce manually."
-
- if("initialdna")
- if( !changeling || !changeling.stored_profiles.len || !istype(current, /mob/living/carbon))
- usr << "Resetting DNA failed!"
- else
- var/mob/living/carbon/C = current
- changeling.first_prof.dna.transfer_identity(C, transfer_SE=1)
- C.real_name = changeling.first_prof.name
- C.updateappearance(mutcolor_update=1)
- C.domutcheck()
-
- else if (href_list["nuclear"])
- switch(href_list["nuclear"])
- if("clear")
- remove_nukeop()
- current << "You have been brainwashed! You are no longer a syndicate operative!"
- message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].")
- log_admin("[key_name(usr)] has de-nuke op'ed [current].")
- if("nuclear")
- if(!(src in ticker.mode.syndicates))
- ticker.mode.syndicates += src
- ticker.mode.update_synd_icons_added(src)
- if (ticker.mode.syndicates.len==1)
- ticker.mode.prepare_syndicate_leader(src)
- else
- current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
- special_role = "Syndicate"
- assigned_role = "Syndicate"
- current << "You are a [syndicate_name()] agent!"
- ticker.mode.forge_syndicate_objectives(src)
- ticker.mode.greet_syndicate(src)
- message_admins("[key_name_admin(usr)] has nuke op'ed [current].")
- log_admin("[key_name(usr)] has nuke op'ed [current].")
- if("lair")
- current.loc = get_turf(locate("landmark*Syndicate-Spawn"))
- if("dressup")
- var/mob/living/carbon/human/H = current
- qdel(H.belt)
- qdel(H.back)
- qdel(H.ears)
- qdel(H.gloves)
- qdel(H.head)
- qdel(H.shoes)
- qdel(H.wear_id)
- qdel(H.wear_suit)
- qdel(H.w_uniform)
-
- if (!ticker.mode.equip_syndicate(current))
- usr << "Equipping a syndicate failed!"
- if("tellcode")
- var/code
- for (var/obj/machinery/nuclearbomb/bombue in machines)
- if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
- code = bombue.r_code
- break
- if (code)
- store_memory("Syndicate Nuclear Bomb Code: [code]", 0, 0)
- current << "The nuclear authorization code is: [code]"
- else
- usr << "No valid nuke found!"
-
- else if (href_list["traitor"])
- switch(href_list["traitor"])
- if("clear")
- remove_traitor()
- current << "You have been brainwashed! You are no longer a traitor!"
- message_admins("[key_name_admin(usr)] has de-traitor'ed [current].")
- log_admin("[key_name(usr)] has de-traitor'ed [current].")
-
- if("traitor")
- if(!(src in ticker.mode.traitors))
- ticker.mode.traitors += src
- special_role = "traitor"
- current << "You are a traitor!"
- message_admins("[key_name_admin(usr)] has traitor'ed [current].")
- log_admin("[key_name(usr)] has traitor'ed [current].")
- if(isAI(current))
- var/mob/living/silicon/ai/A = current
- ticker.mode.add_law_zero(A)
- A.show_laws()
-
- if("autoobjectives")
- ticker.mode.forge_traitor_objectives(src)
- usr << "The objectives for traitor [key] have been generated. You can edit them and anounce manually."
-
- else if(href_list["shadowling"])
- switch(href_list["shadowling"])
- if("clear")
- ticker.mode.update_shadow_icons_removed(src)
- if(src in ticker.mode.shadows)
- ticker.mode.shadows -= src
- special_role = null
- current << "Your powers have been quenched! You are no longer a shadowling!"
- remove_spell(/obj/effect/proc_holder/spell/self/shadowling_hatch)
- remove_spell(/obj/effect/proc_holder/spell/self/shadowling_ascend)
- remove_spell(/obj/effect/proc_holder/spell/targeted/enthrall)
- remove_spell(/obj/effect/proc_holder/spell/self/shadowling_hivemind)
- message_admins("[key_name_admin(usr)] has de-shadowling'ed [current].")
- log_admin("[key_name(usr)] has de-shadowling'ed [current].")
- else if(src in ticker.mode.thralls)
- ticker.mode.remove_thrall(src,0)
- message_admins("[key_name_admin(usr)] has de-thrall'ed [current].")
- log_admin("[key_name(usr)] has de-thrall'ed [current].")
- if("shadowling")
- if(!ishuman(current))
- usr << "This only works on humans!"
- return
- ticker.mode.shadows += src
- special_role = "shadowling"
- current << "Something stirs deep in your mind. A red light floods your vision, and slowly you remember. Though your human disguise has served you well, the \
- time is nigh to cast it off and enter your true form. You have disguised yourself amongst the humans, but you are not one of them. You are a shadowling, and you are to ascend at all costs.\
- "
- ticker.mode.finalize_shadowling(src)
- ticker.mode.update_shadow_icons_added(src)
- if("thrall")
- if(!ishuman(current))
- usr << "This only works on humans!"
- return
- ticker.mode.add_thrall(src)
- message_admins("[key_name_admin(usr)] has thrall'ed [current].")
- log_admin("[key_name(usr)] has thrall'ed [current].")
-
- else if(href_list["abductor"])
- switch(href_list["abductor"])
- if("clear")
- usr << "Not implemented yet. Sorry!"
- if("abductor")
- if(!ishuman(current))
- usr << "This only works on humans!"
- return
- make_Abductor()
- log_admin("[key_name(usr)] turned [current] into abductor.")
- if("equip")
- var/gear = alert("Agent or Scientist Gear","Gear","Agent","Scientist")
- if(gear)
- var/datum/game_mode/abduction/temp = new
- temp.equip_common(current)
- if(gear=="Agent")
- temp.equip_agent(current)
- else
- temp.equip_scientist(current)
-
- else if (href_list["monkey"])
- var/mob/living/L = current
- if (L.notransform)
- return
- switch(href_list["monkey"])
- if("healthy")
- if (check_rights(R_ADMIN))
- var/mob/living/carbon/human/H = current
- var/mob/living/carbon/monkey/M = current
- if (istype(H))
- log_admin("[key_name(usr)] attempting to monkeyize [key_name(current)]")
- message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]")
- src = null
- M = H.monkeyize()
- src = M.mind
- //world << "DEBUG: \"healthy\": M=[M], M.mind=[M.mind], src=[src]!"
- else if (istype(M) && length(M.viruses))
- for(var/datum/disease/D in M.viruses)
- D.cure(0)
- sleep(0) //because deleting of virus is done through spawn(0)
- if("infected")
- if (check_rights(R_ADMIN, 0))
- var/mob/living/carbon/human/H = current
- var/mob/living/carbon/monkey/M = current
- if (istype(H))
- log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]")
- message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]")
- src = null
- M = H.monkeyize()
- src = M.mind
- current.ForceContractDisease(new /datum/disease/transformation/jungle_fever)
- else if (istype(M))
- current.ForceContractDisease(new /datum/disease/transformation/jungle_fever)
- if("human")
- if (check_rights(R_ADMIN, 0))
- var/mob/living/carbon/human/H = current
- var/mob/living/carbon/monkey/M = current
- if (istype(M))
- for(var/datum/disease/D in M.viruses)
- if (istype(D,/datum/disease/transformation/jungle_fever))
- D.cure(0)
- sleep(0) //because deleting of virus is doing throught spawn(0)
- log_admin("[key_name(usr)] attempting to humanize [key_name(current)]")
- message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]")
- H = M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG)
- if(H)
- src = H.mind
-
- else if (href_list["silicon"])
- switch(href_list["silicon"])
- if("unemag")
- var/mob/living/silicon/robot/R = current
- if (istype(R))
- R.SetEmagged(0)
- message_admins("[key_name_admin(usr)] has unemag'ed [R].")
- log_admin("[key_name(usr)] has unemag'ed [R].")
-
- if("unemagcyborgs")
- if (istype(current, /mob/living/silicon/ai))
- var/mob/living/silicon/ai/ai = current
- for (var/mob/living/silicon/robot/R in ai.connected_robots)
- R.SetEmagged(0)
- message_admins("[key_name_admin(usr)] has unemag'ed [ai]'s Cyborgs.")
- log_admin("[key_name(usr)] has unemag'ed [ai]'s Cyborgs.")
-
- else if (href_list["common"])
- switch(href_list["common"])
- if("undress")
- for(var/obj/item/W in current)
- current.unEquip(W, 1) //The 1 forces all items to drop, since this is an admin undress.
- if("takeuplink")
- take_uplink()
- memory = null//Remove any memory they may have had.
- log_admin("[key_name(usr)] removed [current]'s uplink.")
- if("crystals")
- if (check_rights(R_FUN, 0))
- var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
- var/crystals
- if (suplink)
- crystals = suplink.uses
- crystals = input("Amount of telecrystals for [key]","Syndicate uplink", crystals) as null|num
- if (!isnull(crystals))
- if (suplink)
- suplink.uses = crystals
- message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")
- log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].")
- if("uplink")
- if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
- usr << "Equipping a syndicate failed!"
- log_admin("[key_name(usr)] attempted to give [current] an uplink.")
-
- else if (href_list["obj_announce"])
- var/obj_count = 1
- current << "Your current objectives:"
- for(var/datum/objective/objective in objectives)
- current << "Objective #[obj_count]: [objective.explanation_text]"
- obj_count++
-
- edit_memory()
-
-/datum/mind/proc/find_syndicate_uplink()
- var/list/L = current.get_contents()
- for (var/obj/item/I in L)
- if (I.hidden_uplink)
- return I.hidden_uplink
- return null
-
-/datum/mind/proc/take_uplink()
- var/obj/item/device/uplink/hidden/H = find_syndicate_uplink()
- if(H)
- qdel(H)
-
-/datum/mind/proc/make_Traitor()
- if(!(src in ticker.mode.traitors))
- ticker.mode.traitors += src
- special_role = "traitor"
- ticker.mode.forge_traitor_objectives(src)
- ticker.mode.finalize_traitor(src)
- ticker.mode.greet_traitor(src)
-
-/datum/mind/proc/make_Nuke(turf/spawnloc,nuke_code,leader=0, telecrystals = TRUE)
- if(!(src in ticker.mode.syndicates))
- ticker.mode.syndicates += src
- ticker.mode.update_synd_icons_added(src)
- special_role = "Syndicate"
- ticker.mode.forge_syndicate_objectives(src)
- ticker.mode.greet_syndicate(src)
-
- current.loc = spawnloc
-
- var/mob/living/carbon/human/H = current
- qdel(H.belt)
- qdel(H.back)
- qdel(H.ears)
- qdel(H.gloves)
- qdel(H.head)
- qdel(H.shoes)
- qdel(H.wear_id)
- qdel(H.wear_suit)
- qdel(H.w_uniform)
-
- ticker.mode.equip_syndicate(current, telecrystals)
-
- if (nuke_code)
- store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0)
- current << "The nuclear authorization code is: [nuke_code]"
-
- if (leader)
- ticker.mode.prepare_syndicate_leader(src,nuke_code)
- else
- current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
-
-/datum/mind/proc/make_Changling()
- if(!(src in ticker.mode.changelings))
- ticker.mode.changelings += src
- current.make_changeling()
- special_role = "Changeling"
- ticker.mode.forge_changeling_objectives(src)
- ticker.mode.greet_changeling(src)
-
-/datum/mind/proc/make_Wizard()
- if(!(src in ticker.mode.wizards))
- ticker.mode.wizards += src
- special_role = "Wizard"
- assigned_role = "Wizard"
- //ticker.mode.learn_basic_spells(current)
- if(!wizardstart.len)
- current.loc = pick(latejoin)
- current << "HOT INSERTION, GO GO GO"
- else
- current.loc = pick(wizardstart)
-
- ticker.mode.equip_wizard(current)
- for(var/obj/item/weapon/spellbook/S in current.contents)
- S.op = 0
- ticker.mode.name_wizard(current)
- ticker.mode.forge_wizard_objectives(src)
- ticker.mode.greet_wizard(src)
-
-
-/datum/mind/proc/make_Cultist()
- if(!(src in ticker.mode.cult))
- ticker.mode.cult += src
- ticker.mode.update_cult_icons_added(src)
- special_role = "Cultist"
- current << "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie."
- current << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back."
- current << "Your objective is to summon Nar-Sie by building and defending a suitable shell for the Geometer. Adequate supplies can be procured through human sacrifices."
- ticker.mode.equip_cultist(current)
-
-/datum/mind/proc/make_Rev()
- if (ticker.mode.head_revolutionaries.len>0)
- // copy targets
- var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
- if (valid_head)
- for (var/datum/objective/mutiny/O in valid_head.objectives)
- var/datum/objective/mutiny/rev_obj = new
- rev_obj.owner = src
- rev_obj.target = O.target
- rev_obj.explanation_text = "Assassinate [O.target.current.real_name], the [O.target.assigned_role]."
- objectives += rev_obj
- ticker.mode.greet_revolutionary(src,0)
- ticker.mode.head_revolutionaries += src
- ticker.mode.update_rev_icons_added(src)
- special_role = "Head Revolutionary"
-
- ticker.mode.forge_revolutionary_objectives(src)
- ticker.mode.greet_revolutionary(src,0)
-
- var/list/L = current.get_contents()
- var/obj/item/device/assembly/flash/flash = locate() in L
- qdel(flash)
- take_uplink()
- var/fail = 0
-// fail |= !ticker.mode.equip_traitor(current, 1)
- fail |= !ticker.mode.equip_revolutionary(current)
-
-
-/datum/mind/proc/make_Gang(datum/gang/G)
- special_role = "[G.name] Gang Boss"
- G.bosses += src
- gang_datum = G
- G.add_gang_hud(src)
- ticker.mode.forge_gang_objectives(src)
- ticker.mode.greet_gang(src)
- ticker.mode.equip_gang(current,G)
-
-/datum/mind/proc/make_Abductor()
- var/role = alert("Abductor Role ?","Role","Agent","Scientist")
- var/team = input("Abductor Team ?","Team ?") in list(1,2,3,4)
- var/teleport = alert("Teleport to ship ?","Teleport","Yes","No")
-
- if(!role || !team || !teleport)
- return
-
- if(!ishuman(current))
- return
-
- ticker.mode.abductors |= src
-
- var/datum/objective/experiment/O = new
- O.owner = src
- objectives += O
-
- var/mob/living/carbon/human/H = current
-
- H.set_species(/datum/species/abductor)
- var/datum/species/abductor/S = H.dna.species
-
- switch(role)
- if("Agent")
- S.agent = 1
- if("Scientist")
- S.scientist = 1
- S.team = team
-
- var/list/obj/effect/landmark/abductor/agent_landmarks = new
- var/list/obj/effect/landmark/abductor/scientist_landmarks = new
- agent_landmarks.len = 4
- scientist_landmarks.len = 4
- for(var/obj/effect/landmark/abductor/A in landmarks_list)
- if(istype(A,/obj/effect/landmark/abductor/agent))
- agent_landmarks[text2num(A.team)] = A
- else if(istype(A,/obj/effect/landmark/abductor/scientist))
- scientist_landmarks[text2num(A.team)] = A
-
- var/obj/effect/landmark/L
- if(teleport=="Yes")
- switch(role)
- if("Agent")
- S.agent = 1
- L = agent_landmarks[team]
- H.loc = L.loc
- if("Scientist")
- S.scientist = 1
- L = agent_landmarks[team]
- H.loc = L.loc
-
-
-/datum/mind/proc/make_Handofgod_follower(colour)
- . = 0
- switch(colour)
- if("red")
- //Remove old allegiances
- if(src in ticker.mode.blue_deity_followers || src in ticker.mode.blue_deity_prophets)
- current << "You are no longer a member of the Blue cult!"
-
- ticker.mode.blue_deity_followers -= src
- ticker.mode.blue_deity_prophets -= src
- current.faction |= "red god"
- current.faction -= "blue god"
-
- if(src in ticker.mode.red_deity_prophets)
- current << "You have lost the connection with your deity, but you still believe in their grand design, You are no longer a prophet!"
- ticker.mode.red_deity_prophets -= src
-
- ticker.mode.red_deity_followers |= src
- current << "You are now a follower of the red cult's god!"
-
- special_role = "Hand of God: Red Follower"
- . = 1
- if("blue")
- //Remove old allegiances
- if(src in ticker.mode.red_deity_followers || src in ticker.mode.red_deity_prophets)
- current << "You are no longer a member of the Red cult!"
-
- ticker.mode.red_deity_followers -= src
- ticker.mode.red_deity_prophets -= src
- current.faction -= "red god"
- current.faction |= "blue god"
-
- if(src in ticker.mode.blue_deity_prophets)
- current << "You have lost the connection with your deity, but you still believe in their grand design, You are no longer a prophet!"
- ticker.mode.blue_deity_prophets -= src
-
- ticker.mode.blue_deity_followers |= src
- current << "You are now a follower of the blue cult's god!"
-
- special_role = "Hand of God: Blue Follower"
- . = 1
- else
- return 0
-
- ticker.mode.update_hog_icons_removed(src,"red")
- ticker.mode.update_hog_icons_removed(src,"blue")
- //ticker.mode.greet_hog_follower(src,colour)
- ticker.mode.update_hog_icons_added(src, colour)
-
-/datum/mind/proc/make_Handofgod_prophet(colour)
- . = 0
- switch(colour)
- if("red")
- //Remove old allegiances
-
- if(src in ticker.mode.blue_deity_followers || src in ticker.mode.blue_deity_prophets)
- current << "You are no longer a member of the Blue cult!"
- current.faction -= "blue god"
- current.faction |= "red god"
-
- ticker.mode.blue_deity_followers -= src
- ticker.mode.blue_deity_prophets -= src
- ticker.mode.red_deity_followers -= src
-
- ticker.mode.red_deity_prophets |= src
- current << "You are now a prophet of the red cult's god!"
-
- special_role = "Hand of God: Red Prophet"
- . = 1
- if("blue")
- //Remove old allegiances
-
- if(src in ticker.mode.red_deity_followers || src in ticker.mode.red_deity_prophets)
- current << "You are no longer a member of the Red cult!"
- current.faction -= "red god"
- current.faction |= "blue god"
-
- ticker.mode.red_deity_followers -= src
- ticker.mode.red_deity_prophets -= src
- ticker.mode.blue_deity_followers -= src
-
- ticker.mode.blue_deity_prophets |= src
- current << "You are now a prophet of the blue cult's god!"
-
- special_role = "Hand of God: Blue Prophet"
- . = 1
-
- else
- return 0
-
- ticker.mode.update_hog_icons_removed(src,"red")
- ticker.mode.update_hog_icons_removed(src,"blue")
- ticker.mode.greet_hog_follower(src,colour)
- ticker.mode.update_hog_icons_added(src, colour)
-
-
-/datum/mind/proc/make_Handofgod_god(colour)
- switch(colour)
- if("red")
- current.become_god("red")
- ticker.mode.add_god(src,"red")
- if("blue")
- current.become_god("blue")
- ticker.mode.add_god(src,"blue")
- else
- return 0
- ticker.mode.forge_deity_objectives(src)
- ticker.mode.remove_hog_follower(src,0)
- ticker.mode.update_hog_icons_added(src, colour)
-// ticker.mode.greet_hog_follower(src,colour)
- return 1
-
-
-/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/spell)
- spell_list += spell
- if(!spell.action)
- spell.action = new/datum/action/spell_action
- spell.action.target = spell
- spell.action.name = spell.name
- spell.action.button_icon = spell.action_icon
- spell.action.button_icon_state = spell.action_icon_state
- spell.action.background_icon_state = spell.action_background_icon_state
- spell.action.Grant(current)
- return
-/datum/mind/proc/transfer_actions(mob/living/new_character)
- if(current && current.actions)
- for(var/datum/action/A in current.actions)
- A.Grant(new_character)
- transfer_mindbound_actions(new_character)
-
-/datum/mind/proc/transfer_mindbound_actions(var/mob/living/new_character)
- for(var/obj/effect/proc_holder/spell/spell in spell_list)
- if(!spell.action) // Unlikely but whatever
- spell.action = new/datum/action/spell_action
- spell.action.target = spell
- spell.action.name = spell.name
- spell.action.button_icon = spell.action_icon
- spell.action.button_icon_state = spell.action_icon_state
- spell.action.background_icon_state = spell.action_background_icon_state
- spell.action.Grant(new_character)
- return
-
-/mob/proc/sync_mind()
- mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist)
- mind.active = 1 //indicates that the mind is currently synced with a client
-
-/mob/new_player/sync_mind()
- return
-
-/mob/dead/observer/sync_mind()
- return
-
-//Initialisation procs
-/mob/proc/mind_initialize()
- if(mind)
- mind.key = key
-
- else
- mind = new /datum/mind(key)
- if(ticker)
- ticker.minds += mind
- else
- spawn(0)
- throw EXCEPTION("mind_initialize(): No ticker ready")
- if(!mind.name) mind.name = real_name
- mind.current = src
-
-//HUMAN
-/mob/living/carbon/human/mind_initialize()
- ..()
- if(!mind.assigned_role) mind.assigned_role = "Assistant" //defualt
-
-//MONKEY
-/mob/living/carbon/monkey/mind_initialize()
- ..()
-
-//slime
-/mob/living/simple_animal/slime/mind_initialize()
- ..()
- mind.special_role = "slime"
- mind.assigned_role = "slime"
-
-//XENO
-/mob/living/carbon/alien/mind_initialize()
- ..()
- mind.special_role = "Alien"
- mind.assigned_role = "Alien"
- //XENO HUMANOID
-/mob/living/carbon/alien/humanoid/royal/queen/mind_initialize()
- ..()
- mind.special_role = "Queen"
-
-/mob/living/carbon/alien/humanoid/royal/praetorian/mind_initialize()
- ..()
- mind.special_role = "Praetorian"
-
-/mob/living/carbon/alien/humanoid/hunter/mind_initialize()
- ..()
- mind.special_role = "Hunter"
-
-/mob/living/carbon/alien/humanoid/drone/mind_initialize()
- ..()
- mind.special_role = "Drone"
-
-/mob/living/carbon/alien/humanoid/sentinel/mind_initialize()
- ..()
- mind.special_role = "Sentinel"
- //XENO LARVA
-/mob/living/carbon/alien/larva/mind_initialize()
- ..()
- mind.special_role = "Larva"
-
-//AI
-/mob/living/silicon/ai/mind_initialize()
- ..()
- mind.assigned_role = "AI"
-
-//BORG
-/mob/living/silicon/robot/mind_initialize()
- ..()
- mind.assigned_role = "Cyborg"
-
-//PAI
-/mob/living/silicon/pai/mind_initialize()
- ..()
- mind.assigned_role = "pAI"
- mind.special_role = ""
-
-//BLOB
-/mob/camera/blob/mind_initialize()
- ..()
- mind.special_role = "Blob"
-
-//Animals
-/mob/living/simple_animal/mind_initialize()
- ..()
- mind.assigned_role = "Animal"
- mind.special_role = "Animal"
-
-/mob/living/simple_animal/pet/dog/corgi/mind_initialize()
- ..()
- mind.assigned_role = "Corgi"
- mind.special_role = "Corgi"
-
-/mob/living/simple_animal/shade/mind_initialize()
- ..()
- mind.assigned_role = "Shade"
- mind.special_role = "Shade"
-
-/mob/living/simple_animal/hostile/construct/mind_initialize()
- ..()
- mind.assigned_role = "[initial(name)]"
+/* Note from Carnie:
+ The way datum/mind stuff works has been changed a lot.
+ Minds now represent IC characters rather than following a client around constantly.
+
+ Guidelines for using minds properly:
+
+ - Never mind.transfer_to(ghost). The var/current and var/original of a mind must always be of type mob/living!
+ ghost.mind is however used as a reference to the ghost's corpse
+
+ - When creating a new mob for an existing IC character (e.g. cloning a dead guy or borging a brain of a human)
+ the existing mind of the old mob should be transfered to the new mob like so:
+
+ mind.transfer_to(new_mob)
+
+ - You must not assign key= or ckey= after transfer_to() since the transfer_to transfers the client for you.
+ By setting key or ckey explicitly after transfering the mind with transfer_to you will cause bugs like DCing
+ the player.
+
+ - IMPORTANT NOTE 2, if you want a player to become a ghost, use mob.ghostize() It does all the hard work for you.
+
+ - When creating a new mob which will be a new IC character (e.g. putting a shade in a construct or randomly selecting
+ a ghost to become a xeno during an event). Simply assign the key or ckey like you've always done.
+
+ new_mob.key = key
+
+ The Login proc will handle making a new mob for that mobtype (including setting up stuff like mind.name). Simple!
+ However if you want that mind to have any special properties like being a traitor etc you will have to do that
+ yourself.
+
+*/
+
+/datum/mind
+ var/key
+ var/name //replaces mob/var/original_name
+ var/mob/living/current
+ var/active = 0
+
+ var/memory
+
+ var/assigned_role
+ var/special_role
+ var/list/restricted_roles = list()
+
+ var/datum/job/assigned_job
+
+ var/list/datum/objective/objectives = list()
+ var/list/datum/objective/special_verbs = list()
+
+ var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
+
+ var/datum/faction/faction //associated faction
+ var/datum/changeling/changeling //changeling holder
+
+ var/miming = 0 // Mime's vow of silence
+ var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
+ var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
+ var/datum/gang/gang_datum //Which gang this mind belongs to, if any
+
+/datum/mind/New(var/key)
+ src.key = key
+
+
+/datum/mind/proc/transfer_to(mob/new_character)
+ if(current) // remove ourself from our old body's mind variable
+ current.mind = null
+ SStgui.on_transfer(current, new_character)
+
+ if(key)
+ if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours
+ new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless.
+ else
+ key = new_character.key
+
+ if(new_character.mind) //disassociate any mind currently in our new body's mind variable
+ new_character.mind.current = null
+
+ var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list
+ leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it
+ current = new_character //associate ourself with our new body
+ new_character.mind = src //and associate our new body with ourself
+ transfer_antag_huds(hud_to_transfer) //inherit the antag HUD
+ transfer_actions(new_character)
+
+ if(active)
+ new_character.key = key //now transfer the key to link the client to our new body
+
+/datum/mind/proc/store_memory(new_text)
+ memory += "[new_text] "
+
+/datum/mind/proc/wipe_memory()
+ memory = null
+
+
+/*
+ Removes antag type's references from a mind.
+ objectives, uplinks, powers etc are all handled.
+*/
+
+/datum/mind/proc/remove_objectives()
+ if(objectives.len)
+ for(var/datum/objective/O in objectives)
+ objectives -= O
+ qdel(O)
+
+/datum/mind/proc/remove_changeling()
+ if(src in ticker.mode.changelings)
+ ticker.mode.changelings -= src
+ current.remove_changeling_powers()
+ if(changeling)
+ qdel(changeling)
+ changeling = null
+ special_role = null
+ remove_antag_equip()
+
+/datum/mind/proc/remove_traitor()
+ if(src in ticker.mode.traitors)
+ ticker.mode.traitors -= src
+ if(isAI(current))
+ var/mob/living/silicon/ai/A = current
+ A.set_zeroth_law("")
+ A.show_laws()
+ A.verbs -= /mob/living/silicon/ai/proc/choose_modules
+ A.malf_picker.remove_verbs(A)
+ qdel(A.malf_picker)
+ special_role = null
+ remove_antag_equip()
+
+/datum/mind/proc/remove_nukeop()
+ if(src in ticker.mode.syndicates)
+ ticker.mode.syndicates -= src
+ ticker.mode.update_synd_icons_removed(src)
+ special_role = null
+ remove_objectives()
+ remove_antag_equip()
+
+/datum/mind/proc/remove_wizard()
+ if(src in ticker.mode.wizards)
+ ticker.mode.wizards -= src
+ current.spellremove(current)
+ special_role = null
+ remove_antag_equip()
+
+/datum/mind/proc/remove_cultist()
+ if(src in ticker.mode.cult)
+ ticker.mode.cult -= src
+ ticker.mode.update_cult_icons_removed(src)
+ special_role = null
+
+/datum/mind/proc/remove_rev()
+ if(src in ticker.mode.revolutionaries)
+ ticker.mode.revolutionaries -= src
+ ticker.mode.update_rev_icons_removed(src)
+ if(src in ticker.mode.head_revolutionaries)
+ ticker.mode.head_revolutionaries -= src
+ ticker.mode.update_rev_icons_removed(src)
+ special_role = null
+ remove_objectives()
+ remove_antag_equip()
+
+
+/datum/mind/proc/remove_gang()
+ ticker.mode.remove_gangster(src,0,1,1)
+ remove_objectives()
+
+/datum/mind/proc/remove_hog_follower_prophet()
+ ticker.mode.red_deity_followers -= src
+ ticker.mode.red_deity_prophets -= src
+ ticker.mode.blue_deity_prophets -= src
+ ticker.mode.blue_deity_followers -= src
+ ticker.mode.update_hog_icons_removed(src, "red")
+ ticker.mode.update_hog_icons_removed(src, "blue")
+
+
+
+/datum/mind/proc/remove_antag_equip()
+ var/list/Mob_Contents = current.get_contents()
+ for(var/obj/item/I in Mob_Contents)
+ if(istype(I, /obj/item/device/pda))
+ var/obj/item/device/pda/P = I
+ P.lock_code = ""
+
+ else if(istype(I, /obj/item/device/radio))
+ var/obj/item/device/radio/R = I
+ R.traitor_frequency = 0
+
+/datum/mind/proc/remove_all_antag() //For the Lazy amongst us.
+ remove_changeling()
+ remove_traitor()
+ remove_nukeop()
+ remove_wizard()
+ remove_cultist()
+ remove_rev()
+ remove_gang()
+
+/datum/mind/proc/show_memory(mob/recipient, window=1)
+ if(!recipient)
+ recipient = current
+ var/output = "[current.real_name]'s Memories: "
+ output += memory
+
+ if(objectives.len)
+ output += "Objectives:"
+ var/obj_count = 1
+ for(var/datum/objective/objective in objectives)
+ output += " Objective #[obj_count++]: [objective.explanation_text]"
+
+ if(window) recipient << browse(output,"window=memory")
+ else recipient << "[output]"
+
+/datum/mind/proc/edit_memory()
+ if(!ticker || !ticker.mode)
+ alert("Not before round-start!", "Alert")
+ return
+
+ var/out = "[name][(current&&(current.real_name!=name))?" (as [current.real_name])":""] "
+ out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"] "
+ out += "Assigned role: [assigned_role]. Edit "
+ out += "Faction and special role: [special_role] "
+
+ var/list/sections = list(
+ "revolution",
+ "gang",
+ "cult",
+ "wizard",
+ "changeling",
+ "nuclear",
+ "traitor", // "traitorchan",
+ "monkey",
+ )
+ var/text = ""
+
+ if (istype(current, /mob/living/carbon/human) || istype(current, /mob/living/carbon/monkey))
+ /** REVOLUTION ***/
+ text = "revolution"
+ if (ticker.mode.config_tag=="revolution")
+ text = uppertext(text)
+ text = "[text]: "
+ if (assigned_role in command_positions)
+ text += "HEAD|loyal|employee|headrev|rev"
+ else if (src in ticker.mode.head_revolutionaries)
+ text += "head|loyal|employee|HEADREV|rev"
+ text += " Flash: give"
+
+ var/list/L = current.get_contents()
+ var/obj/item/device/assembly/flash/flash = locate() in L
+ if (flash)
+ if(!flash.crit_fail)
+ text += "|take."
+ else
+ text += "|take|repair."
+ else
+ text += "."
+
+ text += " Reequip (gives traitor uplink)."
+ if (objectives.len==0)
+ text += " Objectives are empty! Set to kill all heads."
+ else if(isloyal(current))
+ text += "head|LOYAL|employee|headrev|rev"
+ else if (src in ticker.mode.revolutionaries)
+ text += "head|loyal|employee|headrev|REV"
+ else
+ text += "head|loyal|EMPLOYEE|headrev|rev"
+
+ if(current && current.client && (ROLE_REV in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["revolution"] = text
+
+ /** GANG ***/
+ text = "gang"
+ if (ticker.mode.config_tag=="gang")
+ text = uppertext(text)
+ text = "[text]: "
+ text += "[isloyal(current) ? "LOYAL" : "loyal"]|"
+ if(src in ticker.mode.get_all_gangsters())
+ text += "none"
+ else
+ text += "NONE"
+
+ if(current && current.client && (ROLE_GANG in current.client.prefs.be_special))
+ text += "|Enabled in Prefs "
+ else
+ text += "|Disabled in Prefs "
+
+ for(var/datum/gang/G in ticker.mode.gangs)
+ text += "[G.name]: "
+ if(src in (G.gangsters))
+ text += "GANGSTER"
+ else
+ text += "gangster"
+ text += "|"
+ if(src in (G.bosses))
+ text += "GANG LEADER"
+ text += "|Equipment: give"
+ var/list/L = current.get_contents()
+ var/obj/item/device/gangtool/gangtool = locate() in L
+ if (gangtool)
+ text += "|take"
+
+ else
+ text += "gang leader"
+ text += " "
+
+ if(gang_colors_pool.len)
+ text += "Create New Gang"
+
+ sections["gang"] = text
+
+
+ /** CULT ***/
+ text = "cult"
+ if (ticker.mode.config_tag=="cult")
+ text = uppertext(text)
+ text = "[text]: "
+ if (src in ticker.mode.cult)
+ text += "loyal|employee|CULTIST"
+ text += " Equip"
+
+ else if(isloyal(current))
+ text += "LOYAL|employee|cultist"
+ else
+ text += "loyal|EMPLOYEE|cultist"
+
+ if(current && current.client && (ROLE_CULTIST in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["cult"] = text
+
+ /** WIZARD ***/
+ text = "wizard"
+ if (ticker.mode.config_tag=="wizard")
+ text = uppertext(text)
+ text = "[text]: "
+ if ((src in ticker.mode.wizards) || (src in ticker.mode.apprentices))
+ text += "YES|no"
+ text += " To lair, undress, dress up, let choose name."
+ if (objectives.len==0)
+ text += " Objectives are empty! Randomize!"
+ else
+ text += "yes|NO"
+
+ if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["wizard"] = text
+
+ /** CHANGELING ***/
+ text = "changeling"
+ if (ticker.mode.config_tag=="changeling" || ticker.mode.config_tag=="traitorchan")
+ text = uppertext(text)
+ text = "[text]: "
+ if ((src in ticker.mode.changelings) && special_role)
+ text += "YES|no"
+ if (objectives.len==0)
+ text += " Objectives are empty! Randomize!"
+ if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
+ text += " Transform to initial appearance."
+ else if(src in ticker.mode.changelings) //Station Aligned Changeling
+ text += "YES (but not an antag)|no"
+ if (objectives.len==0)
+ text += " Objectives are empty! Randomize!"
+ if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
+ text += " Transform to initial appearance."
+ else
+ text += "yes|NO"
+// var/datum/game_mode/changeling/changeling = ticker.mode
+// if (istype(changeling) && changeling.changelingdeath)
+// text += " All the changelings are dead! Restart in [round((changeling.TIME_TO_GET_REVIVED-(world.time-changeling.changelingdeathtime))/10)] seconds."
+
+ if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["changeling"] = text
+
+ /** NUCLEAR ***/
+ text = "nuclear"
+ if (ticker.mode.config_tag=="nuclear")
+ text = uppertext(text)
+ text = "[text]: "
+ if (src in ticker.mode.syndicates)
+ text += "OPERATIVE|nanotrasen"
+ text += " To shuttle, undress, dress up."
+ var/code
+ for (var/obj/machinery/nuclearbomb/bombue in machines)
+ if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
+ code = bombue.r_code
+ break
+ if (code)
+ text += " Code is [code]. tell the code."
+ else
+ text += "operative|NANOTRASEN"
+
+ if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["nuclear"] = text
+
+ /** TRAITOR ***/
+ text = "traitor"
+ if (ticker.mode.config_tag=="traitor" || ticker.mode.config_tag=="traitorchan")
+ text = uppertext(text)
+ text = "[text]: "
+ if (src in ticker.mode.traitors)
+ text += "TRAITOR|loyal"
+ if (objectives.len==0)
+ text += " Objectives are empty! Randomize!"
+ else
+ text += "traitor|LOYAL"
+
+ if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["traitor"] = text
+
+ /** SHADOWLING **/
+ text = "shadowling"
+ if(ticker.mode.config_tag == "shadowling")
+ text = uppertext(text)
+ text = "[text]: "
+ if(src in ticker.mode.shadows)
+ text += "SHADOWLING|thrall|human"
+ else if(src in ticker.mode.thralls)
+ text += "shadowling|THRALL|human"
+ else
+ text += "shadowling|thrall|HUMAN"
+
+ if(current && current.client && (ROLE_SHADOWLING in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["shadowling"] = text
+
+ /** Abductors **/
+
+ text = "Abductor"
+ if(ticker.mode.config_tag == "abductor")
+ text = uppertext(text)
+ text = "[text]: "
+ if(src in ticker.mode.abductors)
+ text += "Abductor|human"
+ text += "|undress|equip"
+ else
+ text += "Abductor|human"
+
+ if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["abductor"] = text
+
+ /** HAND OF GOD **/
+ text = "hand of god"
+ if(ticker.mode.config_tag == "handofgod")
+ text = uppertext(text)
+ text = "[text]: "
+ if(src in ticker.mode.red_deity_prophets)
+ text += "RED PROPHET|red follower|employee|blue follower|blue prophet|red god|blue god"
+ else if (src in ticker.mode.red_deity_followers)
+ text += "red prophet|RED FOLLOWER|employee|blue follower|blue prophet|red god|blue god"
+ else if (src in ticker.mode.blue_deity_followers)
+ text += "red prophet|red follower|employee|BLUE FOLLOWER|blue prophet|red god|blue god"
+ else if (src in ticker.mode.blue_deity_prophets)
+ text += "red prophet|red follower|employee|blue follower|BLUE PROPHET|red god|blue god"
+ else if (src in ticker.mode.red_deities)
+ text += "red prophet|red follower|employee|blue follower|blue prophet|RED GOD|blue god"
+ else if (src in ticker.mode.blue_deities)
+ text += "red prophet|red follower|employee|blue follower|blue prophet|red god|BLUE GOD"
+ else
+ text += "red prophet|red follower|EMPLOYEE|blue follower|blue prophet|red god|blue god"
+
+ if(current && current.client && (ROLE_HOG_GOD in current.client.prefs.be_special))
+ text += "|HOG God Enabled in Prefs"
+ else
+ text += "|HOG God Disabled in Prefs"
+
+ if(current && current.client && (ROLE_HOG_CULTIST in current.client.prefs.be_special))
+ text += "|HOG Cultist Enabled in Prefs"
+ else
+ text += "|HOG Disabled in Prefs"
+
+ sections["follower"] = text
+
+ /** MONKEY ***/
+ if (istype(current, /mob/living/carbon))
+ text = "monkey"
+ if (ticker.mode.config_tag=="monkey")
+ text = uppertext(text)
+ text = "[text]: "
+ if (istype(current, /mob/living/carbon/human))
+ text += "healthy|infected|HUMAN|other"
+ else if (istype(current, /mob/living/carbon/monkey))
+ var/found = 0
+ for(var/datum/disease/D in current.viruses)
+ if(istype(D, /datum/disease/transformation/jungle_fever)) found = 1
+
+ if(found)
+ text += "healthy|INFECTED|human|other"
+ else
+ text += "HEALTHY|infected|human|other"
+
+ else
+ text += "healthy|infected|human|OTHER"
+
+ if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special))
+ text += "|Enabled in Prefs"
+ else
+ text += "|Disabled in Prefs"
+
+ sections["monkey"] = text
+
+
+ /** SILICON ***/
+
+ if (istype(current, /mob/living/silicon))
+ text = "silicon"
+ var/mob/living/silicon/robot/robot = current
+ if (istype(robot) && robot.emagged)
+ text += " Cyborg: Is emagged! Unemag! 0th law: [robot.laws.zeroth]"
+ var/mob/living/silicon/ai/ai = current
+ if (istype(ai) && ai.connected_robots.len)
+ var/n_e_robots = 0
+ for (var/mob/living/silicon/robot/R in ai.connected_robots)
+ if (R.emagged)
+ n_e_robots++
+ text += " [n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag"
+ if (ticker.mode.config_tag == "traitorchan")
+ if (sections["traitor"])
+ out += sections["traitor"]+" "
+ if (sections["changeling"])
+ out += sections["changeling"]+"
"
+ sections -= "traitor"
+ sections -= "changeling"
+ else
+ if (sections[ticker.mode.config_tag])
+ out += sections[ticker.mode.config_tag]+"
"
+ sections -= ticker.mode.config_tag
+ for (var/i in sections)
+ if (sections[i])
+ out += sections[i]+" "
+
+
+ if (((src in ticker.mode.head_revolutionaries) || \
+ (src in ticker.mode.traitors) || \
+ (src in ticker.mode.syndicates)) && \
+ istype(current,/mob/living/carbon/human) )
+
+ text = "Uplink: give"
+ var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
+ var/crystals
+ if (suplink)
+ crystals = suplink.uses
+ if (suplink)
+ text += "|take"
+ if (check_rights(R_FUN, 0))
+ text += ", [crystals] crystals"
+ else
+ text += ", [crystals] crystals"
+ text += "." //hiel grammar
+ out += text
+
+ out += "
"
+
+ out += "Memory: "
+ out += memory
+ out += " Edit memory "
+ out += "Objectives: "
+ if (objectives.len == 0)
+ out += "EMPTY "
+ else
+ var/obj_count = 1
+ for(var/datum/objective/objective in objectives)
+ out += "[obj_count]: [objective.explanation_text] EditDeleteToggle Completion "
+ obj_count++
+ out += "Add objective
"
dat += "Random rune"
@@ -381,19 +383,30 @@
popup.open()
dat = ""
+/obj/item/toy/crayon/proc/crayon_text_strip(text)
+ var/list/base = text2list(lowertext(text),"")
+ var/list/out = list()
+ for(var/a in base)
+ if(a in (letters|numerals))
+ out += a
+ return list2text(out)
+
/obj/item/toy/crayon/Topic(href, href_list, hsrc)
var/temp = "a"
- switch(href_list["type"])
- if("random_letter")
- temp = pick(letters)
- if("letter")
- temp = input("Choose what to write.", "Scribbles") in (letters|numerals)
- if("random_rune")
- temp = "rune[rand(1,6)]"
- if("random_graffiti")
- temp = pick(graffiti)
- else
- temp = href_list["type"]
+ if(href_list["buffer"])
+ text_buffer = crayon_text_strip(stripped_input(usr,"Choose what to write.", "Scribbles",default = text_buffer))
+ if(href_list["type"])
+ switch(href_list["type"])
+ if("random_letter")
+ temp = pick(letters)
+ if("letter")
+ temp = input("Choose what to write.", "Scribbles") in (letters|numerals)
+ if("random_rune")
+ temp = "rune[rand(1,6)]"
+ if("random_graffiti")
+ temp = pick(graffiti)
+ else
+ temp = href_list["type"]
if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
return
drawtype = temp
@@ -409,6 +422,7 @@
if(istype(target, /obj/effect/decal/cleanable))
target = target.loc
if(is_type_in_list(target,validSurfaces))
+
var/temp = "rune"
if(letters.Find(drawtype))
temp = "letter"
@@ -457,6 +471,10 @@
playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
if((instant>0) || do_after(user, 50, target = target))
+ if(length(text_buffer))
+ drawtype = copytext(text_buffer,1,2)
+ text_buffer = copytext(text_buffer,2)
+
//Gang functions
if(gangID)
//Delete any old markings on this tile, including other gang tags
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index d0891d42d8d..3eb2d6aa3b7 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -60,13 +60,6 @@ AI MODULES
user << "Upload complete. [reciever]'s laws have been modified."
reciever.show_laws()
reciever.law_change_counter++
- if(isAI(reciever))
- var/mob/living/silicon/ai/A = reciever
- for(var/mob/living/silicon/robot/R in A.connected_robots)
- if(R.lawupdate)
- R << "From now on, these are your laws:"
- R.show_laws()
- R.law_change_counter++
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [reciever.name]([reciever.key]).[law2log ? " The law specified [law2log]" : ""]")
@@ -360,9 +353,9 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/robocop
name = "'Robo-Officer' Core AI Module"
origin_tech = "programming=4"
- laws = list("Uphold the law.",\
- "Protect the innocent.",\
- "Serve the public trust.")
+ laws = list("Serve the public trust.",\
+ "Protect the innocent",\
+ "Uphold the law.")
/******************** Antimov ********************/
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index a69655548ca..2fe704d5760 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -89,7 +89,7 @@
else
user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \
"You begin to wipe off [H]'s lipstick...")
- if(do_after(user, 10, target = H) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not.
+ if(do_after(user, 10, target = H))
user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
"You wipe off [H]'s lipstick.")
H.lip_style = null
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 9d09a3b0cf8..21eed445b28 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -145,15 +145,9 @@
step_towards(W,my_target)
if(!W || !W.reagents) return
W.reagents.reaction(get_turf(W))
- for(var/atom/atm in get_turf(W))
+ for(var/A in get_turf(W))
if(!W) return
- W.reagents.reaction(atm)
- if(isliving(atm)) //For extinguishing mobs on fire
- var/mob/living/M = atm
- M.ExtinguishMob()
- if(istype(atm,/obj/item))
- var/obj/item/Item = atm
- Item.extinguish()
+ W.reagents.reaction(A)
if(W.loc == my_target) break
sleep(2)
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index bdb527ff358..723725e46f5 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -19,6 +19,7 @@
var/obj/item/weapon/weldingtool/weldtool = null
var/obj/item/device/assembly/igniter/igniter = null
var/obj/item/weapon/tank/internals/plasma/ptank = null
+ var/warned_admins = 0 //for the message_admins() when lit
/obj/item/weapon/flamethrower/Destroy()
@@ -144,6 +145,9 @@
lit = !lit
if(lit)
SSobj.processing |= src
+ if(!warned_admins)
+ message_admins("[key_name_admin(usr)]? (FLW) has lit a flamethrower.")
+ warned_admins = 1
if(href_list["amount"])
throw_amount = throw_amount + text2num(href_list["amount"])
throw_amount = max(50, min(5000, throw_amount))
@@ -226,4 +230,4 @@
var/target_turf = get_turf(owner)
ignite_turf(target_turf, 100)
qdel(ptank)
- return 1 //It hit the flamethrower, not them
\ No newline at end of file
+ return 1 //It hit the flamethrower, not them
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index a6a525541d5..f7037ee5516 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -441,6 +441,25 @@
beakers += B1
beakers += B2
+/obj/item/weapon/grenade/chem_grenade/tuberculosis
+ name = "Fungal tuberculosis grenade"
+ desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
+ stage = READY
+
+/obj/item/weapon/grenade/chem_grenade/tuberculosis/New()
+ ..()
+ var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+
+ B1.reagents.add_reagent("potassium", 50)
+ B1.reagents.add_reagent("phosphorus", 50)
+ B1.reagents.add_reagent("fungalspores", 200)
+ B2.reagents.add_reagent("blood", 250)
+ B2.reagents.add_reagent("sugar", 50)
+
+ beakers += B1
+ beakers += B2
+
#undef EMPTY
#undef WIRED
#undef READY
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index 93e09950eb3..4feac56d880 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -15,4 +15,9 @@
name = "HE Grenade"
desc = "A compact shrapnel grenade meant to devestate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction."
icon_state = "concussion"
- origin_tech = "materials=3;magnets=4;syndicate=2"
\ No newline at end of file
+ origin_tech = "materials=3;magnets=4;syndicate=2"
+
+/obj/item/weapon/grenade/syndieminibomb/concussion/prime()
+ update_mob()
+ explosion(src.loc,0,2,3,flame_range = 3)
+ qdel(src)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 15893990d48..e5b7b2df05f 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -2,7 +2,9 @@
* Contains:
* Fork
* Kitchen knives
+ * Ritual Knife
* Butcher's cleaver
+ * Combat Knife
* Rolling Pins
*/
@@ -86,6 +88,17 @@
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
w_class = 3
+/obj/item/weapon/kitchen/knife/combat
+ name = "combat knife"
+ icon_state = "buckknife"
+ item_state = "knife"
+ desc = "A military combat utility survival knife."
+ force = 20
+ throwforce = 20
+ origin_tech = "materials=2;combat=4"
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+
+
/obj/item/weapon/kitchen/rollingpin
name = "rolling pin"
desc = "Used to knock out the Bartender."
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index d27084d1b23..d884853d8df 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -8,7 +8,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "riot"
slot_flags = SLOT_BACK
- force = 8
+ force = 10
throwforce = 5
throw_speed = 2
throw_range = 3
@@ -39,6 +39,15 @@
icon_state = "roman_shield"
item_state = "roman_shield"
+/obj/item/weapon/shield/riot/buckler
+ name = "wooden buckler"
+ desc = "A medieval wooden buckler."
+ icon_state = "buckler"
+ item_state = "buckler"
+ materials = list()
+ burn_state = FLAMMABLE
+ block_chance = 30
+
/obj/item/weapon/shield/energy
name = "energy combat shield"
desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index deabe13233d..e36882889e3 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -439,7 +439,7 @@
return
/obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle
- desc = "A large dufflebag containing a M90gl, a magazine, and a stimpack."
+ desc = "A large dufflebag containing an M90gl, a magazine, four additional grenades, and a pack of Syndicate cigarettes."
/obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle/New()
..()
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 5ef8feef8d0..7e53d4a443d 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -100,6 +100,7 @@
/obj/item/ammo_box,
/obj/item/weapon/reagent_containers/food/snacks/donut,
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
+ /obj/item/weapon/kitchen/knife/combat,
/obj/item/device/flashlight/seclite,
/obj/item/weapon/melee/classic_baton/telescopic
)
@@ -145,6 +146,14 @@
icon_state = "militarybelt"
item_state = "military"
+/obj/item/weapon/storage/belt/military/assault
+ name = "assault belt"
+ desc = "A tactical assault belt."
+ icon_state = "assaultbelt"
+ item_state = "security"
+ storage_slots = 6
+
+
/obj/item/weapon/storage/belt/wands
name = "wand belt"
desc = "A belt designed to hold various rods of power. A veritable fanny pack of exotic magic."
@@ -189,7 +198,7 @@
desc = "A bandolier for holding shotgun ammunition."
icon_state = "bandolier"
item_state = "bandolier"
- storage_slots = 6
+ storage_slots = 8
can_hold = list(
/obj/item/ammo_casing/shotgun
)
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 728d2a99ea1..af55712f0ae 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -13,17 +13,22 @@
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
burn_state = FLAMMABLE
burntime = 20
+ var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New()
/obj/item/weapon/storage/briefcase/New()
..()
- new /obj/item/weapon/paper(src)
- new /obj/item/weapon/paper(src)
- new /obj/item/weapon/paper(src)
- new /obj/item/weapon/paper(src)
- new /obj/item/weapon/paper(src)
- new /obj/item/weapon/paper(src)
new /obj/item/weapon/pen(src)
+ var/obj/item/weapon/folder/folder = new folder_path(src)
+ for(var/i in 1 to 6)
+ new /obj/item/weapon/paper(folder)
+/obj/item/weapon/storage/briefcase/lawyer
+ folder_path = /obj/item/weapon/folder/blue
+
+/obj/item/weapon/storage/briefcase/lawyer/New()
+ new /obj/item/weapon/stamp/law(src)
+ ..()
+
/obj/item/weapon/storage/briefcase/sniperbundle
name = "briefcase"
desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 2ccaa9071f0..6b2d688e5dd 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -240,3 +240,31 @@
new /obj/item/weapon/screwdriver/nuke(src)
new /obj/item/nuke_core_container(src)
new /obj/item/weapon/paper/nuke_instructions(src)
+
+
+/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade
+ name = "boxed virus grenade kit"
+
+/obj/item/weapon/storage/box/virus_kit/tuberculosisgrenade/New()
+ ..()
+ new /obj/item/weapon/grenade/chem_grenade/tuberculosis(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/syringe(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
+ return
+
+/obj/item/weapon/storage/box/syndie_kit/tuberculosiskit
+ name = "boxed virus kit"
+
+/obj/item/weapon/storage/box/virus_kit/tuberculosiskit/New()
+ ..()
+ new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis(src)
+ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/weapon/reagent_containers/syringe(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
+ return
+
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 586e3a47ddc..aa55051c783 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -14,7 +14,7 @@
name = "oxygen tank"
desc = "A tank of oxygen."
icon_state = "oxygen"
- distribute_pressure = 16
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
force = 10
@@ -156,7 +156,7 @@
slot_flags = SLOT_BELT
w_class = 2
force = 4
- distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index f3d5ead1b88..11770f8fcf1 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -1,7 +1,3 @@
-#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3)
-#define TANK_MIN_RELEASE_PRESSURE 0
-#define TANK_DEFAULT_RELEASE_PRESSURE (ONE_ATMOSPHERE*O2STANDARD)
-
/obj/item/weapon/tank
name = "tank"
icon = 'icons/obj/tank.dmi'
@@ -119,10 +115,10 @@
add_fingerprint(user)
ui_interact(user)
-/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "tanks", name, 525, 210, state = inventory_state)
+ ui = new(user, src, ui_key, "tanks", name, 400, 200, state = inventory_state)
ui.open()
/obj/item/weapon/tank/get_ui_data()
@@ -144,14 +140,12 @@
if(istype(location))
var/mask_check = 0
-
if(location.internal == src) // if tank is current internal
mask_check = 1
data["valveOpen"] = 1
else if(src in location) // or if tank is in the mobs possession
if(!location.internal) // and they do not have any active internals
mask_check = 1
-
if(mask_check)
if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS))
data["maskConnected"] = 1
@@ -163,7 +157,7 @@
switch(action)
if("pressure")
- switch(params["set"])
+ switch(params["pressure"])
if("custom")
var/custom = input(usr, "What rate do you set the regulator to? The dial reads from 0 to [TANK_MAX_RELEASE_PRESSURE].") as null|num
if(isnum(custom))
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1ab5437d9db..38a348bbfcb 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -214,7 +214,7 @@
return
user << "You begin cutting \the [src] apart..."
playsound(loc, cutting_sound, 40, 1)
- if(do_after(user,40/W.toolspeed,5,1, target = src))
+ if(do_after(user,40/W.toolspeed,1, target = src))
if( !opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
return
playsound(loc, cutting_sound, 50, 1)
@@ -234,7 +234,7 @@
if(WT.remove_fuel(0,user))
user << "You begin [welded ? "unwelding":"welding"] \the [src]..."
playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
- if(do_after(user,40,5,1, target = src))
+ if(do_after(user,40,1, target = src))
if(opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
return
playsound(loc, 'sound/items/welder.ogg', 50, 1)
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index b1802b6f7a6..019e596c5db 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -48,10 +48,10 @@
s.set_up(12, 1, src)
s.start()
if(buckled_mob)
- buckled_mob.burn_skin(85)
+ buckled_mob.electrocute_act(85, src, 1)
buckled_mob << "You feel a deep shock course through your body!"
sleep(1)
- buckled_mob.burn_skin(85)
+ buckled_mob.electrocute_act(85, src, 1)
visible_message("The electric chair went off!", "You hear a deep sharp shock!")
A.power_light = light
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index d9333d6e123..521d01bfbec 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -157,217 +157,3 @@
if(signs)
overlays += "cart_sign[signs]"
-
-//old style PIMP-CART
-/obj/structure/bed/chair/janicart
- name = "janicart"
- desc = "A brave janitor cyborg gave its life to produce such an amazing combination of speed and utility."
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "pussywagon"
- anchored = 0
- density = 1
- var/obj/item/weapon/storage/bag/trash/mybag = null
- var/callme = "pimpin' ride" //how do people refer to it?
- var/move_delay = 0
- var/floorbuffer = 0
- var/keytype = /obj/item/key/janitor
-
-/obj/structure/bed/chair/janicart/New()
- handle_rotation()
-
-/obj/structure/bed/chair/janicart/Move(a, b, flag)
- ..()
- if(floorbuffer)
- var/turf/tile = loc
- if(isturf(tile))
- tile.clean_blood()
- for(var/A in tile)
- if(istype(A, /obj/effect))
- if(is_cleanable(A))
- qdel(A)
-
-/obj/structure/bed/chair/janicart/examine(mob/user)
- ..()
- if(floorbuffer)
- user << "It has been upgraded with a floor buffer."
-
-
-/obj/structure/bed/chair/janicart/attackby(obj/item/I, mob/user, params)
- if(istype(I, keytype))
- user << "Hold [I] in one of your hands while you drive this [callme]."
- else if(istype(I, /obj/item/weapon/storage/bag/trash))
- if(keytype == /obj/item/key/janitor)
- if(!user.drop_item())
- return
- user << "You hook the trashbag onto the [callme]."
- I.loc = src
- mybag = I
- else if(istype(I, /obj/item/janiupgrade))
- if(keytype == /obj/item/key/janitor)
- floorbuffer = 1
- qdel(I)
- user << "You upgrade the [callme] with the floor buffer."
- update_icon()
-
-/obj/structure/bed/chair/janicart/update_icon()
- overlays.Cut()
- if(mybag)
- overlays += "cart_garbage"
- if(floorbuffer)
- overlays += "cart_buffer"
-
-/obj/structure/bed/chair/janicart/attack_hand(mob/user)
- if(..())
- return 1
- else if(mybag)
- mybag.loc = get_turf(user)
- user.put_in_hands(mybag)
- mybag = null
- update_icon()
-
-
-/obj/structure/bed/chair/janicart/relaymove(mob/user, direction)
- if(user.stat || user.stunned || user.weakened || user.paralysis)
- unbuckle_mob()
- if(istype(user.l_hand, keytype) || istype(user.r_hand, keytype))
- if(!Process_Spacemove(direction) || !has_gravity(src.loc) || move_delay || !isturf(loc))
- return
- step(src, direction)
- update_mob()
- handle_rotation()
- move_delay = 1
- spawn(2)
- move_delay = 0
- else
- user << "You'll need the keys in one of your hands to drive this [callme]."
-
-/obj/structure/bed/chair/janicart/user_buckle_mob(mob/living/M, mob/user)
- if(user.incapacitated()) //user can't move the mob on the janicart's turf if incapacitated
- return
- for(var/atom/movable/A in get_turf(src)) //we check for obstacles on the turf.
- if(A.density)
- if(A != src && A != M)
- return
- M.loc = loc //we move the mob on the janicart's turf before checking if we can buckle.
- ..()
- update_mob()
-
-/obj/structure/bed/chair/janicart/unbuckle_mob(force = 0)
- if(buckled_mob)
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 0
- . = ..()
-
-/obj/structure/bed/chair/janicart/handle_rotation()
- if((dir == SOUTH) || (dir == WEST) || (dir == EAST))
- layer = FLY_LAYER
- else
- layer = OBJ_LAYER
-
- if(buckled_mob)
- if(buckled_mob.loc != loc)
- buckled_mob.buckled = null //Temporary, so Move() succeeds.
- buckled_mob.buckled = src //Restoring
-
- update_mob()
-
-/obj/structure/bed/chair/janicart/Bump(atom/movable/M)
- . = ..()
- if(istype(M, /obj/machinery/door) && buckled_mob)
- M.Bumped(buckled_mob)
-
-/obj/structure/bed/chair/janicart/proc/update_mob()
- if(buckled_mob)
- buckled_mob.dir = dir
- switch(dir)
- if(SOUTH)
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 7
- if(WEST)
- buckled_mob.pixel_x = 12
- buckled_mob.pixel_y = 7
- if(NORTH)
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 4
- if(EAST)
- buckled_mob.pixel_x = -12
- buckled_mob.pixel_y = 7
-
-//keys+attachables//
-
-/obj/item/key
- name = "key"
- desc = "A small grey key."
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "key"
- w_class = 1
-
-/obj/item/key/janitor
- desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
- icon_state = "keyjanitor"
-
-/obj/item/key/security
- desc = "A keyring with a small steel key, and a rubber stun baton accessory."
- icon_state = "keysec"
-
-/obj/item/janiupgrade
- name = "floor buffer upgrade"
- desc = "An upgrade for mobile janicarts."
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "upgrade"
-
-//secway//
-
-/obj/structure/bed/chair/janicart/secway
- name = "secway"
- desc = "A brave security cyborg gave its life to help you look like a complete tool."
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "secway"
- callme = "secway"
- keytype = /obj/item/key/security
-
-/obj/structure/bed/chair/janicart/secway/update_mob()
- if(buckled_mob)
- buckled_mob.dir = dir
- buckled_mob.pixel_y = 4
-
-//atv//
-
-/obj/structure/bed/chair/janicart/atv
- name = "atv"
- desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "atv"
- callme = "All-terrain vehicle"
- keytype = /obj/item/key
- var/image/atvcover = null
-
-/obj/structure/bed/chair/janicart/atv/New()
- atvcover = image("icons/obj/vehicles.dmi", "atvcover")
- atvcover.layer = MOB_LAYER + 0.1
- return ..()
-
-obj/structure/bed/chair/janicart/atv/post_buckle_mob(mob/living/M)
- if(buckled_mob)
- overlays += atvcover
- else
- overlays -= atvcover
-
-/obj/structure/bed/chair/janicart/atv/update_mob()
- if(buckled_mob)
- buckled_mob.dir = dir
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 4
-
-/obj/structure/bed/chair/janicart/atv/handle_rotation()
- if(dir == SOUTH)
- layer = FLY_LAYER
- else
- layer = OBJ_LAYER
-
- if(buckled_mob)
- if(buckled_mob.loc != loc)
- buckled_mob.buckled = null //Temporary, so Move() succeeds.
- buckled_mob.buckled = src //Restoring
-
- update_mob()
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 14ad3320de6..a79e01c5011 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -74,6 +74,7 @@
m180.Turn(180)
animate(H, transform = m180, time = 3)
H.pixel_y = H.get_standard_pixel_y_offset(180)
+ qdel(G)
return
user << "You can't use that on the spike!"
return
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index 010200185ee..d10ffe89303 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -35,8 +35,11 @@
//for junctions, just swap the diagonals with each other
if(split_text.len == 3 && split_text[3] != "Pass")
split_text.Swap(2,3)
+ else if(length(split_text[1]) == 2 && length(split_text[2]) == 2) //diagonals
+ split_text[1] = copytext(split_text[1],1,2) + copytext(split_text[2],2,3)
+ split_text[2] = copytext(split_text[2],1,2) + ((copytext(split_text[2],2,3) == "E") ? "W" : "E")
//for curves, swap the diagonal direction that is not in the same axis as the cardinal direction
- else
+ else
if(split_text[1] == "N" || split_text[1] == "S")
split_text[2] = copytext(split_text[2],1,2) + ((copytext(split_text[2],2,3) == "E") ? "W" : "E")
else
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 365acba4a54..431057335d7 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -79,7 +79,7 @@
if(open)
GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie...")
swirlie = GM
- if(do_after(user, 30, 5, 0, target = src))
+ if(do_after(user, 30, 0, target = src))
GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.")
if(iscarbon(GM))
var/mob/living/carbon/C = GM
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index c39d15e7249..3a5e694d904 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -25,7 +25,6 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
thermal_conductivity = 0.040
heat_capacity = 10000
intact = 1
- var/lava = 0
var/broken = 0
var/burnt = 0
var/floor_tile = null //tile that this floor drops
@@ -82,8 +81,6 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
return
/turf/simulated/floor/proc/update_icon()
- if(lava)
- return 0
if(air)
update_visuals()
return 1
@@ -172,4 +169,4 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
ChangeTurf(/turf/simulated/floor/engine/cult)
/turf/simulated/floor/can_have_cabling()
- return !burnt & !broken & !lava
+ return !burnt & !broken
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 34c8ce714e0..af2e3206eac 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -27,7 +27,6 @@
flags = 0
var/image/obscured //camerachunks
-
/turf/New()
..()
for(var/atom/movable/AM in src)
diff --git a/code/hub.dm b/code/hub.dm
index 69b90bd6782..f0005818f18 100644
--- a/code/hub.dm
+++ b/code/hub.dm
@@ -1,7 +1,11 @@
/world
hub = "Exadv1.spacestation13"
+#ifdef PUTONHUB
+ hub_password = "kMZy3U5jJHSiBQjr"
+#else
hub_password = "SORRYNOPASSWORD"
+#endif
name = "/tg/ Station 13"
/*
@@ -13,4 +17,4 @@ If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstatio
hub_password = "kMZy3U5jJHSiBQjr"
name = "Space Station 13"
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5549ea52383..d5c56e5e5b0 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1,7 +1,5 @@
var/global/BSACooldown = 0
-var/global/floorIsLava = 0
-
////////////////////////////////
/proc/message_admins(msg)
@@ -147,8 +145,8 @@ var/global/floorIsLava = 0
body += "Coffee | "
//body += "Parrot | "
//body += "Poly | "
- body += "\[ Construct: Armored , "
- body += "Builder , "
+ body += "\[ Construct: Juggernaut , "
+ body += "Artificer , "
body += "Wraith \] "
body += "Shade"
body += " "
@@ -398,7 +396,10 @@ var/global/floorIsLava = 0
Create Mob
"}
- usr << browse(dat, "window=admin2;size=210x180")
+ if(marked_datum && istype(marked_datum, /atom))
+ dat += "Duplicate Marked Datum "
+
+ usr << browse(dat, "window=admin2;size=210x200")
return
/////////////////////////////////////////////////////////////////////////////////////////////////admins2.dm merge
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 654c04c8ffa..7c9dbc23474 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -60,7 +60,8 @@ var/list/admin_verbs_admin = list(
/client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/
/client/proc/cmd_admin_local_narrate, /*sends text to all mobs within view of atom*/
/client/proc/cmd_admin_create_centcom_report,
- /client/proc/toggle_antag_hud /*toggle display of the admin antag hud*/
+ /client/proc/toggle_antag_hud, /*toggle display of the admin antag hud*/
+ /client/proc/toggle_AI_interact /*toggle admin ability to interact with machines as an AI*/
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -366,6 +367,8 @@ var/list/admin_verbs_hideable = list(
if(holder)
holder.check_antagonists()
log_admin("[key_name(usr)] checked antagonists.") //for tsar~
+ if(!isobserver(usr))
+ message_admins("[key_name_admin(usr)] checked antagonists.")
feedback_add_details("admin_verb","CHA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -422,6 +425,9 @@ var/list/admin_verbs_hideable = list(
if(holder)
if(holder.fakekey)
holder.fakekey = null
+ mob.invisibility = initial(mob.invisibility)
+ mob.alpha = initial(mob.alpha)
+ mob.name = initial(mob.name)
else
var/new_key = ckeyEx(input("Enter your desired display name.", "Fake Key", key) as text|null)
if(!new_key) return
@@ -429,6 +435,9 @@ var/list/admin_verbs_hideable = list(
new_key = copytext(new_key, 1, 26)
holder.fakekey = new_key
createStealthKey()
+ mob.invisibility = INVISIBILITY_MAXIMUM + 1 //JUST IN CASE
+ mob.alpha = 0 //JUUUUST IN CASE
+ mob.name = " "
log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
feedback_add_details("admin_verb","SM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -638,3 +647,12 @@ var/list/admin_verbs_hideable = list(
testing("Spawned test mob with name \"[mob.name]\" at [tile.x],[tile.y],[tile.z]")
while (!area && --j > 0)
+
+/client/proc/toggle_AI_interact()
+ set name = "Toggle Admin AI Interact"
+ set category = "Admin"
+ set desc = "Allows you to interact with most machines as an AI would as a ghost"
+
+ AI_Interact = !AI_Interact
+ log_admin("[key_name(usr)] has [AI_Interact ? "activated" : "deactivated"] Admin AI Interact")
+ message_admins("[key_name_admin(usr)] has [AI_Interact ? "activated" : "deactivated"] their AI interaction")
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index d6408f0f6ad..a513fb346d9 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -389,62 +389,8 @@
L.fix()
if("floorlava")
- if(!check_rights(R_FUN))
- return
- if(floorIsLava)
- usr << "The floor is lava already."
- return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","LF")
-
- //Options
- var/length = input(usr, "How long will the lava last? (in seconds)", "Length", 180) as num
- length = min(abs(length), 1200)
-
- var/damage = input(usr, "How deadly will the lava be?", "Damage", 2) as num
- damage = min(abs(damage), 100)
-
- var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "YES!", "Nah")
- if(sure == "Nah")
- return
- floorIsLava = 1
-
- message_admins("[key_name_admin(usr)] made the floor LAVA! It'll last [length] seconds and it will deal [damage] damage to everyone.")
-
- for(var/turf/simulated/floor/F in world)
- if(F.z == ZLEVEL_STATION)
- F.name = "lava"
- F.desc = "The floor is LAVA!"
- F.overlays += "lava"
- F.lava = 1
-
- spawn(0)
- for(var/i = i, i < length, i++) // 180 = 3 minutes
- if(damage)
- for(var/mob/living/carbon/L in living_mob_list)
- if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?!
- var/turf/simulated/floor/F = L.loc
- if(F.lava)
- var/safe = 0
- for(var/obj/structure/O in F.contents)
- if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor!
- safe = 1
- break
- if(!safe)
- L.adjustFireLoss(damage)
-
-
- sleep(10)
-
- for(var/turf/simulated/floor/F in world) // Reset everything.
- if(F.z == ZLEVEL_STATION)
- F.name = initial(F.name)
- F.desc = initial(F.desc)
- F.overlays.Cut()
- F.lava = 0
- F.update_icon()
- floorIsLava = 0
- return
+ var/datum/weather/floor_is_lava/storm = new /datum/weather/floor_is_lava
+ storm.weather_start_up()
if("virus")
if(!check_rights(R_FUN))
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index b0d4ec4622c..8c42eb8261b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -46,7 +46,7 @@
message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create changelings.")
if("3")
- if(!src.makeRevs())
+ if(src.makeRevs())
message_admins("[key_name(usr)] started a revolution.")
log_admin("[key_name(usr)] started a revolution.")
else
@@ -239,6 +239,7 @@
message_admins("Ban process: A mob matching [playermob.ckey] was found at location [playermob.x], [playermob.y], [playermob.z]. Custom ip and computer id fields replaced with the ip and computer id from the located mob")
DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid )
+ add_note(banckey, banreason, null, usr.ckey, 0)
else if(href_list["editrights"])
edit_rights_topic(href_list)
@@ -1714,6 +1715,10 @@
if(!check_rights(R_SPAWN)) return
return create_mob(usr)
+ else if(href_list["dupe_marked_datum"])
+ if(!check_rights(R_SPAWN)) return
+ return DuplicateObject(marked_datum, perfectcopy=1, newloc=get_turf(usr))
+
else if(href_list["object_list"]) //this is the laggiest thing ever
if(!check_rights(R_SPAWN)) return
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 18c0b2a4b8d..aabbbf8f3f0 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -114,12 +114,14 @@
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_REV in applicant.client.prefs.be_special)
if(applicant.stat == CONSCIOUS)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(T.z == ZLEVEL_STATION)
+ if(applicant.mind)
+ if(!applicant.mind.special_role)
+ if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numRevs = min(candidates.len, 3)
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index d856e5b8577..88cd7f16394 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -10,20 +10,8 @@
ticker.mode.traitors += H.mind
H.mind.special_role = "traitor"
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = H.mind
- steal_objective.set_target(new /datum/objective_item/steal/nukedisc)
- H.mind.objectives += steal_objective
-
- var/datum/objective/hijack/hijack_objective = new
- hijack_objective.owner = H.mind
- H.mind.objectives += hijack_objective
-
- H << "You are the traitor."
- var/obj_count = 1
- for(var/datum/objective/OBJ in H.mind.objectives)
- H << "Objective #[obj_count]: [OBJ.explanation_text]"
- obj_count++
+ add_objective(H.mind, /datum/objective/default/steal)
+ add_objective(H.mind, /datum/objective/escape_obj/hijack, 1)
for (var/obj/item/I in H)
if (istype(I, /obj/item/weapon/implant))
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index bf87018e786..c7a1bb0ebc5 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -32,6 +32,7 @@
var/death = TRUE
var/flavour_text = "The mapper forgot to set this!"
var/faction = null
+ var/list/implants = list()
density = 1
/obj/effect/landmark/corpse/initialize()
@@ -105,6 +106,11 @@
W.registered_name = M.real_name
W.update_label()
M.equip_to_slot_or_del(W, slot_wear_id)
+
+ for(var/I in implants)
+ var/obj/item/weapon/implant/X = new I
+ X.implant(M)
+
if(ckey)
M.ckey = ckey
M << "[flavour_text]"
@@ -270,7 +276,7 @@
-/////////////////Officers//////////////////////
+/////////////////Officers+Nanotrasen Security//////////////////////
/obj/effect/landmark/corpse/bridgeofficer
name = "Bridge Officer"
@@ -298,6 +304,21 @@
corpseidjob = "Commander"
corpseidaccess = "Captain"
+/obj/effect/landmark/corpse/nanotrasensoldier
+ name = "Nanotrasen Private Security Officer"
+ corpseuniform = /obj/item/clothing/under/rank/security
+ corpsesuit = /obj/item/clothing/suit/armor/vest
+ corpseshoes = /obj/item/clothing/shoes/combat
+ corpsegloves = /obj/item/clothing/gloves/combat
+ corpseradio = /obj/item/device/radio/headset
+ corpsemask = /obj/item/clothing/mask/gas/sechailer/swat
+ corpsehelmet = /obj/item/clothing/head/helmet/swat/nanotrasen
+ corpseback = /obj/item/weapon/storage/backpack/security
+ corpseid = 1
+ corpseidjob = "Private Security Force"
+ corpseidaccess = "Security Officer"
+
+
/obj/effect/landmark/corpse/commander/alive
death = FALSE
roundstart = FALSE
@@ -343,3 +364,11 @@
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
flavour_text = "By unknown powers, your rotting remains have been resurrected! Walk this mortal plain and terrorize all living adventurers who dare cross your path."
+
+
+/obj/effect/landmark/corpse/abductor
+ name = "abductor"
+ mobname = "???"
+ mob_species = /datum/species/abductor
+ corpseuniform = /obj/item/clothing/under/color/grey
+ corpseshoes = /obj/item/clothing/shoes/combat
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 5b43288d109..d6d72ba061f 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -1,31 +1,31 @@
//Academy Areas
/area/awaymission/academy
- name = "\improper Academy Asteroids"
+ name = "Academy Asteroids"
icon_state = "away"
/area/awaymission/academy/headmaster
- name = "\improper Academy Fore Block"
+ name = "Academy Fore Block"
icon_state = "away1"
/area/awaymission/academy/classrooms
- name = "\improper Academy Classroom Block"
+ name = "Academy Classroom Block"
icon_state = "away2"
/area/awaymission/academy/academyaft
- name = "\improper Academy Ship Aft Block"
+ name = "Academy Ship Aft Block"
icon_state = "away3"
/area/awaymission/academy/academygate
- name = "\improper Academy Gateway"
+ name = "Academy Gateway"
icon_state = "away4"
/area/awaymission/academy/academycellar
- name = "\improper Academy Cellar"
+ name = "Academy Cellar"
icon_state = "away4"
/area/awaymission/academy/academyengine
- name = "\improper Academy Engine"
+ name = "Academy Engine"
icon_state = "away4"
//Academy Items
@@ -102,7 +102,7 @@
/obj/structure/academy_wizard_spawner/proc/summon_wizard()
var/turf/T = src.loc
-
+
var/mob/living/carbon/human/wizbody = new(T)
wizbody.equipOutfit(/datum/outfit/wizard/academy)
var/obj/item/weapon/implant/exile/Implant = new/obj/item/weapon/implant/exile(wizbody)
@@ -110,7 +110,7 @@
wizbody.faction |= "wizard"
wizbody.real_name = "Academy Teacher"
wizbody.name = "Academy Teacher"
-
+
var/datum/mind/wizmind = new /datum/mind()
wizmind.name = "Wizard Defender"
wizmind.special_role = "Academy Defender"
@@ -118,13 +118,13 @@
wizmind.objectives += O
wizmind.transfer_to(wizbody)
ticker.mode.wizards |= wizmind
-
+
wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt)
wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile)
wizmind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball)
current_wizard = wizbody
-
+
give_control()
/obj/structure/academy_wizard_spawner/proc/update_status()
diff --git a/code/modules/awaymissions/mission_code/blackmarketpackers.dm b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
index b6496fe4718..1b6ffd1d0bf 100644
--- a/code/modules/awaymissions/mission_code/blackmarketpackers.dm
+++ b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
@@ -1,22 +1,22 @@
//Packer Ship Areas
/area/awaymission/BMPship
- name = "\improper BMP Asteroids"
+ name = "BMP Asteroids"
icon_state = "away"
luminosity = 0
/area/awaymission/BMPship/Aft
- name = "\improper Aft Block"
+ name = "Aft Block"
icon_state = "away1"
requires_power = 1
/area/awaymission/BMPship/Midship
- name = "\improper Midship Block"
+ name = "Midship Block"
icon_state = "away2"
requires_power = 1
/area/awaymission/BMPship/Fore
- name = "\improper Fore Block"
+ name = "Fore Block"
icon_state = "away3"
requires_power = 1
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index 1625b3da847..724dcf434e3 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -5,7 +5,7 @@
icon_state = "away"
/area/awaymission/challenge/main
- name = "\improper Danger Room"
+ name = "Danger Room"
icon_state = "away1"
requires_power = 0
diff --git a/code/modules/awaymissions/mission_code/researchbase.dm b/code/modules/awaymissions/mission_code/researchbase.dm
new file mode 100644
index 00000000000..0149a5cdf08
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/researchbase.dm
@@ -0,0 +1,64 @@
+//Research Base Areas//--
+
+/area/awaymission/research
+ name = "Research Outpost"
+ icon_state = "away"
+ luminosity = 0
+ lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/research/interior
+ name = "Research Inside"
+ requires_power = 1
+ icon_state = "away2"
+
+/area/awaymission/research/interior/cryo
+ name = "Research Cryostasis Room"
+ icon_state = "medbay"
+
+/area/awaymission/research/interior/clonestorage
+ name = "Research Clone Storage"
+ icon_state = "cloning"
+
+/area/awaymission/research/interior/genetics
+ name = "Research Genetics Research"
+ icon_state = "genetics"
+
+/area/awaymission/research/interior/engineering
+ name = "Research Engineering"
+ icon_state = "engine"
+
+/area/awaymission/research/interior/security
+ name = "Research Security"
+ icon_state = "security"
+
+/area/awaymission/research/interior/secure
+ name = "Research Secure Vault"
+
+/area/awaymission/research/interior/maint
+ name = "Research Maintenance"
+ icon_state = "maintcentral"
+
+/area/awaymission/research/interior/dorm
+ name = "Research Dorms"
+ icon_state = "Sleep"
+
+/area/awaymission/research/interior/escapepods
+ name = "Research Escape Wing"
+ icon_state = "exit"
+
+/area/awaymission/research/interior/gateway
+ name = "Research Gateway"
+ icon_state = "start"
+
+/area/awaymission/research/interior/bathroom
+ name = "Research Bathrooms"
+ icon_state = "restrooms"
+
+/area/awaymission/research/interior/medbay
+ name = "Research Medbay"
+ icon_state = "medbay"
+
+/area/awaymission/research/exterior
+ name = "Research Exterior"
+ icon_state = "unknown"
+
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index bbf5856959f..eeca2c33add 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -1,37 +1,37 @@
//Snow Valley Areas//--
/area/awaymission/snowdin
- name = "\improper Snowdin Tundra Plains"
+ name = "Snowdin Tundra Plains"
icon_state = "away"
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/snowdin/post
- name = "\improper Snowdin Outpost"
+ name = "Snowdin Outpost"
requires_power = 1
/area/awaymission/snowdin/igloo
- name = "\improper Snowdin Igloos"
+ name = "Snowdin Igloos"
icon_state = "away2"
/area/awaymission/snowdin/cave
- name = "\improper Snowdin Caves"
+ name = "Snowdin Caves"
icon_state = "away2"
luminosity = 0
/area/awaymission/snowdin/base
- name = "\improper Snowdin Main Base"
+ name = "Snowdin Main Base"
icon_state = "away3"
requires_power = 1
/area/awaymission/snowdin/dungeon1
- name = "\improper Snowdin Depths"
+ name = "Snowdin Depths"
icon_state = "away2"
luminosity = 0
/area/awaymission/snowdin/sekret
- name = "\improper Snowdin Operations"
+ name = "Snowdin Operations"
icon_state = "away3"
requires_power = 1
@@ -237,6 +237,7 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
icon_state = "sleeper"
roundstart = FALSE
death = FALSE
+ implants = list(/obj/item/weapon/implant/exile)
faction = "syndicate"
flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record infomation. All intruders should be
disposed of swirfly to assure no gathered infomation is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."}
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index 9b9a70d220a..b8906c8011d 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -1,33 +1,33 @@
//Spacebattle Areas
/area/awaymission/spacebattle
- name = "\improper Space Battle"
+ name = "Space Battle"
icon_state = "away"
requires_power = 0
/area/awaymission/spacebattle/cruiser
- name = "\improper Nanotrasen Cruiser"
+ name = "Nanotrasen Cruiser"
/area/awaymission/spacebattle/syndicate1
- name = "\improper Syndicate Assault Ship 1"
+ name = "Syndicate Assault Ship 1"
/area/awaymission/spacebattle/syndicate2
- name = "\improper Syndicate Assault Ship 2"
+ name = "Syndicate Assault Ship 2"
/area/awaymission/spacebattle/syndicate3
- name = "\improper Syndicate Assault Ship 3"
+ name = "Syndicate Assault Ship 3"
/area/awaymission/spacebattle/syndicate4
- name = "\improper Syndicate War Sphere 1"
+ name = "Syndicate War Sphere 1"
/area/awaymission/spacebattle/syndicate5
- name = "\improper Syndicate War Sphere 2"
+ name = "Syndicate War Sphere 2"
/area/awaymission/spacebattle/syndicate6
- name = "\improper Syndicate War Sphere 3"
+ name = "Syndicate War Sphere 3"
/area/awaymission/spacebattle/syndicate7
- name = "\improper Syndicate Fighter"
+ name = "Syndicate Fighter"
/area/awaymission/spacebattle/secret
- name = "\improper Hidden Chamber"
\ No newline at end of file
+ name = "Hidden Chamber"
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 6b87a8c3beb..7a4bcc86671 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -7,30 +7,30 @@
//Wild West Areas
/area/awaymission/wwmines
- name = "\improper Wild West Mines"
+ name = "Wild West Mines"
icon_state = "away1"
luminosity = 1
requires_power = 0
/area/awaymission/wwgov
- name = "\improper Wild West Mansion"
+ name = "Wild West Mansion"
icon_state = "away2"
luminosity = 1
requires_power = 0
/area/awaymission/wwrefine
- name = "\improper Wild West Refinery"
+ name = "Wild West Refinery"
icon_state = "away3"
luminosity = 1
requires_power = 0
/area/awaymission/wwvault
- name = "\improper Wild West Vault"
+ name = "Wild West Vault"
icon_state = "away3"
luminosity = 0
/area/awaymission/wwvaultdoors
- name = "\improper Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
+ name = "Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
icon_state = "away2"
requires_power = 0
luminosity = 0
@@ -96,14 +96,8 @@
user << "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart."
ticker.mode.traitors += user.mind
user.mind.special_role = "traitor"
- var/datum/objective/hijack/hijack = new
- hijack.owner = user.mind
- user.mind.objectives += hijack
+ add_objective(user.mind, /datum/objective/escape_obj/hijack, 1)
user << "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!"
- var/obj_count = 1
- for(var/datum/objective/OBJ in user.mind.objectives)
- user << "Objective #[obj_count]: [OBJ.explanation_text]"
- obj_count++
user.set_species(/datum/species/shadow)
if("Peace")
user << "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence."
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 807c8f1a291..4219bafe595 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -1,38 +1,21 @@
+#define RANDOM_UPPER_X 220
+#define RANDOM_UPPER_Y 220
+
+#define RANDOM_LOWER_X 30
+#define RANDOM_LOWER_Y 30
+
+
+var/global/list/potentialRandomZlevels = generateMapList(filename = "config/awaymissionconfig.txt")
+
+var/global/list/potentialLavaRuins = generateMapList(filename = "config/lavaRuinConfig.txt")
+
+var/global/list/potentialSpaceRuins = generateMapList(filename = "config/spaceRuinConfig.txt")
+
/proc/createRandomZlevel()
if(awaydestinations.len) //crude, but it saves another var!
return
- var/list/potentialRandomZlevels = list()
- world << "Searching for away missions..."
- var/list/Lines = file2list("config/awaymissionconfig.txt")
- if(!Lines.len) return
- for (var/t in Lines)
- if (!t)
- continue
-
- t = trim(t)
- if (length(t) == 0)
- continue
- else if (copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name = null
- // var/value = null
-
- if (pos)
- name = lowertext(copytext(t, 1, pos))
- // value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if (!name)
- continue
-
- potentialRandomZlevels.Add(t)
-
-
- if(potentialRandomZlevels.len)
+ if(potentialRandomZlevels && potentialRandomZlevels.len)
world << "Loading away mission..."
var/map = pick(potentialRandomZlevels)
@@ -53,4 +36,98 @@
else
world << "No away missions found."
- return
\ No newline at end of file
+ return
+
+
+/proc/generateMapList(filename)
+ var/list/potentialMaps = list()
+ var/list/Lines = file2list(filename)
+ if(!Lines.len) return
+ for (var/t in Lines)
+ if (!t)
+ continue
+
+ t = trim(t)
+ if (length(t) == 0)
+ continue
+ else if (copytext(t, 1, 2) == "#")
+ continue
+
+ var/pos = findtext(t, " ")
+ var/name = null
+
+ if (pos)
+ name = lowertext(copytext(t, 1, pos))
+
+ else
+ name = lowertext(t)
+
+ if (!name)
+ continue
+
+ potentialMaps.Add(t)
+
+ return potentialMaps
+
+
+/proc/seedRuins(z_level = 1, ruin_number = 0, whitelist = /area/space, list/potentialRuins = potentialSpaceRuins)
+ ruin_number = min(ruin_number, potentialRuins.len)
+
+ while(ruin_number)
+ var/sanity = 0
+ var/valid = FALSE
+ while(!valid)
+ valid = TRUE
+ sanity++
+ if(sanity > 100)
+ ruin_number--
+ break
+ var/turf/T = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), z_level)
+
+ for(var/turf/check in range(T, 15))
+ var/area/new_area = get_area(check)
+ if(!(istype(new_area, whitelist)))
+ valid = FALSE
+ break
+
+
+ if(valid)
+ world.log << "Ruins marker placed at [T.x][T.y][T.z]"
+ var/obj/effect/ruin_loader/R = new /obj/effect/ruin_loader(T)
+ R.Load(potentialRuins, -15, -15)
+ ruin_number --
+
+ return
+
+
+/obj/effect/ruin_loader
+ name = "random ruin"
+ icon = 'icons/obj/weapons.dmi'
+ icon_state = "syndballoon"
+ invisibility = 0
+
+/obj/effect/ruin_loader/proc/Load(list/potentialRuins = potentialSpaceRuins, x_offset = 0, y_offset = 0)
+ if(potentialRuins.len)
+ world << "Loading ruins..."
+
+ var/map = pick(potentialRuins)
+ var/file = file(map)
+ if(isfile(file))
+ maploader.load_map(file, src.x + x_offset, src.y + y_offset, src.z)
+ world.log << "[map] loaded at at [src.x + x_offset],[src.y + y_offset],[src.z]"
+ potentialRuins -= map //Don't want to load the same one twice
+ world << "Ruins loaded."
+
+ else
+ world << "No ruins found."
+ return
+
+ qdel(src)
+
+
+
+#undef RANDOM_UPPER_X
+#undef RANDOM_UPPER_Y
+
+#undef RANDOM_LOWER_X
+#undef RANDOM_LOWER_Y
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 66384199db2..6e73a0bfd97 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -173,10 +173,10 @@ You can set verify to TRUE if you want send() to sleep until the client has the
//DEFINITIONS FOR ASSET DATUMS START HERE.
-/datum/asset/simple/nanoui
+/datum/asset/simple/tgui
assets = list(
- "nanoui.css" = 'nano/assets/nanoui.css',
- "nanoui.js" = 'nano/assets/nanoui.js'
+ "tgui.css" = 'tgui/assets/tgui.css',
+ "tgui.js" = 'tgui/assets/tgui.js'
)
/datum/asset/simple/pda
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index e5b4a1d2895..ad9ea063694 100644
--- a/code/modules/client/client defines.dm
+++ b/code/modules/client/client defines.dm
@@ -5,6 +5,7 @@
////////////////
var/datum/admins/holder = null
var/buildmode = 0
+ var/AI_Interact = 0
var/jobbancache = null //Used to cache this client's jobbans to save on DB queries
var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ca7deaef336..b26f8fd1cfc 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -27,7 +27,7 @@ var/list/preferences_datums = list()
var/UI_style = "Midnight"
- var/nanoui_fancy = TRUE
+ var/tgui_fancy = TRUE
var/toggles = TOGGLES_DEFAULT
var/chat_toggles = TOGGLES_DEFAULT_CHAT
var/ghost_form = "ghost"
@@ -325,7 +325,7 @@ var/list/preferences_datums = list()
dat += "
"
dat += "
General Settings
"
dat += "UI Style:[UI_style] "
- dat += "Fancy NanoUI:[(nanoui_fancy) ? "Yes" : "No"] "
+ dat += "tgui Style:[(tgui_fancy) ? "Fancy" : "No Frills"] "
dat += "Play admin midis:[(toggles & SOUND_MIDI) ? "Yes" : "No"] "
dat += "Play lobby music:[(toggles & SOUND_LOBBY) ? "Yes" : "No"] "
dat += "Ghost ears:[(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] "
@@ -721,7 +721,7 @@ var/list/preferences_datums = list()
if("undershirt")
undershirt = random_undershirt(gender)
if("socks")
- socks = random_socks(gender)
+ socks = random_socks()
if("eyes")
eye_color = random_eye_color()
if("s_tone")
@@ -834,10 +834,7 @@ var/list/preferences_datums = list()
if("socks")
var/new_socks
- if(gender == MALE)
- new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_m
- else
- new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_f
+ new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_list
if(new_socks)
socks = new_socks
@@ -1001,7 +998,7 @@ var/list/preferences_datums = list()
gender = MALE
underwear = random_underwear(gender)
undershirt = random_undershirt(gender)
- socks = random_socks(gender)
+ socks = random_socks()
facial_hair_style = random_facial_hair_style(gender)
hair_style = random_hair_style(gender)
@@ -1018,8 +1015,8 @@ var/list/preferences_datums = list()
else
UI_style = "Midnight"
- if("nanoui")
- nanoui_fancy = !nanoui_fancy
+ if("tgui_fancy")
+ tgui_fancy = !tgui_fancy
if("hear_adminhelps")
toggles ^= SOUND_ADMINHELP
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 53c66f1f520..b53b52e06e1 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -102,7 +102,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(current_version < 12)
ignoring = list()
-
//should this proc get fairly long (say 3 versions long),
//just increase SAVEFILE_VERSION_MIN so it's not as far behind
//SAVEFILE_VERSION_MAX and then delete any obsolete if clauses
@@ -165,14 +164,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["ooccolor"] >> ooccolor
S["lastchangelog"] >> lastchangelog
S["UI_style"] >> UI_style
- S["nanoui_fancy"] >> nanoui_fancy
- S["be_special"] >> be_special
+ S["tgui_fancy"] >> tgui_fancy
if(islist(S["be_special"]))
- S["be_special"] >> be_special
+ S["be_special"] >> be_special
else //force update and store the old bitflag version of be_special
needs_update = 11
- S["be_special"] >> old_be_special
+ S["be_special"] >> old_be_special
S["default_slot"] >> default_slot
S["chat_toggles"] >> chat_toggles
@@ -193,7 +191,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor)))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
UI_style = sanitize_inlist(UI_style, list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative"), initial(UI_style))
- nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
+ tgui_fancy = sanitize_integer(tgui_fancy, 0, 1, initial(tgui_fancy))
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
ghost_form = sanitize_inlist(ghost_form, ghost_forms, initial(ghost_form))
@@ -213,7 +211,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["ooccolor"] << ooccolor
S["lastchangelog"] << lastchangelog
S["UI_style"] << UI_style
- S["nanoui_fancy"] << nanoui_fancy
+ S["tgui_fancy"] << tgui_fancy
S["be_special"] << be_special
S["default_slot"] << default_slot
S["toggles"] << toggles
@@ -323,14 +321,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list)
underwear = sanitize_inlist(underwear, underwear_m)
undershirt = sanitize_inlist(undershirt, undershirt_m)
- socks = sanitize_inlist(socks, socks_m)
else
hair_style = sanitize_inlist(hair_style, hair_styles_female_list)
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list)
underwear = sanitize_inlist(underwear, underwear_f)
undershirt = sanitize_inlist(undershirt, undershirt_f)
- socks = sanitize_inlist(socks, socks_f)
-
+ socks = sanitize_inlist(socks, socks_list)
age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
hair_color = sanitize_hexcolor(hair_color, 3, 0)
facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 1fe7e79d754..d2fd8ff78c2 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -93,7 +93,7 @@
desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
icon_state = "swatsyndie"
item_state = "swatsyndie"
- armor = list(melee = 40, bullet = 30, laser = 25,energy = 25, bomb = 50, bio = 10, rad = 0)
+ armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 66729755e1e..bf565cd3664 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -3,6 +3,7 @@
Contains:
- Captain's spacesuit
- Death squad's hardsuit
+ - SWAT suit
- Officer's beret/spacesuit
- NASA Voidsuit
- Father Christmas' magical clothes
@@ -53,13 +54,23 @@ Contains:
desc = "A heavily armored, advanced space suit that protects against most forms of damage."
icon_state = "deathsquad"
item_state = "swat_suit"
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat)
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
unacidable = 1
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/deathsquad
+ //NEW SWAT suit
+/obj/item/clothing/suit/space/swat
+ name = "SWAT armor"
+ desc = "Space-proof tactical SWAT armor."
+ icon_state = "heavy"
+ item_state = "swat_suit"
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat)
+ armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20)
+ strip_delay = 120
+
/obj/item/clothing/head/helmet/space/beret
name = "officer's beret"
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 40d77f12752..89c27f94d13 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/suit/armor
- allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic)
+ allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/weapon/kitchen/knife/combat)
body_parts_covered = CHEST
cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
@@ -118,7 +118,7 @@
name = "armor"
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
- allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+ allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic)
burn_state = FLAMMABLE
@@ -304,4 +304,4 @@
name = "crusader armour"
desc = "God wills it!"
icon_state = "knight_templar"
- item_state = "knight_templar"
\ No newline at end of file
+ item_state = "knight_templar"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index d63c5c43a70..dd112de5f44 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -81,7 +81,7 @@
item_state = "det_suit"
blood_overlay_type = "coat"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+ allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic)
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 5e03c3db4e4..1b242b34cfa 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -283,9 +283,11 @@
result = /obj/item/clothing/head/lizard
time = 20
reqs = list(/obj/item/organ/severedtail = 1)
+ category = CAT_MISC
/datum/table_recipe/lizardhat_alternate
name = "Lizard Cloche Hat"
result = /obj/item/clothing/head/lizard
time = 20
reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1)
+ category = CAT_MISC
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 499306b617a..3eaf7e3c0c7 100644
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -4,7 +4,7 @@
weight = 5
max_occurrences = 1
- earliest_start = 180000 // 30 min
+ earliest_start = 18000 // 30 min
gamemode_blacklist = list("nuclear","wizard","revolution","abduction")
diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm
new file mode 100644
index 00000000000..8e60fce2208
--- /dev/null
+++ b/code/modules/events/wizard/advanced_darkness.dm
@@ -0,0 +1,14 @@
+/datum/round_event_control/wizard/darkness
+ name = "Advanced Darkness"
+ weight = 2
+ typepath = /datum/round_event/wizard/darkness
+ max_occurrences = 2
+ earliest_start = 0
+
+/datum/round_event/wizard/darkness
+ endWhen = 0
+
+/datum/round_event/wizard/darkness/start()
+ var/datum/weather/advanced_darkness/darkness = new
+ darkness.weather_start_up()
+ return
diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm
index ec6f4fa06c5..c260a51251c 100644
--- a/code/modules/events/wizard/imposter.dm
+++ b/code/modules/events/wizard/imposter.dm
@@ -38,11 +38,9 @@
ticker.mode.apprentices += I.mind
I.mind.special_role = "imposter"
- var/datum/objective/protect/protect_objective = new /datum/objective/protect
- protect_objective.owner = I.mind
+ var/datum/objective/protect_objective = add_objective(I.mind, /datum/objective/default/protect)
protect_objective.target = W.mind
protect_objective.explanation_text = "Protect [W.real_name], the wizard."
- I.mind.objectives += protect_objective
ticker.mode.update_wiz_icons_added(I.mind)
I.attack_log += "\[[time_stamp()]\] Is an imposter!"
diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm
index 23d9afeeff3..fe6044182dd 100644
--- a/code/modules/events/wizard/lava.dm
+++ b/code/modules/events/wizard/lava.dm
@@ -6,37 +6,9 @@
earliest_start = 0
/datum/round_event/wizard/lava/
-
- endWhen = 30 //half a minutes
+ endWhen = 0
/datum/round_event/wizard/lava/start()
-
- for(var/turf/simulated/floor/F in world)
- if(F.z == ZLEVEL_STATION)
- F.name = "lava"
- F.desc = "The floor is LAVA!"
- F.overlays += "lava"
- F.lava = 1
-
-/datum/round_event/wizard/lava/tick()
-
- for(var/mob/living/carbon/L in living_mob_list)
- if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?!
- var/turf/simulated/floor/F = L.loc
- if(F.lava)
- var/safe = 0
- for(var/obj/structure/O in F.contents)
- if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor!
- safe = 1
- if(!safe)
- L.adjustFireLoss(3)
-
-/datum/round_event/wizard/lava/end()
-
- for(var/turf/simulated/floor/F in world) // Reset everything.
- if(F.z == ZLEVEL_STATION)
- F.name = initial(F.name)
- F.desc = initial(F.desc)
- F.overlays.Cut()
- F.lava = 0
- F.update_icon()
\ No newline at end of file
+ var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava
+ LAVA.weather_start_up()
+ return
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 49027281407..1c3365cd59a 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -281,29 +281,31 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/delusion
var/list/image/delusions = list()
-/obj/effect/hallucination/delusion/New(loc,var/mob/living/carbon/T)
+/obj/effect/hallucination/delusion/New(loc,mob/living/carbon/T,force_kind = null , duration = 300,skip_nearby = 1)
target = T
var/image/A = null
- var/kind = rand(1,3)
+ var/kind = force_kind ? force_kind : pick("clown","corgi","carp","skeleton","demon")
for(var/mob/living/carbon/human/H in living_mob_list)
if(H == target)
continue
- if(H in view(target))
+ if(skip_nearby && (H in view(target)))
continue
switch(kind)
- if(1)//Clown
+ if("clown")//Clown
A = image('icons/mob/animal.dmi',H,"clown")
- if(2)//Carp
+ if("carp")//Carp
A = image('icons/mob/animal.dmi',H,"carp")
- if(3)//Corgi
+ if("corgi")//Corgi
A = image('icons/mob/pets.dmi',H,"corgi")
- if(4)//Skeletons
+ if("skeleton")//Skeletons
A = image('icons/mob/human.dmi',H,"skeleton_s")
+ if("demon")//Demon
+ A = image('icons/mob/mob.dmi',H,"daemon")
A.override = 1
if(target.client)
delusions |= A
target.client.images |= A
- sleep(300)
+ sleep(duration)
for(var/image/I in delusions)
if(target.client)
target.client.images.Remove(I)
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 69cbccb4d99..b9f6cc3fbd3 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -8,7 +8,7 @@
icon_state = null
flags = OPENCONTAINER
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
- possible_transfer_amounts = list(5,10,25)
+ possible_transfer_amounts = list(5,10,15,20,25,30,50)
volume = 50
burn_state = FIRE_PROOF
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index e97d65fdea7..9b9bccc986e 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -7,6 +7,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle
amount_per_transfer_from_this = 10
volume = 100
+ throwforce = 15
item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
diff --git a/code/modules/html_interface/html_interface.dm b/code/modules/html_interface/html_interface.dm
index 38fb620fddb..66ced5276c6 100644
--- a/code/modules/html_interface/html_interface.dm
+++ b/code/modules/html_interface/html_interface.dm
@@ -221,7 +221,7 @@ mob/verb/test()
hclient = getClient(hclient, TRUE)
if (istype(hclient))
- if (type in asset_list && islist(asset_list[type]))
+ if ((type in asset_list) && islist(asset_list[type]))
send_asset_list(hclient.client, asset_list[type], TRUE)
if (!winexists(hclient.client, "browser_\ref[src]"))
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index a14996e18b9..aa59022f094 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -174,7 +174,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
var/checkoutperiod = 5 // In minutes
var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive
var/list/libcomp_menu
- var/page = 1 //current page of the external archives
+ var/page = 1 //current page of the external archives
var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl
/obj/machinery/computer/libraryconsole/bookmanagement/proc/build_library_menu()
@@ -184,7 +184,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
if(!cachedbooks)
return
libcomp_menu = list("")
-
+
for(var/i in 1 to cachedbooks.len)
var/datum/cachedbook/C = cachedbooks[i]
var/page = round(i/250)+1
@@ -434,7 +434,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
B.title = title
B.author = author
B.dat = content
- B.icon_state = "book[rand(1,7)]"
+ B.icon_state = "book[rand(1,8)]"
src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
break
src.add_fingerprint(usr)
diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm
index 16c3dee6ac9..56514b6113d 100644
--- a/code/modules/library/random_books.dm
+++ b/code/modules/library/random_books.dm
@@ -39,7 +39,7 @@
B.title = query.item[3]
B.dat = query.item[4]
B.name = "Book: [B.title]"
- B.icon_state= "book[rand(1,7)]"
+ B.icon_state= "book[rand(1,8)]"
else
log_game("SQL ERROR populating library bookshelf. Category: \[[category]\], Count: [book_count], Error: \[[query.ErrorMsg()]\]\n")
update_icon()
diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm
index 9b67f630def..7367f760a0b 100644
--- a/code/modules/lighting/lighting_system.dm
+++ b/code/modules/lighting/lighting_system.dm
@@ -131,7 +131,7 @@
if(AM.opacity)
range = 0
break
-
+
owner.luminosity = range
if (!range)
return 0
diff --git a/code/modules/mining/lavaland/lavaland_areas.dm b/code/modules/mining/lavaland/lavaland_areas.dm
new file mode 100644
index 00000000000..e3fa70aa43d
--- /dev/null
+++ b/code/modules/mining/lavaland/lavaland_areas.dm
@@ -0,0 +1,28 @@
+/**********************Lavaland Areas**************************/
+
+/area/lavaland
+ icon_state = "mining"
+ has_gravity = 1
+
+/area/lavaland/surface
+ name = "Lavaland"
+ icon_state = "explored"
+ music = null
+ requires_power = 1
+ ambientsounds = list('sound/ambience/ambimine.ogg')
+
+/area/lavaland/underground
+ name = "Lavaland Caves"
+ icon_state = "unexplored"
+ music = null
+ always_unpowered = 1
+ requires_power = 1
+ poweralm = 0
+ power_environ = 0
+ power_equip = 0
+ power_light = 0
+ ambientsounds = list('sound/ambience/ambimine.ogg')
+
+
+/area/lavaland/surface/outdoors
+ name = "Lavaland Wastes"
diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm
new file mode 100644
index 00000000000..2d24616df50
--- /dev/null
+++ b/code/modules/mining/lavaland/weather.dm
@@ -0,0 +1,100 @@
+#define STARTUP_STAGE 1
+#define MAIN_STAGE 2
+#define WIND_DOWN_STAGE 3
+#define END_STAGE 4
+
+/datum/weather
+ var/name = "storm"
+ var/start_up_time = 300 //30 seconds
+ var/start_up_message = "The wind begins to pick up."
+ var/duration = 120 //2 minutes
+ var/duration_lower = 120
+ var/duration_upper = 120
+ var/duration_message = "A storm has started!"
+ var/wind_down = 300 // 30 seconds
+ var/wind_down_message = "The storm is passing."
+
+ var/target_z = 1
+ var/exclude_walls = TRUE
+ var/area_type = /area/space
+ var/stage = STARTUP_STAGE
+
+
+ var/start_up_overlay = "lava"
+ var/duration_overlay = "lava"
+ var/overlay_layer = 10 //This is the default area layer, and above everything else. 2 is floors/below walls and mobs.
+ var/purely_aesthetic = FALSE //If we just want gentle rain that doesn't hurt people
+ var/list/impacted_areas = list()
+
+/datum/weather/proc/weather_start_up()
+ for(var/area/N in get_areas(area_type))
+ if(N.z == target_z)
+ impacted_areas += N
+ duration = rand(duration_lower,duration_upper)
+ update_areas()
+ for(var/mob/M in player_list)
+ if(M.z == target_z)
+ M << start_up_message
+
+ spawn(start_up_time)
+ stage = MAIN_STAGE
+ weather_main()
+
+
+/datum/weather/proc/weather_main()
+ update_areas()
+ for(var/mob/M in player_list)
+ if(M.z == target_z)
+ M << "[duration_message]"
+ if(purely_aesthetic)
+ sleep(duration*10)
+ else //Storm effects
+ for(var/i in 1 to duration-1)
+ for(var/mob/living/L in living_mob_list)
+ var/area/storm_area = get_area(L)
+ if(storm_area in impacted_areas)
+ storm_act(L)
+ sleep(10)
+
+ stage = WIND_DOWN_STAGE
+ weather_wind_down()
+
+
+/datum/weather/proc/weather_wind_down()
+ update_areas()
+ for(var/mob/M in player_list)
+ if(M.z == target_z)
+ M << wind_down_message
+
+ sleep(wind_down)
+
+ stage = END_STAGE
+ update_areas()
+
+
+/datum/weather/proc/storm_act(mob/living/L)
+ if(prob(30)) //Dont want it spammed very tick
+ L << "You're buffeted by the storm!"
+ L.adjustBruteLoss(1)
+
+/datum/weather/proc/update_areas()
+ for(var/area/N in impacted_areas)
+ N.layer = overlay_layer
+ N.icon = 'icons/effects/weather_effects.dmi'
+ N.invisibility = 0
+ switch(stage)
+ if(STARTUP_STAGE)
+ N.icon_state = start_up_overlay
+
+ if(MAIN_STAGE)
+ N.icon_state = duration_overlay
+
+ if(WIND_DOWN_STAGE)
+ N.icon_state = start_up_overlay
+
+ if(END_STAGE)
+ N.icon_state = initial(N.icon_state)
+ N.icon = 'icons/turf/areas.dmi'
+ N.layer = 10 //Just default back to normal area stuff since I assume setting a var is faster than initial
+ N.invisibility = 100
+ N.opacity = 0
\ No newline at end of file
diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm
new file mode 100644
index 00000000000..89308d4437c
--- /dev/null
+++ b/code/modules/mining/lavaland/weather_types.dm
@@ -0,0 +1,90 @@
+///The floor is lava
+
+/datum/weather/floor_is_lava
+ name = "floor is lava"
+ start_up_time = 30 //3 seconds
+ start_up_message = "The ground begins to bubble."
+ duration_lower = 45
+ duration_upper = 60 //1 minute
+ duration_message = "The floor is lava!"
+ wind_down = 30// 3 seconds
+ wind_down_message = "The ground begins to cool."
+
+ target_z = 1
+ exclude_walls = TRUE
+ area_type = /area
+
+ start_up_overlay = "lava"
+ duration_overlay = "lava"
+ overlay_layer = 2 //Covers floors only
+
+
+/datum/weather/floor_is_lava/storm_act(mob/living/L)
+ var/turf/F = get_turf(L)
+ for(var/obj/structure/O in F.contents)
+ if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor!
+ return
+ L.adjustFireLoss(3)
+
+
+
+/datum/weather/advanced_darkness
+ name = "advanced darkness"
+ start_up_time = 100 //10 seconds
+ start_up_message = "The lights begin to dim... is power going out?"
+ duration_lower = 45
+ duration_upper = 60 //1 minute
+ duration_message = "This isn't average everyday darkness... this is advanced darkness!"
+ wind_down = 100 // 10 seconds
+ wind_down_message = "The darkness is receding. Thank god."
+ purely_aesthetic = TRUE
+
+ target_z = 1
+ exclude_walls = TRUE
+ area_type = /area
+
+ start_up_overlay = ""
+ duration_overlay = ""
+ overlay_layer = 10
+
+/datum/weather/advanced_darkness/update_areas()
+ for(var/area/A in impacted_areas)
+ if(stage == MAIN_STAGE)
+ A.invisibility = 0
+ A.opacity = 1
+ else
+ A.invisibility = 100
+ A.opacity = 0
+//Ash storms
+
+/datum/weather/ash_storm
+ name = "ash storm"
+ start_up_time = 300 //30 seconds
+ start_up_message = "The wind begins to pick up. Seek shelter."
+ duration_lower = 90 //1.5 minutes
+ duration_upper = 360 //3 minutes
+ duration_message = "An ash storm has started! Get inside!"
+ wind_down = 300 // 30 seconds
+ wind_down_message = "The storm begins to fade. Should be safe to go outside again."
+
+ target_z = ZLEVEL_LAVALAND
+ area_type = /area/lavaland/surface/outdoors
+
+ start_up_overlay = "light_ash"
+ duration_overlay = "ash_storm"
+ overlay_layer = 10
+
+
+/datum/weather/ash_storm/false_alarm //No storm, just light ember fall
+ purely_aesthetic = TRUE
+ duration_overlay = "light_ash"
+ duration_message = "Looks like the storm just missed the mining area. False alarm."
+ wind_down_message = "The ash fall starts to trail off."
+
+/datum/weather/ash_storm/storm_act(mob/living/L)
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ var/thermal_protection = H.get_thermal_protection()
+ if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
+ return
+ L.adjustFireLoss(4)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 5958d0275ad..f15c5a5c37e 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -191,6 +191,7 @@
qdel(src)
/obj/item/weapon/survivalcapsule/proc/load()
+ var/list/blacklist = list(/area/shuttle) //Shuttles move based on area, and we'd like not to break them
var/turf/start_turf = get_turf(src.loc)
var/turf/cur_turf
var/x_size = 5
@@ -243,7 +244,9 @@
threshhold.nitrogen = 82
threshhold.carbon_dioxide = 0
threshhold.toxins = 0
- L.contents += threshhold
+ var/area/ZZ = get_area(threshhold)
+ if(!is_type_in_list(ZZ, blacklist))
+ L.contents += threshhold
threshhold.overlays.Cut()
var/list/turfs = room["floors"]
@@ -261,5 +264,6 @@
A.air.temperature = 293.15
SSair.add_to_active(A)
A.overlays.Cut()
-
- L.contents += A
+ var/area/Z = get_area(A)
+ if(!is_type_in_list(Z, blacklist))
+ L.contents += A
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1d3e6ed3a72..641fa9446f5 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -86,7 +86,7 @@ Works together with spawning an observer, noted above.
if(key)
if(!cmptext(copytext(key,1,2),"@")) // Skip aghosts.
var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc.
- SSnano.on_transfer(src, ghost) // Transfer NanoUIs.
+ SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.key = key
return ghost
@@ -156,7 +156,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients
usr << "Another consciousness is in your body...It is resisting you."
return
- SSnano.on_transfer(src, mind.current) // Transfer NanoUIs.
+ SStgui.on_transfer(src, mind.current) // Transfer NanoUIs.
mind.current.key = key
return 1
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index fa00df2f7db..753b66235b6 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -173,3 +173,52 @@
//if(hasvar(src,"r_hand")) if(src:r_hand) items += src:r_hand
return items
+
+
+/obj/item/proc/equip_to_best_slot(var/mob/M)
+ if(src != M.get_active_hand())
+ M << "You are not holding anything to equip!"
+ return 0
+
+ if(M.equip_to_appropriate_slot(src))
+ if(M.hand)
+ M.update_inv_l_hand()
+ else
+ M.update_inv_r_hand()
+ return 1
+
+ if(M.s_active && M.s_active.can_be_inserted(src,1)) //if storage active insert there
+ M.s_active.handle_item_insertion(src)
+ return 1
+
+ var/obj/item/weapon/storage/S = M.get_inactive_hand()
+ if(istype(S) && S.can_be_inserted(src,1)) //see if we have box in other hand
+ S.handle_item_insertion(src)
+ return 1
+
+ S = M.get_item_by_slot(slot_belt)
+ if(istype(S) && S.can_be_inserted(src,1)) //else we put in belt
+ S.handle_item_insertion(src)
+ return 1
+
+ S = M.get_item_by_slot(slot_drone_storage) //else we put in whatever is in drone storage
+ if(istype(S) && S.can_be_inserted(src,1))
+ S.handle_item_insertion(src)
+
+ S = M.get_item_by_slot(slot_back) //else we put in backpack
+ if(istype(S) && S.can_be_inserted(src,1))
+ S.handle_item_insertion(src)
+ playsound(src.loc, "rustle", 50, 1, -5)
+ return 1
+
+ M << "You are unable to equip that!"
+ return 0
+
+
+/mob/verb/quick_equip()
+ set name = "quick-equip"
+ set hidden = 1
+
+ var/obj/item/I = get_active_hand()
+ if (I)
+ I.equip_to_best_slot(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 27d29ef4e50..40727647cd7 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -39,7 +39,10 @@ var/global/posibrain_notif_cooldown = 0
spawn(askDelay) //Seperate from the global cooldown.
notified = 0
update_icon()
- visible_message("The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?")
+ if(brainmob.stat == CONSCIOUS && brainmob.client)
+ visible_message("The positronic brain pings, and its lights start flashing. Success!")
+ else
+ visible_message("The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?")
return //Code for deleting personalities recommended here.
@@ -127,7 +130,6 @@ var/global/posibrain_notif_cooldown = 0
return
/obj/item/device/mmi/posibrain/New()
-
brainmob = new(src)
brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","ANNS","KOS","TKRG","XAL","STLP","CBOS","DNCN","FXMC","DRSD"))]-[rand(100, 999)]"
brainmob.real_name = brainmob.name
@@ -137,7 +139,6 @@ var/global/posibrain_notif_cooldown = 0
brainmob.silent = 0
dead_mob_list -= brainmob
ping_ghosts("created")
-
..()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index d1f2c2c10b2..36184591213 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -87,8 +87,7 @@
if(reagents.has_reagent("teslium"))
shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging!
take_overall_damage(0,shock_damage)
- //src.burn_skin(shock_damage)
- //src.adjustFireLoss(shock_damage) //burn_skin will do this for us
+ //src.adjustFireLoss(shock_damage)
//src.updatehealth()
visible_message(
"[src] was shocked by \the [source]!", \
@@ -388,7 +387,7 @@ var/const/GALOSHES_DONT_HELP = 4
last_special = world.time + CLICK_CD_BREAKOUT
visible_message("[src] attempts to unbuckle themself!", \
"You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)")
- if(do_after(src, 600, needhand = 0, target = src))
+ if(do_after(src, 600, 0, target = src))
if(!buckled)
return
buckled.user_unbuckle_mob(src,src)
@@ -431,7 +430,7 @@ var/const/GALOSHES_DONT_HELP = 4
if(!cuff_break)
visible_message("[src] attempts to remove [I]!")
src << "You attempt to remove [I]... (This will take around [displaytime] minutes and you need to stand still.)"
- if(do_after(src, breakouttime, 10, 0, target = src))
+ if(do_after(src, breakouttime, 0, target = src))
if(I.loc != src || buckled)
return
visible_message("[src] manages to remove [I]!")
@@ -457,7 +456,7 @@ var/const/GALOSHES_DONT_HELP = 4
breakouttime = 50
visible_message("[src] is trying to break [I]!")
src << "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)"
- if(do_after(src, breakouttime, needhand = 0, target = src))
+ if(do_after(src, breakouttime, 0, target = src))
if(!I.loc || buckled)
return
visible_message("[src] manages to break [I]!")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 752e796573f..5cfa976e679 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -21,8 +21,6 @@
t_has = "have"
t_is = "are"
else
- if(icon)
- msg += "\icon[src] " //note, should we ever go back to runtime-generated icons (please don't), you will need to change this to \icon[icon] to prevent crashes.
switch(gender)
if(MALE)
t_He = "He"
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 5c866d142fb..36978456f8a 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -1,38 +1,6 @@
/mob/living/carbon/human/can_equip(obj/item/I, slot, disable_warning = 0)
return dna.species.can_equip(I, slot, disable_warning, src)
-/mob/living/carbon/human/verb/quick_equip()
- set name = "quick-equip"
- set hidden = 1
-
- if(ishuman(src))
- var/mob/living/carbon/human/H = src
- var/obj/item/I = H.get_active_hand()
- var/obj/item/weapon/storage/S = H.get_inactive_hand()
- if(!I)
- H << "You are not holding anything to equip!"
- return
- if(H.equip_to_appropriate_slot(I))
- if(hand)
- update_inv_l_hand()
- else
- update_inv_r_hand()
- else if(s_active && s_active.can_be_inserted(I,1)) //if storage active insert there
- s_active.handle_item_insertion(I)
- else if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) //see if we have box in other hand
- S.handle_item_insertion(I)
- else
- S = H.get_item_by_slot(slot_belt)
- if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) //else we put in belt
- S.handle_item_insertion(I)
- else
- S = H.get_item_by_slot(slot_back) //else we put in backpack
- if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))
- S.handle_item_insertion(I)
- playsound(src.loc, "rustle", 50, 1, -5)
- else
- H << "You are unable to equip that!"
-
/mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1)
for(var/slot in slots)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 34803e4bff7..27a76f7eec2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -106,14 +106,8 @@
if(!dna || !dna.species.handle_fire(src))
..()
if(on_fire)
- var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
- if(wear_suit)
- if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)
- thermal_protection += (wear_suit.max_heat_protection_temperature*0.7)
- if(head)
- if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT)
- thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD)
- thermal_protection = round(thermal_protection)
+ var/thermal_protection = get_thermal_protection()
+
if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
return
if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT)
@@ -121,6 +115,16 @@
else
bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12))
+/mob/living/carbon/human/proc/get_thermal_protection()
+ var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
+ if(wear_suit)
+ if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)
+ thermal_protection += (wear_suit.max_heat_protection_temperature*0.7)
+ if(head)
+ if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT)
+ thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD)
+ thermal_protection = round(thermal_protection)
+ return thermal_protection
/mob/living/carbon/human/IgniteMob()
if(!dna || !dna.species.IgniteMob(src))
@@ -302,6 +306,8 @@
if(head)
if(head.flags & BLOCK_GAS_SMOKE_EFFECT)
. = 1
+ if(NOBREATH in dna.species.specflags)
+ . = 1
return .
/mob/living/carbon/human/proc/handle_embedded_objects()
for(var/obj/item/organ/limb/L in organs)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 98eb3b5f3a8..c46d0f1cfde 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -208,27 +208,6 @@ Sorry Giacom. Please don't be mad :(
return pressure
-//sort of a legacy burn method for /electrocute, /shock, and the e_chair
-/mob/living/proc/burn_skin(burn_amount)
- if(istype(src, /mob/living/carbon/human))
- //world << "DEBUG: burn_skin(), mutations=[mutations]"
- var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
- var/divided_damage = (burn_amount)/(H.organs.len)
- var/extradam = 0 //added to when organ is at max dam
- for(var/obj/item/organ/limb/affecting in H.organs)
- if(!affecting) continue
- if(affecting.take_damage(0, divided_damage+extradam)) //TODO: fix the extradam stuff. Or, ebtter yet...rewrite this entire proc ~Carn
- H.update_damage_overlays(0)
- H.updatehealth()
- return 1
- else if(istype(src, /mob/living/carbon/monkey))
- var/mob/living/carbon/monkey/M = src
- M.adjustFireLoss(burn_amount)
- M.updatehealth()
- return 1
- else if(istype(src, /mob/living/silicon/ai))
- return 0
-
/mob/living/proc/adjustBodyTemp(actual, desired, incrementboost)
var/temperature = actual
var/difference = abs(actual-desired) //get difference
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 462c2912e93..1af50b500f1 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -187,6 +187,7 @@
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
if(buckled)
user << "You cannot grab [src], \he is buckled in!"
+ return 0
if(!G) //the grab will delete itself in New if src is anchored
return 0
user.put_in_active_hand(G)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 45525ee11a0..9a4875bfe9a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -842,4 +842,10 @@ var/list/ai_list = list()
//get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
if(M && cameranet && !cameranet.checkTurfVis(get_turf_pixel(M)) && !apc_override)
return
- return 1
\ No newline at end of file
+ return 1
+
+/mob/living/silicon/ai/proc/relay_speech(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans)
+ raw_message = lang_treat(speaker, message_langs, raw_message, spans)
+ var/name_used = speaker.GetVoice()
+ var/rendered = "Relayed Speech: [name_used][raw_message]"
+ show_message(rendered, 2)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index f3569d4c503..d03587fd26d 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -6,9 +6,10 @@
/mob/camera/aiEye
name = "Inactive AI Eye"
+ invisibility = 100
var/list/visibleCameraChunks = list()
var/mob/living/silicon/ai/ai = null
-
+ var/relay_speech = FALSE
// Use this when setting the aiEye's location.
// It will also stream the chunk that the new loc is in.
@@ -78,7 +79,6 @@
if (user.camera_light_on)
user.light_cameras()
-
// Return to the Core.
/mob/living/silicon/ai/proc/view_core()
@@ -104,3 +104,7 @@
return //won't work if dead
acceleration = !acceleration
usr << "Camera acceleration has been toggled [acceleration ? "on" : "off"]."
+
+/mob/camera/aiEye/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans)
+ if(relay_speech && speaker && ai && !radio_freq && speaker != ai && near_camera(speaker))
+ ai.relay_speech(message, speaker, message_langs, raw_message, radio_freq, spans)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm
index 50c188ca629..9f11d34359b 100644
--- a/code/modules/mob/living/silicon/ai/laws.dm
+++ b/code/modules/mob/living/silicon/ai/laws.dm
@@ -17,3 +17,10 @@
src.laws_sanity_check()
src.laws.show_laws(who)
+ if(!everyone)
+ for(var/mob/living/silicon/robot/R in connected_robots)
+ if(R.lawupdate)
+ R.lawsync()
+ R.show_laws()
+ R.law_change_counter++
+
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index ff680cf7131..97a5c7174a3 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -152,6 +152,7 @@
target_types += /obj/effect/decal/cleanable/ash
target_types += /obj/effect/decal/cleanable/greenglow
target_types += /obj/effect/decal/cleanable/dirt
+ target_types += /obj/effect/decal/cleanable/deadcockroach
if(blood)
target_types += /obj/effect/decal/cleanable/xenoblood/
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index d84a6d112df..a0d0ef6b331 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -110,7 +110,7 @@ Auto Patrol: []"},
"[arrest_type ? "Detain" : "Arrest"]",
"[declare_arrests ? "Yes" : "No"]",
"[auto_patrol ? "On" : "Off"]" )
-
+
return dat
/mob/living/simple_animal/bot/secbot/Topic(href, href_list)
@@ -402,101 +402,5 @@ Auto Patrol: []"},
return
..()
-//Secbot Construction
-
-/obj/item/clothing/head/helmet/attackby(obj/item/device/assembly/signaler/S, mob/user, params)
- ..()
- if(!issignaler(S))
- ..()
- return
-
- if(type != /obj/item/clothing/head/helmet/sec) //Eh, but we don't want people making secbots out of space helmets.
- return
-
- if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
- user << "The mounted flashlight is in the way, remove it first!"
- return
-
- if(S.secured)
- qdel(S)
- var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
- user.put_in_hands(A)
- user << "You add the signaler to the helmet."
- user.unEquip(src, 1)
- qdel(src)
- else
- return
-
-/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user, params)
- ..()
- if(istype(I, /obj/item/weapon/weldingtool))
- if(!build_step)
- var/obj/item/weapon/weldingtool/WT = I
- if(WT.remove_fuel(0, user))
- build_step++
- overlays += "hs_hole"
- user << "You weld a hole in [src]!"
- else if(build_step == 1)
- var/obj/item/weapon/weldingtool/WT = I
- if(WT.remove_fuel(0, user))
- build_step--
- overlays -= "hs_hole"
- user << "You weld the hole in [src] shut!"
-
- else if(isprox(I) && (build_step == 1))
- if(!user.unEquip(I))
- return
- build_step++
- user << "You add the prox sensor to [src]!"
- overlays += "hs_eye"
- name = "helmet/signaler/prox sensor assembly"
- qdel(I)
-
- else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2))
- if(!user.unEquip(I))
- return
- build_step++
- user << "You add the robot arm to [src]!"
- name = "helmet/signaler/prox sensor/robot arm assembly"
- overlays += "hs_arm"
- qdel(I)
-
- else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3))
- if(!user.unEquip(I))
- return
- build_step++
- user << "You complete the Securitron! Beep boop."
- var/mob/living/simple_animal/bot/secbot/S = new/mob/living/simple_animal/bot/secbot(get_turf(src))
- S.name = created_name
- qdel(I)
- qdel(src)
-
- else if(istype(I, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
- if(!t)
- return
- if(!in_range(src, usr) && loc != usr)
- return
- created_name = t
-
- else if(istype(I, /obj/item/weapon/screwdriver))
- if(!build_step)
- new /obj/item/device/assembly/signaler(get_turf(src))
- new /obj/item/clothing/head/helmet/sec(get_turf(src))
- user << "You disconnect the signaler from the helmet."
- qdel(src)
-
- else if(build_step == 2)
- overlays -= "hs_eye"
- new /obj/item/device/assembly/prox_sensor(get_turf(src))
- user << "You detach the proximity sensor from [src]."
- build_step--
-
- else if(build_step == 3)
- overlays -= "hs_arm"
- new /obj/item/robot_parts/l_arm(get_turf(src))
- user << "You remove the robot arm from [src]."
- build_step--
-
/obj/machinery/bot_core/secbot
req_access = list(access_security)
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 75e71a6ed77..fa0f4d29a38 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -161,4 +161,19 @@
corpseuniform = /obj/item/clothing/under/color/lightpurple
corpsesuit = /obj/item/clothing/suit/wizrobe
corpseshoes = /obj/item/clothing/shoes/sandal
- corpsehelmet = /obj/item/clothing/head/wizard
\ No newline at end of file
+ corpsehelmet = /obj/item/clothing/head/wizard
+
+
+/obj/effect/landmark/mobcorpse/nanotrasensoldier
+ name = "Nanotrasen Private Security Officer"
+ corpseuniform = /obj/item/clothing/under/rank/security
+ corpsesuit = /obj/item/clothing/suit/armor/vest
+ corpseshoes = /obj/item/clothing/shoes/combat
+ corpsegloves = /obj/item/clothing/gloves/combat
+ corpseradio = /obj/item/device/radio/headset
+ corpsemask = /obj/item/clothing/mask/gas/sechailer/swat
+ corpsehelmet = /obj/item/clothing/head/helmet/swat/nanotrasen
+ corpseback = /obj/item/weapon/storage/backpack/security
+ corpseid = 1
+ corpseidjob = "Private Security Force"
+ corpseidaccess = "Security Officer"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index 9e4eac0075c..f863d12faa1 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -33,7 +33,7 @@
D << "You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)]."
return
D.visible_message("[D] begins to reactivate [src].", "You begin to reactivate [src]...")
- if(do_after(user,30,needhand = 1, target = src))
+ if(do_after(user,30, 1, target = src))
adjustBruteLoss(-getBruteLoss()) //Heal all brute damage
stat = CONSCIOUS
icon_state = icon_living
@@ -49,7 +49,7 @@
if("Cannibalize")
if(D.health < D.maxHealth)
D.visible_message("[D] begins to cannibalize parts from [src].", "You begin to cannibalize parts from [src]...")
- if(do_after(D, 60,5,0, target = src))
+ if(do_after(D, 60, 0, target = src))
D.visible_message("[D] repairs itself using [src]'s remains!", "You repair yourself using [src]'s remains.")
D.adjustBruteLoss(-src.maxHealth)
new /obj/effect/decal/cleanable/oil/streak(get_turf(src))
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 8c057a49d3c..b717b0ac252 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -113,28 +113,3 @@
/mob/living/simple_animal/drone/stripPanelEquip(obj/item/what, mob/who, where)
..(what, who, where, 1)
-
-/mob/living/simple_animal/drone/verb/quick_equip()
- set name = "quick-equip"
- set hidden = 1
- var/obj/item/I = get_active_hand()
- var/obj/item/weapon/storage/S = get_inactive_hand()
- var/obj/item/weapon/storage/T = internal_storage
- if (!I)
- usr << "You are not holding anything to equip!"
- return
- if(equip_to_appropriate_slot(I))
- if(hand)
- update_inv_l_hand()
- else
- update_inv_r_hand()
- else if(s_active && s_active.can_be_inserted(I,1)) //if storage active insert there
- s_active.handle_item_insertion(I)
- else if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) //see if we have box in other hand
- S.handle_item_insertion(I)
- else if (istype(T) && T.can_be_inserted(I,1)) // If carrying storage item like toolbox
- T.handle_item_insertion(I)
- else if(!internal_storage)
- equip_to_slot(I, slot_drone_storage)
- else
- usr << "You are unable to equip that!"
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index c4e5c7efb8c..9fabb8f858a 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -2,13 +2,13 @@
name = "Guardian Spirit"
real_name = "Guardian Spirit"
desc = "A mysterious being that stands by it's charge, ever vigilant."
- speak_emote = list("intones")
+ speak_emote = list("hisses")
response_help = "passes through"
response_disarm = "flails at"
response_harm = "punches"
- icon = 'icons/mob/mob.dmi'
- icon_state = "stand"
- icon_living = "stand"
+ icon = 'icons/mob/guardian.dmi'
+ icon_state = "guardianorange"
+ icon_living = "guardianorange"
icon_dead = "stand"
speed = 0
a_intent = "harm"
@@ -26,7 +26,6 @@
melee_damage_upper = 15
butcher_results = list(/obj/item/weapon/ectoplasm = 1)
AIStatus = AI_OFF
- var/animated_manifest = FALSE
var/cooldown = 0
var/damage_transfer = 1 //how much damage from each attack we transfer to the owner
var/mob/living/summoner
@@ -34,7 +33,6 @@
var/playstyle_string = "You are a standard Guardian. You shouldn't exist!"
var/magic_fluff_string = " You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!"
var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!"
- var/bio_fluff_string = "Your scarabs fail to mutate. This shouldn't happen! Submit a bug report!"
/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
..()
@@ -119,11 +117,6 @@
if(loc == summoner)
loc = get_turf(summoner)
cooldown = world.time + 30
- if(animated_manifest)
- var/end_icon = icon_state
- icon_state = "parasite_forming"
- spawn(6)
- icon_state = end_icon
/mob/living/simple_animal/hostile/guardian/proc/Recall()
if(cooldown > world.time)
@@ -217,7 +210,6 @@
environment_smash = 1
magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!"
tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online."
- bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, ready to sow havoc at random."
/mob/living/simple_animal/hostile/guardian/fire/Life() //Dies if the summoner dies
..()
@@ -265,7 +257,6 @@
environment_smash = 2
magic_fluff_string = "..And draw the Assistant, faceless and generic, but never to be underestimated."
tech_fluff_string = "Boot sequence complete. Standard combat modules loaded. Holoparasite swarm online."
- bio_fluff_string = "Your scarab swarm stirs to life, ready to tear apart your enemies."
var/battlecry = "AT"
/mob/living/simple_animal/hostile/guardian/punch/verb/Battlecry()
@@ -299,7 +290,6 @@
playstyle_string = "As a Support type, you may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent mob will warp them to your bluespace beacon after a short delay."
magic_fluff_string = "..And draw the CMO, a potent force of life...and death."
tech_fluff_string = "Boot sequence complete. Medical modules active. Bluespace modules activated. Holoparasite swarm online."
- bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, capable of mending wounds and travelling via bluespace."
var/turf/simulated/floor/beacon
var/beacon_cooldown = 0
var/toggle = FALSE
@@ -424,7 +414,6 @@
playstyle_string = "As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit."
magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat."
tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online."
- bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, capable of spraying shards of crystal."
var/list/snares = list()
var/toggle = FALSE
@@ -502,7 +491,6 @@
playstyle_string = "As an explosive type, you have only moderate close combat abilities, but are capable of converting any adjacent item into a disguised bomb via alt click."
magic_fluff_string = "..And draw the Scientist, master of explosive death."
tech_fluff_string = "Boot sequence complete. Explosive modules active. Holoparasite swarm online."
- bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, capable of stealthily booby trapping items."
var/bomb_cooldown = 0
/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
@@ -609,7 +597,6 @@
else
gaurdiantype = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in possible_guardians
var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch
- var/picked_color = randomColor(0)
switch(gaurdiantype)
if("Chaos")
@@ -638,26 +625,20 @@
user.verbs += /mob/living/proc/guardian_comm
user.verbs += /mob/living/proc/guardian_recall
user.verbs += /mob/living/proc/guardian_reset
+
+ var/picked_name = pick("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces")
+ var/colour = pick("orange", "pink", "red", "blue", "green")
+ G.name = "[picked_name] [capitalize(colour)]"
+ G.real_name = "[picked_name] [capitalize(colour)]"
+ G.icon_living = "guardian[colour]"
+ G.icon_state = "guardian[colour]"
+ G.icon_dead = "guardian[colour]"
+
switch (theme)
if("magic")
- G.name = "[mob_name] [capitalize(picked_color)]"
- G.color = color2hex(picked_color)
- G.real_name = "[mob_name] [capitalize(picked_color)]"
user << "[G.magic_fluff_string]."
if("tech")
- var/colour = pick("orange", "neon", "pink", "red", "blue", "green")
- G.name = "[mob_name] [capitalize(colour)]"
- G.real_name = "[mob_name] [capitalize(colour)]"
- G.icon_living = "parasite[colour]"
- G.icon_state = "parasite[colour]"
- G.icon_dead = "parasite[colour]"
- G.animated_manifest = TRUE
user << "[G.tech_fluff_string]."
- G.speak_emote = list("states")
- if("bio")
- user << "[G.bio_fluff_string]."
- G.attacktext = "swarms"
- G.speak_emote = list("chitters")
G.mind.name = "[G.real_name]"
/obj/item/weapon/guardiancreator/choose
@@ -678,21 +659,6 @@
/obj/item/weapon/guardiancreator/tech/choose
random = FALSE
-/obj/item/weapon/guardiancreator/biological
- name = "scarab egg cluster"
- desc = "A parasitic species that will nest in the closest living creature upon birth. While not great for your health, they'll defend their new 'hive' to the death."
- icon = 'icons/obj/syringe.dmi'
- icon_state = "combat_hypo"
- theme = "bio"
- mob_name = "Scarab Swarm"
- use_message = "The eggs begin to twitch..."
- used_message = "The cluster already hatched."
- failure_message = "...but soon settles again. Guess they weren't ready to hatch after all."
-
-/obj/item/weapon/guardiancreator/biological/choose
- random = FALSE
-
-
/obj/item/weapon/paper/guardian
name = "Holoparasite Guide"
icon_state = "alienpaper_words"
@@ -724,11 +690,6 @@
return
-
-
-
-
-
///HUD
/datum/hud/proc/guardian_hud(ui_style = 'icons/mob/screen_midnight.dmi')
@@ -761,8 +722,6 @@
mymob.client.screen += adding
-
-
//HUD BUTTONS
/obj/screen/guardian
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index b2f13828c02..7d8e73e889b 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -31,6 +31,7 @@
faction = list("carp")
flying = 1
+ pressure_resistance = 200
gold_core_spawnable = 1
/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 65a603ddb9e..a7c6dff1d42 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -24,7 +24,7 @@
speak_emote = list("states")
gold_core_spawnable = 1
del_on_death = 1
- loot = (/obj/effect/decal/cleanable/robot_debris)
+ loot = list(/obj/effect/decal/cleanable/robot_debris)
/mob/living/simple_animal/hostile/hivebot/New()
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 31ae1247d0a..f1774d355f4 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -155,6 +155,9 @@
if(ranged)//We ranged? Shoot at em
if(target_distance >= 2 && ranged_cooldown <= 0)//But make sure they're a tile away at least, and our range attack is off cooldown
OpenFire(target)
+ if(!Process_Spacemove()) // Drifting
+ walk(src,0)
+ return 1
if(retreat_distance != null)//If we have a retreat distance, check if we need to run from our target
if(target_distance <= retreat_distance)//If target's closer than our retreat distance, run
walk_away(src,target,retreat_distance,move_to_delay)
@@ -320,4 +323,4 @@
. = 0
/mob/living/simple_animal/hostile/proc/AIShouldSleep(var/list/possible_targets)
- return !FindTarget(possible_targets, 1)
+ return !FindTarget(possible_targets, 1)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
index 257967c8712..c0474b51e44 100644
--- a/code/modules/mob/living/simple_animal/hostile/illusion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -58,7 +58,7 @@
return
var/mob/living/simple_animal/hostile/illusion/M = new(loc)
M.faction = faction.Copy()
- M.Copy_Parent(parent_mob, life_span, health/2, melee_damage_upper, multiply_chance)
+ M.Copy_Parent(parent_mob, 80, health/2, melee_damage_upper, multiply_chance/2)
M.GiveTarget(L)
///////Actual Types/////////
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 95e12f3ba7c..bfd17bc69db 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -136,7 +136,6 @@
wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
/obj/item/weapon/ore/uranium)
- var/alerted = 0
var/chase_time = 100
/mob/living/simple_animal/hostile/asteroid/goldgrub/New()
@@ -157,7 +156,8 @@
visible_message("The [src.name] tries to flee from [target.name]!")
retreat_distance = 10
minimum_distance = 10
- Burrow()
+ spawn(chase_time)
+ Burrow()
/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget()
if(istype(target, /obj/item/weapon/ore))
@@ -173,12 +173,9 @@
visible_message("The ore was swallowed whole!")
/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
- if(!alerted)
- alerted = 1
- spawn(chase_time)
- if(alerted)
- visible_message("The [src.name] buries into the ground, vanishing from sight!")
- qdel(src)
+ if(!stat)
+ visible_message("The [src.name] buries into the ground, vanishing from sight!")
+ qdel(src)
/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P)
visible_message("The [P.name] was repelled by [src.name]'s girth!")
@@ -220,12 +217,16 @@
minimum_distance = 3
pass_flags = PASSTABLE
loot = list(/obj/item/organ/internal/hivelord_core)
+ var/next_brood = 0
+ var/brood_cooldown = 20
/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target)
- var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc)
- A.GiveTarget(target)
- A.friends = friends
- A.faction = faction
+ if(world.time >= next_brood)
+ var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc)
+ A.GiveTarget(target)
+ A.friends = friends
+ A.faction = faction
+ next_brood = world.time + brood_cooldown
return
/mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget()
@@ -373,6 +374,8 @@
/mob/living/simple_animal/hostile/asteroid/goliath/OpenFire()
var/tturf = get_turf(target)
+ if(!(istype(tturf, /turf/simulated)))
+ return
if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen
visible_message("The [src.name] digs its tentacles under [target.name]!")
new /obj/effect/goliath_tentacle/original(tturf)
diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
new file mode 100644
index 00000000000..7d75f4a747e
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
@@ -0,0 +1,58 @@
+/mob/living/simple_animal/hostile/nanotrasen
+ name = "Nanotrasen Private Security Officer"
+ desc = "An officer part of Nanotrasen's private security force, he seems rather unpleased to meet you."
+ icon_state = "nanotrasen"
+ icon_living = "nanotrasen"
+ icon_dead = null
+ icon_gib = "syndicate_gib"
+ speak_chance = 25
+ turns_per_move = 5
+ response_help = "pokes"
+ response_disarm = "shoves"
+ response_harm = "hits"
+ speed = 0
+ stat_attack = 1
+ robust_searching = 1
+ maxHealth = 100
+ health = 100
+ harm_intent_damage = 5
+ melee_damage_lower = 10
+ melee_damage_upper = 15
+ attacktext = "punches"
+ attack_sound = 'sound/weapons/punch1.ogg'
+ a_intent = "harm"
+ loot = list(/obj/effect/landmark/mobcorpse/nanotrasensoldier)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ unsuitable_atmos_damage = 15
+ faction = list("nanotrasenprivate")
+ status_flags = CANPUSH
+ speak = list("Stop resisting!", "I AM THE LAW!", "Face the wrath of the golden bolt!", "Stop breaking the law, asshole!")
+ search_objects = 1
+
+
+/mob/living/simple_animal/hostile/nanotrasen/Aggro()
+ ..()
+ summon_backup(15)
+ say("411 in progress, requesting backup!")
+
+
+/mob/living/simple_animal/hostile/nanotrasen/ranged
+ icon_state = "nanotrasenranged"
+ icon_living = "nanotrasenranged"
+ ranged = 1
+ retreat_distance = 3
+ minimum_distance = 5
+ casingtype = /obj/item/ammo_casing/c45
+ projectilesound = 'sound/weapons/Gunshot.ogg'
+ loot = list(/obj/item/weapon/gun/projectile/automatic/pistol/m1911,
+ /obj/effect/landmark/mobcorpse/nanotrasensoldier)
+
+
+/mob/living/simple_animal/hostile/nanotrasen/ranged/smg
+ icon_state = "nanotrasenrangedsmg"
+ icon_living = "nanotrasenrangedsmg"
+ rapid = 1
+ casingtype = /obj/item/ammo_casing/c46x30mm
+ projectilesound = 'sound/weapons/Gunshot_smg.ogg'
+ loot = list(/obj/item/weapon/gun/projectile/automatic/wt550,
+ /obj/effect/landmark/mobcorpse/nanotrasensoldier)
\ No newline at end of file
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 082296dcaf2..ed176d9aa3c 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -27,7 +27,7 @@
player_list |= src
update_Login_details()
world.update_status()
-
+
client.images = null //remove the images such as AIs being unable to see runes
client.screen = list() //remove hud items just in case
if(hud_used) qdel(hud_used) //remove the hud objects
@@ -37,7 +37,8 @@
sight |= SEE_SELF
..()
-
+ if (key != client.key)
+ key = client.key
if(loc && !isturf(loc))
client.eye = loc
client.perspective = EYE_PERSPECTIVE
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index f1bc6dcabcc..968b4f0c16c 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -1,5 +1,5 @@
/mob/Logout()
- SSnano.on_logout(src)
+ SStgui.on_logout(src)
player_list -= src
log_access("Logout: [key_name(src)]")
if(admin_datums[src.ckey])
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 585d7ddb96c..82362afc3c1 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -278,30 +278,12 @@ var/next_mob_id = 0
/mob/proc/equip_to_slot_or_del(obj/item/W, slot)
equip_to_slot_if_possible(W, slot, 1, 1, 0)
-//The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot.
-var/list/slot_equipment_priority = list( \
- slot_back,\
- slot_wear_id,\
- slot_w_uniform,\
- slot_wear_suit,\
- slot_wear_mask,\
- slot_head,\
- slot_shoes,\
- slot_gloves,\
- slot_ears,\
- slot_glasses,\
- slot_belt,\
- slot_s_store,\
- slot_l_store,\
- slot_r_store\
- )
-
//puts the item "W" into an appropriate slot in a human's inventory
//returns 0 if it cannot, 1 if successful
/mob/proc/equip_to_appropriate_slot(obj/item/W)
if(!istype(W)) return 0
- for(var/slot in slot_equipment_priority)
+ for(var/slot in W.slot_equipment_priority)
if(equip_to_slot_if_possible(W, slot, 0, 1, 1)) //qdel_on_fail = 0; disable_warning = 0; redraw_mob = 1
return 1
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 2792e69b0f1..0b51dc021d1 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -373,7 +373,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return
/proc/IsAdminGhost(var/mob/user)
- if(check_rights(R_ADMIN, 0) && istype(user, /mob/dead/observer))
+ if(check_rights(R_ADMIN, 0) && istype(user, /mob/dead/observer) && user.client.AI_Interact)
return 1
else
return 0
\ No newline at end of file
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 4e55cef28f9..7f622559c7d 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -7,7 +7,7 @@
gender = pick(MALE,FEMALE)
underwear = random_underwear(gender)
undershirt = random_undershirt(gender)
- socks = random_socks(gender)
+ socks = random_socks()
skin_tone = random_skin_tone()
hair_style = random_hair_style(gender)
facial_hair_style = random_facial_hair_style(gender)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 689058e6aea..97fec9be03e 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -993,112 +993,90 @@
/datum/sprite_accessory/socks/nude
name = "Nude"
icon_state = null
- gender = NEUTER
/datum/sprite_accessory/socks/white_norm
name = "Normal White"
icon_state = "white_norm"
- gender = NEUTER
/datum/sprite_accessory/socks/black_norm
name = "Normal Black"
icon_state = "black_norm"
- gender = NEUTER
/datum/sprite_accessory/socks/white_short
name = "Short White"
icon_state = "white_short"
- gender = NEUTER
/datum/sprite_accessory/socks/black_short
name = "Short Black"
icon_state = "black_short"
- gender = NEUTER
/datum/sprite_accessory/socks/white_knee
name = "Knee-high White"
icon_state = "white_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/black_knee
name = "Knee-high Black"
icon_state = "black_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/thin_knee
name = "Knee-high Thin"
icon_state = "thin_knee"
- gender = FEMALE
/datum/sprite_accessory/socks/striped_knee
name = "Knee-high Striped"
icon_state = "striped_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/rainbow_knee
name = "Knee-high Rainbow"
icon_state = "rainbow_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/white_thigh
name = "Thigh-high White"
icon_state = "white_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/black_thigh
name = "Thigh-high Black"
icon_state = "black_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/thin_thigh
name = "Thigh-high Thin"
icon_state = "thin_thigh"
- gender = FEMALE
/datum/sprite_accessory/socks/striped_thigh
name = "Thigh-high Striped"
icon_state = "striped_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/rainbow_thigh
name = "Thigh-high Rainbow"
icon_state = "rainbow_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/usa_knee
name = "Knee-High Freedom Stripes"
icon_state = "assblastusa_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/usa_thigh
name = "Thigh-high Freedom Stripes"
icon_state = "assblastusa_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/uk_knee
name = "Knee-High UK Stripes"
icon_state = "uk_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/uk_thigh
name = "Thigh-high UK Stripes"
icon_state = "uk_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/commie_knee
name = "Knee-High Commie Stripes"
icon_state = "commie_knee"
- gender = NEUTER
/datum/sprite_accessory/socks/commie_thigh
name = "Thigh-high Commie Stripes"
icon_state = "commie_thigh"
- gender = NEUTER
/datum/sprite_accessory/socks/pantyhose
name = "Pantyhose"
icon_state = "pantyhose"
- gender = FEMALE
//////////.//////////////////
// MutantParts Definitions //
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
deleted file mode 100644
index c713e14bb45..00000000000
--- a/code/modules/nano/nanoui.dm
+++ /dev/null
@@ -1,365 +0,0 @@
- /**
- * NanoUI
- *
- * Contains the NanoUI datum, and its procs.
- *
- * /tg/station user interface library
- * thanks to baystation12
- *
- * modified by neersighted
- **/
-
- /**
- * NanoUI datum:
- *
- * Represents a NanoUI.
- **/
-/datum/nanoui
- var/mob/user // The mob who opened/is using the NanoUI.
- var/atom/movable/src_object // The object which owns the NanoUI.
- var/title // The title of te NanoUI.
- var/ui_key // The ui_key of the NanoUI. This allows multiple UIs for one src_object.
- var/window_id // The window_id for browse() and onclose().
- var/width = 0 // The window width.
- var/height = 0 // The window height
- var/window_options = list( // Extra options to winset().
- "focus" = 0,
- "titlebar" = 1,
- "can_resize" = 1,
- "can_minimize" = 1,
- "can_maximize" = 0,
- "can_close" = 1,
- "auto_format" = 0
- )
- var/atom/ref = null // An extra ref to call when the window is closed.
- var/layout = "nanotrasen" // The layout to be used for this UI.
- var/template // The template to be used for this UI.
- var/auto_update = 1 // Update the NanoUI every MC tick.
- var/list/initial_data // The data (and datastructure) used to initialize the NanoUI
- var/status = NANO_INTERACTIVE // The status/visibility of the NanoUI.
- var/datum/nano_state/state = null // Topic state used to determine status. Topic states are in interactions/.
- var/datum/nanoui/master_ui // The parent NanoUI.
- var/list/datum/nanoui/children = list() // Children of this NanoUI.
-
- /**
- * public
- *
- * Create a new NanoUI.
- *
- * required user mob The mob who opened/is using the NanoUI.
- * required src_object atom/movable The object which owns the NanoUI.
- * required ui_key string The ui_key of the NanoUI.
- * required template string The template to render the NanoUI content with.
- * optional title string The title of the NanoUI.
- * optional width int The window width.
- * optional height int The window height.
- * optional ref atom An extra ref to use when the window is closed.
- * optional master_ui datum/nanoui The parent NanoUI.
- * optional state datum/nano_state The state used to determine status.
- *
- * return datum/nanoui The requested NanoUI.
- **/
-/datum/nanoui/New(mob/user, atom/movable/src_object, ui_key, template, \
- title = 0, width = 0, height = 0, \
- atom/ref = null, datum/nanoui/master_ui = null, \
- datum/nano_state/state = default_state)
- src.user = user
- src.src_object = src_object
- src.ui_key = ui_key
- src.window_id = "\ref[src_object]-[ui_key]"
-
- set_template(template)
-
- if(title)
- src.title = sanitize(title)
- if(width)
- src.width = width
- if(height)
- src.height = height
-
- if(ref)
- src.ref = ref
-
- src.master_ui = master_ui
- if(master_ui)
- master_ui.children += src
- src.state = state
-
- var/datum/asset/assets = get_asset_datum(/datum/asset/simple/nanoui)
- assets.send(user)
-
- /**
- * public
- *
- * Open this NanoUI (and initialize it with data).
- *
- * optional data list The data to intialize the UI with.
- **/
-/datum/nanoui/proc/open(list/data = null)
- if(!user.client)
- return // Bail if there is no client.
-
- update_status(push = 0) // Update the window status.
- if(status == NANO_CLOSE)
- return // Bail if we should close.
-
- if(!initial_data)
- if(!data) // If we don't have initial_data and data was not passed, get data from the src_object.
- data = src_object.get_ui_data(user)
- set_initial_data(data) // Otherwise use the passed data.
-
- var/window_size = ""
- if(width && height) // If we have a width and height, use them.
- window_size = "size=[width]x[height];"
-
- user << browse(get_html(), "window=[window_id];[window_size][list2params(window_options)]") // Open the window.
- winset(user, window_id, "on-close=\"nanoclose \ref[src]\"") // Instruct the client to signal NanoUI when the window is closed.
- SSnano.on_open(src)
-
- /**
- * public
- *
- * Reinitialize the NanoUI.
- * (Possibly with a new template and/or data).
- *
- * optional template string The filename of the new template.
- * optional data list The new initial data.
- **/
-/datum/nanoui/proc/reinitialize(template, list/data)
- if(template)
- set_template(template) // Set a new template.
- if(data)
- set_initial_data(data) // Replace the initial_data.
- open()
-
- /**
- * public
- *
- * Close the NanoUI, and all its children.
- **/
-/datum/nanoui/proc/close()
- user << browse(null, "window=[window_id]") // Close the window.
- SSnano.on_close(src)
- for(var/datum/nanoui/child in children) // Loop through and close all children.
- child.close()
-
- /**
- * public
- *
- * Sets the browse() window options for this NanoUI.
- *
- * required window_options list The window options to set.
- **/
-/datum/nanoui/proc/set_window_options(list/window_options)
- src.window_options = window_options
-
- /**
- * public
- *
- * Set the layout for this NanoUI.
- * This loads custom layout styles and templates for this NanoUI.
- *
- * required layout string The new UI layout.
- **/
-/datum/nanoui/proc/set_layout(layout)
- src.layout = lowertext(layout)
-
- /**
- * public
- *
- * Set the template for this NanoUI.
- *
- * required template string The new UI template.
- **/
-/datum/nanoui/proc/set_template(template)
- src.template = lowertext(template)
-
- /**
- * public
- *
- * Enable/disable auto-updating of the NanoUI.
- *
- * required state bool Enable/disable auto-updating.
- **/
-/datum/nanoui/proc/set_auto_update(state = 1)
- auto_update = state
-
- /**
- * private
- *
- * Set the data to initialize the NanoUI with.
- * The datastructure cannot be changed by subsequent updates.
- *
- * optional data list The data/datastructure to initialize the NanoUI with.
- **/
-/datum/nanoui/proc/set_initial_data(list/data)
- initial_data = data
-
- /**
- * private
- *
- * Generate HTML for this NanoUI.
- *
- * return string NanoUI HTML output.
- **/
-/datum/nanoui/proc/get_html()
- // Generate JSON.
- var/list/send_data = get_send_data(initial_data)
- var/send_data_json = JSON.stringify(send_data)
- // Strip junk.
- send_data_json = replacetext(send_data_json, "'", "'")
- send_data_json = replacetext(send_data_json, "ÿ", "")
-
- // Populate it.
- var/send_html = replacetext(SSnano.html, "!!data!!", send_data_json)
- return send_html
-
- /**
- * private
- *
- * Get the config data/datastructure to initialize the NanoUI with.
- *
- * return list The config data.
- **/
-/datum/nanoui/proc/get_config_data()
- var/list/config_data = list(
- "title" = title,
- "status" = status,
- "layout" = layout,
- "window" = window_id,
- "ref" = "\ref[src]",
- "user" = list(
- "name" = user.name,
- "fancy" = user.client.prefs.nanoui_fancy,
- "ref" = "\ref[user]"
- ),
- "srcObject" = list(
- "name" = src_object.name,
- "ref" = "\ref[src_object]"
- ),
- "templates" = list(
- "layout" = "_[layout]",
- "content" = "[template]"
- )
- )
- return config_data
-
- /**
- * private
- *
- * Package the data to send to the UI.
- * This is the (regular) data and config data, bundled together.
- *
- * return list The packaged data.
- **/
-/datum/nanoui/proc/get_send_data(list/data)
- var/list/send_data = list()
-
- send_data["config"] = get_config_data()
- if(!isnull(data))
- send_data["data"] = data
-
- return send_data
-
- /**
- * private
- *
- * Handle clicks from the NanoUI.
- * Call the src_object's ui_act() if status is NANO_INTERACTIVE.
- * If the src_object's ui_act() returns 1, update all UIs attacked to it.
- **/
-/datum/nanoui/Topic(href, href_list)
- update_status(push = 0) // Update the window state.
- if(status != NANO_INTERACTIVE || user != usr)
- return // If UI is not interactive or usr calling Topic is not the UI user.
-
- var/action = href_list["nano"] // Pull the action out.
- href_list -= "nano"
-
- var/update = src_object.ui_act(action, href_list, state) // Call ui_act() on the src_object.
- if(src_object && update)
- SSnano.update_uis(src_object) // If we have a src_object and its ui_act() told us to update.
-
- /**
- * private
- *
- * Update the NanoUI. Only updates the contents/layout if update is true,
- * otherwise only updates the status.
- *
- * optional force bool If the UI should be forced to update.
- **/
-/datum/nanoui/process(force = 0)
- if(!src_object || !user) // If the object or user died (or something else), abort.
- close()
- return
-
- if(status && (force || auto_update))
- update() // Update the UI if the status and update settings allow it.
- else
- update_status(push = 1) // Otherwise only update status.
-
- /**
- * private
- *
- * Push data to an already open NanoUI.
- *
- * required data list The data to send.
- * optional force bool If the update should be sent regardless of state.
- **/
-/datum/nanoui/proc/push_data(data, force = 0)
- update_status(push = 0) // Update the window state.
- if(status <= NANO_DISABLED && !force)
- return // Cannot update UI, we have no visibility.
-
- var/list/send_data = get_send_data(data) // Get the data to send.
-
- // Send the new data to the recieveUpdate() Javascript function.
- user << output(JSON.stringify(send_data), "[window_id].browser:receiveUpdate")
-
-
- /**
- * private
- *
- * Updates the UI by interacting with the src_object again, which will hopefully
- * call try_ui_update on it.
- *
- * optional force_open bool If force_open should be passed to ui_interact.
- **/
-/datum/nanoui/proc/update(force_open = 0)
- src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
-
- /**
- * private
- *
- * Update the status/visibility of the NanoUI for its user.
- *
- * optional push bool Push an update to the UI (an update is always sent for NANO_DISABLED).
- **/
-/datum/nanoui/proc/update_status(push = 0)
- var/new_status = src_object.nano_state(user, state)
- if(master_ui)
- new_status = min(new_status, master_ui.status)
-
- if(new_status == NANO_CLOSE)
- close()
- else
- set_status(new_status, push)
-
- /**
- * private
- *
- * Set the status/visibility of the NanoUI.
- *
- * required status int The status to set (NANO_CLOSE/NANO_DISABLED/NANO_UPDATE/NANO_INTERACTIVE).
- * optional push bool Push an update to the UI (an update is always sent for NANO_DISABLED).
- **/
-/datum/nanoui/proc/set_status(status, push = 0)
- if(src.status != status) // Only update if status has changed.
- if(src.status == NANO_DISABLED)
- src.status = status
- if(push)
- update()
- else
- src.status = status
- if(status == NANO_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
- push_data(null, force = 1)
\ No newline at end of file
diff --git a/code/modules/nano/states/admin.dm b/code/modules/nano/states/admin.dm
deleted file mode 100644
index d4048b9e11d..00000000000
--- a/code/modules/nano/states/admin.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: admin_state
- *
- * Checks that the user is an admin, end-of-story.
- **/
-
-/var/global/datum/nano_state/admin_state/admin_state = new()
-
-/datum/nano_state/admin_state/can_use_topic(atom/movable/src_object, mob/user)
- if(check_rights_for(user.client, R_ADMIN))
- return NANO_INTERACTIVE
- return NANO_CLOSE
diff --git a/code/modules/nano/states/conscious.dm b/code/modules/nano/states/conscious.dm
deleted file mode 100644
index 07574e91da7..00000000000
--- a/code/modules/nano/states/conscious.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: conscious_state
- *
- * Only checks if the user is conscious.
- **/
-
-/var/global/datum/nano_state/conscious_state/conscious_state = new()
-
-/datum/nano_state/conscious_state/can_use_topic(atom/movable/src_object, mob/user)
- if(user.stat == CONSCIOUS)
- return NANO_INTERACTIVE
- return NANO_CLOSE
diff --git a/code/modules/nano/states/contained.dm b/code/modules/nano/states/contained.dm
deleted file mode 100644
index 89b18d0b136..00000000000
--- a/code/modules/nano/states/contained.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: contained_state
- *
- * Checks that the user is inside the src_object.
- **/
-
-/var/global/datum/nano_state/contained_state/contained_state = new()
-
-/datum/nano_state/contained_state/can_use_topic(atom/movable/src_object, mob/user)
- if(!src_object.contains(user))
- return NANO_CLOSE
- return user.shared_nano_interaction(src_object)
diff --git a/code/modules/nano/states/deep_inventory.dm b/code/modules/nano/states/deep_inventory.dm
deleted file mode 100644
index d01f43bb2f4..00000000000
--- a/code/modules/nano/states/deep_inventory.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: deep_inventory_state
- *
- * Checks that the src_object is in the user's fist-level (backpack, webbing, etc) inventory.
- **/
-
-/var/global/datum/nano_state/deep_inventory_state/deep_inventory_state = new()
-
-/datum/nano_state/deep_inventory_state/can_use_topic(atom/movable/src_object, mob/user)
- if(!user.contains(src_object))
- return NANO_CLOSE
- return user.shared_nano_interaction(src_object)
diff --git a/code/modules/nano/states/hands.dm b/code/modules/nano/states/hands.dm
deleted file mode 100644
index 32807335433..00000000000
--- a/code/modules/nano/states/hands.dm
+++ /dev/null
@@ -1,20 +0,0 @@
- /**
- * NanoUI State: hands_state
- *
- * Checks that the src_object is in the user's hands.
- **/
-
-/var/global/datum/nano_state/hands_state/hands_state = new()
-
-/datum/nano_state/hands_state/can_use_topic(atom/movable/src_object, mob/user)
- . = user.shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
- return min(., user.hands_can_use_topic(src_object))
-
-/mob/proc/hands_can_use_topic(atom/movable/src_object)
- return NANO_CLOSE
-
-/mob/living/hands_can_use_topic(atom/movable/src_object)
- if(src_object in get_both_hands(src))
- return NANO_INTERACTIVE
- return NANO_CLOSE
\ No newline at end of file
diff --git a/code/modules/nano/states/inventory.dm b/code/modules/nano/states/inventory.dm
deleted file mode 100644
index e1160339e8a..00000000000
--- a/code/modules/nano/states/inventory.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: inventory_state
- *
- * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
- **/
-
-/var/global/datum/nano_state/inventory_state/inventory_state = new()
-
-/datum/nano_state/inventory_state/can_use_topic(atom/movable/src_object, mob/user)
- if(!(src_object in user))
- return NANO_CLOSE
- return user.shared_nano_interaction(src_object)
diff --git a/code/modules/nano/states/physical.dm b/code/modules/nano/states/physical.dm
deleted file mode 100644
index 569e284e447..00000000000
--- a/code/modules/nano/states/physical.dm
+++ /dev/null
@@ -1,21 +0,0 @@
- /**
- * NanoUI State: physical_state
- *
- * Short-circuits the default state to only check physical distance.
- **/
-
-/var/global/datum/nano_state/physical/physical_state = new()
-
-/datum/nano_state/physical/can_use_topic(atom/movable/src_object, mob/user)
- . = user.shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
- return min(., user.physical_can_use_topic(src_object))
-
-/mob/proc/physical_can_use_topic(atom/movable/src_object)
- return NANO_CLOSE
-
-/mob/living/physical_can_use_topic(atom/movable/src_object)
- return shared_living_nano_distance(src_object)
-
-/mob/living/silicon/physical_can_use_topic(atom/movable/src_object)
- return max(NANO_UPDATE, shared_living_nano_distance(src_object)) // Silicons can always see.
diff --git a/code/modules/nano/states/self.dm b/code/modules/nano/states/self.dm
deleted file mode 100644
index 9817c68ac0e..00000000000
--- a/code/modules/nano/states/self.dm
+++ /dev/null
@@ -1,12 +0,0 @@
- /**
- * NanoUI State: self_state
- *
- * Only checks that the user and src_object are the same.
- **/
-
-/var/global/datum/nano_state/self_state/self_state = new()
-
-/datum/nano_state/self_state/can_use_topic(atom/movable/src_object, mob/user)
- if(src_object != user)
- return NANO_CLOSE
- return user.shared_nano_interaction(src_object)
diff --git a/code/modules/nano/states/states.dm b/code/modules/nano/states/states.dm
deleted file mode 100644
index 532f7e4dfb9..00000000000
--- a/code/modules/nano/states/states.dm
+++ /dev/null
@@ -1,112 +0,0 @@
- /**
- * NanoUI States
- *
- * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
- **/
-
- /**
- * public
- *
- * Checks if a user can use src_object's NanoUI, under the given state.
- *
- * required user mob The mob who opened/is using the NanoUI.
- * required state datum/nano_state The state to check.
- *
- * return NANO_state The state of the UI.
- **/
-/atom/proc/nano_state(mob/user, datum/nano_state/state)
- var/src_object = nano_host()
-
- if(istype(user, /mob/dead/observer)) // Special-case ghosts.
- if(check_rights_for(user.client, R_ADMIN))
- return NANO_INTERACTIVE // Admins can interact anyway.
- if(get_dist(src_object, src) > user.client.view)
- return NANO_CLOSE // Keep ghosts from opening too many NanoUIs.
- return NANO_UPDATE // Ghosts can only view.
- return state.can_use_topic(src_object, user) // Check if the state allows interaction.
-
- /**
- * private
- *
- * Checks if a user can use src_object's NanoUI, and returns the state.
- * Can call a mob proc, which allows overrides for each mob.
- *
- * required src_object atom/movable The object which owns the NanoUI.
- * required user mob The mob who opened/is using the NanoUI.
- *
- * return NANO_state The state of the UI.
- **/
-/datum/nano_state/proc/can_use_topic(atom/movable/src_object, mob/user)
- return NANO_CLOSE // Don't allow interaction by default.
-
-
- /**
- * public
- *
- * Standard interaction/sanity checks. Different mob types may have overrides.
- *
- * return NANO_state The state of the UI.
- **/
-/mob/proc/shared_nano_interaction(atom/movable/src_object)
- if(!client || stat) // Close NanoUIs if mindless or dead/unconcious.
- return NANO_CLOSE
- // Update NanoUIs if incapicitated but concious.
- else if(incapacitated() || lying)
- return NANO_UPDATE
- return NANO_INTERACTIVE
-
-/mob/living/carbon/human/shared_nano_interaction(atom/movable/src_object)
- // If we have telekinesis and remain close enough, allow interaction.
- if(dna.check_mutation(TK))
- if(tkMaxRangeCheck(src, src_object))
- return NANO_INTERACTIVE
- return ..()
-
-/mob/living/silicon/ai/shared_nano_interaction(atom/movable/src_object)
- if(lacks_power()) // Close NanoUIs if the AI is unpowered.
- return NANO_CLOSE
- return ..()
-
-/mob/living/silicon/robot/shared_nano_interaction(atom/movable/src_object)
- if(cell.charge <= 0) // Close NanoUIs if the Borg is unpowered.
- return NANO_CLOSE
- if(lockcharge) // Disable NanoUIs if the Borg is locked.
- return NANO_DISABLED
- return ..()
-
-/**
- * public
- *
- * Check the distance for a living mob.
- * Really only used for checks outside the context of a mob.
- * Otherwise, use shared_living_nano_distance().
- *
- * required src_object atom/movable The object which owns the NanoUI.
- * required user mob The mob who opened/is using the NanoUI.
- *
- * return NANO_state The state of the UI.
- **/
-/atom/proc/contents_nano_distance(atom/movable/src_object, mob/living/user)
- return user.shared_living_nano_distance(src_object) // Just call this mob's check.
-
- /**
- * public
- *
- * Distance versus interaction check.
- *
- * required src_object atom/movable The object which owns the NanoUI.
- *
- * return NANO_state The state of the UI.
- **/
-/mob/living/proc/shared_living_nano_distance(atom/movable/src_object)
- if(!(src_object in view(4, src))) // If the object is out of view, close it.
- return NANO_CLOSE
-
- var/dist = get_dist(src_object, src)
- if(dist <= 1) // Open and interact if 1-0 tiles away.
- return NANO_INTERACTIVE
- else if(dist <= 2) // View only if 2-3 tiles away.
- return NANO_UPDATE
- else if(dist <= 5) // Disable if 5 tiles away.
- return NANO_DISABLED
- return NANO_CLOSE // Otherwise, we got nothing.
\ No newline at end of file
diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm
index fda579af7ef..e4b60e7d420 100644
--- a/code/modules/ninja/ninja_event.dm
+++ b/code/modules/ninja/ninja_event.dm
@@ -76,64 +76,37 @@ Contents:
else if(M.assigned_role in command_positions)
possible_targets[M] = 1 //good-guy
+/*
+ Alright, so, if I had my way I'd axe all this retarded bullshit entirely, but I know some people would complain because
+ porting ninja specifics to the random gen system would go horribly. I can at the very least axe 99% of the autism
+ and make ninja code slightly more bearable.
+ - Iamgoofball
+*/
var/list/objectives = list(1,2,3,4)
- while(Mind.objectives.len < 6) //still not enough objectives!
- switch(pick_n_take(objectives))
+ while(Mind.objectives.len < 6) //still not enough objectives! // WHY DOES THIS CALL FOR 6 OBJECTIVES
+ switch(pick_n_take(objectives)) // BUT THEN PREVENT YOU FROM GETTING 4 IN THE END
if(1) //research
- var/datum/objective/download/O = new /datum/objective/download()
- O.owner = Mind
- O.gen_amount_goal()
- Mind.objectives += O
+ add_objective(Mind, /datum/objective/download)
if(2) //steal
- var/datum/objective/steal/special/O = new /datum/objective/steal/special()
- O.owner = Mind
- Mind.objectives += O
+ add_objective(Mind, /datum/objective/default/steal/special)
if(3) //protect/kill
- if(!possible_targets.len) continue
- var/selected = rand(1,possible_targets.len)
- var/datum/mind/M = possible_targets[selected]
- var/is_bad_guy = possible_targets[M]
- possible_targets.Cut(selected,selected+1)
-
- if(is_bad_guy ^ helping_station) //kill (good-ninja + bad-guy or bad-ninja + good-guy)
- var/datum/objective/assassinate/O = new /datum/objective/assassinate()
- O.owner = Mind
- O.target = M
- O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]."
- Mind.objectives += O
- else //protect
- var/datum/objective/protect/O = new /datum/objective/protect()
- O.owner = Mind
- O.target = M
- O.explanation_text = "Protect \the [M.current.real_name], the [M.assigned_role], from harm."
- Mind.objectives += O
+ if(prob(50))
+ add_objective(Mind, /datum/objective/default/assassinate)
+ else
+ add_objective(Mind, /datum/objective/default/protect)
if(4) //debrain/capture
- if(!possible_targets.len) continue
- var/selected = rand(1,possible_targets.len)
- var/datum/mind/M = possible_targets[selected]
- var/is_bad_guy = possible_targets[M]
- possible_targets.Cut(selected,selected+1)
-
- if(is_bad_guy ^ helping_station) //debrain (good-ninja + bad-guy or bad-ninja + good-guy)
- var/datum/objective/debrain/O = new /datum/objective/debrain()
- O.owner = Mind
- O.target = M
- O.explanation_text = "Steal the brain of [M.current.real_name]."
- Mind.objectives += O
- else //capture
- var/datum/objective/capture/O = new /datum/objective/capture()
- O.owner = Mind
- O.gen_amount_goal()
- Mind.objectives += O
+ if(prob(50))
+ add_objective(Mind, /datum/objective/default/debrain)
+ else
+ add_objective(Mind, /datum/objective/capture)
else
break
//Add a survival objective since it's usually broad enough for any round type.
- var/datum/objective/O = new /datum/objective/survive()
- O.owner = Mind
- Mind.objectives += O
+ add_objective(Mind, /datum/objective/escape_obj/survive)
+
//add some RP-fluff
Mind.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A SPACE NINJA!")
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 240c534e634..a53171e4621 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -626,10 +626,10 @@
else
ui_interact(user)
-/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "apc", name, 550, 550)
+ ui = new(user, src, ui_key, "apc", name, 460, 515)
ui.open()
/obj/machinery/power/apc/get_ui_data(mob/user)
@@ -747,12 +747,22 @@
if(!can_use(usr, 1))
return
+ if(locked && !usr.has_unlimited_silicon_privilege)
+ return
+
switch(action)
if("lock")
+ if(usr.has_unlimited_silicon_privilege)
+ if(emagged || (stat & (BROKEN|MAINT)))
+ usr << "The APC does not respond to the command."
+ else
+ locked = !locked
+ update_icon()
+ if("cover")
coverlocked = !coverlocked
- if ("breaker")
+ if("breaker")
toggle_breaker()
- if("chargemode")
+ if("charge")
chargemode = !chargemode
if(!chargemode)
charging = 0
@@ -773,19 +783,12 @@
environ = setsubsystem(val)
update_icon()
update()
- if("toggleaccess")
- if(usr.has_unlimited_silicon_privilege)
- if(emagged || (stat & (BROKEN|MAINT)))
- usr << "The APC does not respond to the command."
- else
- locked = !locked
- update_icon()
if("overload")
if(usr.has_unlimited_silicon_privilege)
src.overload_lighting()
if("hack")
var/mob/living/silicon/ai/malfai = usr
- if(get_malf_status(malfai)==1)
+ if(get_malf_status(malfai) == 1)
if (malfai.malfhacking)
malfai << "You are already hacking an APC."
return 1
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index b2ca9ae4a1b..9a021cd1b4e 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -468,6 +468,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
item_state = "coil_red"
max_amount = MAXCOIL
amount = MAXCOIL
+ merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
item_color = "red"
desc = "A coil of power cable."
throwforce = 0
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index cc65f704968..aa748fbbf03 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -92,7 +92,7 @@
var/stun = min(shock_damage, 15)
user.Stun(stun)
user.Weaken(10)
- user.burn_skin(shock_damage)
+ user.electrocute_act(shock_damage, src, 1)
user.visible_message("[user.name] was shocked by the [src.name]!", \
"You feel a powerful shock course through your body, sending you flying!", \
"You hear a heavy electrical crack.")
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index a51b1f0c7bd..9d0238fba71 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -256,22 +256,27 @@
else
if(input_attempt && input_available > 0 && input_available >= input_level)
inputting = 1
+ else
+ inputting = 0
//outputting
- if(outputting)
- output_used = min( charge/SMESRATE, output_level) //limit output to that stored
+ if(output_attempt)
+ if(outputting)
+ output_used = min( charge/SMESRATE, output_level) //limit output to that stored
- charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive)
+ charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive)
- add_avail(output_used) // add output to powernet (smes side)
+ add_avail(output_used) // add output to powernet (smes side)
- if(output_used < 0.0001) // either from no charge or set to 0
- outputting = 0
- investigate_log("lost power and turned off","singulo")
- else if(output_attempt && charge > output_level && output_level > 0)
- outputting = 1
+ if(output_used < 0.0001) // either from no charge or set to 0
+ outputting = 0
+ investigate_log("lost power and turned off","singulo")
+ else if(output_attempt && charge > output_level && output_level > 0)
+ outputting = 1
+ else
+ output_used = 0
else
- output_used = 0
+ outputting = 0
// only update icon if state changed
if(last_disp != chargedisplay() || last_chrg != inputting || last_onln != outputting)
@@ -324,10 +329,10 @@
return
ui_interact(user)
-/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "smes", name, 500, 455)
+ ui = new(user, src, ui_key, "smes", name, 340, 440)
ui.open()
/obj/machinery/power/smes/get_ui_data()
@@ -364,7 +369,7 @@
log_smes(usr.ckey)
update_icon()
if("input")
- switch(params["set"])
+ switch(params["input"])
if("custom")
var/custom = input(usr, "What rate would you like this SMES to attempt to charge at? Max is [input_level_max].") as null|num
if(custom)
@@ -380,7 +385,7 @@
input_level = Clamp(input_level, 0, input_level_max)
log_smes(usr.ckey)
if("output")
- switch(params["set"])
+ switch(params["output"])
if("custom")
var/custom = input(usr, "What rate would you like this SMES to attempt to output at? Max is [output_level_max].") as null|num
if(custom)
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 58f62ad9f8f..f138b106657 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -369,10 +369,10 @@
return
ui_interact(user)
-/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "solar_control", name, 515, 425)
+ ui = new(user, src, ui_key, "solar_control", name, 465, 400)
ui.open()
/obj/machinery/power/solar_control/get_ui_data()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index f1af4c5f66f..e1e2018779e 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -73,6 +73,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
spawn(100)
var/obj/singularity/energy_ball/EB = new(loc)
orbiting_balls.Add(EB)
+ poi_list.Remove(EB)
EB.transform *= pick(0.3,0.4,0.5,0.6,0.7)
EB.is_orbiting = 1
var/icon/I = icon(icon,icon_state,dir)
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 818601f831d..ea35c457cb9 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -176,7 +176,7 @@
name = "wt550 magazine (4.6x30mm)"
icon_state = "46x30mmt-20"
ammo_type = /obj/item/ammo_casing/c46x30mm
- caliber = "4x6x30mm"
+ caliber = "4.6x30mm"
max_ammo = 20
/obj/item/ammo_box/magazine/wt550m9/update_icon()
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index ac922b9637a..51e0a7822be 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -428,6 +428,10 @@ obj/item/weapon/gun/proc/newshot()
process_fire(target, user, 1, params)
+/obj/item/weapon/gun/proc/unlock() //used in summon guns and as a convience for admins
+ if(pin)
+ qdel(pin)
+ pin = new /obj/item/device/firing_pin
/////////////
// ZOOMING //
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index e2659248250..ea52cf11f12 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -39,7 +39,7 @@
item_state = "laser"
desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use."
origin_tech = "combat=5;materials=4;powerstorage=4"
- ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/laser/scatter)
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
/obj/item/weapon/gun/energy/laser/cyborg
can_charge = 0
@@ -55,7 +55,7 @@
/obj/item/weapon/gun/energy/laser/scatter
name = "scatter laser gun"
desc = "A laser gun equipped with a refraction kit that spreads bolts."
- ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/laser/scatter)
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
/obj/item/weapon/gun/energy/lasercannon
name = "laser cannon"
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
new file mode 100644
index 00000000000..d6a54ffa0ea
--- /dev/null
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -0,0 +1,28 @@
+/obj/item/weapon/gun/energy/gun/advtaser/mounted
+ name = "mounted taser"
+ desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
+ icon_state = "armcannon"
+ force = 5
+ selfcharge = 1
+ flags = NODROP
+ slot_flags = null
+ w_class = 5
+ can_flashlight = 0
+
+/obj/item/weapon/gun/energy/gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
+ src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases.
+
+/obj/item/weapon/gun/energy/laser/mounted
+ name = "mounted laser"
+ desc = "An arm mounted cannon that fires lethal lasers. Doesn't come with a charge beam."
+ icon_state = "armcannon"
+ item_state = "armcannonlase"
+ force = 5
+ selfcharge = 1
+ flags = NODROP
+ slot_flags = null
+ w_class = 5
+ materials = null
+
+/obj/item/weapon/gun/energy/laser/mounted/dropped()
+ src.loc = null
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 80f135be1ba..681db297fc3 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -37,7 +37,6 @@
if(istype(AM, mag_type))
if(magazine)
user << "You perform a tactical reload on \the [src], replacing the magazine."
- user.say(pick("I'M RELOADING!!!", "NEW MAG IN!!!", "CHANGING MAG!!!", "COVER ME! I'M RELOADING!!!", "RELOADING!!!"))
magazine.loc = get_turf(src.loc)
magazine.update_icon()
magazine = null
@@ -233,4 +232,4 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
burst_size = 3
- fire_delay = 1
+ fire_delay = 1
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index ff5927f326c..ee8f3198a85 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -113,6 +113,40 @@
..()
user << "The bolt is [bolt_open ? "open" : "closed"]."
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted
+ name = "enchanted bolt action rifle"
+ desc = "Careful not to lose your head."
+ var/guns_left = 30
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/New()
+ ..()
+ bolt_open = 1
+ pump()
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/dropped()
+ guns_left = 0
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+ ..()
+ if(guns_left)
+ var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new
+ GUN.guns_left = src.guns_left - 1
+ user.drop_item()
+ user.swap_hand()
+ user.put_in_hands(GUN)
+ else
+ user.drop_item()
+ src.throw_at_fast(pick(oview(7,get_turf(user))),1,1)
+ user.visible_message("[user] tosses aside the spent rifle!")
+
+
+/obj/item/ammo_box/magazine/internal/boltaction/enchanted
+ max_ammo =1
+
+
+
/////////////////////////////
// DOUBLE BARRELED SHOTGUN //
/////////////////////////////
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 06fd47933ba..2555a8ac16a 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -16,6 +16,9 @@
/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
..()
+/obj/item/weapon/gun/projectile/automatic/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/automatic/toy/pistol
name = "foam force pistol"
desc = "A small, easily concealable toy handgun. Ages 8 and up."
@@ -39,6 +42,12 @@
magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
..()
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/shotgun/toy
name = "foam force shotgun"
desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
@@ -55,6 +64,9 @@
if(chambered && !chambered.BB)
qdel(chambered)
+/obj/item/weapon/gun/projectile/shotgun/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/shotgun/toy/crossbow
name = "foam force crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
@@ -77,6 +89,10 @@
/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
..()
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/automatic/l6_saw/toy
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
@@ -86,4 +102,7 @@
mag_type = /obj/item/ammo_box/magazine/toy/m762
/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
- ..()
\ No newline at end of file
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/unrestricted
+ pin = /obj/item/device/firing_pin
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index e29f2604fe5..cb9f8e0894e 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -85,10 +85,10 @@
return
ui_interact(user)
-/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "chem_dispenser", name, 530, 700)
+ ui = new(user, src, ui_key, "chem_dispenser", name, 412, 600)
ui.open()
/obj/machinery/chem_dispenser/get_ui_data()
@@ -119,7 +119,7 @@
for(var/re in dispensable_reagents)
var/datum/reagent/temp = chemical_reagents_list[re]
if(temp)
- chemicals.Add(list(list("title" = temp.name, "id" = temp.id, "commands" = list("reagent" = temp.id))))
+ chemicals.Add(list(list("title" = temp.name, "id" = temp.id)))
data["chemicals"] = chemicals
return data
@@ -129,7 +129,7 @@
switch(action)
if("amount")
- amount = round(text2num(params["set"]), 5) // round to nearest 5
+ amount = round(text2num(params["amount"]), 5) // round to nearest 5
if (amount < 0) // Since the user can actually type the commands himself, some sanity checking
amount = 0
if (amount > 100)
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 2e19186075b..eacd2fba7e9 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -87,6 +87,7 @@
if("temperature")
desired_temp = Clamp(input("Please input the target temperature", name) as num, 0, 1000)
if("eject")
+ on = FALSE
eject_beaker()
return 1
@@ -95,10 +96,10 @@
return
ui_interact(user)
-/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
- ui = new(user, src, ui_key, "chem_heater", name, 350, 400)
+ ui = new(user, src, ui_key, "chem_heater", name, 275, 400)
ui.open()
/obj/machinery/chem_heater/get_ui_data()
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 3ec9c3c9a0d..4704c01e251 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -2,6 +2,7 @@
/datum/reagent/blob
name = "Unknown"
description = "shouldn't exist and you should adminhelp immediately."
+ var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects
var/blobbernaut_message = "slams" //blobbernaut attack verb
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
@@ -41,6 +42,7 @@
name = "Sporing Pods"
id = "sporing_pods"
description = "will do low toxin damage and produce fragile spores when killed or on expanding."
+ shortdesc = "will do low toxin damage."
color = "#E88D5D"
message_living = ", and you feel sick"
@@ -70,6 +72,7 @@
name = "Replicating Foam"
id = "replicating_foam"
description = "will do medium brute damage and replicate when damaged."
+ shortdesc = "will do medium brute damage."
color = "#7B5A57"
/datum/reagent/blob/replicating_foam/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -93,7 +96,8 @@
/datum/reagent/blob/energized_fibers
name = "Energized Fibers"
id = "energized_fibers"
- description = "will do low burn, high stamina damage, and react to stamina damage."
+ description = "will do low burn and high stamina damage, and react to stamina damage."
+ shortdesc = "will do low burn and high stamina damage."
color = "#FFDC73"
blobbernaut_message = "shocks"
message_living = ", and you feel a strong tingling sensation"
@@ -153,7 +157,7 @@
/datum/reagent/blob/envenomed_filaments
name = "Envenomed Filaments"
id = "envenomed_filaments"
- description = "will cause medium toxin damage, stamina damage, and inject targets with toxins."
+ description = "will cause medium toxin and stamina damage, and inject targets with toxins."
color = "#9ACD32"
message_living = ", and you feel sick and nauseated"
@@ -170,7 +174,7 @@
/datum/reagent/blob/lexorin_jelly
name = "Lexorin Jelly"
id = "lexorin_jelly"
- description = "will cause low brute damage, high oxygen damage, and cause targets to be unable to breathe."
+ description = "will cause low brute and high oxygen damage, and cause targets to be unable to breathe."
color = "#00E5B1"
message_living = ", and your lungs feel heavy and weak"
@@ -208,7 +212,7 @@
/datum/reagent/blob/cryogenic_liquid
name = "Cryogenic Liquid"
id = "cryogenic_liquid"
- description = "will do low burn damage, stamina damage, and cause targets to freeze."
+ description = "will do low burn and stamina damage, and cause targets to freeze."
color = "#8BA6E9"
blobbernaut_message = "splashes"
message = "The blob splashes you with an icy liquid"
@@ -229,6 +233,7 @@
name = "Synchronous Mesh"
id = "synchronous_mesh"
description = "will do brute damage for each nearby blob and spread damage between nearby blobs."
+ shortdesc = "will do brute damage for each nearby blob."
color = "#65ADA2"
blobbernaut_message = "synchronously strikes"
message = "The blobs strike you"
@@ -259,7 +264,8 @@
/datum/reagent/blob/pressurized_slime
name = "Pressurized Slime"
id = "pressurized_slime"
- description = "will do low brute damage, oxygen damage, stamina damage, and wet tiles when damaged or killed."
+ description = "will do low brute, oxygen, and stamina damage, and wet tiles when damaged or killed."
+ shortdesc = "will do low brute, oxygen, and stamina damage, and wet tiles under targets."
color = "#AAAABB"
blobbernaut_message = "emits slime at"
message = "The blob splashes into you"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 11d169070d1..39986a13f8f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -141,9 +141,8 @@
*/
/datum/reagent/water/reaction_obj(obj/O, reac_volume)
- if(istype(O,/obj/item))
- var/obj/item/Item = O
- Item.extinguish()
+ if(istype(O))
+ O.extinguish()
// Monkey cube
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
@@ -163,10 +162,11 @@
*/
/datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out!
- if(!istype(M, /mob/living))
+ if(!istype(M))
return
if(method == TOUCH)
M.adjust_fire_stacks(-(reac_volume / 10))
+ M.ExtinguishMob()
..()
/datum/reagent/water/holywater
@@ -763,6 +763,16 @@
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
M.ContractDisease(new /datum/disease/transformation/xeno(0))
+/datum/reagent/fungalspores
+ name = "Tubercle bacillus Cosmosis microbes"
+ id = "fungalspores"
+ description = "Active fungal spores."
+ color = "#92D17D" // rgb: 146, 209, 125
+
+/datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
+ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
+ M.ForceContractDisease(new /datum/disease/tuberculosis(0))
+
/datum/reagent/fluorosurfactant//foam precursor
name = "Fluorosurfactant"
id = "fluorosurfactant"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 100c6e85271..47d9191bcfd 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -5,7 +5,7 @@
icon_state = null
w_class = 1
var/amount_per_transfer_from_this = 5
- var/list/possible_transfer_amounts = list(5,10,15,25,30)
+ var/list/possible_transfer_amounts = list(5,10,15,20,25,30)
var/volume = 30
var/list/list_reagents = null
var/spawned_disease = null
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 1ac7629b5bd..36b9eb2ed21 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -296,4 +296,16 @@
name = "Spanish flu culture bottle"
desc = "A small bottle. Contains a sample of Inquisitius."
icon_state = "bottle3"
- spawned_disease = /datum/disease/fluspanish
\ No newline at end of file
+ spawned_disease = /datum/disease/fluspanish
+
+/obj/item/weapon/reagent_containers/glass/bottle/tuberculosis
+ name = "Fungal Tuberculosis culture bottle"
+ desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/tuberculosis
+
+/obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure
+ name = "BVAK bottle"
+ desc = "A small bottle containing Bio Virus Antidote Kit."
+ icon_state = "bottle5"
+ list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index e9275ebd71c..11ad8afc028 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/reagent_containers/glass
name = "glass"
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5, 10, 15, 25, 30, 50)
+ possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
volume = 50
flags = OPENCONTAINER
spillable = 1
@@ -197,7 +197,7 @@
materials = list(MAT_GLASS=2500)
volume = 100
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,25,30,50,100)
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/noreact
@@ -216,7 +216,7 @@
materials = list(MAT_GLASS=5000)
volume = 300
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
@@ -253,7 +253,7 @@
materials = list(MAT_METAL=200)
w_class = 3
amount_per_transfer_from_this = 20
- possible_transfer_amounts = list(10,20,30,50,70)
+ possible_transfer_amounts = list(10,15,20,25,30,50,70)
volume = 70
flags = OPENCONTAINER | BLOCKHAIR
slot_flags = SLOT_HEAD
@@ -282,3 +282,12 @@
user << "[src]'s contents spill all over you!"
reagents.reaction(user, TOUCH)
reagents.clear_reagents()
+
+/obj/item/weapon/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
+ if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
+ var/index = slot_equipment_priority.Find(slot_head)
+ slot_equipment_priority.Remove(slot_head)
+ . = ..()
+ slot_equipment_priority.Insert(index, slot_head)
+ return
+ return ..()
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index df207b0b3cf..090942bf0e6 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -112,3 +112,11 @@
name = "morphine medipen"
desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
list_reagents = list("morphine" = 10)
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
+ name = "BVAK autoinjector"
+ desc = "Bio Virus Antidote Kit autoinjector. Has a two use system for yourself, and someone else. Inject when infected."
+ icon_state = "stimpen"
+ volume = 60
+ amount_per_transfer_from_this = 30
+ list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20)
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 135b716506b..f35a8196405 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -114,7 +114,7 @@
/obj/item/weapon/stock_parts/matter_bin
name = "matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "matter_bin"
origin_tech = "materials=1"
materials = list(MAT_METAL=80)
@@ -155,7 +155,7 @@
/obj/item/weapon/stock_parts/matter_bin/adv
name = "advanced matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "advanced_matter_bin"
origin_tech = "materials=3"
rating = 2
@@ -197,7 +197,7 @@
/obj/item/weapon/stock_parts/matter_bin/super
name = "super matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "super_matter_bin"
origin_tech = "materials=5"
rating = 3
@@ -239,7 +239,7 @@
/obj/item/weapon/stock_parts/matter_bin/bluespace
name = "bluespace matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "bluespace_matter_bin"
origin_tech = "materials=6"
rating = 4
@@ -301,4 +301,4 @@
icon = 'icons/obj/stock_parts.dmi'
icon_state = "capacitor"
desc = "A debug item for research."
- origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8;engineering=8;plasmatech=8"
\ No newline at end of file
+ origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8;engineering=8;plasmatech=8"
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 8ddda4e49f7..3097d3f8b1b 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -460,6 +460,7 @@
unacidable = 1
mouse_opacity = 0
var/mob/living/immune = list() // the one who creates the timestop is immune
+ var/list/stopped_atoms = list()
var/freezerange = 2
var/duration = 140
alpha = 125
@@ -474,9 +475,10 @@
/obj/effect/timestop/proc/timestop()
playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1)
- while(loc)
- if(duration)
- for(var/mob/living/M in orange (freezerange, src.loc))
+ for(var/i in 1 to duration-1)
+ for(var/atom/A in orange (freezerange, src.loc))
+ if(istype(A, /mob/living))
+ var/mob/living/M = A
if(M in immune)
continue
M.stunned = 10
@@ -485,24 +487,36 @@
var/mob/living/simple_animal/hostile/H = M
H.AIStatus = AI_OFF
H.LoseTarget()
- continue
- for(var/obj/item/projectile/P in orange (freezerange, src.loc))
+ stopped_atoms |= M
+ else if(istype(A, /obj/item/projectile))
+ var/obj/item/projectile/P = A
P.paused = TRUE
- duration --
- else
- for(var/mob/living/M in orange (freezerange+2, src.loc)) //longer range incase they lag out of it or something
- M.stunned = 0
- M.anchored = 0
- if(istype(M, /mob/living/simple_animal/hostile))
- var/mob/living/simple_animal/hostile/H = M
- H.AIStatus = initial(H.AIStatus)
- continue
- for(var/obj/item/projectile/P in orange(freezerange+2, src.loc))
- P.paused = FALSE
- qdel(src)
- return
+ stopped_atoms |= P
+
+ for(var/mob/living/M in stopped_atoms)
+ if(get_dist(get_turf(M),get_turf(src)) > freezerange) //If they lagged/ran past the timestop somehow, just ignore them
+ unfreeze_mob(M)
+ stopped_atoms -= M
sleep(1)
+ //End
+ for(var/mob/living/M in stopped_atoms)
+ unfreeze_mob(M)
+
+ for(var/obj/item/projectile/P in stopped_atoms)
+ P.paused = FALSE
+ qdel(src)
+ return
+
+
+
+/obj/effect/timestop/proc/unfreeze_mob(mob/living/M)
+ M.stunned = 0
+ M.anchored = 0
+ if(istype(M, /mob/living/simple_animal/hostile))
+ var/mob/living/simple_animal/hostile/H = M
+ H.AIStatus = initial(H.AIStatus)
+
/obj/effect/timestop/wizard
duration = 100
diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm
new file mode 100644
index 00000000000..f0c8cade312
--- /dev/null
+++ b/code/modules/ruins/ruin_areas.dm
@@ -0,0 +1,23 @@
+//Parent types
+
+/area/ruin/
+ name = "\improper Unexplored Location"
+ icon_state = "away"
+
+
+/area/ruin/unpowered
+ always_unpowered = 0
+
+/area/ruin/unpowered/no_grav
+ has_gravity = 0
+
+/area/ruin/powered
+ requires_power = 0
+
+
+
+//Areas
+
+/area/ruin/unpowered/no_grav/way_home
+ name = "\improper Salvation"
+ icon_state = "away"
\ No newline at end of file
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index c32bca635a4..c56b673a067 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -25,7 +25,7 @@
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(tool)
- if(IC || tool.w_class > 3 || NODROP in tool.flags || istype(tool, /obj/item/organ))
+ if(IC || tool.w_class > 3 || (NODROP in tool.flags) || istype(tool, /obj/item/organ))
user << "You can't seem to fit [tool] in [target]'s [target_zone]!"
return 0
else
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index b904d93f9e3..e6314c5b040 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -253,6 +253,73 @@
if(H.stat == CONSCIOUS)
H << "You feel your heart beating again!"
+/obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped.
+ name = "Arm-mounted item implant"
+ desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
+ icon_state = "chest_implant"
+ implant_color = "#007ACC"
+ slot = "shoulders"
+ origin_tech = "materials=5;biotech=4;powerstorage=4"
+ organ_action_name = "Toggle Arm Mod"
+ var/obj/holder//is defined as the retractable item itself. ensure this is defined somewhere!
+ var/out = 0//determines if the item is in the owner's hand or not
+ var/overloaded = 0//is set to 1 when owner gets EMPed. if set to 1, implant doesn't work.
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
+ if(overloaded)//ensure the implant isn't broken
+ owner.visible_message("The implant doesn't respond. It seems to be broken...")
+ return
+ if(out)//check if the owner has the item out already
+ owner.unEquip(holder, 1)//if he does, take it away. then,
+ holder.loc = null//stash it in nullspace
+ out = 0//and set this to clarify the item isn't out.
+ owner.visible_message("You retract [holder].")
+ playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+ else//if he doesn't have the item out
+ if(owner.put_in_hands(holder))//put it in his hands.
+ out = 1
+ owner.visible_message("You extend [holder]!")
+ playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+ else//if this fails to put the item in his hands,
+ holder.loc = null//keep it in nullspace
+ owner.visible_message("You can't extend [holder] if you can't use your hands!")
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed...
+ if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then...
+ return
+ if(out)//check if he has the item out...
+ owner.unEquip(holder, 1)//if he does, take it away.
+ holder.loc = null
+ out = 0
+ owner.visible_message("[holder] forcibly retracts into your arm.")
+ owner.visible_message("A loud bang comes from [owner]...")
+ playsound(get_turf(owner), 'sound/weapons/flashbang.ogg', 100, 1)
+ owner << "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?"
+ owner.adjust_fire_stacks(20)
+ owner.IgniteMob()//ignite the owner, as well as
+ owner.say("AUUUUUUUUUUUUUUUUUUGH!!")
+ owner.adjustFireLoss(25)//severely injure him!
+ overloaded = 1//then make sure this can't happen again by breaking the implant.
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/tase//mounted, self-charging taser!
+ name = "Arm-cannon taser implant"
+ desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arms and remains in the shoulders when not in use."
+ icon_state = "armcannon_tase_implant"
+ origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4"
+ organ_action_name = "Toggle Arm Cannon Taser"
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/tase/New()//when the implant is created...
+ holder = new /obj/item/weapon/gun/energy/gun/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/lase//mounted, self-charging laser!
+ name = "Arm-cannon laser implant"
+ desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arms and remains in the shoulders when not in use."
+ icon_state = "armcannon_lase_implant"
+ origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4;syndicate=5"//this is kinda nutty and i might lower it
+ organ_action_name = "Toggle Arm Cannon Laser"
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/lase/New()
+ holder = new /obj/item/weapon/gun/energy/laser/mounted(src)
//BOX O' IMPLANTS
diff --git a/code/modules/nano/external.dm b/code/modules/tgui/external.dm
similarity index 50%
rename from code/modules/nano/external.dm
rename to code/modules/tgui/external.dm
index 7a15197eedc..1efa5cee8fe 100644
--- a/code/modules/nano/external.dm
+++ b/code/modules/tgui/external.dm
@@ -1,41 +1,36 @@
/**
- * NanoUI External
+ * tgui external
*
- * Contains all external NanoUI declarations.
- *
- * /tg/station user interface library
- * thanks to baystation12
- *
- * modified by neersighted
+ * Contains all external tgui declarations.
**/
/**
* public
*
- * Used to open and update NanoUIs.
- * If this proc is not implemented properly, the NanoUI will not update correctly.
+ * Used to open and update UIs.
+ * If this proc is not implemented properly, the UI will not update correctly.
*
- * required user mob The mob who opened/is using the NanoUI.
- * optional ui_key string The ui_key of the NanoUI.
- * optional ui datum/nanoui The UI to be updated, if it exists.
+ * required user mob The mob who opened/is using the UI.
+ * optional ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
* optional force_open bool If the UI should be re-opened instead of updated.
- * optional master_ui datum/nanoui The parent NanoUI.
- * optional state datum/nano_state The state used to determine status.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/ui_state The state used to determine status.
**/
-/atom/movable/proc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, \
- force_open = 0, datum/nano_ui/master_ui = null, \
- datum/nano_state/state = default_state)
+/atom/movable/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, \
+ force_open = 0, datum/tgui/master_ui = null, \
+ datum/ui_state/state = default_state)
return -1 // Sorta implemented.
/**
* public
*
- * Data to be sent to the NanoUI.
- * This must be implemented for a NanoUI to work.
+ * Data to be sent to the UI.
+ * This must be implemented for a UI to work.
*
- * required user mob The mob interacting with the NanoUI.
+ * required user mob The mob interacting with the UI.
*
- * return list Data to be sent to the NanoUI.
+ * return list Data to be sent to the UI.
**/
/atom/movable/proc/get_ui_data(mob/user)
return list() // Not implemented.
@@ -44,7 +39,7 @@
/**
* public
*
- * Called on a NanoUI when the UI receieves a href.
+ * Called on a UI when the UI receieves a href.
* Think of this as Topic().
*
* required action string The action/button that has been invoked by the user.
@@ -59,34 +54,34 @@
/**
* private
*
- * The NanoUI's host object (usually src_object).
- * Used internally by nano_state(s).
+ * The UI's host object (usually src_object).
+ * Used internally by ui_state(s).
**/
-/atom/proc/nano_host()
+/atom/proc/ui_host()
return src
/**
* global
*
- * Used to track NanoUIs for a mob.
+ * Used to track UIs for a mob.
**/
/mob/var/list/open_uis = list()
/**
* verb
*
- * Called by NanoUIs when they are closed.
+ * Called by UIs when they are closed.
* Must be a verb so winset() can call it.
*
* required uiref ref The UI that was closed.
**/
-/client/verb/nanoclose(uiref as text)
+/client/verb/uiclose(uiref as text)
// Name the verb, and hide it from the user panel.
- set name = "nanoclose"
+ set name = "uiclose"
set hidden = 1
// Get the UI based on the ref.
- var/datum/nanoui/ui = locate(uiref)
+ var/datum/tgui/ui = locate(uiref)
// If we found the UI, close it.
if(istype(ui))
diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm
new file mode 100644
index 00000000000..c9a3bb467c4
--- /dev/null
+++ b/code/modules/tgui/states/admin.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: admin_state
+ *
+ * Checks that the user is an admin, end-of-story.
+ **/
+
+/var/global/datum/ui_state/admin_state/admin_state = new()
+
+/datum/ui_state/admin_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(check_rights_for(user.client, R_ADMIN))
+ return UI_INTERACTIVE
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/conscious.dm b/code/modules/tgui/states/conscious.dm
new file mode 100644
index 00000000000..1b781a458d7
--- /dev/null
+++ b/code/modules/tgui/states/conscious.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: conscious_state
+ *
+ * Only checks if the user is conscious.
+ **/
+
+/var/global/datum/ui_state/conscious_state/conscious_state = new()
+
+/datum/ui_state/conscious_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(user.stat == CONSCIOUS)
+ return UI_INTERACTIVE
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm
new file mode 100644
index 00000000000..20cda3241e0
--- /dev/null
+++ b/code/modules/tgui/states/contained.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: contained_state
+ *
+ * Checks that the user is inside the src_object.
+ **/
+
+/var/global/datum/ui_state/contained_state/contained_state = new()
+
+/datum/ui_state/contained_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(!src_object.contains(user))
+ return UI_CLOSE
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm
new file mode 100644
index 00000000000..4fef9ad5b3c
--- /dev/null
+++ b/code/modules/tgui/states/deep_inventory.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: deep_inventory_state
+ *
+ * Checks that the src_object is in the user's fist-level (backpack, webbing, etc) inventory.
+ **/
+
+/var/global/datum/ui_state/deep_inventory_state/deep_inventory_state = new()
+
+/datum/ui_state/deep_inventory_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(!user.contains(src_object))
+ return UI_CLOSE
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/nano/states/default.dm b/code/modules/tgui/states/default.dm
similarity index 52%
rename from code/modules/nano/states/default.dm
rename to code/modules/tgui/states/default.dm
index cd5155b9c05..8e1c3e8dec9 100644
--- a/code/modules/nano/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -1,60 +1,60 @@
/**
- * NanoUI State: default_state
+ * tgui state: default_state
*
* Checks a number of things -- mostly physical distance for humans and view for robots.
**/
-/var/global/datum/nano_state/default/default_state = new()
+/var/global/datum/ui_state/default/default_state = new()
-/datum/nano_state/default/can_use_topic(atom/movable/src_object, mob/user)
+/datum/ui_state/default/can_use_topic(atom/movable/src_object, mob/user)
return user.default_can_use_topic(src_object) // Call the individual mob-overriden procs.
/mob/proc/default_can_use_topic(atom/movable/src_object)
- return NANO_CLOSE // Don't allow interaction by default.
+ return UI_CLOSE // Don't allow interaction by default.
/mob/living/default_can_use_topic(atom/movable/src_object)
- . = shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
- . = min(., shared_living_nano_distance(src_object)) // Check the distance...
- if(. == NANO_INTERACTIVE) // Non-human living mobs can only look, not touch.
- return NANO_UPDATE
+ . = shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ . = min(., shared_living_ui_distance(src_object)) // Check the distance...
+ if(. == UI_INTERACTIVE) // Non-human living mobs can only look, not touch.
+ return UI_UPDATE
/mob/living/carbon/human/default_can_use_topic(atom/movable/src_object)
- . = shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
- . = min(., shared_living_nano_distance(src_object)) // Check the distance...
+ . = shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ . = min(., shared_living_ui_distance(src_object)) // Check the distance...
// Derp a bit if we have brain loss.
if(prob(getBrainLoss()))
- return NANO_UPDATE
+ return UI_UPDATE
/mob/living/silicon/robot/default_can_use_topic(atom/movable/src_object)
- . = shared_nano_interaction(src_object)
- if(. <= NANO_DISABLED)
+ . = shared_ui_interaction(src_object)
+ if(. <= UI_DISABLED)
return
// Robots can interact with anything they can see.
if(get_dist(src, src_object) <= src.client.view)
- return NANO_INTERACTIVE
- return NANO_DISABLED // Otherwise they can keep the UI open.
+ return UI_INTERACTIVE
+ return UI_DISABLED // Otherwise they can keep the UI open.
/mob/living/silicon/ai/default_can_use_topic(atom/movable/src_object)
- . = shared_nano_interaction(src_object)
- if(. < NANO_INTERACTIVE)
+ . = shared_ui_interaction(src_object)
+ if(. < UI_INTERACTIVE)
return
// The AI can interact with anything it can see nearby, or with cameras.
if((get_dist(src, src_object) <= src.client.view) || cameranet.checkTurfVis(get_turf_pixel(src_object)))
- return NANO_INTERACTIVE
- return NANO_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
/mob/living/simple_animal/drone/default_can_use_topic(atom/movable/src_object)
- . = shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
- . = min(., shared_living_nano_distance(src_object)) // Drones can only use things they're near.
+ . = shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ . = min(., shared_living_ui_distance(src_object)) // Drones can only use things they're near.
/mob/living/silicon/pai/default_can_use_topic(atom/movable/src_object)
// pAIs can only use themselves and the owner's radio.
if((src_object == src || src_object == radio) && !stat)
- return NANO_INTERACTIVE
+ return UI_INTERACTIVE
else
return ..()
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
new file mode 100644
index 00000000000..536a90597e4
--- /dev/null
+++ b/code/modules/tgui/states/hands.dm
@@ -0,0 +1,20 @@
+ /**
+ * tgui state: hands_state
+ *
+ * Checks that the src_object is in the user's hands.
+ **/
+
+/var/global/datum/ui_state/hands_state/hands_state = new()
+
+/datum/ui_state/hands_state/can_use_topic(atom/movable/src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ return min(., user.hands_can_use_topic(src_object))
+
+/mob/proc/hands_can_use_topic(atom/movable/src_object)
+ return UI_CLOSE
+
+/mob/living/hands_can_use_topic(atom/movable/src_object)
+ if(src_object in get_both_hands(src))
+ return UI_INTERACTIVE
+ return UI_CLOSE
\ No newline at end of file
diff --git a/code/modules/tgui/states/inventory.dm b/code/modules/tgui/states/inventory.dm
new file mode 100644
index 00000000000..a5f7233f00d
--- /dev/null
+++ b/code/modules/tgui/states/inventory.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: inventory_state
+ *
+ * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
+ **/
+
+/var/global/datum/ui_state/inventory_state/inventory_state = new()
+
+/datum/ui_state/inventory_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(!(src_object in user))
+ return UI_CLOSE
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/nano/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
similarity index 66%
rename from code/modules/nano/states/notcontained.dm
rename to code/modules/tgui/states/notcontained.dm
index 11dfe67025c..8df75b57626 100644
--- a/code/modules/nano/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -1,22 +1,22 @@
/**
- * NanoUI State: notcontained_state
+ * tgui state: notcontained_state
*
* Checks that the user is not inside src_object, and then makes the default checks.
**/
-/var/global/datum/nano_state/notcontained_state/notcontained_state = new()
+/var/global/datum/ui_state/notcontained_state/notcontained_state = new()
-/datum/nano_state/notcontained_state/can_use_topic(atom/movable/src_object, mob/user)
- . = user.shared_nano_interaction(src_object)
- if(. > NANO_CLOSE)
+/datum/ui_state/notcontained_state/can_use_topic(atom/movable/src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
return min(., user.notcontained_can_use_topic(src_object))
/mob/proc/notcontained_can_use_topic(atom/movable/src_object)
- return NANO_CLOSE
+ return UI_CLOSE
/mob/living/notcontained_can_use_topic(atom/movable/src_object)
if(src_object.contains(src))
- return NANO_CLOSE // Close if we're inside it.
+ return UI_CLOSE // Close if we're inside it.
return default_can_use_topic(src_object)
/mob/living/silicon/notcontained_can_use_topic(atom/movable/src_object)
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
new file mode 100644
index 00000000000..a3fae3b276e
--- /dev/null
+++ b/code/modules/tgui/states/physical.dm
@@ -0,0 +1,21 @@
+ /**
+ * tgui state: physical_state
+ *
+ * Short-circuits the default state to only check physical distance.
+ **/
+
+/var/global/datum/ui_state/physical/physical_state = new()
+
+/datum/ui_state/physical/can_use_topic(atom/movable/src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ return min(., user.physical_can_use_topic(src_object))
+
+/mob/proc/physical_can_use_topic(atom/movable/src_object)
+ return UI_CLOSE
+
+/mob/living/physical_can_use_topic(atom/movable/src_object)
+ return shared_living_ui_distance(src_object)
+
+/mob/living/silicon/physical_can_use_topic(atom/movable/src_object)
+ return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
diff --git a/code/modules/tgui/states/self.dm b/code/modules/tgui/states/self.dm
new file mode 100644
index 00000000000..edb7c3ef300
--- /dev/null
+++ b/code/modules/tgui/states/self.dm
@@ -0,0 +1,12 @@
+ /**
+ * tgui state: self_state
+ *
+ * Only checks that the user and src_object are the same.
+ **/
+
+/var/global/datum/ui_state/self_state/self_state = new()
+
+/datum/ui_state/self_state/can_use_topic(atom/movable/src_object, mob/user)
+ if(src_object != user)
+ return UI_CLOSE
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/states.dm b/code/modules/tgui/states/states.dm
new file mode 100644
index 00000000000..195d9394e3e
--- /dev/null
+++ b/code/modules/tgui/states/states.dm
@@ -0,0 +1,112 @@
+ /**
+ * tgui states
+ *
+ * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
+ **/
+
+ /**
+ * public
+ *
+ * Checks if a user can use src_object's UI, under the given state.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required state datum/ui_state The state to check.
+ *
+ * return UI_state The state of the UI.
+ **/
+/atom/proc/ui_state(mob/user, datum/ui_state/state)
+ var/src_object = ui_host()
+
+ if(istype(user, /mob/dead/observer)) // Special-case ghosts.
+ if(check_rights_for(user.client, R_ADMIN))
+ return UI_INTERACTIVE // Admins can interact anyway.
+ if(get_dist(src_object, src) > user.client.view)
+ return UI_CLOSE // Keep ghosts from opening too many UIs.
+ return UI_UPDATE // Ghosts can only view.
+ return state.can_use_topic(src_object, user) // Check if the state allows interaction.
+
+ /**
+ * private
+ *
+ * Checks if a user can use src_object's UI, and returns the state.
+ * Can call a mob proc, which allows overrides for each mob.
+ *
+ * required src_object atom/movable The object which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ **/
+/datum/ui_state/proc/can_use_topic(atom/movable/src_object, mob/user)
+ return UI_CLOSE // Don't allow interaction by default.
+
+
+ /**
+ * public
+ *
+ * Standard interaction/sanity checks. Different mob types may have overrides.
+ *
+ * return UI_state The state of the UI.
+ **/
+/mob/proc/shared_ui_interaction(atom/movable/src_object)
+ if(!client || stat) // Close UIs if mindless or dead/unconcious.
+ return UI_CLOSE
+ // Update UIs if incapicitated but concious.
+ else if(incapacitated() || lying)
+ return UI_UPDATE
+ return UI_INTERACTIVE
+
+/mob/living/carbon/human/shared_ui_interaction(atom/movable/src_object)
+ // If we have telekinesis and remain close enough, allow interaction.
+ if(dna.check_mutation(TK))
+ if(tkMaxRangeCheck(src, src_object))
+ return UI_INTERACTIVE
+ return ..()
+
+/mob/living/silicon/ai/shared_ui_interaction(atom/movable/src_object)
+ if(lacks_power()) // Close UIs if the AI is unpowered.
+ return UI_CLOSE
+ return ..()
+
+/mob/living/silicon/robot/shared_ui_interaction(atom/movable/src_object)
+ if(cell.charge <= 0) // Close UIs if the Borg is unpowered.
+ return UI_CLOSE
+ if(lockcharge) // Disable UIs if the Borg is locked.
+ return UI_DISABLED
+ return ..()
+
+/**
+ * public
+ *
+ * Check the distance for a living mob.
+ * Really only used for checks outside the context of a mob.
+ * Otherwise, use shared_living_ui_distance().
+ *
+ * required src_object atom/movable The object which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ **/
+/atom/proc/contents_ui_distance(atom/movable/src_object, mob/living/user)
+ return user.shared_living_ui_distance(src_object) // Just call this mob's check.
+
+ /**
+ * public
+ *
+ * Distance versus interaction check.
+ *
+ * required src_object atom/movable The object which owns the UI.
+ *
+ * return UI_state The state of the UI.
+ **/
+/mob/living/proc/shared_living_ui_distance(atom/movable/src_object)
+ if(!(src_object in view(4, src))) // If the object is out of view, close it.
+ return UI_CLOSE
+
+ var/dist = get_dist(src_object, src)
+ if(dist <= 1) // Open and interact if 1-0 tiles away.
+ return UI_INTERACTIVE
+ else if(dist <= 2) // View only if 2-3 tiles away.
+ return UI_UPDATE
+ else if(dist <= 5) // Disable if 5 tiles away.
+ return UI_DISABLED
+ return UI_CLOSE // Otherwise, we got nothing.
\ No newline at end of file
diff --git a/code/modules/nano/states/zlevel.dm b/code/modules/tgui/states/zlevel.dm
similarity index 53%
rename from code/modules/nano/states/zlevel.dm
rename to code/modules/tgui/states/zlevel.dm
index 199c22e22c0..2f06f36c8f8 100644
--- a/code/modules/nano/states/zlevel.dm
+++ b/code/modules/tgui/states/zlevel.dm
@@ -1,14 +1,14 @@
/**
- * NanoUI State: z_state
+ * tgui state: z_state
*
* Only checks that the Z-level of the user and src_object are the same.
**/
-/var/global/datum/nano_state/z_state/z_state = new()
+/var/global/datum/ui_state/z_state/z_state = new()
-/datum/nano_state/z_state/can_use_topic(atom/movable/src_object, mob/user)
+/datum/ui_state/z_state/can_use_topic(atom/movable/src_object, mob/user)
var/turf/turf_obj = get_turf(src_object)
var/turf/turf_usr = get_turf(user)
if(!turf_obj || !turf_usr || !(turf_obj.z == turf_usr.z))
- return NANO_CLOSE
- return NANO_INTERACTIVE
+ return UI_CLOSE
+ return UI_INTERACTIVE
diff --git a/code/modules/nano/subsystem.dm b/code/modules/tgui/subsystem.dm
similarity index 60%
rename from code/modules/nano/subsystem.dm
rename to code/modules/tgui/subsystem.dm
index b539566bd45..14b4dd5f7e5 100644
--- a/code/modules/nano/subsystem.dm
+++ b/code/modules/tgui/subsystem.dm
@@ -1,34 +1,29 @@
/**
- * NanoUI Subsystem
+ * tgui subsystem
*
- * Contains all NanoUI state and subsystem code.
- *
- * /tg/station user interface library
- * thanks to baystation12
- *
- * modified by neersighted
+ * Contains all tgui state and subsystem code.
**/
/**
* public
*
- * Get a open NanoUI given a user, src_object, and ui_key and try to update it with data.
+ * Get a open UI given a user, src_object, and ui_key and try to update it with data.
*
- * required user mob The mob who opened/is using the NanoUI.
- * required src_object atom/movable The object which owns the NanoUI.
- * required ui_key string The ui_key of the NanoUI.
- * optional ui datum/nanoui The UI to be updated, if it exists.
+ * required user mob The mob who opened/is using the UI.
+ * required src_object atom/movable The object which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
* optional data list The data to update the UI with, if it exists.
* optional force_open bool If the UI should be re-opened instead of updated.
*
- * return datum/nanoui The found NanoUI.
+ * return datum/tgui The found UI.
**/
-/datum/subsystem/nano/proc/try_update_ui(mob/user, atom/movable/src_object, ui_key, datum/nanoui/ui, \
+/datum/subsystem/tgui/proc/try_update_ui(mob/user, atom/movable/src_object, ui_key, datum/tgui/ui, \
list/data = null, force_open = 0)
if(!data)
data = src_object.get_ui_data(user)
- if(isnull(ui)) // No NanoUI was passed, so look for one.
+ if(isnull(ui)) // No UI was passed, so look for one.
ui = get_open_ui(user, src_object, ui_key)
if(!isnull(ui))
@@ -43,22 +38,22 @@
/**
* private
*
- * Get a open NanoUI given a user, src_object, and ui_key.
+ * Get a open UI given a user, src_object, and ui_key.
*
- * required user mob The mob who opened/is using the NanoUI.
- * required src_object atom/movable The object which owns the NanoUI.
- * required ui_key string The ui_key of the NanoUI.
+ * required user mob The mob who opened/is using the UI.
+ * required src_object atom/movable The object which owns the UI.
+ * required ui_key string The ui_key of the UI.
*
- * return datum/nanoui The found NanoUI.
+ * return datum/tgui The found UI.
**/
-/datum/subsystem/nano/proc/get_open_ui(mob/user, atom/movable/src_object, ui_key)
+/datum/subsystem/tgui/proc/get_open_ui(mob/user, atom/movable/src_object, ui_key)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return null // No UIs open.
else if(isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list))
return null // No UIs open for this object.
- for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key]) // Find UIs for this object.
+ for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) // Find UIs for this object.
if(ui.user == user) // Make sure we have the right user
return ui
@@ -67,21 +62,21 @@
/**
* private
*
- * Update all NanoUIs attached to src_object.
+ * Update all UIs attached to src_object.
*
- * required src_object atom/movable The object which owns the NanoUIs.
+ * required src_object atom/movable The object which owns the UIs.
*
- * return int The number of NanoUIs updated.
+ * return int The number of UIs updated.
**/
-/datum/subsystem/nano/proc/update_uis(atom/movable/src_object)
+/datum/subsystem/tgui/proc/update_uis(atom/movable/src_object)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // Couldn't find any UIs for this object.
var/update_count = 0
for(var/ui_key in open_uis[src_object_key])
- for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.nano_host()) // Check the UI is valid.
+ for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host()) // Check the UI is valid.
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we update.
return update_count
@@ -89,21 +84,21 @@
/**
* private
*
- * Close all NanoUIs attached to src_object.
+ * Close all UIs attached to src_object.
*
- * required src_object atom/movable The object which owns the NanoUIs.
+ * required src_object atom/movable The object which owns the UIs.
*
- * return int The number of NanoUIs closed.
+ * return int The number of UIs closed.
**/
-/datum/subsystem/nano/proc/close_uis(atom/movable/src_object)
+/datum/subsystem/tgui/proc/close_uis(atom/movable/src_object)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // Couldn't find any UIs for this object.
var/close_count = 0
for(var/ui_key in open_uis[src_object_key])
- for(var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.nano_host()) // Check the UI is valid.
+ for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host()) // Check the UI is valid.
ui.close() // Close the UI.
close_count++ // Count each UI we close.
return close_count
@@ -111,20 +106,20 @@
/**
* private
*
- * Update all NanoUIs belonging to a user.
+ * Update all UIs belonging to a user.
*
- * required user mob The mob who opened/is using the NanoUI.
+ * required user mob The mob who opened/is using the UI.
* optional src_object atom/movable If provided, only update UIs belonging this atom.
* optional ui_key string If provided, only update UIs with this UI key.
*
- * return int The number of NanoUIs updated.
+ * return int The number of UIs updated.
**/
-/datum/subsystem/nano/proc/update_user_uis(mob/user, atom/movable/src_object = null, ui_key = null)
+/datum/subsystem/tgui/proc/update_user_uis(mob/user, atom/movable/src_object = null, ui_key = null)
if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/update_count = 0
- for(var/datum/nanoui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_uis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we upadte.
@@ -133,20 +128,20 @@
/**
* private
*
- * Close all NanoUIs belonging to a user.
+ * Close all UIs belonging to a user.
*
- * required user mob The mob who opened/is using the NanoUI.
+ * required user mob The mob who opened/is using the UI.
* optional src_object atom/movable If provided, only update UIs belonging this atom.
* optional ui_key string If provided, only update UIs with this UI key.
*
- * return int The number of NanoUIs closed.
+ * return int The number of UIs closed.
**/
-/datum/subsystem/nano/proc/close_user_uis(mob/user, atom/movable/src_object = null, ui_key = null)
+/datum/subsystem/tgui/proc/close_user_uis(mob/user, atom/movable/src_object = null, ui_key = null)
if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/close_count = 0
- for(var/datum/nanoui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_uis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.close() // Close the UI.
close_count++ // Count each UI we close.
@@ -155,11 +150,11 @@
/**
* private
*
- * Add a NanoUI to the list of open UIs.
+ * Add a UI to the list of open UIs.
*
- * required ui datum/nanoui The UI to be added.
+ * required ui datum/tgui The UI to be added.
**/
-/datum/subsystem/nano/proc/on_open(datum/nanoui/ui)
+/datum/subsystem/tgui/proc/on_open(datum/tgui/ui)
var/src_object_key = "\ref[ui.src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
open_uis[src_object_key] = list(ui.ui_key = list()) // Make a list for the ui_key and src_object.
@@ -175,13 +170,13 @@
/**
* private
*
- * Remove a NanoUI from the list of open UIs.
+ * Remove a UI from the list of open UIs.
*
- * required ui datum/nanoui The UI to be removed.
+ * required ui datum/tgui The UI to be removed.
*
* return bool If the UI was removed or not.
**/
-/datum/subsystem/nano/proc/on_close(datum/nanoui/ui)
+/datum/subsystem/tgui/proc/on_close(datum/tgui/ui)
var/src_object_key = "\ref[ui.src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // It wasn't open.
@@ -198,35 +193,35 @@
/**
* private
*
- * Handle client logout, by closing all their NanoUIs.
+ * Handle client logout, by closing all their UIs.
*
* required user mob The mob which logged out.
*
- * return int The number of NanoUIs closed.
+ * return int The number of UIs closed.
**/
-/datum/subsystem/nano/proc/on_logout(mob/user)
+/datum/subsystem/tgui/proc/on_logout(mob/user)
return close_user_uis(user)
/**
* private
*
- * Handle clients switching mobs, by transfering their NanoUIs.
+ * Handle clients switching mobs, by transfering their UIs.
*
* required user source The client's original mob.
* required user target The client's new mob.
*
- * return bool If the NanoUIs were transferred.
+ * return bool If the UIs were transferred.
**/
-/datum/subsystem/nano/proc/on_transfer(mob/source, mob/target)
+/datum/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
if(!source || isnull(source.open_uis) || !istype(source.open_uis, /list) || open_uis.len == 0)
- return 0 // The old mob had no open NanoUIs.
+ return 0 // The old mob had no open UIs.
if(isnull(target.open_uis) || !istype(target.open_uis, /list))
target.open_uis = list() // Create a list for the new mob if needed.
- for(var/datum/nanoui/ui in source.open_uis)
+ for(var/datum/tgui/ui in source.open_uis)
ui.user = target // Inform the UIs of their new owner.
- target.open_uis.Add(ui) // Transfer all the NanoUIs.
+ target.open_uis.Add(ui) // Transfer all the UIs.
source.open_uis.Cut() // Clear the old list.
return 1 // Let the caller know we did it.
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
new file mode 100644
index 00000000000..8cc69f3145e
--- /dev/null
+++ b/code/modules/tgui/tgui.dm
@@ -0,0 +1,348 @@
+ /**
+ * tgui
+ *
+ * /tg/station user interface library
+ **/
+
+ /**
+ * tgui datum (represents a UI).
+ **/
+/datum/tgui
+ var/mob/user // The mob who opened/is using the UI.
+ var/atom/movable/src_object // The object which owns the UI.
+ var/title // The title of te UI.
+ var/ui_key // The ui_key of the UI. This allows multiple UIs for one src_object.
+ var/window_id // The window_id for browse() and onclose().
+ var/width = 0 // The window width.
+ var/height = 0 // The window height
+ var/window_options = list( // Extra options to winset().
+ "focus" = 0,
+ "titlebar" = 1,
+ "can_resize" = 1,
+ "can_minimize" = 1,
+ "can_maximize" = 0,
+ "can_close" = 1,
+ "auto_format" = 0
+ )
+ var/atom/ref = null // An extra ref to call when the window is closed.
+ var/style = "nanotrasen" // The style to be used for this UI.
+ var/interface // The interface (template) to be used for this UI.
+ var/auto_update = 1 // Update the UI every MC tick.
+ var/list/initial_data // The data (and datastructure) used to initialize the UI.
+ var/status = UI_INTERACTIVE // The status/visibility of the UI.
+ var/datum/ui_state/state = null // Topic state used to determine status/interactability.
+ var/datum/tgui/master_ui // The parent UI.
+ var/list/datum/tgui/children = list() // Children of this UI.
+
+ /**
+ * public
+ *
+ * Create a new UI.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object atom/movable The object which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ * required interface string The interface used to render the UI.
+ * optional title string The title of the UI.
+ * optional width int The window width.
+ * optional height int The window height.
+ * optional ref atom An extra ref to use when the window is closed.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/ui_state The state used to determine status.
+ *
+ * return datum/tgui The requested UI.
+ **/
+/datum/tgui/New(mob/user, atom/movable/src_object, ui_key, interface, \
+ title, width = 0, height = 0, \
+ atom/ref = null, datum/tgui/master_ui = null, \
+ datum/ui_state/state = default_state)
+ src.user = user
+ src.src_object = src_object
+ src.ui_key = ui_key
+ src.window_id = "\ref[src_object]-[ui_key]"
+
+ set_interface(interface)
+
+ if(title)
+ src.title = sanitize(title)
+ if(width)
+ src.width = width
+ if(height)
+ src.height = height
+
+ if(ref)
+ src.ref = ref
+
+ src.master_ui = master_ui
+ if(master_ui)
+ master_ui.children += src
+ src.state = state
+
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/tgui)
+ assets.send(user)
+
+ /**
+ * public
+ *
+ * Open this UI (and initialize it with data).
+ *
+ * optional data list The data to intialize the UI with.
+ **/
+/datum/tgui/proc/open(list/data = null)
+ if(!user.client)
+ return // Bail if there is no client.
+
+ update_status(push = 0) // Update the window status.
+ if(status == UI_CLOSE)
+ return // Bail if we should close.
+
+ if(!initial_data)
+ if(!data) // If we don't have initial_data and data was not passed, get data from the src_object.
+ data = src_object.get_ui_data(user)
+ set_initial_data(data) // Otherwise use the passed data.
+
+ var/window_size = ""
+ if(width && height) // If we have a width and height, use them.
+ window_size = "size=[width]x[height];"
+
+ user << browse(get_html(), "window=[window_id];[window_size][list2params(window_options)]") // Open the window.
+ winset(user, window_id, "on-close=\"uiclose \ref[src]\"") // Instruct the client to signal UI when the window is closed.
+ SStgui.on_open(src)
+
+ /**
+ * public
+ *
+ * Reinitialize the UI.
+ * (Possibly with a new interface and/or data).
+ *
+ * optional template string The name of the new interface.
+ * optional data list The new initial data.
+ **/
+/datum/tgui/proc/reinitialize(interface, list/data)
+ if(interface)
+ set_interface(interface) // Set a new interface.
+ if(data)
+ set_initial_data(data) // Replace the initial_data.
+ open()
+
+ /**
+ * public
+ *
+ * Close the UI, and all its children.
+ **/
+/datum/tgui/proc/close()
+ user << browse(null, "window=[window_id]") // Close the window.
+ SStgui.on_close(src)
+ for(var/datum/tgui/child in children) // Loop through and close all children.
+ child.close()
+
+ /**
+ * public
+ *
+ * Sets the browse() window options for this UI.
+ *
+ * required window_options list The window options to set.
+ **/
+/datum/tgui/proc/set_window_options(list/window_options)
+ src.window_options = window_options
+
+ /**
+ * public
+ *
+ * Set the style for this UI.
+ *
+ * required style string The new UI style.
+ **/
+/datum/tgui/proc/set_style(style)
+ src.style = lowertext(style)
+
+ /**
+ * public
+ *
+ * Set the interface (template) for this UI.
+ *
+ * required interface string The new UI interface.
+ **/
+/datum/tgui/proc/set_interface(interface)
+ src.interface = lowertext(interface)
+
+ /**
+ * public
+ *
+ * Enable/disable auto-updating of the UI.
+ *
+ * required state bool Enable/disable auto-updating.
+ **/
+/datum/tgui/proc/set_auto_update(state = 1)
+ auto_update = state
+
+ /**
+ * private
+ *
+ * Set the data to initialize the UI with.
+ * The datastructure cannot be changed by subsequent updates.
+ *
+ * optional data list The data/datastructure to initialize the UI with.
+ **/
+/datum/tgui/proc/set_initial_data(list/data)
+ initial_data = data
+
+ /**
+ * private
+ *
+ * Generate HTML for this UI.
+ *
+ * return string UI HTML output.
+ **/
+/datum/tgui/proc/get_html()
+ // Poplate HTML with JSON.
+ return replacetextEx(SStgui.html, "{}", get_json(initial_data))
+
+ /**
+ * private
+ *
+ * Get the config data/datastructure to initialize the UI with.
+ *
+ * return list The config data.
+ **/
+/datum/tgui/proc/get_config_data()
+ var/list/config_data = list(
+ "title" = title,
+ "status" = status,
+ "style" = style,
+ "interface" = interface,
+ "fancy" = user.client.prefs.tgui_fancy,
+ "window" = window_id,
+ "ref" = "\ref[src]",
+ "user" = list(
+ "name" = user.name,
+ "ref" = "\ref[user]"
+ ),
+ "srcObject" = list(
+ "name" = src_object.name,
+ "ref" = "\ref[src_object]"
+ )
+ )
+ return config_data
+
+ /**
+ * private
+ *
+ * Package the data to send to the UI, as JSON.
+ * This includes the UI data and config_data.
+ *
+ * return string The packaged JSON.
+ **/
+/datum/tgui/proc/get_json(list/data)
+ var/list/json_data = list()
+
+ json_data["config"] = get_config_data()
+ if(!isnull(data))
+ json_data["data"] = data
+
+ // Generate the JSON; replace bad characters.
+ var/json = JSON.stringify(json_data)
+ json = replacetextEx(json, "\improper", "")
+
+ return json
+
+ /**
+ * private
+ *
+ * Handle clicks from the UI.
+ * Call the src_object's ui_act() if status is UI_INTERACTIVE.
+ * If the src_object's ui_act() returns 1, update all UIs attacked to it.
+ **/
+/datum/tgui/Topic(href, href_list)
+ update_status(push = 0) // Update the window state.
+ if(status != UI_INTERACTIVE || user != usr)
+ return // If UI is not interactive or usr calling Topic is not the UI user.
+
+ var/action = href_list["action"] // Pull the action out.
+ href_list -= "action"
+
+ var/update = src_object.ui_act(action, href_list, state) // Call ui_act() on the src_object.
+ if(src_object && update)
+ SStgui.update_uis(src_object) // If we have a src_object and its ui_act() told us to update.
+
+ /**
+ * private
+ *
+ * Update the UI.
+ * Only updates the data if update is true, otherwise only updates the status.
+ *
+ * optional force bool If the UI should be forced to update.
+ **/
+/datum/tgui/process(force = 0)
+ if(!src_object || !user) // If the object or user died (or something else), abort.
+ close()
+ return
+
+ if(status && (force || auto_update))
+ update() // Update the UI if the status and update settings allow it.
+ else
+ update_status(push = 1) // Otherwise only update status.
+
+ /**
+ * private
+ *
+ * Push data to an already open UI.
+ *
+ * required data list The data to send.
+ * optional force bool If the update should be sent regardless of state.
+ **/
+/datum/tgui/proc/push_data(data, force = 0)
+ update_status(push = 0) // Update the window state.
+ if(status <= UI_DISABLED && !force)
+ return // Cannot update UI, we have no visibility.
+
+ // Send the new JSON to the recieveUpdate() Javascript function.
+ user << output(url_encode(get_json(data)), "[window_id].browser:receiveUpdate")
+
+
+ /**
+ * private
+ *
+ * Updates the UI by interacting with the src_object again, which will hopefully
+ * call try_ui_update on it.
+ *
+ * optional force_open bool If force_open should be passed to ui_interact.
+ **/
+/datum/tgui/proc/update(force_open = 0)
+ src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
+
+ /**
+ * private
+ *
+ * Update the status/visibility of the UI for its user.
+ *
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ **/
+/datum/tgui/proc/update_status(push = 0)
+ var/new_status = src_object.ui_state(user, state)
+ if(master_ui)
+ new_status = min(new_status, master_ui.status)
+
+ if(new_status == UI_CLOSE)
+ close()
+ else
+ set_status(new_status, push)
+
+ /**
+ * private
+ *
+ * Set the status/visibility of the UI.
+ *
+ * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ **/
+/datum/tgui/proc/set_status(status, push = 0)
+ if(src.status != status) // Only update if status has changed.
+ if(src.status == UI_DISABLED)
+ src.status = status
+ if(push)
+ update()
+ else
+ src.status = status
+ if(status == UI_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
+ push_data(null, force = 1)
\ No newline at end of file
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
new file mode 100644
index 00000000000..6d9d94747dd
--- /dev/null
+++ b/code/modules/vehicles/atv.dm
@@ -0,0 +1,82 @@
+
+/obj/vehicle/atv
+ name = "all-terrain vehicle"
+ desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
+ icon_state = "atv"
+ keytype = /obj/item/key
+ generic_pixel_x = 0
+ generic_pixel_y = 4
+ vehicle_move_delay = 1
+ var/static/image/atvcover = null
+
+
+/obj/vehicle/atv/New()
+ ..()
+ if(!atvcover)
+ atvcover = image("icons/obj/vehicles.dmi", "atvcover")
+ atvcover.layer = MOB_LAYER + 0.1
+
+
+obj/vehicle/atv/post_buckle_mob(mob/living/M)
+ if(buckled_mob)
+ overlays += atvcover
+ else
+ overlays -= atvcover
+
+
+/obj/vehicle/atv/handle_vehicle_layer()
+ if(dir == SOUTH)
+ layer = MOB_LAYER+0.1
+ else
+ layer = OBJ_LAYER
+
+
+//TURRETS!
+/obj/vehicle/atv/turret
+ var/obj/machinery/porta_turret/syndicate/vehicle_turret/turret = null
+
+
+/obj/machinery/porta_turret/syndicate/vehicle_turret
+ name = "mounted turret"
+ scan_range = 7
+ emp_vunerable = 1
+ density = 0
+
+
+/obj/vehicle/atv/turret/New()
+ ..()
+ turret = new(loc)
+ turret.base = src
+
+
+/obj/vehicle/atv/turret/handle_vehicle_layer()
+ if(dir == SOUTH)
+ layer = MOB_LAYER+0.1
+ else
+ layer = OBJ_LAYER
+
+ if(turret)
+ if(dir == NORTH)
+ turret.layer = MOB_LAYER+0.1
+ else
+ turret.layer = OBJ_LAYER
+
+
+/obj/vehicle/atv/turret/handle_vehicle_offsets()
+ ..()
+ if(turret)
+ turret.loc = loc
+ switch(dir)
+ if(NORTH)
+ turret.pixel_x = 0
+ turret.pixel_y = 4
+ if(EAST)
+ turret.pixel_x = -12
+ turret.pixel_y = 4
+ if(SOUTH)
+ turret.pixel_x = 0
+ turret.pixel_y = 4
+ if(WEST)
+ turret.pixel_x = 12
+ turret.pixel_y = 4
+
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
new file mode 100644
index 00000000000..c74b66caee1
--- /dev/null
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -0,0 +1,93 @@
+
+
+//PIMP-CART
+/obj/vehicle/janicart
+ name = "janicart (pimpin' ride)"
+ desc = "A brave janitor cyborg gave its life to produce such an amazing combination of speed and utility."
+ icon_state = "pussywagon"
+ keytype = /obj/item/key/janitor
+ var/obj/item/weapon/storage/bag/trash/mybag = null
+ var/floorbuffer = 0
+
+
+/obj/vehicle/janicart/handle_vehicle_offsets()
+ ..()
+ if(buckled_mob)
+ switch(buckled_mob.dir)
+ if(NORTH)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 4
+ if(EAST)
+ buckled_mob.pixel_x = -12
+ buckled_mob.pixel_y = 7
+ if(SOUTH)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 7
+ if(WEST)
+ buckled_mob.pixel_x = 12
+ buckled_mob.pixel_y = 7
+
+
+/obj/item/key/janitor
+ desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
+ icon_state = "keyjanitor"
+
+
+/obj/item/janiupgrade
+ name = "floor buffer upgrade"
+ desc = "An upgrade for mobile janicarts."
+ icon = 'icons/obj/vehicles.dmi'
+ icon_state = "upgrade"
+
+
+/obj/vehicle/janicart/Moved(atom/OldLoc, Dir)
+ if(floorbuffer)
+ var/turf/tile = loc
+ if(isturf(tile))
+ tile.clean_blood()
+ for(var/A in tile)
+ if(is_cleanable(A))
+ qdel(A)
+
+
+/obj/vehicle/janicart/examine(mob/user)
+ ..()
+ if(floorbuffer)
+ user << "It has been upgraded with a floor buffer."
+
+
+/obj/vehicle/janicart/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/weapon/storage/bag/trash))
+ if(keytype == /obj/item/key/janitor)
+ if(!user.drop_item())
+ return
+ user << "You hook the trashbag onto \the [name]."
+ I.loc = src
+ mybag = I
+ else if(istype(I, /obj/item/janiupgrade))
+ if(keytype == /obj/item/key/janitor)
+ floorbuffer = 1
+ qdel(I)
+ user << "You upgrade \the [name] with the floor buffer."
+ update_icon()
+
+ ..()
+
+
+/obj/vehicle/janicart/update_icon()
+ overlays.Cut()
+ if(mybag)
+ overlays += "cart_garbage"
+ if(floorbuffer)
+ overlays += "cart_buffer"
+
+
+/obj/vehicle/janicart/attack_hand(mob/user)
+ if(..())
+ return 1
+ else if(mybag)
+ mybag.loc = get_turf(user)
+ user.put_in_hands(mybag)
+ mybag = null
+ update_icon()
+
diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm
new file mode 100644
index 00000000000..0a440eb370c
--- /dev/null
+++ b/code/modules/vehicles/secway.dm
@@ -0,0 +1,13 @@
+
+/obj/vehicle/secway
+ name = "secway"
+ desc = "A brave security cyborg gave its life to help you look like a complete tool."
+ icon_state = "secway"
+ keytype = /obj/item/key/security
+ generic_pixel_x = 0
+ generic_pixel_y = 4
+
+
+/obj/item/key/security
+ desc = "A keyring with a small steel key, and a rubber stun baton accessory."
+ icon_state = "keysec"
\ No newline at end of file
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
new file mode 100644
index 00000000000..6c6c8dbf6a1
--- /dev/null
+++ b/code/modules/vehicles/vehicle.dm
@@ -0,0 +1,125 @@
+
+/obj/vehicle
+ name = "vehicle"
+ desc = "A basic vehicle, vroom"
+ icon = 'icons/obj/vehicles.dmi'
+ icon_state = "fuckyou"
+ density = 1
+ anchored = 0
+ can_buckle = 1
+ buckle_lying = 0
+ var/keytype = null //item typepath, if non-null an item of this type is needed in your hands to drive this vehicle
+ var/next_vehicle_move = 0 //used for move delays
+ var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
+ var/auto_door_open = TRUE
+
+ //Pixels
+ var/generic_pixel_x = 0 //All dirs show this pixel_x for the driver
+ var/generic_pixel_y = 0 //All dirs shwo this pixel_y for the driver
+
+
+/obj/vehicle/New()
+ ..()
+ handle_vehicle_layer()
+
+
+//APPEARANCE
+/obj/vehicle/proc/handle_vehicle_layer()
+ if(dir != NORTH)
+ layer = MOB_LAYER+0.1
+ else
+ layer = OBJ_LAYER
+
+
+//Override this to set your vehicle's various pixel offsets
+//if they differ between directions, otherwise use the
+//generic variables
+/obj/vehicle/proc/handle_vehicle_offsets()
+ if(buckled_mob)
+ buckled_mob.dir = dir
+ buckled_mob.pixel_x = generic_pixel_x
+ buckled_mob.pixel_y = generic_pixel_y
+
+
+/obj/vehicle/update_icon()
+ return
+
+
+
+//KEYS
+/obj/vehicle/proc/keycheck(mob/user)
+ if(keytype)
+ if(istype(user.l_hand, keytype) || istype(user.r_hand, keytype))
+ return 1
+ else
+ return 1
+ return 0
+
+/obj/item/key
+ name = "key"
+ desc = "A small grey key."
+ icon = 'icons/obj/vehicles.dmi'
+ icon_state = "key"
+ w_class = 1
+
+
+//BUCKLE HOOKS
+/obj/vehicle/unbuckle_mob(force = 0)
+ if(buckled_mob)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 0
+ . = ..()
+
+
+/obj/vehicle/user_buckle_mob(mob/living/M, mob/user)
+ if(user.incapacitated())
+ return
+ for(var/atom/movable/A in get_turf(src))
+ if(A.density)
+ if(A != src && A != M)
+ return
+ M.loc = get_turf(src)
+ ..()
+ handle_vehicle_offsets()
+
+
+//MOVEMENT
+/obj/vehicle/relaymove(mob/user, direction)
+ if(user.incapacitated())
+ unbuckle_mob()
+
+ if(keycheck(user))
+ if(!Process_Spacemove(direction) || !has_gravity(src.loc) || world.time < next_vehicle_move || !isturf(loc))
+ return
+ next_vehicle_move = world.time + vehicle_move_delay
+
+ step(src, direction)
+
+ if(buckled_mob)
+ if(buckled_mob.loc != loc)
+ buckled_mob.buckled = null //Temporary, so Move() succeeds.
+ buckled_mob.buckled = src //Restoring
+
+ handle_vehicle_layer()
+ handle_vehicle_offsets()
+ else
+ user << "You'll need the keys in one of your hands to drive \the [name]."
+
+
+/obj/vehicle/Move(NewLoc,Dir=0,step_x=0,step_y=0)
+ ..()
+ handle_vehicle_layer()
+ handle_vehicle_offsets()
+
+
+/obj/vehicle/attackby(obj/item/I, mob/user, params)
+ if(keytype && istype(I, keytype))
+ user << "Hold [I] in one of your hands while you drive \the [name]."
+
+
+/obj/vehicle/Bump(atom/movable/M)
+ . = ..()
+ if(auto_door_open)
+ if(istype(M, /obj/machinery/door) && buckled_mob)
+ M.Bumped(buckled_mob)
+
diff --git a/config/admins.txt b/config/admins.txt
index 40eb253258d..1da322c5d64 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -104,4 +104,5 @@ Lzimann = Game Master
As334 = Game Master
neersighted = Game Master
Swankcookie = Game Master
-Ressler = Game Master
\ No newline at end of file
+Ressler = Game Master
+Bawhoppennn = Game Master
\ No newline at end of file
diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt
index dde7edfc7b6..986900d5c1d 100644
--- a/config/awaymissionconfig.txt
+++ b/config/awaymissionconfig.txt
@@ -18,3 +18,4 @@
#_maps/RandomZLevels/undergroundoutpost45.dmm
#_maps/RandomZLevels/caves.dmm
#_maps/RandomZLevels/snowdin.dmm
+#_maps/RandomZLevels/research.dmm
diff --git a/config/lavaRuinConfig.txt b/config/lavaRuinConfig.txt
new file mode 100644
index 00000000000..c677f1e344a
--- /dev/null
+++ b/config/lavaRuinConfig.txt
@@ -0,0 +1,4 @@
+#List the potential random ruins here. This file is for small things that would appear in lavaland, such as hidden temples or labs.
+#Maps must be the full path to them
+#Ruins should be 30x30 at max. Anymore than that will break the game.
+#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
\ No newline at end of file
diff --git a/config/spaceRuinConfig.txt b/config/spaceRuinConfig.txt
new file mode 100644
index 00000000000..a0de267df38
--- /dev/null
+++ b/config/spaceRuinConfig.txt
@@ -0,0 +1,6 @@
+#List the potential random ruins here. This file is for small things that would appear in space, like an asteroid or broken escape pod.
+#Maps must be the full path to them
+#Ruins should be 40x40 at max. Anymore than that will break the game.
+#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
+
+#_maps/RandomRuins/SpaceRuins/way_home.dmm
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 94c4d651767..5c85c074aeb 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,106 @@
-->
+
02 January 2016
+
Kor updated:
+
+
Guardians/Parasites are now named after constellations, and have new sprites from Ausops.
+
+
Kor and GunHog updated:
+
+
Malfunctioning AIs can now purchase Enhanced Surveillance for 30 points, which allows them to "hear" with their camera eye.
+
+
MMMiracles updated:
+
+
A distress signal was recently discovered with gateway coordinates attached to a far-off research facility owned by Nanotrasen. The signal was sent out in hopes of someone competent receiving it, unfortunately, your station was the only one to respond. Local security forces may not be welcoming your arrival group with open arms.
+
+
+
01 January 2016
+
Iamgoofball updated:
+
+
Redid how objectives are assigned, they're now a lot more random in terms of what you can get.
+
+
Incoming5643 updated:
+
+
Removed gender restrictions from socks.
+
+
Joan updated:
+
+
Storage Blobs are gone; they were effectively a waste of resources, as there are more or less no points at which you should need them, unless you were winning excessively hard.
+
Blobs can no longer burst early; instead, the button gives some early help and serves to indicate you're a blob.
+
Blobbernauts now poll candidates instead of grabbing a candidate immediately. The poll is 5 seconds, so that there's no significant pause between making a blobbernaut and it doing stuff.
+
Blobbernaut creation replaces Storage Blob creation on the blob HUD.
+
Overmind communication is now much larger and easier to see, and blob mobs, such as blobbernauts, will hear it.
+
+
Kor updated:
+
+
The wizard has a new spell, Lesser Summon Guns. This summons an unending stream of single shot bolt action rifles into his hands, automatically replacing themselves as you fire.
+
Fixes successive generations of grey tide clones not despawning.
+
Using challenge ops now delays shuttle refuel.
+
Added a new wizard event, Advanced Darkness.
+
+
MrStonedOne updated:
+
+
GHOST POPUP RE-WORK
+
Ghost popups will no longer steal focus
+
Ghost popups will no longer submit on key press (regardless of focus) unless you tab to a button first
+
Ghost popups will close themselves after the time out has ended
+
Ghost popups are now themed.
+
Long actions (like resisting out of handcuffs) will no longer count space/nograv drifting as the user moving.
+
This does not apply to the target of a long action if that target isn't you. Pulling something while space drifting and working on it intentionally won't work.
+
+
+
31 December 2015
+
Bawhoppen updated:
+
+
Nanotrasen has opened the availability of tactical SWAT gear to station's cargo department
+
Due to a new trade agreement with Chinese space suit manufacturers, Nanotrasen can now obtain basic space suits much cheaper; This has been reflected in the cargo prices
+
Amateur medieval enthusiasts have found a quick way to easily make wooden bucklers.
+
+
Joan updated:
+
+
Replaced every book sprite in the game with new, consistent versions.
+
Except the one-use wizard spellbooks, which already got new sprites.
+
+
PKPenguin321 updated:
+
+
Chest implants have been added that allow you to morph your arms into a gun and back at will. There are two variants, a taser version and a laser version. Both versions are self-charging. Getting EMPed with one of these implants results in the implant breaking and loads of fire damage. The implants are currently admin-only.
+
The telecrystal price for thermal imaging goggles has been lowered from 6 to 4.
+
+
incoming5643 updated:
+
+
The wizard federation has finally updated their assortment of guns for the summon guns event. Look forward to getting shot in the face with a whole new batch of interesting and rarely seen weaponry!
+
+
+
28 December 2015
+
AnturK updated:
+
+
You can now write an entire word with crayons by setting it as a buffer and then clicking the target tiles in the right order.
+
+
Joan updated:
+
+
Blobbernauts can no longer smash walls of any type.
+
+
MrStonedOne updated:
+
+
Progress bars now have 20 states instead of 5.
+
Bump mining should be fixed.
+
Long actions now checks for movement/changed hands/etc more often to prevent edge cases.
+
Multiple progress bars will now stack properly, rather than fight each other for focus.
+
+
Ressler updated:
+
+
Adds the reagent Haloperidol.
+
It is an anti-drug reagent, good for stopping assistants hyped up on meth, bath salts, and equally illegal drugs.
+
It can be made with Chlorine, Fluorine, Aluminum, Potassium Iodide, and Oil.
+
+
neersighted updated:
+
+
Make NanoUIs transfer upon (un)ghosting.
+
Fix NanoUIs jumping when resized/dragged.
+
Lots of other NanoUI bugs.
+
+
27 December 2015
Joan updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b5f3110a2ad..973982dae38 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3092,3 +3092,100 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
the emper, not in range of the flash.
- tweak: Flashes in a mob's inventory that are emp'ed will only aoe stun if it is
not inside of a container like a backpack/box
+2015-12-28:
+ AnturK:
+ - rscadd: You can now write an entire word with crayons by setting it as a buffer
+ and then clicking the target tiles in the right order.
+ Joan:
+ - rscdel: Blobbernauts can no longer smash walls of any type.
+ MrStonedOne:
+ - tweak: Progress bars now have 20 states instead of 5.
+ - bugfix: Bump mining should be fixed.
+ - tweak: Long actions now checks for movement/changed hands/etc more often to prevent
+ edge cases.
+ - tweak: Multiple progress bars will now stack properly, rather than fight each
+ other for focus.
+ Ressler:
+ - rscadd: Adds the reagent Haloperidol.
+ - rscadd: It is an anti-drug reagent, good for stopping assistants hyped up on meth,
+ bath salts, and equally illegal drugs.
+ - rscadd: It can be made with Chlorine, Fluorine, Aluminum, Potassium Iodide, and
+ Oil.
+ neersighted:
+ - bugfix: Make NanoUIs transfer upon (un)ghosting.
+ - bugfix: Fix NanoUIs jumping when resized/dragged.
+ - bugfix: Lots of other NanoUI bugs.
+2015-12-31:
+ Bawhoppen:
+ - rscadd: Nanotrasen has opened the availability of tactical SWAT gear to station's
+ cargo department
+ - rscadd: Due to a new trade agreement with Chinese space suit manufacturers, Nanotrasen
+ can now obtain basic space suits much cheaper; This has been reflected in the
+ cargo prices
+ - rscadd: Amateur medieval enthusiasts have found a quick way to easily make wooden
+ bucklers.
+ Joan:
+ - imageadd: Replaced every book sprite in the game with new, consistent versions.
+ - imageadd: Except the one-use wizard spellbooks, which already got new sprites.
+ PKPenguin321:
+ - rscadd: Chest implants have been added that allow you to morph your arms into
+ a gun and back at will. There are two variants, a taser version and a laser
+ version. Both versions are self-charging. Getting EMPed with one of these implants
+ results in the implant breaking and loads of fire damage. The implants are currently
+ admin-only.
+ - tweak: The telecrystal price for thermal imaging goggles has been lowered from
+ 6 to 4.
+ incoming5643:
+ - rscadd: The wizard federation has finally updated their assortment of guns for
+ the summon guns event. Look forward to getting shot in the face with a whole
+ new batch of interesting and rarely seen weaponry!
+2016-01-01:
+ Iamgoofball:
+ - experiment: Redid how objectives are assigned, they're now a lot more random in
+ terms of what you can get.
+ Incoming5643:
+ - tweak: Removed gender restrictions from socks.
+ Joan:
+ - rscdel: Storage Blobs are gone; they were effectively a waste of resources, as
+ there are more or less no points at which you should need them, unless you were
+ winning excessively hard.
+ - rscdel: Blobs can no longer burst early; instead, the button gives some early
+ help and serves to indicate you're a blob.
+ - wip: Blobbernauts now poll candidates instead of grabbing a candidate immediately.
+ The poll is 5 seconds, so that there's no significant pause between making a
+ blobbernaut and it doing stuff.
+ - rscadd: Blobbernaut creation replaces Storage Blob creation on the blob HUD.
+ - tweak: Overmind communication is now much larger and easier to see, and blob mobs,
+ such as blobbernauts, will hear it.
+ Kor:
+ - rscadd: The wizard has a new spell, Lesser Summon Guns. This summons an unending
+ stream of single shot bolt action rifles into his hands, automatically replacing
+ themselves as you fire.
+ - bugfix: Fixes successive generations of grey tide clones not despawning.
+ - tweak: Using challenge ops now delays shuttle refuel.
+ - rscadd: Added a new wizard event, Advanced Darkness.
+ MrStonedOne:
+ - experiment: GHOST POPUP RE-WORK
+ - bugfix: Ghost popups will no longer steal focus
+ - bugfix: Ghost popups will no longer submit on key press (regardless of focus)
+ unless you tab to a button first
+ - tweak: Ghost popups will close themselves after the time out has ended
+ - rscadd: Ghost popups are now themed.
+ - tweak: Long actions (like resisting out of handcuffs) will no longer count space/nograv
+ drifting as the user moving.
+ - tweak: This does not apply to the target of a long action if that target isn't
+ you. Pulling something while space drifting and working on it intentionally
+ won't work.
+2016-01-02:
+ Kor:
+ - rscadd: Guardians/Parasites are now named after constellations, and have new sprites
+ from Ausops.
+ Kor and GunHog:
+ - rscadd: Malfunctioning AIs can now purchase Enhanced Surveillance for 30 points,
+ which allows them to "hear" with their camera eye.
+ MMMiracles:
+ - rscadd: A distress signal was recently discovered with gateway coordinates attached
+ to a far-off research facility owned by Nanotrasen. The signal was sent out
+ in hopes of someone competent receiving it, unfortunately, your station was
+ the only one to respond. Local security forces may not be welcoming your arrival
+ group with open arms.
diff --git a/html/changelogs/AutoChangeLog-pr-14056.yml b/html/changelogs/AutoChangeLog-pr-14056.yml
deleted file mode 100644
index 1f355cb7ef3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-14056.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: neersighted
-delete-after: True
-changes:
- - bugfix: "Make NanoUIs transfer upon (un)ghosting."
- - bugfix: "Fix NanoUIs jumping when resized/dragged."
- - bugfix: "Lots of other NanoUI bugs."
diff --git a/html/changelogs/AutoChangeLog-pr-14057.yml b/html/changelogs/AutoChangeLog-pr-14057.yml
deleted file mode 100644
index 48b589dd834..00000000000
--- a/html/changelogs/AutoChangeLog-pr-14057.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Ressler
-delete-after: True
-changes:
- - rscadd: "Adds the reagent Haloperidol."
- - rscadd: "It is an anti-drug reagent, good for stopping assistants hyped up on meth, bath salts, and equally illegal drugs."
- - rscadd: "It can be made with Chlorine, Fluorine, Aluminum, Potassium Iodide, and Oil."
diff --git a/icons/effects/doafter_icon.dmi b/icons/effects/doafter_icon.dmi
deleted file mode 100644
index 0add263e976..00000000000
Binary files a/icons/effects/doafter_icon.dmi and /dev/null differ
diff --git a/icons/effects/progessbar.dmi b/icons/effects/progessbar.dmi
new file mode 100644
index 00000000000..99284060aa6
Binary files /dev/null and b/icons/effects/progessbar.dmi differ
diff --git a/icons/effects/weather_effects.dmi b/icons/effects/weather_effects.dmi
new file mode 100644
index 00000000000..57d92f17b6b
Binary files /dev/null and b/icons/effects/weather_effects.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 263efbbeade..c114de2421e 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index af26c8e825d..83ca97a050f 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 64a6befed1e..e1f56e4ebbe 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index c8d92941b47..62feebd8126 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi
index 354b4eb33d8..184337131ad 100644
Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ
diff --git a/icons/mob/guardian.dmi b/icons/mob/guardian.dmi
index 9db3fbedc68..9da38ca7706 100644
Binary files a/icons/mob/guardian.dmi and b/icons/mob/guardian.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index d73d539e14c..ad118904ec2 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 159f8b93be2..b5f858b0406 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 092a08e9596..48e9898a77d 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index dbfe5a67b89..703d22a67db 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 6e03c9f6f14..83d70a7e4ac 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 90210fe486a..4696fcf81b1 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 3a99f8a99c2..b44f969c459 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index df1288b3aa1..8d3e2fa7866 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/nano/Gulpfile.coffee b/nano/Gulpfile.coffee
deleted file mode 100644
index 2a0f51d326b..00000000000
--- a/nano/Gulpfile.coffee
+++ /dev/null
@@ -1,129 +0,0 @@
-### Settings ###
-util = require("gulp-util")
-f =
- colorblind: util.env.colorblind || util.env.c
- min: util.env.min || util.env.m
- sourcemaps: util.env.sourcemaps || util.env.s
-
-# Project Paths
-input =
- html: "html"
- images: "images"
- scripts: "scripts"
- styles: "styles"
- templates: "templates"
-
-output =
- dir: "assets"
- js: "nanoui.js"
- css: "nanoui.css"
-
-# Processor Settings
-dotOpts =
- evaluate: /\{\{([\s\S]+?)\}\}/g,
- interpolate: /\{\{=([\s\S]+?)\}\}/g,
- encode: /\{\{!([\s\S]+?)\}\}/g,
- use: /\{\{#([\s\S]+?)\}\}/g,
- define: /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
- conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
- iterate: /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
- varname: "data, config, helper",
- strip: true,
- append: true,
- selfcontained: true
-
-### Packages ###
-bower = require "main-bower-files"
-child_process = require "child_process"
-del = require "del"
-gulp = require "gulp"
-merge = require "merge2"
-
-### Plugins ###
-g = require("gulp-load-plugins")({replaceString: /^gulp(-|\.)|-/g})
-p =
- autoprefixer: require "autoprefixer"
- colorblind: require "postcss-colorblind"
- fontweights: require "postcss-font-weights"
- gradient: require "postcss-filter-gradient"
- opacity: require "postcss-opacity"
- plsfilters: require "pleeease-filters"
- rgba: require "postcss-color-rgba-fallback"
-
-### Helpers ###
-glob = (path) ->
- "#{path}/*"
-
-### Tasks ###
-html = ->
- gulp.src glob input.html
- .pipe g.bytediff.start()
- .pipe g.if(f.min, g.htmlmin({collapseWhitespace: true, minifyJS: true, minifyCSS: true, quoteCharacter: "'"}))
- .pipe g.bytediff.stop()
- .pipe gulp.dest output.dir
-
-
-js = ->
- lib = gulp.src bower "**/*.js"
- .pipe g.if(f.sourcemaps, g.sourcemaps.init())
-
- main = gulp.src glob input.scripts
- .pipe g.if(f.sourcemaps, g.sourcemaps.init())
- .pipe g.coffee()
-
- templates = gulp.src glob input.templates
- .pipe g.dotprecompiler({dictionary: "TMPL", templateSettings: dotOpts})
- .pipe g.concat("templates")
- .pipe g.header("window.TMPL = {};\n")
-
- combined = merge lib, templates, main
- combined
- .pipe g.concat(output.js)
- .pipe g.bytediff.start()
- .pipe g.if(f.min, g.uglify({mangle: true, compress: {unsafe: true, negate_iife: true, drop_console: true}}), g.jsbeautifier())
- .pipe g.if(f.sourcemaps, g.sourcemaps.write())
- .pipe g.bytediff.stop()
- .pipe gulp.dest output.dir
-
-
-css = ->
- lib = gulp.src bower "**/*.css"
- .pipe g.if(f.sourcemaps, g.sourcemaps.init())
-
- main = gulp.src glob input.styles
- .pipe g.filter(["*.less", "!_*.less"])
- .pipe g.if(f.sourcemaps, g.sourcemaps.init())
- .pipe g.less({paths: [input.images]})
- .pipe g.postcss([
- p.autoprefixer({browsers: ["last 2 versions", "ie >= 8"]}),
- p.gradient,
- p.opacity,
- p.rgba({oldie: true}),
- p.plsfilters({oldIE: true}),
- p.fontweights
- ])
- .pipe g.if(f.colorblind, g.postcss([p.colorblind]))
-
- combined = merge lib, main
- combined
- .pipe g.concat(output.css)
- .pipe g.bytediff.start()
- .pipe g.if(f.min, g.cssnano({autoprefixer: {browsers: ["last 2 versions", "ie >= 8"]}, discardComments: {removeAll: true}}), g.csscomb())
- .pipe g.if(f.sourcemaps, g.sourcemaps.write())
- .pipe g.bytediff.stop()
- .pipe gulp.dest output.dir
-
-
-gulp.task "default", ["clean"], ->
- all = merge js(), css(), html()
- all.pipe g.size()
-
-gulp.task "reload", ["default"], ->
- child_process.exec "reload.bat", (err, stdout, stderr) ->
- console.log err if err
-
-gulp.task "watch", ->
- Object.keys(input).forEach (inp) ->
- gulp.watch [glob input[inp]], ["reload"]
-
-gulp.task "clean", -> del glob output.dir
diff --git a/nano/README.md b/nano/README.md
deleted file mode 100644
index aebc35d75d6..00000000000
--- a/nano/README.md
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-- [NanoUI](#nanoui)
- - [Introduction](#introduction)
- - [Components](#components)
- - [`ui_interact()`](#uiinteract)
- - [`get_ui_data()`](#getuidata)
- - [`Topic()`](#topic)
- - [Template (doT)](#template-dot)
- - [Helpers](#helpers)
- - [Link](#link)
- - [Bar](#bar)
- - [doT](#dot)
- - [Styling](#styling)
- - [Contributing](#contributing)
-
-
-
-# NanoUI
-
-## Introduction
-
-NanoUI is the user interface library of /tg/station. While more complex than
-traditional `browse()`/stringbuilder based interfaces, it allows much more
-control over display of data and gives you many features for free, such as
-different `CanUseTopic()` checks (in range/is robot/in inventory/in hand/etc),
-automatic refresh, attractive looks, and helpers that make writing interfaces
-much easier.
-
-NanoUI adds a `ui_interact()` proc to all atoms, which should be called from
-`interact()`. The interact proc can be called from anywhere in the atom (usually
- `attack_self()` or `attack_hand()`), and is where all checks should be made.
- The `ui_interact()` proc should only include NanoUI code.
-
-Baystation12's version of NanoUI, while slightly different in syntax, has a
-good [reference](http://wiki.baystation12.net/NanoUI).
-
-Here is a real example from
-[tanks.dm](https://github.com/tgstation/-tg-station/blob/master/code/game/objects/items/weapons/tanks/tanks.dm).
-
- /obj/item/weapon/tank/attack_self(mob/user)
- if (!user)
- return
- interact(user)
-
- /obj/item/weapon/tank/interact(mob/user)
- add_fingerprint(user)
- ui_interact(user)
-
- /obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
- if (!ui)
- ui = new(user, src, ui_key, "tanks", name, 525, 175, state = inventory_state)
- ui.open()
-
-
-
-
-## Components
-
-### `ui_interact()`
-
-The`ui_interact()` proc is used to open a NanoUI (or update it if already open).
-As NanoUI will call this proc to update your UI, you should not put any logic in
-it, as NanoUI handles the logic for you.
-
-The parameters for `try_update_ui` and `/datum/nanoui/new()` are documented in
-the code [here](https://github.com/tgstation/-tg-station/tree/master/code/modules/nano).
-The most interesting parameter is `state`, which allows the object to choose the
-checks that allow the UI to be interacted with.
-
-The default state (`default_state`) checks that the user is alive, conscious,
-and within a few tiles. It allows universal access to silicons. Other states
-exist, and may be more appropriate for different interfaces. For example,
-`physical_state` requires the user to be nearby, even if they are a silicon.
-`inventory_state` checks that the user has the object in their first-level
-(not container) inventory, this is suitable for devices such as radios;
-`notcontained_state` checks that the user is outside the object (great for cryo
-and similar machines).
-
- /obj/item/the/thing/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
- ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
- if (!ui)
- ui = new(user, src, ui_key, "template", title, width, height)
- ui.open()
-
-### `get_ui_data()`
-
-The `get_ui_data()` proc returns a list which is used to populate the `data`
-variable in the UI. This is where you should pass variables from your atom to
-the UI. Here's another example from tanks.dm.
-
- /obj/item/weapon/tank/get_ui_data()
- var/mob/living/carbon/location = null
-
- if(istype(loc, /mob/living/carbon))
- location = loc
- else if(istype(loc.loc, /mob/living/carbon))
- location = loc.loc
-
- var/data = list()
- data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
- data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
- data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
- data["minReleasePressure"] = round(TANK_MIN_RELEASE_PRESSURE)
- data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE)
- data["valveOpen"] = 0
- data["maskConnected"] = 0
-
- if(istype(location))
- var/mask_check = 0
-
- if(location.internal == src) // if tank is current internal
- mask_check = 1
- data["valveOpen"] = 1
- else if(src in location) // or if tank is in the mobs possession
- if(!location.internal) // and they do not have any active internals
- mask_check = 1
-
- if(mask_check)
- if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS))
- data["maskConnected"] = 1
- return data
-
-This data can be accessed inside the NanoUI. For example, to find out if the
-mask is connected (as checked near the end of the proc), we simply use
-`data.maskConnected` in our template.
-
-### `Topic()`
-
-`Topic()` handles input from the UI. Typically you will recieve some data from
-a button press, or pop up a input dialog to take a numerical value from the
-user. Sanity checking is useful here, as `Topic()` is trivial to spoof with
-arbitrary data.
-
-The `Topic()` interface is just the same as with more conventional,
-stringbuilder-based UIs, and this needs little explanation.
-
- /obj/item/weapon/tank/Topic(href, href_list)
- if (..())
- return
-
- if (href_list["dist_p"])
- if (href_list["dist_p"] == "custom")
- var/custom = input(usr, "What rate do you set the regulator to? The dial reads from 0 to [TANK_MAX_RELEASE_PRESSURE].") as null|num
- if(isnum(custom))
- href_list["dist_p"] = custom
- .()
- else if (href_list["dist_p"] == "reset")
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
- else if (href_list["dist_p"] == "min")
- distribute_pressure = TANK_MIN_RELEASE_PRESSURE
- else if (href_list["dist_p"] == "max")
- distribute_pressure = TANK_MAX_RELEASE_PRESSURE
- else
- distribute_pressure = text2num(href_list["dist_p"])
- distribute_pressure = min(max(round(distribute_pressure), TANK_MIN_RELEASE_PRESSURE), TANK_MAX_RELEASE_PRESSURE)
- if (href_list["stat"])
- if(istype(loc,/mob/living/carbon))
- var/mob/living/carbon/location = loc
- if(location.internal == src)
- location.internal = null
- location.internals.icon_state = "internal0"
- usr << "You close the tank release valve."
- if (location.internals)
- location.internals.icon_state = "internal0"
- else
- if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS))
- location.internal = src
- usr << "You open \the [src] valve."
- if (location.internals)
- location.internals.icon_state = "internal1"
- else
- usr << "You need something to connect to \the [src]!"
-
-### Template (doT)
-
-NanoUI templates are written in [doT](https://olado.github.io/doT/index.html),
-a Javascript template engine. Data is accessed from the `data` object,
-configuration (not used in pratice) from the `config` object, and template
-helpers are accessed from the `helper` object.
-
-#### Helpers
-
-##### Link
-
- {{=helpers.link(text, icon, {'parameter': true}, status, class)}}
-
-Used to create a link (button), which will pass its parameters to `Topic()`.
-
-* Text: The text content of the link/button
-* Icon: The icon shown to the left of the link (http://fontawesome.io/)
-* Parameters: The values to be passed to `Topic()`'s `href_list`.
-* Status: `null` for clickable, a class for selected/unclickable.
-* Class: Styling to apply to the link.
-
-Status and Class have almost the same effect. However, changing a link's status
-from `null` to something else makes it unclickable, while setting a custom Class
-does not.
-
-Ternary operators are often used to avoid writing many `if` statements.
-For example, depending on if a value in `data` is true or false we can set a
-button to clickable or selected:
-
- {{=helper.link('Close', 'lock', {'stat': 1}, data.valveOpen ? null : 'selected')}}
-
-Available classes/statuses are:
-
-* null (normal)
-* selected
-* caution
-* danger
-* disabled
-
-##### Bar
-
- {{=helpers.bar(value, min, max, class, text)}}
-
-Used to create a bar, to display a numerical value visually. Min and Max default
-to 0 and 100, but you can change them to avoid doing your own percent calculations.
-
-* Value: Defaults to a percentage but can be a straight number if Min/Max are set
-* Min: The minimum value (left hand side) of the bar
-* Max: The maximum value (right hand side) of the bar
-* Class: The color of the bar (null/normal, good, average, bad)
-* Text: The text label for the data contained in the bar (often just number form)
-
-As with buttons, ternary operators are quite useful:
-
- {{=helper.bar(data.tankPressure, 0, 1013, (data.tankPressure > 200) ? 'good' : ((data.tankPressure > 100) ? 'average' : 'bad'))}}
-
-#### doT
-
-doT is a simple template language, with control statements mixed in with
-regular HTML and interpolation expressions.
-
-Here is a simple example from tanks, checking if a variable is true:
-
- {{? data.maskConnected}}
- The regulator is connected to a mask.
- {{??}}
- The regulator is not connected to a mask.
- {{?}}
-
-The doT tutorial is [here](https://olado.github.io/doT/tutorial.html).
-
-Print:
-
- {{=expression }}
-
-Print (with escape):
-
- {{!expression }}
-
-If/Else If/Else
-
- {{? condition}}
- // if
- {{?? condition}}
- // else if
- {{??}}
- // else
- {{?}}
-
-For
-
- {{~ object:key:index}}
- // key, value
- {{~}}
-
-#### Styling
-
-For the most part, a NanoUI is just normal HTML. However, to use the NanoUI
-styles correctly, you have to be concious of a few elements.
-
-A `` is the building block of most NanoUIs, and
-represents the wells/blocks you see in most NanoUIs. Inside said article should
-be a `` labeling it, and many ``s representing items inside
-(such as a label/button pair). The styling is highly subjective, so ask a
-regular contribuitor to NanoUI (@neersighted at time of writing) to take a look
-at and help style your UI.
-
-Here's an example of UI styling from Air Alarms:
-
-
-
-
- {{??}}
- Warning: Cannot obtain air sample for analysis.
- {{?}}
- {{? data.dangerous}}
-
-
- Warning: Safety measures offline. Device may exhibit abnormal behavior.
-
- {{?}}
-
-
-## Contributing
-
-There are a few gotchas when it comes to writing for NanoUI. In order to
-simplify server code and make the UI more responsive, we precompile all
-templates to Javascript. In addition, Coffeescript and LESS are used to make
-development easier, and also need to be precompiled. Precompiling CSS also
-allows us to add fallbacks for old versions of Internet Explorer.
-
-To compile NanoUI (which you will need to do after adding or updating a
-template), first install [Node.js](https://nodejs.org).
-
-Next, you will need to install packages used by NanoUI:
-
- cd nanoui/
- npm install -g gulp bower
- npm install
- bower install
-
-Finally, to compile NanoUI, run Gulp:
-
- gulp
-
-Every time you make an update, you will need to recompile. Before comitting,
-make sure you minimize the files with Gulp:
-
- gulp --min
-
-If you would like to view your changes without restarting, run Gulp reload:
-
- gulp reload
-
-Finally, if you want to auto-compile and reload on save, run Gulp watch:
-
- gulp watch
diff --git a/nano/assets/nanoui.css b/nano/assets/nanoui.css
deleted file mode 100644
index ec019f1b8a2..00000000000
--- a/nano/assets/nanoui.css
+++ /dev/null
@@ -1 +0,0 @@
-html{cursor:default}body,html{min-height:100%;margin:0}body{height:100%;background-color:#202020;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff}h1,h2,h3{font-size:18px;margin:0;padding:6px 0}h2{font-size:16px}h3{font-size:14px}hr{background-color:#40628a;border:none}.normal{color:#40628a}.good{color:#537d29}.average{color:#be6209}.bad{color:#b00e0e}.highlight,.label{color:#8ba5c4}.dark{color:#272727}.bold{font-weight:700}.italic{font-style:italic}.hidden{display:none!important}.clearBoth{clear:both}.clearLeft{clear:left}.clearRight{clear:right}.floatNone{float:none}.floatLeft{float:left}.floatRight{float:right}.alignTop{vertical-align:top}.alignBottom{vertical-align:bottom}.alignLeft{text-align:left}.alignCenter{text-align:center}.alignRight{text-align:right}div.loading{background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px);padding:8px}div.content{margin:32px 4px 0}div.content.titlebared{padding-top:3px}header.titlebar{position:fixed;top:0;left:0;width:100%;height:32px;background-color:#363636;box-shadow:0 3px 3px rgba(0,0,0,.1)}header.titlebar .statusicon{position:absolute;top:4px;left:12px}header.titlebar .title{position:absolute;top:6px;left:46px;color:#98b0c3;font-size:16px;white-space:nowrap}header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3;position:absolute;top:6px;right:46px}header.titlebar .minimize:hover{color:#b8c9d6}header.titlebar .close{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3;position:absolute;top:4px;right:12px}header.titlebar .close:hover{color:#b8c9d6}div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 30px 30px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}.fancy{display:none!important}article.display,article.notice{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column;width:auto;padding:4px;margin:6px 2px;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}article.display header,article.notice header{padding-left:4px;margin-bottom:6px;border-bottom:2px solid #40628a}article.display section,article.notice section{width:100%;padding:3px 0}article.display .label,article.notice .label{display:inline-block;margin:0;width:33%;color:#8ba5c4}article.display .content,article.notice .content{display:inline-block;margin:0;width:66%}article.display .line,article.notice .line{display:inline-block;margin:0;width:100%}article.display .buttoninfo,article.notice .buttoninfo{margin-left:5px}article.display table,article.notice table{width:auto;border-collapse:collapse}article.display table.grow,article.notice table.grow{width:100%}article.display th,article.notice th{vertical-align:top;padding:4px 16px 4px 0;text-align:left;color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none;color:#8ba5c4}article.display td,article.notice td{padding:2px 2px 0 0;vertical-align:top}article.notice{margin:8px 2px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}article.notice .label{color:#000}span.link{display:inline-block;box-sizing:border-box;height:22px;margin:1px;padding:2px 3px;white-space:nowrap;border:1px solid #272727;color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none;background-color:#40628a}span.link .fa{margin-right:3px}span.link .iconed{padding-left:3px}span.link.active{background-color:#40628a}span.link.active:hover{background-color:#507bad}span.link.active.selected{background-color:#2f943c}span.link.active.selected:hover{background-color:#3bbb4c}span.link.active.caution{background-color:#9a9d00}span.link.active.caution:hover{background-color:#ccd000}span.link.active.danger{background-color:#9d0808}span.link.active.danger:hover{background-color:#ce0a0a}span.link.inactive{background-color:#999}span.link.inactive.selected{background-color:#2f943c}span.link.inactive.caution{background-color:#9a9d00}span.link.inactive.danger{background-color:#9d0808}span.link.disabled{background-color:#999}span.link.gridable{width:125px}.bar{display:inline-block;position:relative;top:4px;vertical-align:top;box-sizing:border-box;width:100%;height:20px;margin:1px;padding:1px;border:1px solid #40628a;background:#272727}.bar .barText{position:absolute;top:1px;right:3px;color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}.bar .barFill{display:block;height:100%;overflow:hidden;background:#40628a}.bar .barFill.good{background:#537d29}.bar .barFill.average{background:#be6209}.bar .barFill.bad{background:#b00e0e}.bar .barFill.highlight{background:#8ba5c4}body.generic{background:linear-gradient(180deg,#2a2a2a 0,#202020)}body.generic,body.nanotrasen{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen{background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1' viewBox='0 0 425 200' opacity='.25'%3E%3Cpath d='M178.004.04H106.8a6.76 6.026 0 0 0-6.76 6.024v187.872a6.76 6.026 0 0 0 6.76 6.025h53.107a6.76 6.026 0 0 0 6.762-6.024V92.392l72.215 104.7a6.76 6.026 0 0 0 5.76 2.87H318.2a6.76 6.026 0 0 0 6.76-6.026V6.064A6.76 6.026 0 0 0 318.2.04h-54.717a6.76 6.026 0 0 0-6.76 6.024v102.62L183.762 2.91a6.76 6.026 0 0 0-5.76-2.87zM4.845 22.11A13.412 12.502 0 0 1 13.478.04h66.118a5.365 5 0 0 1 5.365 5v79.88zM420.155 177.89a13.412 12.502 0 0 1-8.633 22.07h-66.118a5.365 5 0 0 1-5.365-5v-79.88z'/%3E%3C/svg%3E") no-repeat fixed center/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020)}
\ No newline at end of file
diff --git a/nano/assets/nanoui.html b/nano/assets/nanoui.html
deleted file mode 100644
index 99f00ab6777..00000000000
--- a/nano/assets/nanoui.html
+++ /dev/null
@@ -1 +0,0 @@
-
Loading...
\ No newline at end of file
diff --git a/nano/assets/nanoui.js b/nano/assets/nanoui.js
deleted file mode 100644
index da66a9e7080..00000000000
--- a/nano/assets/nanoui.js
+++ /dev/null
@@ -1,3 +0,0 @@
-!function(e){function t(e,t,n,a){for(var r,i=n.slice(),l=s(t,e),o=0,c=i.length;c>o&&(handler=i[o],"object"==typeof handler&&"function"==typeof handler.handleEvent?handler.handleEvent(l):handler.call(e,l),!l.stoppedImmediatePropagation);o++);return r=!l.stoppedPropagation,a&&r&&e.parentNode?e.parentNode.dispatchEvent(l):!l.defaultPrevented}function n(e,t){return{configurable:!0,get:e,set:t}}function a(e,t,a){var s=b(t||e,a);g(e,"textContent",n(function(){return s.get.call(this)},function(e){s.set.call(this,e)}))}function s(e,t){return e.currentTarget=t,e.eventPhase=e.target===e.currentTarget?2:3,e}function r(e,t){for(var n=e.length;n--&&e[n]!==t;);return n}function i(){if("BR"===this.tagName)return"\n";for(var e=this.firstChild,t=[];e;)8!==e.nodeType&&7!==e.nodeType&&t.push(e.textContent),e=e.nextSibling;return t.join("")}function l(e){var t=document.createEvent("Event");t.initEvent("input",!0,!0),(e.srcElement||e.fromElement||document).dispatchEvent(t)}function o(e){!p&&x.test(document.readyState)&&(p=!p,document.detachEvent(h,o),e=document.createEvent("Event"),e.initEvent(f,!0,!0),document.dispatchEvent(e))}function c(e){for(var t;t=this.lastChild;)this.removeChild(t);null!=e&&this.appendChild(document.createTextNode(e))}function u(t,n){return n||(n=e.event),n.target||(n.target=n.srcElement||n.fromElement||document),n.timeStamp||(n.timeStamp=(new Date).getTime()),n}if(!document.createEvent){var d=!0,p=!1,h="onreadystatechange",f="DOMContentLoaded",v="__IE8__"+Math.random(),g=Object.defineProperty||function(e,t,n){e[t]=n.value},m=Object.defineProperties||function(t,n){for(var a in n)if(y.call(n,a))try{g(t,a,n[a])}catch(s){e.console}},b=Object.getOwnPropertyDescriptor,y=Object.prototype.hasOwnProperty,k=e.Element.prototype,w=e.Text.prototype,E=/^[a-z]+$/,x=/loaded|complete/,T={},S=document.createElement("div"),_=document.documentElement,O=_.removeAttribute,P=_.setAttribute;a(e.HTMLCommentElement.prototype,k,"nodeValue"),a(e.HTMLScriptElement.prototype,null,"text"),a(w,null,"nodeValue"),a(e.HTMLTitleElement.prototype,null,"text"),g(e.HTMLStyleElement.prototype,"textContent",function(e){return n(function(){return e.get.call(this.styleSheet)},function(t){e.set.call(this.styleSheet,t)})}(b(e.CSSStyleSheet.prototype,"cssText"))),m(k,{textContent:{get:i,set:c},firstElementChild:{get:function(){for(var e=this.childNodes||[],t=0,n=e.length;n>t;t++)if(1==e[t].nodeType)return e[t]}},lastElementChild:{get:function(){for(var e=this.childNodes||[],t=e.length;t--;)if(1==e[t].nodeType)return e[t]}},oninput:{get:function(){return this._oninput||null},set:function(e){this._oninput&&(this.removeEventListener("input",this._oninput),this._oninput=e,e&&this.addEventListener("input",e))}},previousElementSibling:{get:function(){for(var e=this.previousSibling;e&&1!=e.nodeType;)e=e.previousSibling;return e}},nextElementSibling:{get:function(){for(var e=this.nextSibling;e&&1!=e.nodeType;)e=e.nextSibling;return e}},childElementCount:{get:function(){for(var e=0,t=this.childNodes||[],n=t.length;n--;e+=1==t[n].nodeType);return e}},addEventListener:{value:function(e,n,a){var s,i,o=this,c="on"+e,d=o[v]||g(o,v,{value:{}})[v],p=d[c]||(d[c]={}),h=p.h||(p.h=[]);if(!y.call(p,"w")){if(p.w=function(e){return e[v]||t(o,u(o,e),h,!1)},!y.call(T,c))if(E.test(e)){try{s=document.createEventObject(),s[v]=!0,9!=o.nodeType&&null==o.parentNode&&S.appendChild(o),(i=o.getAttribute(c))&&O.call(o,c),o.fireEvent(c,s),T[c]=!0}catch(s){for(T[c]=!1;S.hasChildNodes();)S.removeChild(S.firstChild)}null!=i&&P.call(o,c,i)}else T[c]=!1;(p.n=T[c])&&o.attachEvent(c,p.w)}r(h,n)<0&&h[a?"unshift":"push"](n),"input"===e&&o.attachEvent("onkeyup",l)}},dispatchEvent:{value:function(e){var n,a=this,s="on"+e.type,r=a[v],i=r&&r[s],l=!!i;return e.target||(e.target=a),l?i.n?a.fireEvent(s,e):t(a,e,i.h,!0):(n=a.parentNode)?n.dispatchEvent(e):!0,!e.defaultPrevented}},removeEventListener:{value:function(e,t,n){var a=this,s="on"+e,i=a[v],l=i&&i[s],o=l&&l.h,c=o?r(o,t):-1;c>-1&&o.splice(c,1)}}}),m(w,{addEventListener:{value:k.addEventListener},dispatchEvent:{value:k.dispatchEvent},removeEventListener:{value:k.removeEventListener}}),m(e.XMLHttpRequest.prototype,{addEventListener:{value:function(e,t,n){var a=this,s="on"+e,i=a[v]||g(a,v,{value:{}})[v],l=i[s]||(i[s]={}),o=l.h||(l.h=[]);r(o,t)<0&&(a[s]||(a[s]=function(){var t=document.createEvent("Event");t.initEvent(e,!0,!0),a.dispatchEvent(t)}),o[n?"unshift":"push"](t))}},dispatchEvent:{value:function(e){var n=this,a="on"+e.type,s=n[v],r=s&&s[a],i=!!r;return i&&(r.n?n.fireEvent(a,e):t(n,e,r.h,!0))}},removeEventListener:{value:k.removeEventListener}}),m(e.Event.prototype,{bubbles:{value:!0,writable:!0},cancelable:{value:!0,writable:!0},preventDefault:{value:function(){this.cancelable&&(this.defaultPrevented=!0,this.returnValue=!1)}},stopPropagation:{value:function(){this.stoppedPropagation=!0,this.cancelBubble=!0}},stopImmediatePropagation:{value:function(){this.stoppedImmediatePropagation=!0,this.stopPropagation()}},initEvent:{value:function(e,t,n){this.type=e,this.bubbles=!!t,this.cancelable=!!n,this.bubbles||this.stopPropagation()}}}),m(e.HTMLDocument.prototype,{defaultView:{get:function(){return this.parentWindow}},textContent:{get:function(){return 11===this.nodeType?i.call(this):null},set:function(e){11===this.nodeType&&c.call(this,e)}},addEventListener:{value:function(t,n,a){var s=this;k.addEventListener.call(s,t,n,a),d&&t===f&&!x.test(s.readyState)&&(d=!1,s.attachEvent(h,o),e==top&&!function r(e){try{s.documentElement.doScroll("left"),o()}catch(t){setTimeout(r,50)}}())}},dispatchEvent:{value:k.dispatchEvent},removeEventListener:{value:k.removeEventListener},createEvent:{value:function(e){var t;if("Event"!==e)throw Error("unsupported "+e);return t=document.createEventObject(),t.timeStamp=(new Date).getTime(),t}}}),m(e.Window.prototype,{getComputedStyle:{value:function(){function e(e){this._=e}function t(){}var n=/^(?:[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|))(?!px)[a-z%]+$/,a=/^(top|right|bottom|left)$/,s=/\-([a-z])/g,r=function(e,t){return t.toUpperCase()};return e.prototype.getPropertyValue=function(e){var t,i,l,o=this._,c=o.style,u=o.currentStyle,d=o.runtimeStyle;return e=("float"===e?"style-float":e).replace(s,r),t=u?u[e]:c[e],n.test(t)&&!a.test(e)&&(i=c.left,l=d&&d.left,l&&(d.left=u.left),c.left="fontSize"===e?"1em":t,t=c.pixelLeft+"px",c.left=i,l&&(d.left=l)),null==t?t:t+""||"auto"},t.prototype.getPropertyValue=function(){return null},function(n,a){return a?new t(n):new e(n)}}()},addEventListener:{value:function(n,a,s){var i,l=e,o="on"+n;l[o]||(l[o]=function(e){return t(l,u(l,e),i,!1)}),i=l[o][v]||(l[o][v]=[]),r(i,a)<0&&i[s?"unshift":"push"](a)}},dispatchEvent:{value:function(t){var n=e["on"+t.type];return n?n.call(e,t)!==!1&&!t.defaultPrevented:!0}},removeEventListener:{value:function(t,n,a){var s="on"+t,i=(e[s]||Object)[v],l=i?r(i,n):-1;l>-1&&i.splice(l,1)}}}),function(e,t,n){for(n=0;n0||-1)*Math.floor(Math.abs(t))),t},ToPrimitive:function(t){var n,a,s;if(A(t))return t;if(a=t.valueOf,e(a)&&(n=a.call(t),A(n)))return n;if(s=t.toString,e(s)&&(n=s.call(t),A(n)))return n;throw new TypeError},ToObject:function(e){if(null==e)throw new TypeError("can't convert "+e+" to object");return a(e)},ToUint32:function(e){return e>>>0}},I=function(){};j(r,{bind:function(t){var n=this;if(!e(n))throw new TypeError("Function.prototype.bind called on incompatible "+n);for(var s,r=u.call(arguments,1),i=function(){if(this instanceof s){var e=n.apply(this,f.call(r,u.call(arguments)));return a(e)===e?e:this}return n.apply(t,f.call(r,u.call(arguments)))},l=g(0,n.length-r.length),o=[],c=0;l>c;c++)p.call(o,"$"+c);return s=Function("binder","return function ("+o.join(",")+"){ return binder.apply(this, arguments); }")(i),n.prototype&&(I.prototype=n.prototype,s.prototype=new I,I.prototype=null),s}});var R=v.bind(s.hasOwnProperty),z=v.bind(s.toString),q=v.bind(l.slice),F=v.bind(l.split),U=v.bind(l.indexOf),B=v.bind(p),H=t.isArray||function(e){return"[object Array]"===z(e)},V=1!==[].unshift(0);j(n,{unshift:function(){return h.apply(this,arguments),this.length}},V),j(t,{isArray:H});var $=a("a"),W="a"!==$[0]||!(0 in $),J=function(e){var t=!0,n=!0;return e&&(e.call("foo",function(e,n,a){"object"!=typeof a&&(t=!1)}),e.call([1],function(){"use strict";n="string"==typeof this},"x")),!!e&&t&&n};j(n,{forEach:function(t){var n,a=D.ToObject(this),s=W&&P(this)?F(this,""):a,r=-1,i=D.ToUint32(s.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.forEach callback must be a function");for(;++r1&&(a=arguments[1]),!e(n))throw new TypeError("Array.prototype.map callback must be a function");for(var o=0;i>o;o++)o in r&&(void 0===a?l[o]=n(r[o],o,s):l[o]=n.call(a,r[o],o,s));return l}},!J(n.map)),j(n,{filter:function(t){var n,a,s=D.ToObject(this),r=W&&P(this)?F(this,""):s,i=D.ToUint32(r.length),l=[];if(arguments.length>1&&(a=arguments[1]),!e(t))throw new TypeError("Array.prototype.filter callback must be a function");for(var o=0;i>o;o++)o in r&&(n=r[o],(void 0===a?t(n,o,s):t.call(a,n,o,s))&&B(l,n));return l}},!J(n.filter)),j(n,{every:function(t){var n,a=D.ToObject(this),s=W&&P(this)?F(this,""):a,r=D.ToUint32(s.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.every callback must be a function");for(var i=0;r>i;i++)if(i in s&&!(void 0===n?t(s[i],i,a):t.call(n,s[i],i,a)))return!1;return!0}},!J(n.every)),j(n,{some:function(t){var n,a=D.ToObject(this),s=W&&P(this)?F(this,""):a,r=D.ToUint32(s.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.some callback must be a function");for(var i=0;r>i;i++)if(i in s&&(void 0===n?t(s[i],i,a):t.call(n,s[i],i,a)))return!0;return!1}},!J(n.some));var G=!1;n.reduce&&(G="object"==typeof n.reduce.call("es5",function(e,t,n,a){return a})),j(n,{reduce:function(t){var n=D.ToObject(this),a=W&&P(this)?F(this,""):n,s=D.ToUint32(a.length);if(!e(t))throw new TypeError("Array.prototype.reduce callback must be a function");if(0===s&&1===arguments.length)throw new TypeError("reduce of empty array with no initial value");var r,i=0;if(arguments.length>=2)r=arguments[1];else for(;;){if(i in a){r=a[i++];break}if(++i>=s)throw new TypeError("reduce of empty array with no initial value")}for(;s>i;i++)i in a&&(r=t(r,a[i],i,n));return r}},!G);var X=!1;n.reduceRight&&(X="object"==typeof n.reduceRight.call("es5",function(e,t,n,a){return a})),j(n,{reduceRight:function(t){var n=D.ToObject(this),a=W&&P(this)?F(this,""):n,s=D.ToUint32(a.length);if(!e(t))throw new TypeError("Array.prototype.reduceRight callback must be a function");if(0===s&&1===arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var r,i=s-1;if(arguments.length>=2)r=arguments[1];else for(;;){if(i in a){r=a[i--];break}if(--i<0)throw new TypeError("reduceRight of empty array with no initial value")}if(0>i)return r;do i in a&&(r=t(r,a[i],i,n));while(i--);return r}},!X);var Z=n.indexOf&&-1!==[0,1].indexOf(1,2);j(n,{indexOf:function(e){var t=W&&P(this)?F(this,""):D.ToObject(this),n=D.ToUint32(t.length);if(0===n)return-1;var a=0;for(arguments.length>1&&(a=D.ToInteger(arguments[1])),a=a>=0?a:g(0,n+a);n>a;a++)if(a in t&&t[a]===e)return a;return-1}},Z);var Y=n.lastIndexOf&&-1!==[0,1].lastIndexOf(0,-3);j(n,{lastIndexOf:function(e){var t=W&&P(this)?F(this,""):D.ToObject(this),n=D.ToUint32(t.length);if(0===n)return-1;var a=n-1;for(arguments.length>1&&(a=m(a,D.ToInteger(arguments[1]))),a=a>=0?a:n-Math.abs(a);a>=0;a--)if(a in t&&e===t[a])return a;return-1}},Y);var K=function(){var e=[1,2],t=e.splice();return 2===e.length&&H(t)&&0===t.length}();j(n,{splice:function(e,t){return 0===arguments.length?[]:d.apply(this,arguments)}},!K);var Q=function(){var e={};return n.splice.call(e,0,0,1),1===e.length}();j(n,{splice:function(e,t){if(0===arguments.length)return[];var n=arguments;return this.length=g(D.ToInteger(this.length),0),arguments.length>0&&"number"!=typeof t&&(n=u.call(arguments),n.length<2?B(n,this.length-e):n[1]=D.ToInteger(t)),d.apply(this,n)}},!Q);var ee=function(){var e=new t(1e5);return e[8]="x",e.splice(1,1),7===e.indexOf("x")}(),te=function(){var e=256,t=[];return t[e]="a",t.splice(e+1,0,"b"),"a"===t[e]}();j(n,{splice:function(e,t){for(var n,a=D.ToObject(this),s=[],r=D.ToUint32(a.length),l=D.ToInteger(e),o=0>l?g(r+l,0):m(l,r),c=m(g(D.ToInteger(t),0),r-o),d=0;c>d;)n=i(o+d),R(a,n)&&(s[d]=a[n]),d+=1;var p,h=u.call(arguments,2),f=h.length;if(c>f){for(d=o;r-c>d;)n=i(d+c),p=i(d+f),R(a,n)?a[p]=a[n]:delete a[p],d+=1;for(d=r;d>r-c+f;)delete a[d-1],d-=1}else if(f>c)for(d=r-c;d>o;)n=i(d+c-1),p=i(d+f-1),R(a,n)?a[p]=a[n]:delete a[p],d-=1;d=o;for(var v=0;v=0&&!H(t)&&e(t.callee)},be=ge(arguments)?ge:me;j(a,{keys:function(t){var n=e(t),a=be(t),s=null!==t&&"object"==typeof t,r=s&&P(t);if(!s&&!n&&!a)throw new TypeError("Object.keys called on a non-object");var l=[],o=oe&&n;if(r&&ce||a)for(var c=0;cp;p++){var h=fe[p];d&&"constructor"===h||!R(t,h)||B(l,h)}return l}});var ye=a.keys&&function(){return 2===a.keys(arguments).length}(1,2),ke=a.keys&&function(){var e=a.keys(arguments);return 1!==arguments.length||1!==e.length||1!==e[0]}(1),we=a.keys;j(a,{keys:function(e){return we(be(e)?u.call(e):e)}},!ye||ke);var Ee=-621987552e5,xe="-000001",Te=Date.prototype.toISOString&&-1===new Date(Ee).toISOString().indexOf(xe),Se=Date.prototype.toISOString&&"1969-12-31T23:59:59.999Z"!==new Date(-1).toISOString();j(Date.prototype,{toISOString:function(){var e,t,n,a,s;if(!isFinite(this))throw new RangeError("Date.prototype.toISOString called on non-finite value.");for(a=this.getUTCFullYear(),s=this.getUTCMonth(),a+=Math.floor(s/12),s=(s%12+12)%12,e=[s+1,this.getUTCDate(),this.getUTCHours(),this.getUTCMinutes(),this.getUTCSeconds()],a=(0>a?"-":a>9999?"+":"")+q("00000"+Math.abs(a),a>=0&&9999>=a?-4:-6),t=e.length;t--;)n=e[t],10>n&&(e[t]="0"+n);return a+"-"+u.call(e,0,2).join("-")+"T"+u.call(e,2).join(":")+"."+q("000"+this.getUTCMilliseconds(),-3)+"Z"}},Te||Se);var _e=function(){try{return Date.prototype.toJSON&&null===new Date(NaN).toJSON()&&-1!==new Date(Ee).toJSON().indexOf(xe)&&Date.prototype.toJSON.call({toISOString:function(){return!0}})}catch(e){return!1}}();_e||(Date.prototype.toJSON=function(t){var n=a(this),s=D.ToPrimitive(n);if("number"==typeof s&&!isFinite(s))return null;var r=n.toISOString;if(!e(r))throw new TypeError("toISOString property is not callable");return r.call(n)});var Oe=1e15===Date.parse("+033658-09-27T01:46:40.000Z"),Pe=!isNaN(Date.parse("2012-04-04T24:00:00.500Z"))||!isNaN(Date.parse("2012-11-31T23:59:59.000Z"))||!isNaN(Date.parse("2012-12-31T23:59:60.000Z")),Ce=isNaN(Date.parse("2000-01-01T00:00:00.000Z"));if(Ce||Pe||!Oe){var Le=Math.pow(2,31)-1,Me=(Math.floor(Le/1e3),N(new Date(1970,0,1,0,0,0,Le+1).getTime()));Date=function(e){var t=function(n,a,s,r,l,o,c){var u,d=arguments.length;if(this instanceof e){var p=o,h=c;if(Me&&d>=7&&c>Le){var f=Math.floor(c/Le)*Le,v=Math.floor(f/1e3);p+=v,h-=1e3*v}u=1===d&&i(n)===n?new e(t.parse(n)):d>=7?new e(n,a,s,r,l,p,h):d>=6?new e(n,a,s,r,l,p):d>=5?new e(n,a,s,r,l):d>=4?new e(n,a,s,r):d>=3?new e(n,a,s):d>=2?new e(n,a):d>=1?new e(n):new e}else u=e.apply(this,arguments);return A(u)||j(u,{constructor:t},!0),u},n=RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:(\\.\\d{1,}))?)?(Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$"),a=[0,31,59,90,120,151,181,212,243,273,304,334,365],s=function(e,t){var n=t>1?1:0;return a[t]+Math.floor((e-1969+n)/4)-Math.floor((e-1901+n)/100)+Math.floor((e-1601+n)/400)+365*(e-1970)},r=function(t){var n=0,a=t;if(Me&&a>Le){var s=Math.floor(a/Le)*Le,r=Math.floor(s/1e3);n+=r,a-=1e3*r}return o(new e(1970,0,1,0,0,n,a))};for(var l in e)R(e,l)&&(t[l]=e[l]);j(t,{now:e.now,UTC:e.UTC},!0),t.prototype=e.prototype,j(t.prototype,{constructor:t},!0);var c=function(t){var a=n.exec(t);if(a){var i,l=o(a[1]),c=o(a[2]||1)-1,u=o(a[3]||1)-1,d=o(a[4]||0),p=o(a[5]||0),h=o(a[6]||0),f=Math.floor(1e3*o(a[7]||0)),v=!(!a[4]||a[8]),g="-"===a[9]?1:-1,m=o(a[10]||0),b=o(a[11]||0),y=p>0||h>0||f>0;return(y?24:25)>d&&60>p&&60>h&&1e3>f&&c>-1&&12>c&&24>m&&60>b&&u>-1&&u=-864e13&&864e13>=i)?i:NaN}return e.parse.apply(this,arguments)};return j(t,{parse:c}),t}(Date)}Date.now||(Date.now=function(){return(new Date).getTime()});var je=c.toFixed&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==0xde0b6b3a7640080.toFixed(0)),Ae={base:1e7,size:6,data:[0,0,0,0,0,0],multiply:function(e,t){for(var n=-1,a=t;++n=0;)n+=Ae.data[t],Ae.data[t]=Math.floor(n/e),n=n%e*Ae.base},numToString:function(){for(var e=Ae.size,t="";--e>=0;)if(""!==t||0===e||0!==Ae.data[e]){var n=i(Ae.data[e]);""===t?t=n:t+=q("0000000",0,7-n.length)+n}return t},pow:function Ze(e,t,n){return 0===t?n:t%2===1?Ze(e,t-1,n*e):Ze(e*e,t/2,n)},log:function(e){for(var t=0,n=e;n>=4096;)t+=12,n/=4096;for(;n>=2;)t+=1,n/=2;return t}},Ne=function(e){var t,n,a,s,r,l,c,u;if(t=o(e),t=N(t)?0:Math.floor(t),0>t||t>20)throw new RangeError("Number.toFixed called with invalid number of decimals");if(n=o(this),N(n))return"NaN";if(-1e21>=n||n>=1e21)return i(n);if(a="",0>n&&(a="-",n=-n),s="0",n>1e-21)if(r=Ae.log(n*Ae.pow(2,69,1))-69,l=0>r?n*Ae.pow(2,-r,1):n/Ae.pow(2,r,1),l*=4503599627370496,r=52-r,r>0){for(Ae.multiply(0,l),c=t;c>=7;)Ae.multiply(1e7,0),c-=7;for(Ae.multiply(Ae.pow(10,c,1),0),c=r-1;c>=23;)Ae.divide(1<<23),c-=23;Ae.divide(1<0?(u=s.length,s=t>=u?a+q("0.0000000000000000000",0,t-u+2)+s:a+q(s,0,u-t)+"."+q(s,u-t)):s=a+s,s};j(c,{toFixed:Ne},je);var De=function(){try{return"1"===1..toPrecision(void 0)}catch(e){return!0}}(),Ie=c.toPrecision;j(c,{toPrecision:function(e){return void 0===e?Ie.call(this):Ie.call(this,e)}},De),2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var e=void 0===/()??/.exec("")[1],t=Math.pow(2,32)-1;l.split=function(n,a){var s=this;if(void 0===n&&0===a)return[];if(!T(n))return F(this,n,a);var r,i,l,o,c=[],d=(n.ignoreCase?"i":"")+(n.multiline?"m":"")+(n.unicode?"u":"")+(n.sticky?"y":""),h=0,f=RegExp(n.source,d+"g");s+="",e||(r=RegExp("^"+f.source+"$(?!\\s)",d));var v=void 0===a?t:D.ToUint32(a);for(i=f.exec(s);i&&(l=i.index+i[0].length,!(l>h&&(B(c,q(s,h,i.index)),!e&&i.length>1&&i[0].replace(r,function(){for(var e=1;e1&&i.index=v)));)f.lastIndex===i.index&&f.lastIndex++,i=f.exec(s);return h===s.length?(o||!f.test(""))&&B(c,""):B(c,q(s,h)),c.length>v?q(c,0,v):c}}():"0".split(void 0,0).length&&(l.split=function(e,t){return void 0===e&&0===t?[]:F(this,e,t)});var Re=l.replace,ze=function(){var e=[];return"x".replace(/x(.)?/g,function(t,n){B(e,n)}),1===e.length&&void 0===e[0]}();ze||(l.replace=function(t,n){var a=e(n),s=T(t)&&/\)[*?]/.test(t.source);if(a&&s){var r=function(e){var a=arguments.length,s=t.lastIndex;t.lastIndex=0;var r=t.exec(e)||[];return t.lastIndex=s,B(r,arguments[a-2],arguments[a-1]),n.apply(this,r)};return Re.call(this,t,r)}return Re.call(this,t,n)});var qe=l.substr,Fe="".substr&&"b"!=="0b".substr(-1);j(l,{substr:function(e,t){var n=e;return 0>e&&(n=g(this.length+e,0)),qe.call(this,n,t)}},Fe);var Ue=" \n\x0B\f\r Â áš€á Žâ€€â€â€‚         âŸã€€\u2028\u2029\ufeff",Be="​",He="["+Ue+"]",Ve=RegExp("^"+He+He+"*"),$e=RegExp(He+He+"*$"),We=l.trim&&(Ue.trim()||!Be.trim());j(l,{trim:function(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");return i(this).replace(Ve,"").replace($e,"")}},We);var Je=l.lastIndexOf&&-1!=="abcã‚ã„".lastIndexOf("ã‚ã„",2);j(l,{lastIndexOf:function(e){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");for(var t=i(this),n=i(e),a=arguments.length>1?o(arguments[1]):NaN,s=N(a)?1/0:D.ToInteger(a),r=m(g(s,0),t.length),l=n.length,c=r+l;c>0;){c=g(0,c-l);var u=U(q(t,c,r+l),n);if(-1!==u)return c+u}return-1}},Je);var Ge=l.lastIndexOf;if(j(l,{lastIndexOf:function(e){return Ge.apply(this,arguments)}},1!==l.lastIndexOf.length),(8!==parseInt(Ue+"08")||22!==parseInt(Ue+"0x16"))&&(parseInt=function(e){var t=/^[\-+]?0[xX]/;return function(n,a){var s=i(n).trim(),r=o(a)||(t.test(s)?16:10);return e(s,r)}}(parseInt)),new RangeError("test")+""!="RangeError: test"){var Xe=(Error.prototype.toString,function(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");var e=this.name;void 0===e?e="Error":"string"!=typeof e&&(e=i(e));var t=this.message;return void 0===t?t="":"string"!=typeof t&&(t=i(t)),e?t?e+": "+t:e:t});Error.prototype.toString=Xe}}),function(e,t){function n(e,t){var n=e.createElement("p"),a=e.getElementsByTagName("head")[0]||e.documentElement;return n.innerHTML="x",a.insertBefore(n.lastChild,a.firstChild)}function a(){var e=y.elements;return"string"==typeof e?e.split(" "):e}function s(e,t){var n=y.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),y.elements=n+" "+e,c(t)}function r(e){var t=b[e[g]];return t||(t={},m++,e[g]=m,b[m]=t),t}function i(e,n,a){if(n||(n=t),d)return n.createElement(e);a||(a=r(n));var s;return s=a.cache[e]?a.cache[e].cloneNode():v.test(e)?(a.cache[e]=a.createElem(e)).cloneNode():a.createElem(e),!s.canHaveChildren||f.test(e)||s.tagUrn?s:a.frag.appendChild(s)}function l(e,n){if(e||(e=t),d)return e.createDocumentFragment();n=n||r(e);for(var s=n.frag.cloneNode(),i=0,l=a(),o=l.length;o>i;i++)s.createElement(l[i]);return s}function o(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return y.shivMethods?i(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+a().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(y,t.frag)}function c(e){e||(e=t);var a=r(e);return!y.shivCSS||u||a.hasCSS||(a.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),d||o(e,a),e}var u,d,p="3.7.3",h=e.html5||{},f=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,v=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,g="_html5shiv",m=0,b={};!function(){try{var e=t.createElement("a");e.innerHTML="",u="hidden"in e,d=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return void 0===e.cloneNode||void 0===e.createDocumentFragment||void 0===e.createElement}()}catch(n){u=!0,d=!0}}();var y={elements:h.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:p,shivCSS:h.shivCSS!==!1,supportsUnknownElements:d,shivMethods:h.shivMethods!==!1,type:"default",shivDocument:c,createElement:i,createDocumentFragment:l,addElements:s};e.html5=y,c(t),"object"==typeof module&&module.exports&&(module.exports=y)}("undefined"!=typeof window?window:this,document),function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.MiniSignal=e()}}(function(){return function e(t,n,a){function s(i,l){if(!n[i]){if(!t[i]){var o="function"==typeof require&&require;if(!l&&o)return o(i,!0);if(r)return r(i,!0);var c=Error("Cannot find module '"+i+"'");throw c.code="MODULE_NOT_FOUND",c}var u=n[i]={exports:{}};t[i][0].call(u.exports,function(e){var n=t[i][1][e];return s(n?n:e)},u,u.exports,e,t,n,a)}return n[i].exports}for(var r="function"==typeof require&&require,i=0;i-1}}([].indexOf||function(e){for(F=this.length;F--&&this[F]!==e;);return F}),item:function(e){return this[e]||null},remove:function(){for(var e,t=0;t
",a+=""},TMPL.canister=function(e,t,n){var a='';return a+=e.hasHoldingTank?"The regulator is connected to a tank.":"The regulator is not connected to a tank.",a+='
',e.isBeakerLoaded)if(e.beakerContents.length){a+=""+e.beakerCurrentVolume+"/"+e.beakerMaxVolume+" Units ";var h=e.beakerContents;if(h)for(var f,i=-1,v=h.length-1;v>i;)f=h[i+=1],a+=''+f.volume+" units of "+f.name+" "}else a+='Beaker Empty';else a+='No Beaker Loaded';return a+="
"},TMPL.tanks=function(e,t,n){var a='';return a+=e.hasHoldingTank?"The regulator is connected to a mask.":"The regulator is not connected to a mask.",a+='Tank Pressure:
-
-
diff --git a/nano/templates/tanks.dot b/nano/templates/tanks.dot
deleted file mode 100644
index 7bc46a39a4d..00000000000
--- a/nano/templates/tanks.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-
- {{? data.hasHoldingTank }}
- The regulator is connected to a mask.
- {{??}}
- The regulator is not connected to a mask.
- {{?}}
-
-
-
- Tank Pressure:
-