cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-19 03:50:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Archie
2021-01-05 03:41:08 -03:00
parent d98266036f 90ae23caaa
commit 9e37d3be62
106 changed files with 13604 additions and 13417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/rotation.dm
+1
View File
@@ -106,6 +106,7 @@
if(!can_be_rotated.Invoke(user, rotation) || !can_user_rotate.Invoke(user, rotation))
return
BaseRot(user, rotation)
return TRUE
/datum/component/simple_rotation/proc/WrenchRot(datum/source, obj/item/I, mob/living/user)
if(!can_be_rotated.Invoke(user,default_rotation_direction) || !can_user_rotate.Invoke(user,default_rotation_direction))
code/datums/components/storage/storage.dm
+779 -778
View File
File diff suppressed because it is too large Load Diff