Self-Surgery (#7671)

* Allows organics to self-surgery after standing still for 5 seconds. It follows the same rules as normal surgery.

* Confirm-by-delay for self-surgery steps.

* Verb to toggle self-surgery.

* Add log.
This commit is contained in:
Mechoid
2020-11-18 13:55:33 -08:00
committed by GitHub
parent 499c248712
commit b411c75a19
6 changed files with 38 additions and 8 deletions
+11 -4
View File
@@ -1173,12 +1173,19 @@ proc/is_hot(obj/item/W as obj)
// check if mob is lying down on something we can operate him on.
// The RNG with table/rollerbeds comes into play in do_surgery() so that fail_step() can be used instead.
/proc/can_operate(mob/living/carbon/M)
return M.lying
/proc/can_operate(mob/living/carbon/M, mob/living/user)
. = M.lying
if(user && M == user && user.allow_self_surgery && user.a_intent == I_HELP) // You can, technically, always operate on yourself after standing still. Inadvised, but you can.
if(!M.isSynthetic())
. = TRUE
return .
// Returns an instance of a valid surgery surface.
/mob/living/proc/get_surgery_surface()
if(!lying)
/mob/living/proc/get_surgery_surface(mob/living/user)
if(!lying && user != src)
return null // Not lying down means no surface.
var/obj/surface = null
for(var/obj/O in loc) // Looks for the best surface.
+1 -1
View File
@@ -44,7 +44,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
/mob/living/attackby(obj/item/I, mob/user, var/attack_modifier, var/click_parameters)
if(!ismob(user))
return 0
if(can_operate(src) && I.do_surgery(src,user))
if(can_operate(src, user) && I.do_surgery(src,user))
return 1
return I.attack(src, user, user.zone_sel.selecting, attack_modifier)
@@ -52,6 +52,8 @@
dna.real_name = real_name
sync_organ_dna()
verbs |= /mob/living/proc/toggle_selfsurgery
/mob/living/carbon/human/Destroy()
human_mob_list -= src
for(var/organ in organs)
@@ -70,4 +70,7 @@
var/makes_dirt = TRUE //FALSE if the mob shouldn't be making dirt on the ground when it walks
var/looking_elsewhere = FALSE //If the mob's view has been relocated to somewhere else, like via a camera or with binocs
var/image/selected_image = null // Used for buildmode AI control stuff.
var/allow_self_surgery = FALSE // Used to determine if the mob can perform surgery on itself.
+10
View File
@@ -15,3 +15,13 @@
layer = HIDING_LAYER //Just above cables with their 2.44
plane = OBJ_PLANE
to_chat(src,"<span class='notice'>You are now hiding.</span>")
/mob/living/proc/toggle_selfsurgery()
set name = "Allow Self Surgery"
set desc = "Toggles the 'safeties' on self-surgery, allowing you to do so."
set category = "Object"
allow_self_surgery = !allow_self_surgery
to_chat(usr, "<span class='notice'>You will [allow_self_surgery ? "now" : "no longer"] attempt to operate upon yourself.</span>")
log_admin("DEBUG \[[world.timeofday]\]: [src.ckey ? "[src.name]:([src.ckey])" : "[src.name]"] has [allow_self_surgery ? "Enabled" : "Disabled"] self surgery.")
+11 -3
View File
@@ -121,8 +121,8 @@
/obj/item/proc/can_do_surgery(mob/living/carbon/M, mob/living/user)
if(M == user)
return 0
// if(M == user)
// return 0
if(!ishuman(M))
return 1
@@ -139,11 +139,19 @@
if(zone in M.op_stage.in_progress) //Can't operate on someone repeatedly.
to_chat(user, "<span class='warning'>You can't operate on this area while surgery is already in progress.</span>")
return 1
for(var/datum/surgery_step/S in surgery_steps)
//check if tool is right or close enough and if this step is possible
if(S.tool_quality(src))
var/step_is_valid = S.can_use(user, M, zone, src)
if(step_is_valid && S.is_valid_target(M))
if(M == user) // Once we determine if we can actually do a step at all, give a slight delay to self-surgery to confirm attempts.
to_chat(user, "<span class='critical'>You focus on attempting to perform surgery upon yourself.</span>")
if(!do_after(user, 3 SECONDS, M))
return 0
if(step_is_valid == SURGERY_FAILURE) // This is a failure that already has a message for failing.
return 1
M.op_stage.in_progress += zone
@@ -155,7 +163,7 @@
success = FALSE
// Bad or no surface may mean failure as well.
var/obj/surface = M.get_surgery_surface()
var/obj/surface = M.get_surgery_surface(user)
if(!surface || !prob(surface.surgery_odds))
success = FALSE