Merge pull request #10010 from Ghommie/Ghommie-cit415
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
This commit is contained in:
@@ -107,7 +107,7 @@
|
|||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/implant/proc/get_data()
|
/obj/item/implant/proc/get_data()
|
||||||
return "No information available"
|
return "No information available about this implant."
|
||||||
|
|
||||||
/obj/item/implant/dropped(mob/user)
|
/obj/item/implant/dropped(mob/user)
|
||||||
. = 1
|
. = 1
|
||||||
|
|||||||
@@ -13,34 +13,31 @@
|
|||||||
var/broadcasting = null
|
var/broadcasting = null
|
||||||
var/listening = 1
|
var/listening = 1
|
||||||
|
|
||||||
|
/obj/item/implantpad/examine(mob/user)
|
||||||
|
. = ..()
|
||||||
|
if(case)
|
||||||
|
. += "<span class='notice'>Alt-click [src] to remove the inserted implant case.</span>"
|
||||||
|
|
||||||
/obj/item/implantpad/update_icon()
|
/obj/item/implantpad/update_icon()
|
||||||
if(case)
|
icon_state = "implantpad-[case ? TRUE : FALSE]"
|
||||||
icon_state = "implantpad-1"
|
|
||||||
else
|
|
||||||
icon_state = "implantpad-0"
|
|
||||||
|
|
||||||
|
/obj/item/implantpad/AltClick(mob/user)
|
||||||
/obj/item/implantpad/attack_hand(mob/user)
|
|
||||||
. = ..()
|
. = ..()
|
||||||
if(.)
|
if(case && user.can_hold_items() && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
|
||||||
return
|
user.put_in_hands(case)
|
||||||
if(case && user.is_holding(src))
|
|
||||||
user.put_in_active_hand(case)
|
|
||||||
|
|
||||||
case.add_fingerprint(user)
|
case.add_fingerprint(user)
|
||||||
case = null
|
case = null
|
||||||
|
|
||||||
add_fingerprint(user)
|
add_fingerprint(user)
|
||||||
update_icon()
|
update_icon()
|
||||||
|
return TRUE
|
||||||
|
|
||||||
/obj/item/implantpad/attackby(obj/item/implantcase/C, mob/user, params)
|
/obj/item/implantpad/attackby(obj/item/implantcase/C, mob/user, params)
|
||||||
if(istype(C, /obj/item/implantcase))
|
if(istype(C))
|
||||||
if(!case)
|
if(!case && user.transferItemToLoc(C, src))
|
||||||
if(!user.transferItemToLoc(C, src))
|
|
||||||
return
|
|
||||||
case = C
|
case = C
|
||||||
update_icon()
|
update_icon()
|
||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user