cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

More than 2 hands!? WHAAAAAAT

Browse Source
This commit is contained in:
Remie Richards
2016-09-02 16:10:16 +01:00
parent 41a0df585c
commit 00738bd2a3
207 changed files with 1230 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/laptop.dm
+1 -6
View File
@@ -55,12 +55,7 @@
if(!M.restrained() && !M.stat)
if(!isturf(loc) || !Adjacent(M))
return
switch(H.slot_id)
if(slot_r_hand)
M.put_in_r_hand(src)
if(slot_l_hand)
M.put_in_l_hand(src)
M.put_in_hand(src, H.held_index)
/obj/item/device/modular_computer/laptop/attack_hand(mob/user)
if(screen_on && isturf(loc))
code/modules/modular_computers/file_system/program.dm
+1 -1
View File
@@ -89,7 +89,7 @@
if(ishuman(user))
var/mob/living/carbon/human/h = user
var/obj/item/weapon/card/id/I = h.get_idcard()
var/obj/item/weapon/card/id/C = h.get_active_hand()
var/obj/item/weapon/card/id/C = h.get_active_held_item()
if(C)
C = C.GetID()
if(!(C && istype(C)))
code/modules/modular_computers/file_system/programs/card.dm
+2 -2
View File
@@ -169,7 +169,7 @@
data_core.manifest_modify(id_card.registered_name, id_card.assignment)
computer.proc_eject_id(user, 1)
else
var/obj/item/I = usr.get_active_hand()
var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/weapon/card/id))
if(!usr.drop_item())
return
@@ -185,7 +185,7 @@
minor = 0
computer.proc_eject_id(user, 2)
else
var/obj/item/I = usr.get_active_hand()
var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/weapon/card/id))
if(!usr.drop_item())
return