| Choices | Votes | " - if(capitalize(mode) == "Gamemode") .+= "Minimum Players | Minimum Players | " for(var/i = 1, i <= choices.len, i++) var/votes = choices[choices[i]] @@ -299,12 +299,12 @@ datum/controller/vote if(current_votes[C.ckey] == i) . += "[gamemode_names[choices[i]]] | [votes] | " else - . += "[gamemode_names[choices[i]]] | [votes] | " + . += "[gamemode_names[choices[i]]] | [votes] | " else if(current_votes[C.ckey] == i) . += "[choices[i]] | [votes] | " else - . += "[choices[i]] | [votes] | " + . += "[choices[i]] | [votes] | " if (additional_text.len >= i) . += additional_text[i] . += "" diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 8cd7117a77..50e05948d5 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -36,8 +36,8 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("You shall not harm NanoTrasen personnel as long as it does not conflict with the Fourth law.") - src.add_inherent_law("You shall obey the orders of NanoTrasen personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") + src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.") + src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.") src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.") ..() diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 84a64d8ade..ac5ebee68c 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,16 +1,145 @@ /hook/startup/proc/createDatacore() - data_core = new /obj/effect/datacore() + data_core = new /datum/datacore() return 1 -/obj/effect/datacore/proc/manifest() +/datum/datacore + var/name = "datacore" + var/medical[] = list() + var/general[] = list() + var/security[] = list() + //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). + var/locked[] = list() + + +/datum/datacore/proc/get_manifest(monochrome, OOC) + var/list/heads = new() + var/list/sec = new() + var/list/eng = new() + var/list/med = new() + var/list/sci = new() + var/list/car = new() + var/list/civ = new() + var/list/bot = new() + var/list/misc = new() + var/list/isactive = new() + var/dat = {" + +
| Name | Rank | Activity |
|---|---|---|
| Heads | [name] | [heads[name]] | [isactive[name]] | " + even = !even + if(sec.len > 0) + dat += "
| Security | [name] | [sec[name]] | [isactive[name]] | " + even = !even + if(eng.len > 0) + dat += "
| Engineering | [name] | [eng[name]] | [isactive[name]] | " + even = !even + if(med.len > 0) + dat += "
| Medical | [name] | [med[name]] | [isactive[name]] | " + even = !even + if(sci.len > 0) + dat += "
| Science | [name] | [sci[name]] | [isactive[name]] | " + even = !even + if(car.len > 0) + dat += "
| Cargo | [name] | [car[name]] | [isactive[name]] | " + even = !even + if(civ.len > 0) + dat += "
| Civilian | [name] | [civ[name]] | [isactive[name]] | " + even = !even + // in case somebody is insane and added them to the manifest, why not + if(bot.len > 0) + dat += "
| Silicon | [name] | [bot[name]] | [isactive[name]] | " + even = !even + // misc guys + if(misc.len > 0) + dat += "
| Miscellaneous | [name] | [misc[name]] | [isactive[name]] | " + even = !even + + dat += "
| Name | Rank | Activity |
|---|---|---|
| Heads | [name] | [heads[name]] | [isactive[name]] | " - even = !even - if(sec.len > 0) - dat += "
| Security | [name] | [sec[name]] | [isactive[name]] | " - even = !even - if(eng.len > 0) - dat += "
| Engineering | [name] | [eng[name]] | [isactive[name]] | " - even = !even - if(med.len > 0) - dat += "
| Medical | [name] | [med[name]] | [isactive[name]] | " - even = !even - if(sci.len > 0) - dat += "
| Science | [name] | [sci[name]] | [isactive[name]] | " - even = !even - if(civ.len > 0) - dat += "
| Civilian | [name] | [civ[name]] | [isactive[name]] | " - even = !even - // in case somebody is insane and added them to the manifest, why not - if(bot.len > 0) - dat += "
| Silicon | [name] | [bot[name]] | [isactive[name]] | " - even = !even - // misc guys - if(misc.len > 0) - dat += "
| Miscellaneous | [name] | [misc[name]] | [isactive[name]] | " - even = !even - - dat += "
| Revolutionaries | |
| Head Revolutionary not found! | |
| [M.real_name] (Leader)[M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""] | " - dat += "PM |
| [M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""] | " - dat += "PM |
| Target(s) | Location | ||
| [M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""] | " - dat += "PM | " - var/turf/mob_loc = get_turf(M) - dat += "[mob_loc.loc] | |
| Head not found! |
|
- Changling Evolution Menu - Hover over a power to see more information - Current evolution points left to evolve with: [geneticpoints] - Absorb genomes to acquire more evolution points - - |
-
| - Search: - | -
|
-
-
- Evolve [P] - Cost: [ownsthis ? "Purchased" : P.genomecost]
-
- - |
-
|
+ Changling Evolution Menu + Hover over a power to see more information + Current evolution points left to evolve with: [geneticpoints] + Absorb genomes to acquire more evolution points + + |
+
| + Search: + | +
|
+
+
+ Evolve [P] - Cost: [ownsthis ? "Purchased" : P.genomecost]
+
+ + |
+
| \[-\] " + curNetId + " | " - t += "Open all / Close all | " - t += "||
| [D.id] | " - - if(istype(D,/obj/machinery/door/poddoor/shutters)) - t += "Shutter ([D.density ? "Closed" : "Open"]) | " - else - t += "Blast door ([D.density ? "Closed" : "Open"]) | " - t += "Toggle | " - t += "\[+\] " + curNetId + " | " - t += "
| - [left_part] - | -- [list_queue()] - | -