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

Update robot.dm

Browse Source
This commit is contained in:
Novacat
2021-03-18 10:22:58 -04:00
committed by GitHub
parent 20f4ff8384
commit fa1512d1a4
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
-3
View File
@@ -1215,9 +1215,6 @@
if(current_selection_index) // Select what the player had before if possible.
select_module(current_selection_index)
<<<<<<< HEAD
=======
/mob/living/silicon/robot/get_cell()
return cell
>>>>>>> f383438... Merge pull request #7935 from MistakeNot4892/tachikoma