mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 00:35:45 +01:00
powder that makes you say yes
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user