shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Makes new surgeries check for tool qualities (#5690)

Browse Source 
* Makes new surgeries check for tool qualities  (#35847)

* Makes new surgeries check for tool qualities

* Gives augments and autosurgeon some tool_act love

* okay

* Fix duplicate definition

* Makes new surgeries check for tool qualities
This commit is contained in:
CitadelStationBot
2018-02-24 07:02:26 -06:00
committed by Poojawa
parent b2ea3ea668
commit 26702fda91
7 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+9 -10
View File
@@ -41,16 +41,15 @@
..()
to_chat(user, "<span class='info'>[src] is assembled in the [zone == "r_arm" ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>")
/obj/item/organ/cyberimp/arm/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/screwdriver))
if(zone == "r_arm")
zone = "l_arm"
else
zone = "r_arm"
SetSlotFromZone()
to_chat(user, "<span class='notice'>You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm.</span>")
update_icon()
/obj/item/organ/cyberimp/arm/screwdriver_act(mob/living/user, obj/item/I)
I.play_tool_sound(src)
if(zone == "r_arm")
zone = "l_arm"
else
zone = "r_arm"
SetSlotFromZone()
to_chat(user, "<span class='notice'>You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm.</span>")
update_icon()
/obj/item/organ/cyberimp/arm/Remove(mob/living/carbon/M, special = 0)
Retract()
code/modules/surgery/organs/autosurgeon.dm
+20 -13
View File
@@ -53,19 +53,26 @@
return
storedorgan = I
to_chat(user, "<span class='notice'>You insert the [I] into [src].</span>")
else if(istype(I, /obj/item/screwdriver))
if(!storedorgan)
to_chat(user, "<span class='notice'>There's no implant in [src] for you to remove.</span>")
else
var/turf/open/floorloc = get_turf(user)
floorloc.contents += contents
to_chat(user, "<span class='notice'>You remove the [storedorgan] from [src].</span>")
I.play_tool_sound(src)
storedorgan = null
if(uses != INFINITE)
uses--
if(!uses)
desc = "[initial(desc)] Looks like it's been used up."
else
return ..()
/obj/item/device/autosurgeon/screwdriver_act(mob/living/user, obj/item/I)
if(!storedorgan)
to_chat(user, "<span class='notice'>There's no implant in [src] for you to remove.</span>")
else
var/atom/drop_loc = user.drop_location()
for(var/J in src)
var/atom/movable/AM = J
AM.forceMove(drop_loc)
to_chat(user, "<span class='notice'>You remove the [storedorgan] from [src].</span>")
I.play_tool_sound(src)
storedorgan = null
if(uses != INFINITE)
uses--
if(!uses)
desc = "[initial(desc)] Looks like it's been used up."
return TRUE
/obj/item/device/autosurgeon/cmo
desc = "A single use autosurgeon that contains a medical heads-up display augment. A screwdriver can be used to remove it, but implants can't be placed back in."