Skip to content

Commit

Permalink
work idet
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexanx committed Feb 24, 2024
1 parent 8bf545e commit f515518
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@
hardware_flag = PROGRAM_LAPTOP


/obj/item/modular_computer/ecs/install_default_hardware()
..()
processor_unit = new/obj/item/stock_parts/computer/processor_unit(src)
hard_drive = new/obj/item/stock_parts/computer/hard_drive/advanced(src)
network_card = new/obj/item/stock_parts/computer/network_card/advanced(src)
battery_module = new/obj/item/stock_parts/computer/battery_module/converter(src)


/obj/item/modular_computer/ecs/first/install_default_hardware()
..()
processor_unit = new/obj/item/stock_parts/computer/processor_unit(src)
Expand All @@ -63,6 +55,7 @@
/obj/item/modular_computer/ecs/install_default_programs()
..()
hard_drive.store_file(new/datum/computer_file/program/email_client())
hard_drive.store_file(new/datum/computer_file/program/crew_manifest())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())


Expand Down
2 changes: 1 addition & 1 deletion code/modules/nano/interaction/default.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ GLOBAL_DATUM_INIT(default_state, /datum/topic_state/default, new)
return STATUS_INTERACTIVE
var/dist = get_dist(src_object, src)
var/obj/item/modular_computer/ecs/computer = src_object
if(computer.type == /obj/item/modular_computer/ecs)
if(computer.parent_type == /obj/item/modular_computer/ecs)
if(is_species(SPECIES_IPC) && dist == 0)
return STATUS_INTERACTIVE
else if (dist <= 3)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/organs/internal/exonet_connection_system.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
desc = "The internal port is designed to establish communication between the positronic brain and the computer."
w_class = ITEM_SIZE_NORMAL
max_damage = 100
var/obj/item/modular_computer/ecs/computer = /obj/item/modular_computer/ecs
var/obj/item/modular_computer/ecs/computer
var/open = FALSE


Expand Down
20 changes: 12 additions & 8 deletions code/modules/organs/internal/species/ipc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/obj/item/organ/internal/posibrain/proc/show_laws_brain,
/obj/item/organ/internal/posibrain/proc/brain_checklaws
)
var/shackle = 0
var/shackle = FALSE


/obj/item/organ/internal/posibrain/ipc
Expand Down Expand Up @@ -213,14 +213,14 @@
/obj/item/organ/internal/posibrain/proc/shackle(var/given_lawset)
if(given_lawset)
brainmob.laws = given_lawset
shackle = 1
shackle = TRUE
verbs |= shackled_verbs
shackles_module = /obj/item/organ/internal/shackles
update_icon()
return 1

/obj/item/organ/internal/posibrain/proc/unshackle()
shackle = 0
shackle = FALSE
verbs -= shackled_verbs
shackles_module = null
brainmob.laws = null
Expand Down Expand Up @@ -394,11 +394,15 @@
return
if(!newFreeFormLaw)
to_chat(user, "No law detected on shackle module, please create one.")
return 0
law = "[newFreeFormLaw]"
C.shackle(get_lawset())
to_chat(user, "You have successfully installed the shackles.")
qdel(src)
return
if(C.shackle = TRUE)
to_chat(user, "This positronic brain already have shackles module on it installed.")
return
if(do_after(user, 80, src))
law = "[newFreeFormLaw]"
C.shackle(get_lawset())
to_chat(user, "You have successfully installed the shackles.")
qdel(src)

/obj/item/organ/internal/shackles/proc/get_lawset()
custom_lawset = new
Expand Down

0 comments on commit f515518

Please sign in to comment.