powder that makes you say yes

This commit is contained in:
Nadyr
2022-08-28 20:53:22 -04:00
committed by GitHub
parent a5ed38564a
commit f1f6ecf481
-3
View File
@@ -3442,11 +3442,8 @@
#include "code\modules\mob\new_player\sprite_accessories_taur_vr.dm"
#include "code\modules\mob\new_player\sprite_accessories_vr.dm"
#include "code\modules\mob\new_player\sprite_accessories_wing.dm"
<<<<<<< HEAD
#include "code\modules\mob\new_player\sprite_accessories_wing_ch.dm"
=======
#include "code\modules\mob\new_player\sprite_accessories_wing_large_vr.dm"
>>>>>>> 124841bd3a... Merge pull request #13598 from Heroman3003/megawings
#include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm"
#include "code\modules\mob\new_player\sprite_accessories_yw.dm"
#include "code\modules\modular_computers\laptop_vendor.dm"