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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2023-02-20 16:19:02 -07:00
committed by GitHub
parent be56ab7289
commit f32ba89785
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/clothing/under/accessories/accessory_vr.dm
View File

@@ -572,8 +572,6 @@
desc = "A shoulder mantle bearing the colors usually found on a Site Manager, a commanding blue with regal gold inlay."
icon_state = "capmantle"
item_state = "capmantle"
<<<<<<< HEAD
=======
//Boat cloaks
/obj/item/clothing/accessory/poncho/roles/cloak/boat
@@ -688,4 +686,3 @@
name = "research shroud"
icon_state = "scishroud"
item_state = "scishroud"
>>>>>>> 770f8fb231... Merge pull request #14505 from Burrito-Justice/master