shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working code?

Browse Source
This commit is contained in:
Letter N
2020-08-21 15:09:49 +08:00
parent 8d70e21239
commit f04918bdca
22 changed files with 131 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer.dm
+2 -2
View File
@@ -6,7 +6,7 @@
desc = "A small portable microcomputer."
icon = 'icons/obj/computer.dmi'
icon_state = "laptop-open"
light_on = FALSE
var/light_on = FALSE
integrity_failure = 0.5
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
@@ -130,7 +130,7 @@
return
if(enabled)
ui_interact(user)
else if(isAdminGhostAI(user))
else if(IsAdminGhost(user))
var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
if(response == "Yes")
turn_on(user)
code/modules/modular_computers/computers/item/tablet_presets.dm
+1 -1
View File
@@ -30,7 +30,7 @@
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/bounty)
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
. = ..()