Skip to content

Commit

Permalink
Убить нетраннера
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest committed Dec 26, 2023
1 parent 34fcf56 commit e87d540
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 9 deletions.
8 changes: 5 additions & 3 deletions code/__defines/items_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
#define FIRESUIT_MAX_PRESSURE 100 * ONE_ATMOSPHERE // Firesuis and atmos voidsuits
#define RIG_MAX_PRESSURE 50 * ONE_ATMOSPHERE // Rigs
#define LIGHT_RIG_MAX_PRESSURE 25 * ONE_ATMOSPHERE // Rigs
#define ENG_VOIDSUIT_MAX_PRESSURE 50 * ONE_ATMOSPHERE
#define VOIDSUIT_MAX_PRESSURE 25 * ONE_ATMOSPHERE
#define ENG_VOIDSUIT_MAX_PRESSURE 50 * ONE_ATMOSPHERE
#define VOIDSUIT_MAX_PRESSURE 25 * ONE_ATMOSPHERE
#define SPACE_SUIT_MAX_PRESSURE 5 * ONE_ATMOSPHERE

// Fire.
Expand Down Expand Up @@ -218,7 +218,9 @@
#define HUD_SECURITY FLAG(1)
#define HUD_MEDICAL FLAG(2)
#define HUD_JANITOR FLAG(3)

// [SIERRA-EDIT] - NTNet gimmics
#define HUD_IT FLAG(4)
// [/SIERRA-EDIT]

/**
* flags for /mob/proc/equip_to_slot_if_possible
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mob/living/carbon/human/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,10 @@
if (A.hud_type & hudtype)
AUG = A
break

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 - 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]
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)
Expand Down
4 changes: 2 additions & 2 deletions maps/sierra/job/jobs_command.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
access_sec_doors, access_medical, access_network,
access_maint_tunnels, access_eva, access_expedition_shuttle, access_expedition_shuttle_helm,
access_guppy, access_hangar, access_petrov, access_petrov_helm,
access_guppy_helm, access_explorer, access_el
access_guppy_helm, access_explorer, access_el, access_network_admin
)
software_on_spawn = list(
/datum/computer_file/program/comm,
Expand Down Expand Up @@ -295,7 +295,7 @@
access_atmospherics, access_janitor, access_construction,
access_sec_doors, access_medical, access_network, access_ce,
access_RC_announce, access_keycard_auth, access_tcomsat,
access_seneng, access_hangar
access_seneng, access_hangar, access_network_admin
)


Expand Down
4 changes: 2 additions & 2 deletions maps/sierra/job/jobs_engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

access = list( access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage,
access_eva, access_tech_storage, access_atmospherics, access_janitor, access_construction,
access_tcomsat, access_seneng, access_hangar)
access_tcomsat, access_seneng, access_hangar, access_network)


software_on_spawn = list(/datum/computer_file/program/power_monitor,
Expand Down Expand Up @@ -184,7 +184,7 @@
max_skill = list( SKILL_ELECTRICAL = SKILL_MAX,
SKILL_COMPUTER = SKILL_MAX)

access = list( access_maint_tunnels, access_network, access_external_airlocks,
access = list( access_maint_tunnels, access_network, access_network_admin, access_external_airlocks,
access_tech_storage, access_emergency_storage, access_tcomsat)


Expand Down
1 change: 1 addition & 0 deletions packs/sierra-tweaks/_pack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "mob\stat.dm"

// NTNet
#include "machinery\NTNet\NTNet-items.dm"
#include "machinery\NTNet\NTNet-core.dm"

// Objects
Expand Down
3 changes: 3 additions & 0 deletions packs/sierra-tweaks/machinery/NTNet/NTNet-core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ GLOBAL_LIST_INIT(NTNet_machines, list())
/obj/machinery
var/NTNet_id

/obj/machinery/door/airlock
var/t_ntnet_id

//generating ID
/obj/machinery/proc/get_new_ntnet_id(A)
NTNet_id = A + num2text(rand(100,999))
Expand Down
37 changes: 37 additions & 0 deletions packs/sierra-tweaks/machinery/NTNet/NTNet-items.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// HACSO's HUD and related interactions
// code\__defines\items_clothing.dm - used outside pack


/obj/item/clothing/glasses/hud/it
name = "IT special HUD"
desc = "An augmented reality device that allows you to see doors NTNet ID's."
icon_state = "ithud"
off_state = "ithud_off"
hud_type = HUD_IT
body_parts_covered = 0

/obj/machinery/door/airlock/examine(mob/user)
. = ..()
if (lock_cut_state == BOLTS_EXPOSED)
to_chat(user, "The bolt cover has been cut open.")
if (lock_cut_state == BOLTS_CUT)
to_chat(user, "The door bolts have been cut.")
if(brace)
to_chat(user, "\The [brace] is installed on \the [src], preventing it from opening.")
brace.examine_damage_state(user)
if(hasHUD(user, HUD_IT) && arePowerSystemsOn())
to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [t_ntnet_id]")))

/obj/item/modular_computer/examine(mob/user)
. = ..()
if(hasHUD(user, HUD_IT))
if(network_card && network_card.check_functionality() && enabled)
to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [network_card.get_network_tag()].")))

/obj/machinery/computer/modular/examine(mob/user)
. = ..()
if(hasHUD(user, HUD_IT))
var/datum/extension/interactive/ntos/os = get_extension(src, /datum/extension/interactive/ntos)
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()].")))

0 comments on commit e87d540

Please sign in to comment.