cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc

Browse Source
This commit is contained in:
Zuhayr
2014-12-01 00:37:13 +10:30
parent 9b5235016b
commit 14cf4aa8e3
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -26,8 +26,7 @@
/obj/item/weapon/smes_coil /obj/item/weapon/smes_coil
) )
//Item currently being held. var/obj/item/wrapped = null // Item currently being held.
var/obj/item/wrapped = null
/obj/item/weapon/gripper/paperwork /obj/item/weapon/gripper/paperwork
name = "paperwork gripper" name = "paperwork gripper"
@@ -44,7 +43,8 @@
/obj/item/weapon/gripper/attack_self(mob/user as mob) /obj/item/weapon/gripper/attack_self(mob/user as mob)
if(wrapped) if(wrapped)
wrapped.attack_self(user) return wrapped.attack_self(user)
return ..()
/obj/item/weapon/gripper/verb/drop_item() /obj/item/weapon/gripper/verb/drop_item()
@@ -68,12 +68,9 @@
//update_icon() //update_icon()
/obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
return return (wrapped ? wrapped.attack(M,user) : 0)
/obj/item/weapon/gripper/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) /obj/item/weapon/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params)
if(!target || !proximity) //Target is invalid or we are not adjacent.
return
//There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z
if(!wrapped) if(!wrapped)
@@ -82,13 +79,10 @@
break break
if(wrapped) //Already have an item. if(wrapped) //Already have an item.
//Temporary put wrapped into user so target's attackby() checks pass. //Temporary put wrapped into user so target's attackby() checks pass.
wrapped.loc = user wrapped.loc = user
//Pass the attack on to the target. This might delete/relocate wrapped. //Pass the attack on to the target. This might delete/relocate wrapped.
target.attackby(wrapped,user) wrapped.afterattack(target,user)
//If wrapped was neither deleted nor put into target, put it back into the gripper. //If wrapped was neither deleted nor put into target, put it back into the gripper.
if(wrapped && user && (wrapped.loc == user)) if(wrapped && user && (wrapped.loc == user))
wrapped.loc = src wrapped.loc = src