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

Update human.dm

Browse Source
This commit is contained in:
Novacat
2021-03-22 01:31:56 -04:00
committed by GitHub
parent 9a7406aede
commit 57ca69c151
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
-7
View File
@@ -1650,12 +1650,5 @@
..()
<<<<<<< HEAD
/mob/living/carbon/human/reduce_cuff_time()
if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig))
return 2
return ..()
=======
/mob/living/carbon/human/get_mob_riding_slots()
return list(back, head, wear_suit)
>>>>>>> 0b5bb3f... Allows Teshari to glide in some multiz fall conditions. (#7990)