cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4666 from CHOMPStation2/upstream-merge-13457

Browse Source 
[MIRROR] Borgeon can now put in NIFs
This commit is contained in:
Nadyr
2022-08-07 18:40:15 -04:00
committed by GitHub
parent d2393d1cec 3c59fb31cb
commit ca2f70637b
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,8 @@
desc = "A specialized grasping tool used to preserve and manipulate organic material."
can_hold = list(
/obj/item/organ
/obj/item/organ,
/obj/item/device/nif //NIFs can be slapped in during surgery
)
/obj/item/weapon/gripper/no_use/organ/Entered(var/atom/movable/AM)
@@ -208,7 +209,8 @@
/obj/item/organ/external,
/obj/item/organ/internal/brain, //to insert into MMIs,
/obj/item/organ/internal/cell,
/obj/item/organ/internal/eyes/robot
/obj/item/organ/internal/eyes/robot,
/obj/item/device/nif //NIFs can be slapped in during surgery
)
/obj/item/weapon/gripper/no_use/mech

20
code/modules/surgery/implant.dm
View File

@@ -124,7 +124,14 @@
if(..())
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(istype(user,/mob/living/silicon/robot))
return
if(istype(tool, /obj/item/weapon/gripper))
var/obj/item/weapon/gripper/Gripper = tool
if(Gripper.wrapped)
tool = Gripper.wrapped
else
return
else
return
if(affected && affected.cavity)
var/total_volume = tool.w_class
for(var/obj/item/I in affected.implants)
@@ -135,6 +142,9 @@
/datum/surgery_step/cavity/place_item/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(isrobot(user) && istype(tool, /obj/item/weapon/gripper))
var/obj/item/weapon/gripper/G = tool
tool = G.wrapped
user.visible_message("<span class='notice'>[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>", \
"<span class='notice'>You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>" ) //Nobody will probably ever see this, but I made these two blue. ~CK
target.custom_pain("The pain in your chest is living hell!",1)
@@ -142,7 +152,12 @@
/datum/surgery_step/cavity/place_item/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
if(isrobot(user) && istype(tool, /obj/item/weapon/gripper))
var/obj/item/weapon/gripper/G = tool
tool = G.wrapped
G.drop_item()
else
user.drop_item()
user.visible_message("<span class='notice'>[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>", \
"<span class='notice'>You put \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>" )
if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && (affected.robotic < ORGAN_ROBOT))
@@ -150,7 +165,6 @@
var/datum/wound/internal_bleeding/I = new (10)
affected.wounds += I
affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1)
user.drop_item()
affected.implants += tool
tool.loc = affected
if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support