cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-12 04:27:10 -05:00
committed by GitHub
parent c2ba0188e6
commit 873a8bb200
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
View File

@@ -36,8 +36,8 @@
LANGUAGE_ECUREUILIAN= 1, LANGUAGE_ECUREUILIAN= 1,
LANGUAGE_DAEMON = 1, LANGUAGE_DAEMON = 1,
LANGUAGE_ENOCHIAN = 1, LANGUAGE_ENOCHIAN = 1,
<<<<<<< HEAD LANGUAGE_DRUDAKAR = 1,
LANGUAGE_SQUEAKISH = 1 //CHOMPedit LANGUAGE_TAVAN = 1
) )
/obj/item/weapon/robot_module/robot/chound /obj/item/weapon/robot_module/robot/chound
@@ -58,12 +58,8 @@
LANGUAGE_ECUREUILIAN= 1, LANGUAGE_ECUREUILIAN= 1,
LANGUAGE_DAEMON = 1, LANGUAGE_DAEMON = 1,
LANGUAGE_ENOCHIAN = 1, LANGUAGE_ENOCHIAN = 1,
LANGUAGE_DRUDAKAR = 1,
LANGUAGE_SQUEAKISH = 1 //CHOMPedit
=======
LANGUAGE_DRUDAKAR = 1, LANGUAGE_DRUDAKAR = 1,
LANGUAGE_TAVAN = 1 LANGUAGE_TAVAN = 1
>>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001
) )
/hook/startup/proc/robot_modules_vr() /hook/startup/proc/robot_modules_vr()