Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2024-03-01 21:15:28 -05:00
601 changed files with 3791 additions and 2790 deletions
@@ -51,11 +51,11 @@
var/obj/item/stack/S = I
if(obj_integrity == max_integrity)
to_chat(user, span_warning("\The [src] doesn't seem to require repairs."))
return 1
return TRUE
if(S.use(1))
to_chat(user, span_notice("You patch up \the [src] with a bit of \the [I]."))
obj_integrity = min(obj_integrity + 10, max_integrity)
return 1
return TRUE
if(try_insert(I, user))
return TRUE
@@ -34,16 +34,16 @@
// 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection
/obj/item/computer_hardware/network_card/proc/get_signal(specific_action = 0)
if(!holder) // Hardware is not installed in anything. No signal. How did this even get called?
return 0
return FALSE
if(!check_functionality())
return 0
return FALSE
if(ethernet) // Computer is connected via wired connection.
return 3
if(!SSnetworks.station_network || !SSnetworks.station_network.check_function(specific_action)) // NTNet is down and we are not connected via wired connection. No signal.
return 0
return FALSE
if(holder)
@@ -53,12 +53,12 @@
if(long_range)
return 2
else
return 1
return TRUE
if(long_range) // Computer is not on station, but it has upgraded network card. Low signal.
return 1
return TRUE
return 0 // Computer is not on station and does not have upgraded network card. No signal.
return FALSE // Computer is not on station and does not have upgraded network card. No signal.
/obj/item/computer_hardware/network_card/advanced
@@ -95,5 +95,5 @@
charge_rate = 100000
/obj/item/computer_hardware/recharger/lambda/use_power(amount, charging=0)
return 1
return TRUE