cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
cadyn
2020-11-25 20:22:48 -08:00
committed by GitHub
parent e9b6e94fa2
commit 855f42ec48
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -1274,10 +1274,7 @@
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD) body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
species_allowed = list(SPECIES_TESHARI) species_allowed = list(SPECIES_TESHARI)
<<<<<<< HEAD
body_parts = list(BP_L_FOOT,BP_R_FOOT) body_parts = list(BP_L_FOOT,BP_R_FOOT)
||||||| parent of 67fb08e6e2... Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this
=======
voxscales voxscales
name = "Vox Scales" name = "Vox Scales"
@@ -1344,4 +1341,3 @@
icon_state = "unathilongfrills" icon_state = "unathilongfrills"
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
>>>>>>> 67fb08e6e2... Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this