mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] Add basic consent for body writing. (#12024)
Co-authored-by: Aura Dusklight <46622484+NovaDusklight@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
f3cf9ba60f
commit
7ec8dfca29
@@ -185,7 +185,7 @@
|
||||
else if(istype(I, /obj/item/pen))
|
||||
if(!ishuman(src))
|
||||
return FALSE
|
||||
var/mob/living/carbon/human/us = src
|
||||
var/mob/living/carbon/human/canvas_user = src
|
||||
|
||||
if(!isliving(user))
|
||||
return FALSE
|
||||
@@ -205,9 +205,21 @@
|
||||
if(!message)
|
||||
return TRUE
|
||||
|
||||
add_attack_logs(attacker, us, "wrote \"[message]\"")
|
||||
to_chat(canvas_user, span_notice("[attacker] is attempting to write on your [affecting.name]!"))
|
||||
attacker.visible_message(span_notice("[attacker] starts writing on [canvas_user]'s [affecting.name]."), \
|
||||
span_notice("You start writing on [canvas_user]'s [affecting.name]..."))
|
||||
|
||||
LAZYSET(us.body_writing, affecting.organ_tag, message)
|
||||
// Progress bar for writing on someone for better consent check.
|
||||
if(!do_after(attacker, 3 SECONDS, target = canvas_user, max_distance = 1))
|
||||
to_chat(attacker, span_warning("You stop writing on [canvas_user]."))
|
||||
return TRUE
|
||||
|
||||
add_attack_logs(attacker, canvas_user, "wrote \"[message]\"")
|
||||
|
||||
LAZYSET(canvas_user.body_writing, affecting.organ_tag, message)
|
||||
|
||||
attacker.visible_message(span_notice("[attacker] finishes writing on [canvas_user]'s [affecting.name]."), \
|
||||
span_notice("You finish writing on [canvas_user]'s [affecting.name]."))
|
||||
return TRUE
|
||||
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user