Intelicard
"
- var/laws
- for(var/mob/living/silicon/ai/A in src)
- dat += "Stored AI: [A.name]
System integrity: [(A.health+100)/2]%
"
+ for (var/index = 1, index <= A.laws.ion.len, index++)
+ var/law = A.laws.ion[index]
+ if (length(law) > 0)
+ var/num = ionnum()
+ laws += "[num]. [law]"
- for (var/index = 1, index <= A.laws.ion.len, index++)
- var/law = A.laws.ion[index]
- if (length(law) > 0)
- var/num = ionnum()
- laws += "[num]. [law]"
+ if (A.laws.zeroth)
+ laws += "0: [A.laws.zeroth]
"
- if (A.laws.zeroth)
- laws += "0: [A.laws.zeroth]
"
+ var/number = 1
+ for (var/index = 1, index <= A.laws.inherent.len, index++)
+ var/law = A.laws.inherent[index]
+ if (length(law) > 0)
+ laws += "[number]: [law]
"
+ number++
- var/number = 1
- for (var/index = 1, index <= A.laws.inherent.len, index++)
- var/law = A.laws.inherent[index]
- if (length(law) > 0)
- laws += "[number]: [law]
"
- number++
+ for (var/index = 1, index <= A.laws.supplied.len, index++)
+ var/law = A.laws.supplied[index]
+ if (length(law) > 0)
+ laws += "[number]: [law]
"
+ number++
- for (var/index = 1, index <= A.laws.supplied.len, index++)
- var/law = A.laws.supplied[index]
- if (length(law) > 0)
- laws += "[number]: [law]
"
- number++
+ dat += "Laws:
[laws]
"
- dat += "Laws:
[laws]
"
-
- if (A.stat == 2)
- dat += "AI nonfunctional"
+ if (A.stat == 2)
+ dat += "AI nonfunctional"
+ else
+ if (!src.flush)
+ dat += {"Wipe AI"}
else
- if (!src.flush)
- dat += {"Wipe AI"}
- else
- dat += "Wipe in progress"
- dat += "
"
- dat += {"[A.control_disabled ? "Enable" : "Disable"] Wireless Activity"}
- dat += "
"
- dat += "Subspace Transceiver is: [A.aiRadio.disabledAi ? "Disabled" : "Enabled"]"
- dat += "
"
- dat += {"[A.aiRadio.disabledAi ? "Enable" : "Disable"] Subspace Transceiver"}
- dat += "
"
- dat += {" Close"}
- user << browse(dat, "window=aicard")
- onclose(user, "aicard")
+ dat += "Wipe in progress"
+ dat += "
"
+ dat += {"[A.control_disabled ? "Enable" : "Disable"] Wireless Activity"}
+ dat += "
"
+ dat += "Subspace Transceiver is: [A.aiRadio.disabledAi ? "Disabled" : "Enabled"]"
+ dat += "
"
+ dat += {"[A.aiRadio.disabledAi ? "Enable" : "Disable"] Subspace Transceiver"}
+ dat += "
"
+ dat += {" Close"}
+ user << browse(dat, "window=aicard")
+ onclose(user, "aicard")
+ return
+
+/obj/item/device/aicard/Topic(href, href_list)
+ var/mob/U = usr
+ if (!in_range(src, U)||U.machine!=src)//If they are not in range of 1 or less or their machine is not the card (ie, clicked on something else).
+ U << browse(null, "window=aicard")
+ U.unset_machine()
return
- Topic(href, href_list)
- var/mob/U = usr
- if (!in_range(src, U)||U.machine!=src)//If they are not in range of 1 or less or their machine is not the card (ie, clicked on something else).
+ add_fingerprint(U)
+ U.set_machine(src)
+
+ switch(href_list["choice"])//Now we switch based on choice.
+ if ("Close")
U << browse(null, "window=aicard")
U.unset_machine()
return
- add_fingerprint(U)
- U.set_machine(src)
+ if ("Wipe")
+ var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
+ if(confirm == "Yes")
+ if(isnull(src)||!in_range(src, U)||U.machine!=src)
+ U << browse(null, "window=aicard")
+ U.unset_machine()
+ return
+ else
+ flush = 1
+ for(var/mob/living/silicon/ai/A in src)
+ A.suiciding = 1
+ A << "Your core files are being wiped!"
+ while (A.stat != 2)
+ A.adjustOxyLoss(2)
+ A.updatehealth()
+ sleep(10)
+ flush = 0
- switch(href_list["choice"])//Now we switch based on choice.
- if ("Close")
- U << browse(null, "window=aicard")
- U.unset_machine()
- return
+ if ("Radio")
+ for(var/mob/living/silicon/ai/A in src)
+ A.aiRadio.disabledAi = !A.aiRadio.disabledAi
+ A << "Your Subspace Transceiver has been: [A.aiRadio.disabledAi ? "disabled" : "enabled"]"
+ U << "You [A.aiRadio.disabledAi ? "Disable" : "Enable"] the AI's Subspace Transceiver"
- if ("Wipe")
- var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
- if(confirm == "Yes")
- if(isnull(src)||!in_range(src, U)||U.machine!=src)
- U << browse(null, "window=aicard")
- U.unset_machine()
- return
- else
- flush = 1
- for(var/mob/living/silicon/ai/A in src)
- A.suiciding = 1
- A << "Your core files are being wiped!"
- while (A.stat != 2)
- A.adjustOxyLoss(2)
- A.updatehealth()
- sleep(10)
- flush = 0
-
- if ("Radio")
- for(var/mob/living/silicon/ai/A in src)
- A.aiRadio.disabledAi = !A.aiRadio.disabledAi
- A << "Your Subspace Transceiver has been: [A.aiRadio.disabledAi ? "disabled" : "enabled"]"
- U << "You [A.aiRadio.disabledAi ? "Disable" : "Enable"] the AI's Subspace Transceiver"
-
- if ("Wireless")
- for(var/mob/living/silicon/ai/A in src)
- A.control_disabled = !A.control_disabled
- A << "The intelicard's wireless port has been [A.control_disabled ? "disabled" : "enabled"]!"
- if (A.control_disabled)
- overlays -= image('icons/obj/aicards.dmi', "aicard-on")
- else
- overlays += image('icons/obj/aicards.dmi', "aicard-on")
- attack_self(U)
+ if ("Wireless")
+ for(var/mob/living/silicon/ai/A in src)
+ A.control_disabled = !A.control_disabled
+ A << "The intelicard's wireless port has been [A.control_disabled ? "disabled" : "enabled"]!"
+ if (A.control_disabled)
+ overlays -= image('icons/obj/aicards.dmi', "aicard-on")
+ else
+ overlays += image('icons/obj/aicards.dmi', "aicard-on")
+ attack_self(U)
/obj/item/device/aicard/ex_act(severity)
switch(severity)
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 4efc8bdc2ee..28c573be0bb 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -50,10 +50,10 @@ var/list/world_uplinks = list()
job = user.mind.assigned_role
var/dat = "[src.welcome]
"
- dat += "Tele-Crystals left: [src.uses]
"
+ dat += "Telecrystals left: [src.uses]
"
dat += "
"
dat += "Request item:
"
- dat += "Each item costs a number of tele-crystals as indicated by the number following their name.
"
+ dat += "Each item costs a number of telecrystals as indicated by the number following their name.
"
var/category_items = 1
for(var/category in ItemsCategory)
@@ -262,10 +262,6 @@ var/list/world_uplinks = list()
for(var/datum/data/record/L in data_core.general)
if(L.fields["id"] == id)
nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
- // We trade off being able to automatically add shit for more control over what gets passed to json
- // and if it's sanitized for html.
- nanoui_data["exploit"]["nanoui_exploit_record"] = html_encode(L.fields["exploit_record"]) // Change stuff into html
- nanoui_data["exploit"]["nanoui_exploit_record"] = replacetext(nanoui_data["exploit"]["nanoui_exploit_record"], "\n", "
") // change line breaks into
nanoui_data["exploit"]["name"] = html_encode(L.fields["name"])
nanoui_data["exploit"]["sex"] = html_encode(L.fields["sex"])
nanoui_data["exploit"]["age"] = html_encode(L.fields["age"])
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 24788c42a0e..2d788e219a4 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -26,16 +26,20 @@ RCD
var/working = 0
var/mode = 1
var/canRwall = 0
- var/disabled = 0
-
New()
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
+ rcd_list += src
return
-
+
+ Destroy()
+ qdel(spark_system)
+ spark_system = null
+ rcd_list -= src
+ return ..()
attackby(obj/item/weapon/W, mob/user, params)
..()
@@ -82,8 +86,6 @@ RCD
afterattack(atom/A, mob/user, proximity)
if(!proximity) return
- if(disabled && !isrobot(user))
- return 0
if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
return 0
if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index a71b1c76df4..b94337a118c 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -258,7 +258,7 @@
playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
return
else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
- msg_admin_attack("[key_name_admin(user)][isAntag(user) ? "(ANTAG)" : ""] triggered a fueltank explosion.")
+ msg_admin_attack("[key_name_admin(user)] triggered a fueltank explosion.")
log_game("[key_name(user)] triggered a fueltank explosion.")
user << "\red That was stupid of you."
var/obj/structure/reagent_dispensers/fueltank/tank = O
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 03efff51ffe..09871374089 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -251,7 +251,7 @@ var/send_emergency_team
if("Engineer")
engineer_slots -= 1
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/engineer(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
@@ -275,7 +275,7 @@ var/send_emergency_team
if("Security")
security_slots -= 1
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(M), slot_w_uniform)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/security(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/response_team(M), slot_belt)
@@ -299,7 +299,7 @@ var/send_emergency_team
if("Medic")
medical_slots -= 1
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(M), slot_w_uniform)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/medical(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
var/obj/item/weapon/card/id/W = new(src)
@@ -321,7 +321,7 @@ var/send_emergency_team
if("Commander")
command_slots = 0
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/commander(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
var/obj/item/weapon/card/id/W = new(src)
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index d40539cdbf7..847c4179d8f 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -676,11 +676,10 @@ var/list/mechtoys = list(
supply_controller.points -= P.cost
supply_controller.shoppinglist += O
temp = "Thanks for your order.
"
- temp += "
Back Main Menu"
else
temp = "Not enough supply points.
"
- temp += "
Back Main Menu"
break
+ temp += "
Back Main Menu"
else if (href_list["vieworders"])
temp = "Current approved orders:
"
diff --git a/code/modules/DetectiveWork/scanner.dm b/code/modules/DetectiveWork/scanner.dm
index d694e4c1645..5aec21ac94e 100644
--- a/code/modules/DetectiveWork/scanner.dm
+++ b/code/modules/DetectiveWork/scanner.dm
@@ -10,6 +10,7 @@
item_state = "electronic"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
+ origin_tech = "magnets=4;biotech=2"
var/scanning = 0
var/list/log = list()
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index eb6b02cc626..1673171ceec 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -922,7 +922,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert(M), slot_back)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s ID Card (Emergency Response Team - Member)"
@@ -944,7 +944,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
+ M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/commander(M), slot_back)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s ID Card (Emergency Response Team - Leader)"
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 8085fefd999..ec2277c22dd 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -44,12 +44,12 @@
if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
if(!status)
status = 1
- bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
- msg_admin_attack("[key_name_admin(user)][isAntag(user) ? "(ANTAG)" : ""] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
+ bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
+ msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]")
user << "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited."
else
status = 0
- bombers += "[key_name(user)] unwelded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
+ bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
user << "The hole has been closed."
add_fingerprint(user)
..()
diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm
index b3fbea5343c..c1778e060bc 100644
--- a/code/modules/events/mass_hallucination.dm
+++ b/code/modules/events/mass_hallucination.dm
@@ -3,4 +3,4 @@
if(!(C.species.flags & IS_SYNTHETIC))
C.hallucination += rand(50, 100)
/datum/event/mass_hallucination/announce()
- command_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage")
\ No newline at end of file
+ command_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucinations, but no further damage")
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 17417104463..f494d7336db 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -302,9 +302,9 @@
user.lastattacked = M
M.lastattacker = user
- user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])"
- M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])"
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" )
+ user.attack_log += "\[[time_stamp()]\] Attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])"
+ M.attack_log += "\[[time_stamp()]\] Attacked by [key_name(user)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])"
+ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" )
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index 6c3a5d35046..4144c4ef5cc 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -63,7 +63,7 @@ var/list/karma_spenders = list()
var/list/karma_list = list("Cancel")
for(var/mob/M in player_list) if(M.client && M.mind)
- if(isAntag(M)) // Don't include special roles, because players use it to meta
+ if(isNonCrewAntag(M)) // Don't include special roles, because players use it to meta
continue
karma_list += M
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5a0028bb952..82f09f0f489 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1225,6 +1225,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
else if(!seer)
see_in_dark = species.darksight
see_invisible = SEE_INVISIBLE_LIVING
+
+ if(see_override) //Override all
+ see_invisible = see_override
if(ticker && ticker.mode.name == "nations")
process_nations()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 2415bdb5be3..d64dc143ec2 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -55,6 +55,7 @@ var/list/ai_verbs_default = list(
var/ioncheck[1]
var/lawchannel = "Common" // Default channel on which to state laws
var/icon/holo_icon//Default is assigned when AI is created.
+ var/obj/mecha/controlled_mech //For controlled_mech a mech, to determine whether to relaymove or use the AI eye.
var/obj/item/device/pda/ai/aiPDA = null
var/obj/item/device/multitool/aiMulti = null
var/custom_sprite = 0 //For our custom sprites
@@ -66,7 +67,7 @@ var/list/ai_verbs_default = list(
var/processing_time = 100
var/list/datum/AI_Module/current_modules = list()
var/fire_res_on_core = 0
-
+ var/can_dominate_mechs = 0
var/control_disabled = 0 // Set to 1 to stop AI from interacting via Click() -- TLE
var/malfhacking = 0 // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite
var/malf_cooldown = 0 //Cooldown var for malf modules
@@ -536,6 +537,14 @@ var/list/ai_verbs_default = list(
botcall()
return
+ if (href_list["ai_take_control"]) //Mech domination
+ var/obj/mecha/M = locate(href_list["ai_take_control"])
+ if(controlled_mech)
+ src << "You are already loaded into an onboard computer!"
+ return
+ if(M)
+ M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
+
else if (href_list["faketrack"])
var/mob/target = locate(href_list["track"]) in mob_list
var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
@@ -981,6 +990,24 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/proc/is_in_chassis()
return istype(loc, /turf)
+
+/mob/living/silicon/ai/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card)
+ if(!..())
+ return
+ if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card.
+ if(!mind)
+ user << "No intelligence patterns detected." //No more magical carding of empty cores, AI RETURN TO BODY!!!11
+ return
+ if (mind.special_role == "malfunction") //AI MALF!!
+ user << "ERROR: Remote transfer interface disabled."//Do ho ho ho~
+ return
+ new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location.
+ aiRestorePowerRoutine = 0//So the AI initially has power.
+ control_disabled = 1//Can't control things remotely if you're stuck in a card!
+ aiRadio.disabledAi = 1 //No talking on the built-in radio for you either!
+ loc = card//Throw AI into the card.
+ src << "You have been downloaded to a mobile storage device. Remote device connection severed."
+ user << "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
#undef AI_CHECK_WIRELESS
#undef AI_CHECK_RADIO
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 5be1da223a9..40facde6f9c 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -44,7 +44,7 @@
loc = T.loc
if (istype(loc, /area))
//stage = 4
- if (!loc.power_equip && !istype(src.loc,/obj/item))
+ if (!loc.power_equip && !is_type_in_list(src.loc,list(/obj/item, /obj/mecha)))
//stage = 5
blind = 1
@@ -56,7 +56,8 @@
src.sight |= SEE_OBJS
src.see_in_dark = 8
src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
-
+ if(see_override)
+ see_invisible = see_override
//Congratulations! You've found a way for AI's to run without using power!
//Todo: Without snowflaking up master_controller procs find a way to make AI use_power but only when APC's clear the area usage the tick prior
@@ -97,7 +98,7 @@
src.see_in_dark = 0
src.see_invisible = SEE_INVISIBLE_LIVING
- if (((!loc.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item))
+ if (((!loc.power_equip) || istype(T, /turf/space)) && !is_type_in_list(src.loc,list(/obj/item, /obj/mecha)))
if (src:aiRestorePowerRoutine==0)
src:aiRestorePowerRoutine = 1
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index a67a2eed0d9..e64ec58e553 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -174,6 +174,18 @@ proc/isAntag(A)
if(C.mind && C.mind.special_role)
return 1
return 0
+
+proc/isNonCrewAntag(A)
+ if(!isAntag(A))
+ return 0
+
+ var/mob/living/carbon/C = A
+ var/special_role = C.mind.special_role
+ var/list/crew_roles = list("traitor", "Changeling", "Vampire", "Cultist", "Head Revolutionary", "Revolutionary", "malfunctioning AI", "Shadowling", "loyalist", "mutineer", "Response Team")
+ if((special_role in crew_roles))
+ return 0
+
+ return 1
proc/isnewplayer(A)
if(istype(A, /mob/new_player))
@@ -480,7 +492,7 @@ var/list/intents = list("help","disarm","grab","harm")
name = realname
for(var/mob/M in player_list)
- if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || check_rights(R_MOD,0)) && (M.client.prefs.toggles & CHAT_DEAD))
+ if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || check_rights(R_MOD,0,M)) && (M.client.prefs.toggles & CHAT_DEAD))
var/follow
var/lname
if(subject)
@@ -491,7 +503,7 @@ var/list/intents = list("help","disarm","grab","harm")
var/mob/dead/observer/DM
if(istype(subject, /mob/dead/observer))
DM = subject
- if(check_rights(R_MOD,0)) // What admins see
+ if(check_rights(R_MOD,0,M)) // What admins see
lname = "[keyname][(DM && DM.anonsay) ? "*" : (DM ? "" : "^")] ([name])"
else
if(DM && DM.anonsay) // If the person is actually observer they have the option to be anonymous
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index df5727e4315..1201c95b74c 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -191,8 +191,6 @@
if(world.time < move_delay) return
- if(isAI(mob)) return AIMove(n,direct,mob)
-
if(!isliving(mob)) return mob.Move(n,direct)
if(moving) return 0
@@ -211,10 +209,6 @@
var/mob/spirit/currentSpirit = mob
return currentSpirit.Spirit_Move(direct)
- // handle possible AI movement
- if(isAI(mob))
- return AIMove(n,direct,mob)
-
if(mob.notransform) return//This is sota the goto stop mobs from moving var
if(isliving(mob))
@@ -235,6 +229,9 @@
if(mob.remote_control) //we're controlling something, our movement is relayed to it
return mob.remote_control.relaymove(mob, direct)
+ if(isAI(mob))
+ return AIMove(n,direct,mob)
+
if(!mob.canmove)
return
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index eb13ba91b21..b0d3a7e4a85 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -135,8 +135,8 @@
var/obj/item/device/assembly_holder/H = W
if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
- msg_admin_attack("[key_name_admin(user)][isAntag(user) ? "(ANTAG)" : ""] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
- log_game("[key_name(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
+ msg_admin_attack("[key_name_admin(user)] rigged a fueltank for explosion (JMP)")
+ log_game("[key_name(user)] rigged fueltank a fueltank for explosion at [loc.x], [loc.y], [loc.z]")
rig = W
user.drop_item()
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 21cbcd5c49d..e6a16f00765 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -169,10 +169,10 @@
msg = "[user.name] stuffs [target.name] into the [src]!"
user << "You stuff [target.name] into the [src]!"
- user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.")
- target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])")
+ user.attack_log += text("\[[time_stamp()]\] Has placed [key_name(target)] in disposals.")
+ target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [key_name(user)]")
if(target.ckey)
- msg_admin_attack("[user] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] placed [target] ([target.ckey]) in a disposals unit. (JMP)")
+ msg_admin_attack("[key_name_admin(user)] placed [key_name_admin(target)] in a disposals unit")
else
return
if (target.client)
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index 10a6a18ee31..ab78834a877 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -99,4 +99,15 @@
build_type = PROTOLATHE
materials = list("$metal" = 4000, "$glass" = 1000)
build_path = /obj/item/clothing/mask/gas/welding
+ category = list("Equipment")
+
+/datum/design/detective_scanner
+ name = "Forensic Scanner"
+ desc = "A high tech scanner designed for forensic evidence collection, DNA recovery, and fiber analysis."
+ id = "detectivescanner"
+ req_tech = list("biotech" = 2, "magnets" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 6000, "$glass" = 2000)
+ build_path = /obj/item/device/detective_scanner
+ locked = 1 //no validhunting scientists.
category = list("Equipment")
\ No newline at end of file
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index bb1d7e30c4f..6df826f3792 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -210,6 +210,6 @@
M.lastattacker = user
if(inserted_battery.battery_effect)
- user.attack_log += "\[[time_stamp()]\] Tapped [M.name] ([M.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])"
- M.attack_log += "\[[time_stamp()]\] Tapped by [user.name] ([user.ckey]) with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])"
- msg_admin_attack("[key_name(user)][isAntag(user) ? "(ANTAG)" : ""] tapped [key_name(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" )
+ user.attack_log += "\[[time_stamp()]\] Tapped [key_name(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])"
+ M.attack_log += "\[[time_stamp()]\] Tapped by [key_name(user)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])"
+ msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" )
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 8164fca3f39..87f478938f3 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -174,8 +174,7 @@ var/global/maint_all_access = 0
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 1
D.update_icon(0)
- world << "Attention!"
- world << "The maintenance access requirement has been revoked on all airlocks."
+ minor_announcement.Announce("The maintenance access requirement has been revoked on all airlocks.")
maint_all_access = 1
/proc/revoke_maint_all_access()
@@ -183,6 +182,5 @@ var/global/maint_all_access = 0
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 0
D.update_icon(0)
- world << "Attention!"
- world << "The maintenance access requirement has been readded on all maintenance airlocks."
+ minor_announcement.Announce("The maintenance access requirement has been readded on all maintenance airlocks.")
maint_all_access = 0
\ No newline at end of file
diff --git a/code/modules/vehicle/train/trains/cargo/cargo_train.dm b/code/modules/vehicle/train/trains/cargo/cargo_train.dm
index 1daee673201..a8f50cd5463 100644
--- a/code/modules/vehicle/train/trains/cargo/cargo_train.dm
+++ b/code/modules/vehicle/train/trains/cargo/cargo_train.dm
@@ -144,7 +144,7 @@
/obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H)
..()
- attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])")
+ attack_log += text("\[[time_stamp()]\] ran over [key_name(H)]")
/obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H)
..()
@@ -153,10 +153,10 @@
var/mob/living/carbon/human/D = load
D << "\red \b You ran over [H]!"
visible_message("\red \The [src] ran over [H]!")
- attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])")
- msg_admin_attack("[D.name] ([D.ckey])[isAntag(D) ? "(ANTAG)" : ""] ran over [H.name] ([H.ckey]). (JMP)")
+ attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]")
+ msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]")
else
- attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])")
+ attack_log += text("\[[time_stamp()]\] ran over [key_name(H)]")
//-------------------------------------------
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 8773d255248..a4c6dd0e843 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/nano/templates/ai_fixer.tmpl b/nano/templates/ai_fixer.tmpl
new file mode 100644
index 00000000000..4e88dc45c91
--- /dev/null
+++ b/nano/templates/ai_fixer.tmpl
@@ -0,0 +1,63 @@
+
+{{if data.occupant}}
+
+
Stored AI: {{:data.occupant}}
+
Information
+
+ Integrity
+
+
+ {{:data.integrity}}%
+
+
+ Status
+
+
+ {{if data.stat == 2}}
+ Non-functional
+ {{else}}
+ Functional
+ {{/if}}
+
+
+ Wireless Activity
+
+
+ {{:helper.link('Enabled','check',{'wireless' : 0},data.wireless == 0 ? 'selected' : '')}}
+ {{:helper.link('Disabled','close',{'wireless' : 1},data.wireless == 1 ? 'selected' : '')}}
+
+
+ Subspace Transceiver
+
+
+ {{:helper.link('Enabled','check',{'radio' : 0},data.radio == 0 ? 'selected' : '')}}
+ {{:helper.link('Disabled','close',{'radio' : 1},data.radio == 1 ? 'selected' : '')}}
+
+
Laws
+ {{if data.zeroth}}
+ 0: {{:data.zeroth}}
+ {{/if}}
+ {{for data.laws}}
+ {{:value.number}}: {{:value.law}}
+ {{empty}}
+ {{if !data.zeroth}}
+
No laws detected!
+ {{/if}}
+ {{/for}}
+
+
Actions
+ {{if data.active}}
+
Reconstruction in progress, please wait.
+ {{:helper.displayBar(data.integrity, 0, 100, (data.integrity >= 75) ? 'good' : (data.integrity >= 25) ? 'average' : 'bad')}}
+
{{:data.integrity}}%
+ {{/if}}
+
+ {{:helper.link('Reconstruct', 'wrench', {'fix' : 1}, data.active || data.integrity >= 100 ? 'disabled' : '')}}
+
+
No artificial intelligence detected.
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/exosuit_control.tmpl b/nano/templates/exosuit_control.tmpl
new file mode 100644
index 00000000000..c3b88d50f54
--- /dev/null
+++ b/nano/templates/exosuit_control.tmpl
@@ -0,0 +1,81 @@
+
+{{if data.screen == 0}}
+ {{for data.mechas}}
+
+
+
{{:value.name}}
+
Information
+
+ Pilot:
+
+
+ {{:value.pilot}}
+
+
+ Integrity:
+
+
+ {{:value.integrity}}%
+
+
+ Location:
+
+
+ {{:value.location}}
+
+
+ Airtank:
+
+
+ {{:value.airtank}}kPa
+
+
+ Active Equipment:
+
+
+ {{:value.equipment}}
+
+ {{if value.hascargo}}
+
+ Cargo Used:
+
+
+ {{:value.cargo}}%
+
+ {{/if}}
+
+
Power Cell
+ {{if value.cell}}
+
+ Rating:
+
+
+ {{:value.cell_capacity}}
+
+ {{:helper.displayBar(value.cell_percentage, 0, 100, (value.cell_percentage >= 50) ? 'good' : (value.cell_percentage >= 25) ? 'average' : 'bad')}}
+
{{:value.cell_percentage}}%
+ {{else}}
+
Not Installed
+ {{:helper.displayBar(100, 0, 100, 'bad')}}
+ {{/if}}
+
+
+
Actions
+ {{:helper.link('Send Message', 'mail-closed', {'send_message' : value.reference})}}
+ {{:helper.link('Exosuit Log', 'search', {'get_log' : value.reference})}}
+ {{:helper.link('EMP Pulse', 'alert', {'shock' : value.reference}, null, 'redButton')}}
+
+
No mecha trackers were found.
+
+ {{/for}}
+{{else}}
+
+ {{:helper.link('Return', 'close', {'return' : 1})}}
+
+ {{:data.log}}
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/nuclear_bomb.tmpl b/nano/templates/nuclear_bomb.tmpl
index 087e3efb640..3536d17713f 100644
--- a/nano/templates/nuclear_bomb.tmpl
+++ b/nano/templates/nuclear_bomb.tmpl
@@ -5,84 +5,67 @@ Used In File(s): \code\game\gamemodes\nuclear\nuclearbomb.dm
{{if data.is_syndicate}}
{{:helper.syndicateMode()}}
{{/if}}
-{{if !data.hacking}}
+
+ Authorization Disk: {{if data.auth}}{{:helper.link('++++++++++', 'eject', {'auth' : 1})}} {{else}} {{:helper.link('----------', 'disk', {'auth' : 1})}}{{/if}}
+
+
+
+
Status: {{:data.authstatus}} - {{:data.safe}}
+
Timer: {{:data.time}}
+
- Authorization Disk: {{if data.auth}}{{:helper.link('++++++++++', 'eject', {'auth' : 1})}} {{else}} {{:helper.link('----------', 'disk', {'auth' : 1})}}{{/if}}
-
+ {{if data.auth && data.yescode}}
+
+ Timer: {{:helper.link('On', 'play', {'timer' : 1}, data.timer ? 'selected' : '')}}{{:helper.link('Off', 'stop', {'timer' : 0}, !data.timer ? 'selected' : '')}}
+
+
+ Time: {{:helper.link('--', '', {'time' : -10}, data.time <= 120 ? 'disabled' : '')}}{{:helper.link('-', '', {'time' : -1}, data.time <= 120 ? 'disabled' : '')}} {{:data.time}} {{:helper.link('+', '', {'time' : 1})}}{{:helper.link('++', '', {'time' : 10})}}
+
+ {{else}}
+
+ Timer: {{:helper.link('On', 'play', null, 'disabled')}}{{:helper.link('Off', 'pause', null, 'disabled')}}
+
+
+ Time: {{:helper.link('-', '', null, 'disabled')}}{{:helper.link('-', '', null, 'disabled')}} {{:data.time}} {{:helper.link('+', '', null, 'disabled')}}{{:helper.link('++', '', null, 'disabled')}}
+
+ {{/if}}
+
+
+ {{if data.auth && data.yescode}}
+
+ Safety: {{:helper.link('Engaged', 'info', {'safety' : 1}, data.safety ? 'selected' : '')}}{{:helper.link('Disengaged', 'alert', {'safety' : 0}, data.safety ? '' : 'selected')}}
+
+
+ Anchor: {{:helper.link('Engaged', 'locked', {'anchor' : 1}, data.anchored ? 'selected' : '')}}{{:helper.link('Disengaged', 'unlocked', {'anchor' : 0}, data.anchored ? '' : 'selected')}}
+
+ {{else}}
+
+ Safety: {{:helper.link('Engaged', 'info', null, 'disabled')}}{{:helper.link('Disengaged', 'alert', null, 'disabled')}}
+
+
+ Anchor: {{:helper.link('Engaged', 'locked', null, 'disabled')}}{{:helper.link('Disengaged', 'unlocked', null, 'disabled')}}
+
+ {{/if}}
+
+
+
-
Status: {{:data.authstatus}} - {{:data.safe}}
-
Timer: {{:data.time}}
+ >{{if data.message}} {{:data.message}}{{/if}}
- {{if data.auth && data.yescode}}
-
- Timer: {{:helper.link('On', 'play', {'timer' : 1}, data.timer ? 'selected' : '')}}{{:helper.link('Off', 'stop', {'timer' : 0}, !data.timer ? 'selected' : '')}}
-
-
- Time: {{:helper.link('--', '', {'time' : -10}, data.time <= 60 ? 'disabled' : '')}}{{:helper.link('-', '', {'time' : -1}, data.time <= 60 ? 'disabled' : '')}} {{:data.time}} {{:helper.link('+', '', {'time' : 1})}}{{:helper.link('++', '', {'time' : 10})}}
-
- {{else}}
-
- Timer: {{:helper.link('On', 'play', null, 'disabled')}}{{:helper.link('Off', 'pause', null, 'disabled')}}
-
-
- Time: {{:helper.link('-', '', null, 'disabled')}}{{:helper.link('-', '', null, 'disabled')}} {{:data.time}} {{:helper.link('+', '', null, 'disabled')}}{{:helper.link('++', '', null, 'disabled')}}
-
- {{/if}}
+ {{:helper.link('1', '', {'type' : 1})}}{{:helper.link('2', '', {'type' : 2})}}{{:helper.link('3', '', {'type' : 3})}}
- {{if data.auth && data.yescode}}
-
- Safety: {{:helper.link('Engaged', 'info', {'safety' : 1}, data.safety ? 'selected' : '')}}{{:helper.link('Disengaged', 'alert', {'safety' : 0}, data.safety ? '' : 'selected')}}
-
-
- Anchor: {{:helper.link('Engaged', 'locked', {'anchor' : 1}, data.anchored ? 'selected' : '')}}{{:helper.link('Disengaged', 'unlocked', {'anchor' : 0}, data.anchored ? '' : 'selected')}}
-
- {{else}}
-
- Safety: {{:helper.link('Engaged', 'info', null, 'disabled')}}{{:helper.link('Disengaged', 'alert', null, 'disabled')}}
-
-
- Anchor: {{:helper.link('Engaged', 'locked', null, 'disabled')}}{{:helper.link('Disengaged', 'unlocked', null, 'disabled')}}
-
- {{/if}}
-
-
-
-
-
- >{{if data.message}} {{:data.message}}{{/if}}
+ {{:helper.link('4', '', {'type' : 4})}}{{:helper.link('5', '', {'type' : 5})}}{{:helper.link('6', '', {'type' : 6})}}
-
- {{:helper.link('1', '', {'type' : 1})}}{{:helper.link('2', '', {'type' : 2})}}{{:helper.link('3', '', {'type' : 3})}}
-
-
- {{:helper.link('4', '', {'type' : 4})}}{{:helper.link('5', '', {'type' : 5})}}{{:helper.link('6', '', {'type' : 6})}}
-
-
- {{:helper.link('7', '', {'type' : 7})}}{{:helper.link('8', '', {'type' : 8})}}{{:helper.link('9', '', {'type' : 9})}}
-
-
- {{:helper.link('R', '', {'type' : 'R'})}}{{:helper.link('0', '', {'type' : 0})}}{{:helper.link('E', '', {'type' : 'E'})}}
-
+ {{:helper.link('7', '', {'type' : 7})}}{{:helper.link('8', '', {'type' : 8})}}{{:helper.link('9', '', {'type' : 9})}}
+
+
+ {{:helper.link('R', '', {'type' : 'R'})}}{{:helper.link('0', '', {'type' : 0})}}{{:helper.link('E', '', {'type' : 'E'})}}
-{{else}}
-
-
Exposed Wires
- {{for data.wires}}
-
-
{{:value.name}}
-
{{:helper.link(value.cut ? 'Mend' : 'Cut', '', {'wire' : value.name, 'act' : 'wire'})}} {{:helper.link('Pulse', '', {'wire' : value.name, 'act' : 'pulse'})}}
-
- {{/for}}
-
-
- The device is {{if data.timing}}shaking!{{else}}still.{{/if}}
- The device is {{if data.safety}}quiet.{{else}}whirring.{{/if}}
- The lights are {{if data.lighthack}}static.{{else}}functional.{{/if}}
-
-{{/if}}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/nano/templates/pod_tracking.tmpl b/nano/templates/pod_tracking.tmpl
new file mode 100644
index 00000000000..4fd68df82f9
--- /dev/null
+++ b/nano/templates/pod_tracking.tmpl
@@ -0,0 +1,33 @@
+
+
+{{:helper.link('Refresh', 'refresh', {'refresh' : 1})}}
+Pods
+{{for data.pods}}
+
+
+
{{:value.name}}
+
Pilot
+
{{:value.occupant}}
+
Passenger
+
{{:value.occupant2}}
+
Coordinates
+
{{:value.x}}, {{:value.y}}, {{:value.z}}
+
+
No pod trackers were found.
+
+{{/for}}
\ No newline at end of file
diff --git a/nano/templates/robot_control.tmpl b/nano/templates/robot_control.tmpl
index 61c5464ad2f..2e5e892e0e8 100644
--- a/nano/templates/robot_control.tmpl
+++ b/nano/templates/robot_control.tmpl
@@ -64,11 +64,10 @@
{{:value.cell_capacity}}