1984

SierraBay · Dec 26, 2023 · fc06b23 · fc06b23
1 parent 9641be0
commit fc06b23
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 104 deletions.
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -358,10 +358,10 @@
 			if (A.hud_type & hudtype)
 				AUG = A
 				break
-// SIERRA-EDIT - NTNet
+		// [SIERRA-EDIT] - NTNet
 //		return ((istype(G) && ((G.hud_type & hudtype) || (G.hud && (G.hud.hud_type & hudtype)))) && G.check_access(ID)) || AUG?.active && AUG.check_access(ID) // SIERRA-EDIT - ORIGINAL
 		return ((istype(G) && ((G.hud_type & hudtype) || (G.hud && (G.hud.hud_type & hudtype)))) && G.check_access(ID) && (G.toggleable ? G.active : TRUE)) || AUG?.active && AUG.check_access(ID)
-// [/SIERRA-EDIT]
+		// [/SIERRA-EDIT]
 	else if(istype(M, /mob/living/silicon/robot))
 		for (var/obj/item/borg/sight/sight as anything in M.GetAllHeld(/obj/item/borg/sight))
 			if (sight.hud_type & hudtype)

diff --git a/mods/antagonists/README.md b/mods/antagonists/README.md
@@ -2,6 +2,7 @@
 #### Список PRов:
 
 - https://github.com/SierraBay/SierraBay12/pull/1474
+- https://github.com/SierraBay/SierraBay12/pull/1683
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание

diff --git a/mods/ntnet/README.md b/mods/ntnet/README.md
@@ -9,7 +9,7 @@
 -->
 
 <!-- Название мода. Не важно на русском или на английском. -->
-## Экран лобби
+## NTNetwork
 
 ID мода: NTNET
 <!--
@@ -48,7 +48,7 @@ NTNet
 
 ### Дефайны
 
-- HUD IT
+- HUD_IT
 <!--
   Если требовалось добавить какие-либо дефайны, укажи файлы,
   в которые ты их добавил, а также перечисли имена.

diff --git a/mods/ntnet/code/NTNet-items.dm b/mods/ntnet/code/NTNet-items.dm
@@ -74,103 +74,3 @@
 		var/obj/item/stock_parts/computer/network_card/network_card = os.get_component(PART_NETWORK)
 		if(istype(network_card) && network_card.check_functionality() && os.on)
 			to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [network_card.get_network_tag()].")))
-
-/*
-/client/proc/debug_airlocks_id()
-	set name = "Debug Airlocks ID"
-	set category = "Debug"
-//html{background: linear-gradient(180deg, #373737, #171717);color: #a4bad6;}hr{background-color: #40628a;height: 1px;}
-	var/stylesheet = {"<style>
-							div.id_airlocksbugged{
-								background: #844;
-								border-radius: 5px;
-								border-color: #a00;
-								padding: 20px;
-							}
-							table, td, th {
-								border: 1px solid #6a6;
-							}
-							td, th {
-								width: 100px;
-							}
-							table.id_airlocksbugged{
-							border: 1px solid #a66;
-							}
-							table.id_airlocksbugged td, table.id_airlocksbugged th{
-							border: 1px solid #a66;
-							}
-							.airlocksid_stable{
-								background: #4c4;
-								border-radius: 5px;
-								border: #0a0 solid 3px;
-								padding: 30px;
-								font-size: 30px;
-							}
-						</style>"}
-	var/IDS_table = {"<table>
-					<tr>
-						<th>ID
-						<th>NAME
-						<th>LOCATION"}
-	var/list/IDS = list()
-	var/list/bugged_airlocks = list()
-	var/bugged_airlocks_table = {"<tr>
-									<th class='id_airlocksbugged'>ID
-									<th class='id_airlocksbugged'>NAME
-									<th class='id_airlocksbugged'>LOCATION
-									<th class='id_airlocksbugged'>ID PAIR
-									<th class='id_airlocksbugged'>PAIR NAME
-									<th class='id_airlocksbugged'>PAIR LOCATION"}
-	var/data = ""
-	for(var/obj/machinery/door/airlock/TEST in GLOB.airlocks)
-/*
-		for(var/obj/machinery/door/airlock/I in SSmachines.machinery)
-			if(TEST.NTNet_id == I.NTNet_id && I != TEST)
-				bugged_airlocks += "[I.name] | ID: [I.NTNet_id] | Location: [I.loc]"
-				continue
-*/
-		IDS += {"	<td>[TEST.NTNet_id]
-					<td>[TEST.name]
-					<td>(<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[TEST.x];Y=[TEST.y];Z=[TEST.z]'>[where]</a> ([TEST.loc]))"}
-	for(var/obj/machinery/door/airlock/i in GLOB.airlocks)
-		for(var/obj/machinery/door/airlock/n in GLOB.airlocks)
-			if(n == i)
-				continue
-			if(n.NTNet_id == i.NTNet_id)
-				bugged_airlocks += {"	<td class='id_airlocksbugged'>[n.NTNet_id]
-										<td class='id_airlocksbugged'>[n.name]
-										<td class='id_airlocksbugged'>[n.loc] ([<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[n.x];Y=[n.y];Z=[n.z]'>[where]</a>(n)])
-
-										<td class='id_airlocksbugged'>[i.NTNet_id]
-										<td class='id_airlocksbugged'>[i.name]
-										<td class='id_airlocksbugged'>[i.loc] ([<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[i.x];Y=[i.y];Z=[i.z]'>[where]</a>(i)])"}
-
-	if(bugged_airlocks.length)
-		data += {"<div class = 'id_airlocksbugged'>
-					<center>
-						<h2>
-							Airlocks with same ID's:
-						</h2>
-						<br>
-						<div align='center'>
-							<table class="id_airlocksbugged">
-								[bugged_airlocks_table]<tr>
-								[bugged_airlocks.Join("<tr>")]
-							</table>
-						</div>
-					</center>
-				</div><hr>"}
-	else
-		data += "<div class = 'airlocksid_stable'>Airlocks ID system stable</div>"
-	data += "<center><h1>All airlocks IDs:</h1></center><hr>"
-	if(IDS.length)
-		data += "<div align='center'>[IDS_table]<tr>[IDS.Join("<tr>")]</div>"
-	else
-		data += "<div class = 'id_airlocksbugged'>ERROR CODE 523 (Origin Is Unreachable): Airlocks isn't initialized or not found.</div>"
-	data += stylesheet
-	//show_browser(src, data, "airlocks_ntnet_id_debug")
-	var/datum/browser/popup = new(src.virtual_eye, "ailocksdebug", "Airlock ID Debug", 700, 800)
-	popup.set_content(data)
-	popup.open()
-	return 1
-*/