cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update human.dm

Browse Source
This commit is contained in:
Novacat
2020-08-02 02:01:34 -04:00
committed by GitHub
parent c889e5ebe2
commit 0d1ae2638f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1687,12 +1687,6 @@
T.add_blood(src) T.add_blood(src)
. = ..() . = ..()
<<<<<<< HEAD
/mob/living/carbon/human/reduce_cuff_time()
if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig))
return 2
return ..()
=======
// Tries to turn off item-based things that let you see through walls, like mesons. // Tries to turn off item-based things that let you see through walls, like mesons.
// Certain stuff like genetic xray vision is allowed to be kept on. // Certain stuff like genetic xray vision is allowed to be kept on.
/mob/living/carbon/human/disable_spoiler_vision() /mob/living/carbon/human/disable_spoiler_vision()
@@ -1712,4 +1706,8 @@
to_chat(src, span("warning", "\The [rig]'s visor has shuddenly deactivated!")) to_chat(src, span("warning", "\The [rig]'s visor has shuddenly deactivated!"))
..() ..()
>>>>>>> bef865b... Merge pull request #7383 from Neerti/meson_obfuscation
/mob/living/carbon/human/reduce_cuff_time()
if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig))
return 2
return ..()