This commit is contained in:
r4d6
2019-12-23 13:30:42 -05:00
parent 54b3e3603e
commit e17d32199d
908 changed files with 6472 additions and 17340 deletions

View File

@@ -126,7 +126,7 @@
portable_drive.verb_pickup()
/obj/item/modular_computer/AltClick(mob/user)
. = ..()
..()
if(issilicon(user))
return
@@ -142,7 +142,7 @@
return
if(ai_slot)
ai_slot.try_eject(null, user)
return TRUE
// Gets IDs/access levels from card slot. Would be useful when/if PDAs would become modular PCs.
/obj/item/modular_computer/GetAccess()

View File

@@ -86,8 +86,8 @@
/obj/item/modular_computer/laptop/AltClick(mob/user)
if(screen_on) // Close it.
try_toggle_open(user)
return TRUE
return ..()
else
return ..()
/obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null)
if(screen_on)

View File

@@ -94,9 +94,8 @@
cpu.eject_card()
/obj/machinery/modular_computer/AltClick(mob/user)
. = ..()
if(cpu)
return cpu.AltClick(user)
cpu.AltClick(user)
//ATTACK HAND IGNORING PARENT RETURN VALUE
// On-click handling. Turns on the computer if it's off and opens the GUI.

View File

@@ -41,13 +41,6 @@
/obj/item/computer_hardware/ai_slot/try_eject(slot=0,mob/living/user = null,forced = 0)
if (get_dist(src,user) > 1)
if (iscarbon(user))
var/mob/living/carbon/H = user
if (!(H.dna && H.dna.check_mutation(TK) && tkMaxRangeCheck(src,H)))
return FALSE
else
return FALSE
if(!stored_card)
to_chat(user, "<span class='warning'>There is no card in \the [src].</span>")
return FALSE

View File

@@ -73,13 +73,6 @@
/obj/item/computer_hardware/card_slot/try_eject(slot=0, mob/living/user = null, forced = 0)
if (get_dist(src,user) > 1)
if (iscarbon(user))
var/mob/living/carbon/H = user
if (!(H.dna && H.dna.check_mutation(TK) && tkMaxRangeCheck(src,H)))
return FALSE
else
return FALSE
if(!stored_card && !stored_card2)
to_chat(user, "<span class='warning'>There are no cards in \the [src].</span>")
return FALSE