Merge pull request #6690 from VOREStation/vplk-ntnet-fixer

Fixes to Modular Computers and NTNet Relays
This commit is contained in:
Atermonera
2020-02-20 22:57:02 -08:00
committed by VirgoBot
parent a41caca3ca
commit 1010fd283b
8 changed files with 31 additions and 37 deletions

View File

@@ -47,6 +47,7 @@
to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
/obj/item/weapon/computer_hardware/New(var/obj/L)
..()
w_class = hardware_size
if(istype(L, /obj/item/modular_computer))
holder2 = L

View File

@@ -97,4 +97,4 @@ var/global/ntnet_card_uid = 1
/obj/item/weapon/computer_hardware/network_card/Destroy()
if(holder2 && (holder2.network_card == src))
holder2.network_card = null
..()
return ..()