it compiles, UNTESTED YET

This commit is contained in:
Letter N
2021-02-13 21:41:59 +08:00
parent 51b4172509
commit 45d6a5f87f
35 changed files with 952 additions and 536 deletions
@@ -391,7 +391,7 @@
/obj/item/modular_computer/proc/toggle_flashlight()
if(!has_light)
return FALSE
set_light_on(!light_on)
light_on = !light_on
if(light_on)
set_light(comp_light_luminosity, 1, comp_light_color)
else
@@ -410,7 +410,7 @@
if(!has_light || !color)
return FALSE
comp_light_color = color
set_light_color(color)
// set_light_color(color)
update_light()
return TRUE
@@ -112,7 +112,7 @@
/obj/item/modular_computer/tablet/integrated/ui_data(mob/user)
. = ..()
.["has_light"] = TRUE
.["light_on"] = borgo?.lamp_enabled
.["light_on"] = borgo?.lamp_intensity
.["comp_light_color"] = borgo?.lamp_color
//Makes the flashlight button affect the borg rather than the tablet
@@ -29,7 +29,7 @@
install_component(new /obj/item/computer_hardware/card_slot)
install_component(new /obj/item/computer_hardware/network_card)
install_component(new /obj/item/computer_hardware/printer/mini)
hard_drive.store_file(new /datum/computer_file/program/shipping)
// hard_drive.store_file(new /datum/computer_file/program/shipping)
/obj/item/modular_computer/tablet/preset/advanced/atmos/Initialize() //This will be defunct and will be replaced when NtOS PDAs are done
. = ..()
@@ -35,7 +35,7 @@
return FALSE
if(!paccess_to_check) // No required_access, allow it.
return TRUE
if(isAdminGhostAI(user))
if(IsAdminGhost(user))
return TRUE
//Aquire access from the inserted ID card.
@@ -79,7 +79,8 @@
data["supplies"] = list()
for(var/pack in SSshuttle.supply_packs)
var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
if(!is_visible_pack(usr, P.access_view , null, P.contraband) || P.hidden)
// todo: replace to P.access_view
if(!is_visible_pack(usr, P.access , null, P.contraband) || P.hidden)
continue
if(!data["supplies"][P.group])
data["supplies"][P.group] = list(
@@ -61,7 +61,7 @@
//DEBUG -- Cover, TRUE for locked
data["cover"] = "[borgo.locked? "LOCKED":"UNLOCKED"]"
//Ability to move. FAULT if lockdown wire is cut, DISABLED if borg locked, ENABLED otherwise
data["locomotion"] = "[borgo.wires.is_cut(WIRE_LOCKDOWN)?"FAULT":"[borgo.lockcharge?"DISABLED":"ENABLED"]"]"
data["locomotion"] = "[borgo.wires.is_cut(WIRE_LOCKDOWN)?"FAULT":"[borgo.locked_down?"DISABLED":"ENABLED"]"]"
//Module wire. FAULT if cut, NOMINAL otherwise
data["wireModule"] = "[borgo.wires.is_cut(WIRE_RESET_MODULE)?"FAULT":"NOMINAL"]"
//DEBUG -- Camera(net) wire. FAULT if cut (or no cameranet camera), DISABLED if pulse-disabled, NOMINAL otherwise
@@ -21,10 +21,10 @@
// Stuff needed to render the map
var/map_name
var/atom/movable/screen/map_view/cam_screen
var/obj/screen/map_view/cam_screen
/// All the plane masters that need to be applied.
var/list/cam_plane_masters
var/atom/movable/screen/background/cam_background
var/obj/screen/background/cam_background
/datum/computer_file/program/secureye/New()
. = ..()
@@ -42,8 +42,8 @@
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
for(var/plane in subtypesof(/atom/movable/screen/plane_master))
var/atom/movable/screen/instance = new plane()
for(var/plane in subtypesof(/obj/screen/plane_master))
var/obj/screen/instance = new plane()
instance.assigned_map = map_name
instance.del_on_map_removal = FALSE
instance.screen_loc = "[map_name]:CENTER"
@@ -24,8 +24,8 @@
/obj/item/computer_hardware/New(obj/L)
..()
pixel_x = base_pixel_x + rand(-8, 8)
pixel_y = base_pixel_y + rand(-8, 8)
pixel_x = initial(pixel_x) + rand(-8, 8)
pixel_y = initial(pixel_y) + rand(-8, 8)
/obj/item/computer_hardware/Destroy()
if(holder)
@@ -90,7 +90,7 @@
if(!modularInterface.borgo)
return FALSE //No borg found
if(modularInterface.borgo.lockcharge)
if(modularInterface.borgo.locked_down)
return FALSE //lockdown restricts borg networking
if(!modularInterface.borgo.cell || modularInterface.borgo.cell.charge == 0)
@@ -225,7 +225,7 @@
return FALSE
/obj/machinery/lapvend/ui_interact(mob/user, datum/tgui/ui)
if(machine_stat & (BROKEN | NOPOWER | MAINT))
if(stat & (BROKEN | NOPOWER | MAINT))
if(ui)
ui.close()
return FALSE