Skip to content

Commit

Permalink
grab and force people to touch artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
Brtrex committed Oct 10, 2018
1 parent d8a2d60 commit b7f7d27
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion code/obj/artifacts/artifactprocs.dm
Expand Up @@ -193,6 +193,17 @@
if (istype(user,/mob/living/silicon/robot))
src.ArtifactStimulus("silitouch", 1)

if (istype(W, /obj/item/grab))
var/obj/item/grab/GRAB = W
if (ismob(GRAB.affecting))
var/mob/M = GRAB.affecting
var/mob/A = GRAB.assailant
if (get_dist(src.loc, M.loc) > 1)
return
src.visible_message("<b>[M.name]</b> is forced to touch [src] by [A.name].")
src.ArtifactTouched(M)
return 0

if (istype(W,/obj/item/artifact/activator_key))
var/obj/item/artifact/activator_key/ACT = W
if (!src.ArtifactSanityCheck())
Expand Down Expand Up @@ -433,4 +444,4 @@
if (trigger_alert)
message_admins("An artifact ([A.type]) was [type_of_action] [special_addendum ? "([special_addendum])" : ""] at [log_loc(O)]. Last touched by: [O.fingerprintslast ? "[O.fingerprintslast]" : "*null*"]")

return
return

0 comments on commit b7f7d27

Please sign in to comment.