shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update living.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-18 17:26:25 -06:00
committed by GitHub
parent 0d137f82d4
commit 64f003d3b1
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -4
View File
@@ -811,12 +811,9 @@
if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
return FALSE
<<<<<<< HEAD
=======
if(has_disability(PACIFISM))
to_chat(src, "<span class='notice'>You don't want to risk harming anyone!</span>")
return FALSE
>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
return TRUE
/mob/living/carbon/proc/update_stamina()
@@ -1059,4 +1056,4 @@
/mob/living/onTransitZ(old_z,new_z)
..()
update_z(new_z)
update_z(new_z)