cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into logging-improvements

Browse Source
This commit is contained in:
farie82
2020-05-22 07:16:23 +02:00
committed by GitHub
parent fc32be435b 0aaae51cab
commit 38d854dcdd
319 changed files with 17089 additions and 15784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+6 -6
View File
@@ -261,12 +261,12 @@
if(incapacitated())
return
var/face_dir = get_cardinal_dir(src, A)
if(forced_look == face_dir)
if(!face_dir || forced_look == face_dir || A == src)
forced_look = null
to_chat(src, "<span class='notice'>You are no longer facing any direction.</span>")
to_chat(src, "<span class='notice'>Cancelled direction lock.</span>")
return
forced_look = face_dir
to_chat(src, "<span class='notice'>You are now facing [dir2text(forced_look)].</span>")
to_chat(src, "<span class='userdanger'>You are now facing [dir2text(forced_look)]. To cancel this, shift-middleclick yourself.</span>")
/*
Middle shift-control-click
@@ -274,12 +274,12 @@
*/
/mob/proc/MiddleShiftControlClickOn(atom/A)
var/face_uid = A.UID()
if(forced_look == face_uid)
if(forced_look == face_uid || A == src)
forced_look = null
to_chat(src, "<span class='notice'>You are no longer facing [A].</span>")
to_chat(src, "<span class='notice'>Cancelled direction lock.</span>")
return
forced_look = face_uid
to_chat(src, "<span class='notice'>You are now facing [A].</span>")
to_chat(src, "<span class='userdanger'>You are now facing [A]. To cancel this, shift-middleclick yourself.</span>")
// In case of use break glass
/*
code/_onclick/item_attack.dm
+1 -1
View File
@@ -58,7 +58,7 @@
else
return 1
var/obj/item/organ/external/O = M.get_organ(user.zone_selected)
if((is_sharp(src) || (isscrewdriver(src) && O.is_robotic())) && user.a_intent == INTENT_HELP)
if((is_sharp(src) || (isscrewdriver(src) && O?.is_robotic())) && user.a_intent == INTENT_HELP)
if(!attempt_initiate_surgery(src, M, user))
return FALSE
else