cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-01-27 09:30:29 -05:00
committed by GitHub
parent b9e647a4a4
commit 5329fa18f1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/robolimbs_vr.dm
View File

@@ -81,9 +81,6 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
monitor_styles = cyberbeast_monitor_styles
/obj/item/weapon/disk/limb/cyber_beast
<<<<<<< HEAD
company = "Cyber Tech"
=======
company = "Cyber Tech"
/datum/robolimb/zenghu_glacier
@@ -101,4 +98,3 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_glacier_taj.dmi'
unavailable_to_build = 1
parts = list(BP_HEAD)
>>>>>>> 2d6e78eae7... Merge pull request #14346 from SatinIsle/ZenguHu-Glacier