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/advanced/brainwashing.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/datum/surgery_step/brainwash
name = "brainwash"
implements = list(/obj/item/hemostat = 85, /obj/item/wirecutters = 50, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15)
implements = list(/obj/item/hemostat = 85, TOOL_WIRECUTTER = 50, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15)
time = 200
var/objective
code/modules/surgery/advanced/necrotic_revival.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/datum/surgery_step/bionecrosis
name = "start bionecrosis"
implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 35, /obj/item/pen = 15)
implements = list(/obj/item/hemostat = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
time = 50
/datum/surgery_step/bionecrosis/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
code/modules/surgery/advanced/pacification.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/datum/surgery_step/pacify
name = "rewire brain"
implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 35, /obj/item/pen = 15)
implements = list(/obj/item/hemostat = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
time = 40
/datum/surgery_step/pacify/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
code/modules/surgery/advanced/reconstruction.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/datum/surgery_step/reconstruct
name = "repair body"
implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 35, /obj/item/pen = 15)
implements = list(/obj/item/hemostat = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
repeatable = TRUE
time = 25
code/modules/surgery/advanced/viral_bonding.dm
+4 -19
View File
@@ -23,29 +23,14 @@
/datum/surgery_step/viral_bond
name = "viral bond"
implements = list(/obj/item/cautery = 100, /obj/item/weldingtool = 50,
/obj/item/lighter = 35, /obj/item/match = 30)
implements = list(/obj/item/cautery = 100, TOOL_WELDER = 50, /obj/item = 30) // 30% success with any hot item.
time = 100
/datum/surgery_step/viral_bond/tool_check(mob/user, obj/item/tool)
if(istype(tool, /obj/item/cautery))
return TRUE
if(implement_type == TOOL_WELDER || implement_type == /obj/item)
return tool.is_hot()
if(istype(tool, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = tool
if(WT.isOn())
return TRUE
else if(istype(tool, /obj/item/lighter))
var/obj/item/lighter/L = tool
if(L.lit)
return TRUE
else if(istype(tool, /obj/item/match))
var/obj/item/match/M = tool
if(M.lit)
return TRUE
return FALSE
return TRUE
/datum/surgery_step/viral_bond/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] starts heating [target]'s bone marrow with [tool]...", "<span class='notice'>You start heating [target]'s bone marrow with [tool]...</span>")